diff options
| author | obscuren <geffobscura@gmail.com> | 2014-03-03 18:35:35 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-03-03 18:35:35 +0800 |
| commit | 5b1613d65b0c3471b80990120022b5a745ecab86 (patch) | |
| tree | addbb87cc82cca07e8ac8aa810d810e1de02b2a5 /ethchain/block_chain.go | |
| parent | d7c5936ac4ee8ae3156e0bc9813db61b990aa686 (diff) | |
| parent | c1d0ea7366f1bad134c985dbe1f272d376e5ec9b (diff) | |
| download | dexon-5b1613d65b0c3471b80990120022b5a745ecab86.tar dexon-5b1613d65b0c3471b80990120022b5a745ecab86.tar.gz dexon-5b1613d65b0c3471b80990120022b5a745ecab86.tar.bz2 dexon-5b1613d65b0c3471b80990120022b5a745ecab86.tar.lz dexon-5b1613d65b0c3471b80990120022b5a745ecab86.tar.xz dexon-5b1613d65b0c3471b80990120022b5a745ecab86.tar.zst dexon-5b1613d65b0c3471b80990120022b5a745ecab86.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ethchain/block_chain.go')
| -rw-r--r-- | ethchain/block_chain.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ethchain/block_chain.go b/ethchain/block_chain.go index 96d22366d..026fc1cea 100644 --- a/ethchain/block_chain.go +++ b/ethchain/block_chain.go @@ -39,7 +39,7 @@ func (bc *BlockChain) NewBlock(coinbase []byte, txs []*Transaction) *Block { hash := ZeroHash256 if bc.CurrentBlock != nil { - root = bc.CurrentBlock.State().Root + root = bc.CurrentBlock.state.trie.Root hash = bc.LastBlockHash lastBlockTime = bc.CurrentBlock.Time } |