diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-12 08:36:36 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-12 08:36:36 +0800 |
| commit | 60cdb1148c404218846fd39331690658168f4e04 (patch) | |
| tree | 229e68d7dfdaccb12e0b6b9ff19c5c14b9f9c603 /chain/block_manager.go | |
| parent | 9bb1ac7564ff0588f33a1eb43e76f40664d9e527 (diff) | |
| download | dexon-60cdb1148c404218846fd39331690658168f4e04.tar.gz dexon-60cdb1148c404218846fd39331690658168f4e04.tar.zst dexon-60cdb1148c404218846fd39331690658168f4e04.zip | |
Transaction execution fixes
Diffstat (limited to 'chain/block_manager.go')
| -rw-r--r-- | chain/block_manager.go | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chain/block_manager.go b/chain/block_manager.go index 4431e3ba9..a1c75fd93 100644 --- a/chain/block_manager.go +++ b/chain/block_manager.go @@ -161,7 +161,7 @@ done: cumulative := new(big.Int).Set(totalUsedGas.Add(totalUsedGas, txGas)) bloom := ethutil.LeftPadBytes(LogsBloom(state.Logs()).Bytes(), 64) receipt := &Receipt{ethutil.CopyBytes(state.Root()), cumulative, bloom, state.Logs()} - //fmt.Println(receipt) + fmt.Println(receipt) // Notify all subscribers go self.eth.EventMux().Post(TxPostEvent{tx}) @@ -217,13 +217,11 @@ func (sm *BlockManager) ProcessWithParent(block, parent *Block) (td *big.Int, me } //block.SetReceipts(receipts) - /* - txSha := DeriveSha(block.transactions) - if bytes.Compare(txSha, block.TxSha) != 0 { - err = fmt.Errorf("Error validating transaction sha. Received %x, got %x", block.TxSha, txSha) - return - } - */ + txSha := DeriveSha(block.transactions) + if bytes.Compare(txSha, block.TxSha) != 0 { + err = fmt.Errorf("Error validating transaction sha. Received %x, got %x", block.TxSha, txSha) + return + } receiptSha := DeriveSha(receipts) if bytes.Compare(receiptSha, block.ReceiptSha) != 0 { @@ -250,7 +248,7 @@ func (sm *BlockManager) ProcessWithParent(block, parent *Block) (td *big.Int, me state.Update() if !block.State().Cmp(state) { - err = fmt.Errorf("Invalid merkle root.\nrec: %x\nis: %x", block.State().Trie.Root, state.Trie.Root) + err = fmt.Errorf("Invalid merkle root.\nrec: %x\nis: %x", block.State().Root(), state.Root()) return } |