diff options
author | Péter Szilágyi <peterke@gmail.com> | 2016-09-28 18:40:44 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-28 18:40:44 +0800 |
commit | f88bca7ba96a16e10b9feee453dbdb4f81962f34 (patch) | |
tree | 15f58419e13f75dc0dfa940be0b1a9f3930de34f /eth | |
parent | 7a5843de318f4bf0e41ddaab2d690fbe6fd04099 (diff) | |
parent | d4608ae0d2fc76ea1ba1d3a97033e60bab1f0d59 (diff) | |
download | go-tangerine-1.4.14.tar go-tangerine-1.4.14.tar.gz go-tangerine-1.4.14.tar.bz2 go-tangerine-1.4.14.tar.lz go-tangerine-1.4.14.tar.xz go-tangerine-1.4.14.tar.zst go-tangerine-1.4.14.zip |
Merge pull request #3055 from karalabe/release/1.4v1.4.14
Geth 1.4.14: What else should we rewrite?
Diffstat (limited to 'eth')
-rw-r--r-- | eth/api.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eth/api.go b/eth/api.go index 3df86756b..7cdeb7199 100644 --- a/eth/api.go +++ b/eth/api.go @@ -1580,7 +1580,7 @@ func (api *PublicDebugAPI) DumpBlock(number uint64) (state.Dump, error) { if block == nil { return state.Dump{}, fmt.Errorf("block #%d not found", number) } - stateDb, err := state.New(block.Root(), api.eth.ChainDb()) + stateDb, err := api.eth.BlockChain().StateAt(block.Root()) if err != nil { return state.Dump{}, err } @@ -1748,7 +1748,7 @@ func (api *PrivateDebugAPI) traceBlock(block *types.Block, config *vm.Config) (b if err := core.ValidateHeader(api.config, blockchain.AuxValidator(), block.Header(), blockchain.GetHeader(block.ParentHash()), true, false); err != nil { return false, collector.traces, err } - statedb, err := state.New(blockchain.GetBlock(block.ParentHash()).Root(), api.eth.ChainDb()) + statedb, err := blockchain.StateAt(blockchain.GetBlock(block.ParentHash()).Root()) if err != nil { return false, collector.traces, err } @@ -1850,7 +1850,7 @@ func (api *PrivateDebugAPI) TraceTransaction(txHash common.Hash, logger *vm.LogC if parent == nil { return nil, fmt.Errorf("block parent %x not found", block.ParentHash()) } - stateDb, err := state.New(parent.Root(), api.eth.ChainDb()) + stateDb, err := api.eth.BlockChain().StateAt(parent.Root()) if err != nil { return nil, err } |