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

Use statelogger for logging state conflict

This commit is contained in:
nicksavers 2014-08-23 22:47:40 +02:00
parent cdbc5f0a25
commit 99522657ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,8 +112,8 @@ public class Blockchain {
if (block == null) if (block == null)
return; return;
if (block.getNumber() == 2111) if (block.getNumber() == 3211)
logger.debug("Block #2111"); logger.debug("Block #3211");
// if it is the first block to add // if it is the first block to add
// make sure the parent is genesis // make sure the parent is genesis
@ -170,7 +170,7 @@ public class Blockchain {
stateLogger.debug("apply block: [ {} ] tx: [ {} ] ", block.getNumber(), i); stateLogger.debug("apply block: [ {} ] tx: [ {} ] ", block.getNumber(), i);
totalGasUsed += applyTransaction(block, txr.getTransaction()); totalGasUsed += applyTransaction(block, txr.getTransaction());
if(!Arrays.equals(this.repository.getWorldState().getRootHash(), txr.getPostTxState())) if(!Arrays.equals(this.repository.getWorldState().getRootHash(), txr.getPostTxState()))
logger.warn("TX: STATE CONFLICT {}..: {}", Hex.toHexString(txr.getTransaction().getHash()).substring(0, 8), stateLogger.warn("TX: STATE CONFLICT {}..: {}", Hex.toHexString(txr.getTransaction().getHash()).substring(0, 8),
Hex.toHexString(this.repository.getWorldState().getRootHash())); Hex.toHexString(this.repository.getWorldState().getRootHash()));
if(block.getNumber() >= CONFIG.traceStartBlock()) if(block.getNumber() >= CONFIG.traceStartBlock())
repository.dumpState(block, totalGasUsed, i++, txr.getTransaction().getHash()); repository.dumpState(block, totalGasUsed, i++, txr.getTransaction().getHash());
@ -196,7 +196,7 @@ public class Blockchain {
String blockStateRootHash = Hex.toHexString(block.getStateRoot()); String blockStateRootHash = Hex.toHexString(block.getStateRoot());
String worldStateRootHash = Hex.toHexString(WorldManager.getInstance().getRepository().getWorldState().getRootHash()); String worldStateRootHash = Hex.toHexString(WorldManager.getInstance().getRepository().getWorldState().getRootHash());
if(!blockStateRootHash.equals(worldStateRootHash)){ if(!blockStateRootHash.equals(worldStateRootHash)){
logger.warn("BLOCK: STATE CONFLICT! block: {} worldstate {} mismatch", block.getNumber(), worldStateRootHash); stateLogger.warn("BLOCK: STATE CONFLICT! block: {} worldstate {} mismatch", block.getNumber(), worldStateRootHash);
// repository.close(); // repository.close();
// System.exit(-1); // Don't add block // System.exit(-1); // Don't add block
} }