aboutsummaryrefslogtreecommitdiffstats
path: root/les
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-04-12 21:38:31 +0800
committerGitHub <noreply@github.com>2017-04-12 21:38:31 +0800
commita7b9e484d05ceb0afce4ba5dbc62b8f262c2e354 (patch)
tree35ab50c0e276beb15e6beac2eaa846f6b737f64c /les
parent6b7ae4e751dbaee0f31032f045fd35b0c1079388 (diff)
downloadgo-tangerine-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar
go-tangerine-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.gz
go-tangerine-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.bz2
go-tangerine-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.lz
go-tangerine-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.xz
go-tangerine-a7b9e484d05ceb0afce4ba5dbc62b8f262c2e354.tar.zst
go-tangerine-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 'les')
-rw-r--r--les/api_backend.go2
-rw-r--r--les/backend.go1
-rw-r--r--les/odr_test.go4
3 files changed, 4 insertions, 3 deletions
diff --git a/les/api_backend.go b/les/api_backend.go
index 67de3bcd5..7d69046de 100644
--- a/les/api_backend.go
+++ b/les/api_backend.go
@@ -100,7 +100,7 @@ func (b *LesApiBackend) GetEVM(ctx context.Context, msg core.Message, state etha
from.SetBalance(math.MaxBig256)
vmstate := light.NewVMState(ctx, stateDb)
- context := core.NewEVMContext(msg, header, b.eth.blockchain)
+ context := core.NewEVMContext(msg, header, b.eth.blockchain, nil)
return vm.NewEVM(context, vmstate, b.eth.chainConfig, vmCfg), vmstate.Error, nil
}
diff --git a/les/backend.go b/les/backend.go
index 3aad16fa0..5670b77d2 100644
--- a/les/backend.go
+++ b/les/backend.go
@@ -176,6 +176,7 @@ func (s *LightEthereum) ResetWithGenesisBlock(gb *types.Block) {
func (s *LightEthereum) BlockChain() *light.LightChain { return s.blockchain }
func (s *LightEthereum) TxPool() *light.TxPool { return s.txPool }
+func (s *LightEthereum) Engine() consensus.Engine { return s.engine }
func (s *LightEthereum) LesVersion() int { return int(s.protocolManager.SubProtocols[0].Version) }
func (s *LightEthereum) Downloader() *downloader.Downloader { return s.protocolManager.downloader }
func (s *LightEthereum) EventMux() *event.TypeMux { return s.eventMux }
diff --git a/les/odr_test.go b/les/odr_test.go
index 6b074f1a2..532de4d80 100644
--- a/les/odr_test.go
+++ b/les/odr_test.go
@@ -123,7 +123,7 @@ func odrContractCall(ctx context.Context, db ethdb.Database, config *params.Chai
msg := callmsg{types.NewMessage(from.Address(), &testContractAddr, 0, new(big.Int), big.NewInt(100000), new(big.Int), data, false)}
- context := core.NewEVMContext(msg, header, bc)
+ context := core.NewEVMContext(msg, header, bc, nil)
vmenv := vm.NewEVM(context, statedb, config, vm.Config{})
//vmenv := core.NewEnv(statedb, config, bc, msg, header, vm.Config{})
@@ -141,7 +141,7 @@ func odrContractCall(ctx context.Context, db ethdb.Database, config *params.Chai
msg := callmsg{types.NewMessage(from.Address(), &testContractAddr, 0, new(big.Int), big.NewInt(100000), new(big.Int), data, false)}
- context := core.NewEVMContext(msg, header, lc)
+ context := core.NewEVMContext(msg, header, lc, nil)
vmenv := vm.NewEVM(context, vmstate, config, vm.Config{})
//vmenv := light.NewEnv(ctx, state, config, lc, msg, header, vm.Config{})