diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2018-09-17 16:35:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 16:35:42 +0800 |
| commit | cc21928e1246f860ede5160986ec3a95956fc8d4 (patch) | |
| tree | abc73a40bca6026c8addc3af2262b6446180777f /core | |
| parent | 7c71e936a716794709e7a980b7da9010c4d0a98c (diff) | |
| parent | 4bb25042eb957662155079e06bb2efbdd866eb99 (diff) | |
| download | dexon-cc21928e1246f860ede5160986ec3a95956fc8d4.tar.gz dexon-cc21928e1246f860ede5160986ec3a95956fc8d4.tar.zst dexon-cc21928e1246f860ede5160986ec3a95956fc8d4.zip | |
Merge pull request #17622 from karalabe/chain-maker-seal
consensus/clique, core: chain maker clique + error tests
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_makers.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/chain_makers.go b/core/chain_makers.go index de0fc6be9..351673477 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -67,6 +67,11 @@ func (b *BlockGen) SetExtra(data []byte) { b.header.Extra = data } +// SetNonce sets the nonce field of the generated block. +func (b *BlockGen) SetNonce(nonce types.BlockNonce) { + b.header.Nonce = nonce +} + // AddTx adds a transaction to the generated block. If no coinbase has // been set, the block's coinbase is set to the zero address. // @@ -190,13 +195,14 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse if config.DAOForkSupport && config.DAOForkBlock != nil && config.DAOForkBlock.Cmp(b.header.Number) == 0 { misc.ApplyDAOHardFork(statedb) } - // Execute any user modifications to the block and finalize it + // Execute any user modifications to the block if gen != nil { gen(i, b) } - if b.engine != nil { + // Finalize and seal the block block, _ := b.engine.Finalize(b.chainReader, b.header, statedb, b.txs, b.uncles, b.receipts) + // Write state changes to db root, err := statedb.Commit(config.IsEIP158(b.header.Number)) if err != nil { |