status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do state-test after adding block to blockchain

This commit is contained in:
nicksavers 2014-07-07 23:43:22 +02:00
parent 6545049a16
commit 3b38e9cd9a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ethereumj-core/src/main/java/org/ethereum/core/Blockchain.java
View File

@ -110,6 +110,15 @@ public class Blockchain {
} }
for (int i = blocks.size() - 1; i >= 0 ; --i) { for (int i = blocks.size() - 1; i >= 0 ; --i) {
this.addBlock(blocks.get(i)); this.addBlock(blocks.get(i));
/* Debug check to see if the state is still as expected */
if(logger.isWarnEnabled()) {
String blockStateRootHash = Hex.toHexString(blocks.get(i).getStateRoot());
String worldStateRootHash = Hex.toHexString(WorldManager.getInstance().getRepository().getWorldState().getRootHash());
if(!blockStateRootHash.equals(worldStateRootHash))
logger.warn("WARNING: STATE CONFLICT! worldstate {} mismatch", worldStateRootHash);
}
} }
// Remove all wallet transactions as they already approved by the net // Remove all wallet transactions as they already approved by the net
for (Block block : blocks) { for (Block block : blocks) {
@ -135,7 +144,7 @@ public class Blockchain {
this.updateGasPrice(block); this.updateGasPrice(block);
this.setLastBlock(block); this.setLastBlock(block);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("block added to the chain with hash: {}", Hex.toHexString(block.getHash())); logger.debug("block added {}", block.toFlatString());
} else { } else {
logger.warn("Invalid block with nr: {}", block.getNumber()); logger.warn("Invalid block with nr: {}", block.getNumber());
} }