Skip to content

Commit 0dbe819

Browse files
gzliudangzliudan
authored
Merge pull request #676 from gzliudan/evm-reuse
core/vm: improve EVM reusability
2 parents db1fd59 + 733c298 commit 0dbe819

File tree

4 files changed

+70
-72
lines changed

4 files changed

+70
-72
lines changed

‎core/vm/evm.go‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func NewEVM(blockCtx BlockContext, txCtx TxContext, statedb StateDB, tradingStat
142142
chainRules: chainConfig.Rules(blockCtx.BlockNumber),
143143
}
144144

145-
evm.interpreter = NewEVMInterpreter(evm, config)
145+
evm.interpreter = NewEVMInterpreter(evm)
146146
return evm
147147
}
148148

@@ -169,6 +169,12 @@ func (evm *EVM) Interpreter() *EVMInterpreter {
169169
return evm.interpreter
170170
}
171171

172+
// SetBlockContext updates the block context of the EVM.
173+
func (evm *EVM) SetBlockContext(blockCtx BlockContext) {
174+
evm.Context = blockCtx
175+
evm.chainRules = evm.chainConfig.Rules(blockCtx.BlockNumber)
176+
}
177+
172178
// Call executes the contract associated with the addr with the given input as
173179
// parameters. It also handles any necessary value transfer required and takes
174180
// the necessary steps to create accounts and reverses the state in case of an

‎core/vm/instructions.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,9 +838,9 @@ func opSelfdestruct(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext
838838
balance := interpreter.evm.StateDB.GetBalance(scope.Contract.Address())
839839
interpreter.evm.StateDB.AddBalance(beneficiary.Bytes20(), balance)
840840
interpreter.evm.StateDB.Suicide(scope.Contract.Address())
841-
if interpreter.cfg.Debug {
842-
interpreter.cfg.Tracer.CaptureEnter(SELFDESTRUCT, scope.Contract.Address(), beneficiary.Bytes20(), []byte{}, 0, balance)
843-
interpreter.cfg.Tracer.CaptureExit([]byte{}, 0, nil)
841+
if interpreter.evm.Config.Debug {
842+
interpreter.evm.Config.Tracer.CaptureEnter(SELFDESTRUCT, scope.Contract.Address(), beneficiary.Bytes20(), []byte{}, 0, balance)
843+
interpreter.evm.Config.Tracer.CaptureExit([]byte{}, 0, nil)
844844
}
845845
return nil, errStopToken
846846
}

‎core/vm/instructions_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func TestAddMod(t *testing.T) {
204204
var (
205205
env = NewEVM(BlockContext{}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
206206
stack = newstack()
207-
evmInterpreter = NewEVMInterpreter(env, env.Config)
207+
evmInterpreter = NewEVMInterpreter(env)
208208
pc = uint64(0)
209209
)
210210
tests := []struct {
@@ -300,7 +300,7 @@ func opBenchmark(bench *testing.B, op executionFunc, args ...string) {
300300
env = NewEVM(BlockContext{}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
301301
stack = newstack()
302302
scope = &ScopeContext{nil, stack, nil}
303-
evmInterpreter = NewEVMInterpreter(env, env.Config)
303+
evmInterpreter = NewEVMInterpreter(env)
304304
)
305305

306306
env.interpreter = evmInterpreter
@@ -541,7 +541,7 @@ func TestOpMstore(t *testing.T) {
541541
env = NewEVM(BlockContext{}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
542542
stack = newstack()
543543
mem = NewMemory()
544-
evmInterpreter = NewEVMInterpreter(env, env.Config)
544+
evmInterpreter = NewEVMInterpreter(env)
545545
)
546546

547547
env.interpreter = evmInterpreter
@@ -567,7 +567,7 @@ func BenchmarkOpMstore(bench *testing.B) {
567567
env = NewEVM(BlockContext{}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
568568
stack = newstack()
569569
mem = NewMemory()
570-
evmInterpreter = NewEVMInterpreter(env, env.Config)
570+
evmInterpreter = NewEVMInterpreter(env)
571571
)
572572

573573
env.interpreter = evmInterpreter
@@ -590,7 +590,7 @@ func TestOpTstore(t *testing.T) {
590590
env = NewEVM(BlockContext{}, TxContext{}, statedb, nil, params.TestChainConfig, Config{})
591591
stack = newstack()
592592
mem = NewMemory()
593-
evmInterpreter = NewEVMInterpreter(env, env.Config)
593+
evmInterpreter = NewEVMInterpreter(env)
594594
caller = common.Address{}
595595
to = common.Address{1}
596596
contractRef = contractRef{caller}
@@ -632,7 +632,7 @@ func BenchmarkOpKeccak256(bench *testing.B) {
632632
env = NewEVM(BlockContext{}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
633633
stack = newstack()
634634
mem = NewMemory()
635-
evmInterpreter = NewEVMInterpreter(env, env.Config)
635+
evmInterpreter = NewEVMInterpreter(env)
636636
)
637637
env.interpreter = evmInterpreter
638638
mem.Resize(32)
@@ -736,7 +736,7 @@ func TestRandom(t *testing.T) {
736736
env = NewEVM(BlockContext{Random: &tt.random}, TxContext{}, nil, nil, params.TestChainConfig, Config{})
737737
stack = newstack()
738738
pc = uint64(0)
739-
evmInterpreter = NewEVMInterpreter(env, env.Config)
739+
evmInterpreter = NewEVMInterpreter(env)
740740
)
741741
opRandom(&pc, evmInterpreter, &ScopeContext{nil, stack, nil})
742742
if len(stack.data) != 1 {

‎core/vm/interpreter.go‎

Lines changed: 53 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ type Config struct {
2929
Tracer EVMLogger // Opcode logger
3030
NoBaseFee bool // Forces the EIP-1559 baseFee to 0 (needed for 0 price calls)
3131
EnablePreimageRecording bool // Enables recording of SHA3/keccak preimages
32-
33-
JumpTable *JumpTable // EVM instruction table, automatically populated if unset
34-
35-
ExtraEips []int // Additional EIPS that are to be enabled
32+
ExtraEips []int // Additional EIPS that are to be enabled
3633
}
3734

3835
// ScopeContext contains the things that are per-call, such as stack and memory,
@@ -45,8 +42,8 @@ type ScopeContext struct {
4542

4643
// EVMInterpreter represents an EVM interpreter
4744
type EVMInterpreter struct {
48-
evm *EVM
49-
cfg Config
45+
evm *EVM
46+
table *JumpTable
5047

5148
hasher crypto.KeccakState // Keccak256 hasher instance shared across opcodes
5249
hasherBuf common.Hash // Keccak256 hasher result array shared aross opcodes
@@ -56,55 +53,50 @@ type EVMInterpreter struct {
5653
}
5754

5855
// NewEVMInterpreter returns a new instance of the Interpreter.
59-
func NewEVMInterpreter(evm *EVM, cfg Config) *EVMInterpreter {
56+
func NewEVMInterpreter(evm *EVM) *EVMInterpreter {
6057
// If jump table was not initialised we set the default one.
61-
if cfg.JumpTable == nil {
62-
switch {
63-
case evm.chainRules.IsEIP1559:
64-
cfg.JumpTable = &eip1559InstructionSet
65-
case evm.chainRules.IsShanghai:
66-
cfg.JumpTable = &shanghaiInstructionSet
67-
case evm.chainRules.IsMerge:
68-
cfg.JumpTable = &mergeInstructionSet
69-
case evm.chainRules.IsLondon:
70-
cfg.JumpTable = &londonInstructionSet
71-
case evm.chainRules.IsBerlin:
72-
cfg.JumpTable = &berlinInstructionSet
73-
case evm.chainRules.IsIstanbul:
74-
cfg.JumpTable = &istanbulInstructionSet
75-
case evm.chainRules.IsConstantinople:
76-
cfg.JumpTable = &constantinopleInstructionSet
77-
case evm.chainRules.IsByzantium:
78-
cfg.JumpTable = &byzantiumInstructionSet
79-
case evm.chainRules.IsEIP158:
80-
cfg.JumpTable = &spuriousDragonInstructionSet
81-
case evm.chainRules.IsEIP150:
82-
cfg.JumpTable = &tangerineWhistleInstructionSet
83-
case evm.chainRules.IsHomestead:
84-
cfg.JumpTable = &homesteadInstructionSet
85-
default:
86-
cfg.JumpTable = &frontierInstructionSet
87-
}
88-
var extraEips []int
89-
if len(cfg.ExtraEips) > 0 {
90-
// Deep-copy jumptable to prevent modification of opcodes in other tables
91-
cfg.JumpTable = copyJumpTable(cfg.JumpTable)
92-
}
93-
for _, eip := range cfg.ExtraEips {
94-
if err := EnableEIP(eip, cfg.JumpTable); err != nil {
95-
// Disable it, so caller can check if it's activated or not
96-
log.Error("EIP activation failed", "eip", eip, "error", err)
97-
} else {
98-
extraEips = append(extraEips, eip)
99-
}
100-
}
101-
cfg.ExtraEips = extraEips
58+
var table *JumpTable
59+
switch {
60+
case evm.chainRules.IsEIP1559:
61+
table = &eip1559InstructionSet
62+
case evm.chainRules.IsShanghai:
63+
table = &shanghaiInstructionSet
64+
case evm.chainRules.IsMerge:
65+
table = &mergeInstructionSet
66+
case evm.chainRules.IsLondon:
67+
table = &londonInstructionSet
68+
case evm.chainRules.IsBerlin:
69+
table = &berlinInstructionSet
70+
case evm.chainRules.IsIstanbul:
71+
table = &istanbulInstructionSet
72+
case evm.chainRules.IsConstantinople:
73+
table = &constantinopleInstructionSet
74+
case evm.chainRules.IsByzantium:
75+
table = &byzantiumInstructionSet
76+
case evm.chainRules.IsEIP158:
77+
table = &spuriousDragonInstructionSet
78+
case evm.chainRules.IsEIP150:
79+
table = &tangerineWhistleInstructionSet
80+
case evm.chainRules.IsHomestead:
81+
table = &homesteadInstructionSet
82+
default:
83+
table = &frontierInstructionSet
10284
}
103-
104-
return &EVMInterpreter{
105-
evm: evm,
106-
cfg: cfg,
85+
var extraEips []int
86+
if len(evm.Config.ExtraEips) > 0 {
87+
// Deep-copy jumptable to prevent modification of opcodes in other tables
88+
table = copyJumpTable(table)
89+
}
90+
for _, eip := range evm.Config.ExtraEips {
91+
if err := EnableEIP(eip, table); err != nil {
92+
// Disable it, so caller can check if it's activated or not
93+
log.Error("EIP activation failed", "eip", eip, "error", err)
94+
} else {
95+
extraEips = append(extraEips, eip)
96+
}
10797
}
98+
evm.Config.ExtraEips = extraEips
99+
return &EVMInterpreter{evm: evm, table: table}
108100
}
109101

110102
// Run loops and evaluates the contract's code with the given input data and returns
@@ -162,13 +154,13 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
162154
}()
163155
contract.Input = input
164156

165-
if in.cfg.Debug {
157+
if in.evm.Config.Debug {
166158
defer func() {
167159
if err != nil {
168160
if !logged {
169-
in.cfg.Tracer.CaptureState(in.evm, pcCopy, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
161+
in.evm.Config.Tracer.CaptureState(in.evm, pcCopy, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
170162
} else {
171-
in.cfg.Tracer.CaptureFault(in.evm, pcCopy, op, gasCopy, cost, callContext, in.evm.depth, err)
163+
in.evm.Config.Tracer.CaptureFault(in.evm, pcCopy, op, gasCopy, cost, callContext, in.evm.depth, err)
172164
}
173165
}
174166
}()
@@ -178,15 +170,15 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
178170
// the execution of one of the operations or until the done flag is set by the
179171
// parent context.
180172
for {
181-
if in.cfg.Debug {
173+
if in.evm.Config.Debug {
182174
// Capture pre-execution values for tracing.
183175
logged, pcCopy, gasCopy = false, pc, contract.Gas
184176
}
185177

186178
// Get the operation from the jump table and validate the stack to ensure there are
187179
// enough stack items available to perform the operation.
188180
op = contract.GetOp(pc)
189-
operation := in.cfg.JumpTable[op]
181+
operation := in.table[op]
190182
cost = operation.constantGas // For tracing
191183
// Validate stack
192184
if sLen := stack.len(); sLen < operation.minStack {
@@ -224,15 +216,15 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
224216
return nil, ErrOutOfGas
225217
}
226218
// Do tracing before memory expansion
227-
if in.cfg.Debug {
228-
in.cfg.Tracer.CaptureState(in.evm, pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
219+
if in.evm.Config.Debug {
220+
in.evm.Config.Tracer.CaptureState(in.evm, pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
229221
logged = true
230222
}
231223
if memorySize > 0 {
232224
mem.Resize(memorySize)
233225
}
234-
} else if in.cfg.Debug {
235-
in.cfg.Tracer.CaptureState(in.evm, pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
226+
} else if in.evm.Config.Debug {
227+
in.evm.Config.Tracer.CaptureState(in.evm, pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
236228
logged = true
237229
}
238230
// execute the operation

0 commit comments

Comments
 (0)