diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-24 20:16:04 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-24 20:16:04 +0800 |
| commit | 702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85 (patch) | |
| tree | cf025478adbc2243a5b11d4c5e1dda7acf0d3086 /ethchain/block_chain.go | |
| parent | 92b16618edf6bbb6d98659050d8bf0d538285491 (diff) | |
| parent | dcf4fad97156f431612ed3915e167ce5a5314588 (diff) | |
| download | dexon-702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85.tar dexon-702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85.tar.gz dexon-702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85.tar.bz2 dexon-702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85.tar.lz dexon-702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85.tar.xz dexon-702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85.tar.zst dexon-702cf5a3e19e33616e7e98ec8ab7a00d56dd7e85.zip | |
Merge branch 'feature/refactor_vm' into develop
Diffstat (limited to 'ethchain/block_chain.go')
| -rw-r--r-- | ethchain/block_chain.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ethchain/block_chain.go b/ethchain/block_chain.go index f72a77706..1a2662787 100644 --- a/ethchain/block_chain.go +++ b/ethchain/block_chain.go @@ -44,7 +44,7 @@ func (bc *BlockChain) NewBlock(coinbase []byte) *Block { hash := ZeroHash256 if bc.CurrentBlock != nil { - root = bc.CurrentBlock.state.trie.Root + root = bc.CurrentBlock.state.Trie.Root hash = bc.LastBlockHash lastBlockTime = bc.CurrentBlock.Time } @@ -297,7 +297,7 @@ func (bc *BlockChain) setLastBlock() { } else { AddTestNetFunds(bc.genesisBlock) - bc.genesisBlock.state.trie.Sync() + bc.genesisBlock.state.Trie.Sync() // Prepare the genesis block bc.Add(bc.genesisBlock) |