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 /light | |
| 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 'light')
| -rw-r--r-- | light/lightchain.go | 3 | ||||
| -rw-r--r-- | light/odr_test.go | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/light/lightchain.go b/light/lightchain.go index 4073e39e5..e8fd0ba5e 100644 --- a/light/lightchain.go +++ b/light/lightchain.go @@ -213,6 +213,9 @@ func (bc *LightChain) ResetWithGenesisBlock(genesis *types.Block) { // Accessors +// Engine retrieves the light chain's consensus engine. +func (bc *LightChain) Engine() consensus.Engine { return bc.engine } + // Genesis returns the genesis block func (bc *LightChain) Genesis() *types.Block { return bc.genesisBlock diff --git a/light/odr_test.go b/light/odr_test.go index ca33db246..576e3abc9 100644 --- a/light/odr_test.go +++ b/light/odr_test.go @@ -175,7 +175,7 @@ func odrContractCall(ctx context.Context, db ethdb.Database, bc *core.BlockChain msg := callmsg{types.NewMessage(from.Address(), &testContractAddr, 0, new(big.Int), big.NewInt(1000000), 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{}) gp := new(core.GasPool).AddGas(math.MaxBig256) @@ -191,7 +191,7 @@ func odrContractCall(ctx context.Context, db ethdb.Database, bc *core.BlockChain from.SetBalance(math.MaxBig256) msg := callmsg{types.NewMessage(from.Address(), &testContractAddr, 0, new(big.Int), big.NewInt(1000000), 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{}) gp := new(core.GasPool).AddGas(math.MaxBig256) ret, _, _ := core.ApplyMessage(vmenv, msg, gp) |