aboutsummaryrefslogtreecommitdiffstats
path: root/miner
diff options
context:
space:
mode:
authorPaweł Bylica <chfast@gmail.com>2018-12-06 21:34:49 +0800
committerGuillaume Ballet <gballet@gmail.com>2018-12-06 21:34:49 +0800
commitde39513ced05f120b30b0daa49003982cc6b2426 (patch)
tree536d248284c62a0fb913cec44e68daa67a4be51c /miner
parent3ac633ba8423851a85cb909a1f1f0f3c0d2c5351 (diff)
downloadgo-tangerine-de39513ced05f120b30b0daa49003982cc6b2426.tar
go-tangerine-de39513ced05f120b30b0daa49003982cc6b2426.tar.gz
go-tangerine-de39513ced05f120b30b0daa49003982cc6b2426.tar.bz2
go-tangerine-de39513ced05f120b30b0daa49003982cc6b2426.tar.lz
go-tangerine-de39513ced05f120b30b0daa49003982cc6b2426.tar.xz
go-tangerine-de39513ced05f120b30b0daa49003982cc6b2426.tar.zst
go-tangerine-de39513ced05f120b30b0daa49003982cc6b2426.zip
core, internal, eth, miner, les: Take VM config from BlockChain (#17955)
Until this commit, when sending an RPC request that called `NewEVM`, a blank `vm.Config` would be taken so as to set some options, based on the default configuration. If some extra configuration switches were passed to the blockchain, those would be ignored. This PR adds a function to get the config from the blockchain, and this is what is now used for RPC calls. Some subsequent changes need to be made, see https://github.com/ethereum/go-ethereum/pull/17955#pullrequestreview-182237244 for the details of the discussion.
Diffstat (limited to 'miner')
-rw-r--r--miner/worker.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/miner/worker.go b/miner/worker.go
index 8579c5c84..48473796b 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -31,7 +31,6 @@ import (
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
- "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/params"
@@ -692,7 +691,7 @@ func (w *worker) updateSnapshot() {
func (w *worker) commitTransaction(tx *types.Transaction, coinbase common.Address) ([]*types.Log, error) {
snap := w.current.state.Snapshot()
- receipt, _, err := core.ApplyTransaction(w.config, w.chain, &coinbase, w.current.gasPool, w.current.state, w.current.header, tx, &w.current.header.GasUsed, vm.Config{})
+ receipt, _, err := core.ApplyTransaction(w.config, w.chain, &coinbase, w.current.gasPool, w.current.state, w.current.header, tx, &w.current.header.GasUsed, *w.chain.GetVMConfig())
if err != nil {
w.current.state.RevertToSnapshot(snap)
return nil, err