diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-15 09:29:52 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-15 09:29:52 +0800 |
| commit | c924a841c7a6661b3a609c16c447231f5ae951c8 (patch) | |
| tree | 77b94bb5393e86d663813bef9b2699532d3a1972 /core | |
| parent | 12fc590b34fba3391799fbdfd66ef029f7a551f4 (diff) | |
| parent | 7299eb72e0c57d8bf7279cbf2544c266a3fd145b (diff) | |
| download | go-tangerine-c924a841c7a6661b3a609c16c447231f5ae951c8.tar.gz go-tangerine-c924a841c7a6661b3a609c16c447231f5ae951c8.tar.zst go-tangerine-c924a841c7a6661b3a609c16c447231f5ae951c8.zip | |
Merge branch 'develop' into bounty
Diffstat (limited to 'core')
| -rw-r--r-- | core/chain_manager.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/chain_manager.go b/core/chain_manager.go index 308e958fe..54f1ced8c 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -168,7 +168,7 @@ func (bc *ChainManager) NewBlock(coinbase []byte) *types.Block { var root []byte parentHash := ZeroHash256 - if bc.CurrentBlock != nil { + if bc.currentBlock != nil { root = bc.currentBlock.Header().Root parentHash = bc.lastBlockHash } |