diff options
| author | bojie <bojie@dexon.org> | 2019-01-16 17:08:56 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 004b70236a169138ef269c2e6d7fcf4bf86ec987 (patch) | |
| tree | 7f22db6771ff15118c9dbe08d6789ebe9a361d41 /core | |
| parent | a25f20d03b46da26c5593181ffc2526328fba74b (diff) | |
| download | dexon-004b70236a169138ef269c2e6d7fcf4bf86ec987.tar dexon-004b70236a169138ef269c2e6d7fcf4bf86ec987.tar.gz dexon-004b70236a169138ef269c2e6d7fcf4bf86ec987.tar.bz2 dexon-004b70236a169138ef269c2e6d7fcf4bf86ec987.tar.lz dexon-004b70236a169138ef269c2e6d7fcf4bf86ec987.tar.xz dexon-004b70236a169138ef269c2e6d7fcf4bf86ec987.tar.zst dexon-004b70236a169138ef269c2e6d7fcf4bf86ec987.zip | |
app: fix reward bug with empty block (#155)
* app: fix reward bug with empty block
* make block generation consistent
* revert change to dmoment in genesis.json
Diffstat (limited to 'core')
| -rw-r--r-- | core/blockchain.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index a57d8f8ba..fe7ad3dd8 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -1959,13 +1959,12 @@ func (bc *BlockChain) ProcessEmptyBlock(block *types.Block) (*common.Hash, error } header.ParentHash = parentBlock.Hash() - header.GasUsed = 0 - header.Root = currentState.IntermediateRoot(true) + newBlock, err := bc.engine.Finalize(bc, header, currentState, nil, nil, nil) + if header.Root != parentBlock.Root() { return nil, fmt.Errorf("empty block state root must same as parent") } - newBlock := types.NewBlock(header, nil, nil, nil) root := newBlock.Root() if _, ok := bc.GetRoundHeight(newBlock.Round()); !ok { bc.storeRoundHeight(newBlock.Round(), newBlock.NumberU64()) |