diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-10 04:04:40 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-10 04:04:40 +0800 |
| commit | 8f96d66241a7585a12a56f28352cb64951abc559 (patch) | |
| tree | d649e6004e1292a59e54f40b163ea7c03ea35c5e /eth/api.go | |
| parent | 4b9de756236b58fab1df2e467fd4f6d85ea9aebb (diff) | |
| parent | 5782164a35ea8acdb09507a604c45941051fd5f3 (diff) | |
| download | go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.gz go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.bz2 go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.lz go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.xz go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.zst go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.zip | |
Merge branch 'develop' into release/1.4
Diffstat (limited to 'eth/api.go')
| -rw-r--r-- | eth/api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eth/api.go b/eth/api.go index bd8179962..1d66f53fe 100644 --- a/eth/api.go +++ b/eth/api.go @@ -1841,7 +1841,7 @@ func (s *PrivateDebugAPI) TraceTransaction(txHash common.Hash, logger *vm.LogCon } // Mutate the state if we haven't reached the tracing transaction yet if uint64(idx) < txIndex { - vmenv := core.NewEnv(stateDb, s.config, s.eth.BlockChain(), msg, parent.Header(), vm.Config{}) + vmenv := core.NewEnv(stateDb, s.config, s.eth.BlockChain(), msg, block.Header(), vm.Config{}) _, _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(tx.Gas())) if err != nil { return nil, fmt.Errorf("mutation failed: %v", err) @@ -1849,7 +1849,7 @@ func (s *PrivateDebugAPI) TraceTransaction(txHash common.Hash, logger *vm.LogCon continue } // Otherwise trace the transaction and return - vmenv := core.NewEnv(stateDb, s.config, s.eth.BlockChain(), msg, parent.Header(), vm.Config{Debug: true, Logger: *logger}) + vmenv := core.NewEnv(stateDb, s.config, s.eth.BlockChain(), msg, block.Header(), vm.Config{Debug: true, Logger: *logger}) ret, gas, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(tx.Gas())) if err != nil { return nil, fmt.Errorf("tracing failed: %v", err) |