diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-04-12 21:38:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 21:38:31 +0800 |
| commit | a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354 (patch) | |
| tree | 35ab50c0e276beb15e6beac2eaa846f6b737f64c /eth | |
| parent | 6b7ae4e751dbaee0f31032f045fd35b0c1079388 (diff) | |
| download | dexon-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar dexon-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.gz dexon-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.bz2 dexon-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.lz dexon-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.xz dexon-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.zst dexon-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.zip | |
consensus, core, ethstats: use engine specific block beneficiary (#14318)
* consensus, core, ethstats: use engine specific block beneficiary
* core, eth, les, miner: use explicit beneficiary during mining
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/api.go | 2 | ||||
| -rw-r--r-- | eth/api_backend.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/eth/api.go b/eth/api.go index 0decd57ca..b386c08b4 100644 --- a/eth/api.go +++ b/eth/api.go @@ -548,7 +548,7 @@ func (api *PrivateDebugAPI) TraceTransaction(ctx context.Context, txHash common. if err != nil { return nil, fmt.Errorf("sender retrieval failed: %v", err) } - context := core.NewEVMContext(msg, block.Header(), api.eth.BlockChain()) + context := core.NewEVMContext(msg, block.Header(), api.eth.BlockChain(), nil) // Mutate the state if we haven't reached the tracing transaction yet if uint64(idx) < txIndex { diff --git a/eth/api_backend.go b/eth/api_backend.go index 61e184401..fe108d272 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -114,7 +114,7 @@ func (b *EthApiBackend) GetEVM(ctx context.Context, msg core.Message, state etha from.SetBalance(math.MaxBig256) vmError := func() error { return nil } - context := core.NewEVMContext(msg, header, b.eth.BlockChain()) + context := core.NewEVMContext(msg, header, b.eth.BlockChain(), nil) return vm.NewEVM(context, statedb, b.eth.chainConfig, vmCfg), vmError, nil } |