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 /miner | |
| 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 'miner')
| -rw-r--r-- | miner/worker.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index 93b1abf36..41db117bf 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -358,7 +358,7 @@ func (self *worker) push(work *Work) { // makeCurrent creates a new environment for the current cycle. func (self *worker) makeCurrent(parent *types.Block, header *types.Header) error { - state, err := state.New(parent.Root(), self.eth.ChainDb()) + state, err := self.chain.StateAt(parent.Root()) if err != nil { return err } |