execution/vm: fold EVMInterpreter into EVM#18765
Merged
Conversation
yperbasis
requested review from
Giulio2002,
antonis19,
canepat,
Copilot and
taratorio
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors the EVM architecture by folding the EVMInterpreter struct into the EVM struct, eliminating an unnecessary layer of indirection. This is a cherry-pick from go-ethereum that simplifies the codebase by consolidating interpreter functionality directly into the EVM.
Changes:
- Merged EVMInterpreter fields and methods into the EVM struct
- Updated all opcode function signatures to accept
*EVMinstead of*EVMInterpreter - Removed the Interpreter interface and related test infrastructure
Reviewed changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| execution/vm/evm.go | Added interpreter fields (jt, depth, hasher, readOnly, returnData) to EVM struct and removed interpreter indirection |
| execution/vm/interpreter.go | Removed EVMInterpreter struct, Interpreter interface, and VM struct; refactored Run method to be on EVM |
| execution/vm/jump_table.go | Updated executionFunc signature to accept *EVM parameter |
| execution/vm/instructions.go | Updated all opcode implementations to accept *EVM instead of *EVMInterpreter |
| execution/vm/eips.go | Updated EIP-specific opcodes to accept *EVM parameter |
| execution/vm/instructions_test.go | Removed EVMInterpreter references from tests |
| execution/vm/mock_vm.go | Removed test mock file no longer needed |
| execution/vm/evm_test.go | Removed interpreter-specific tests |
| execution/tracing/tracers/logger/logger_test.go | Updated to call evm.Run directly |
| execution/tracing/tracers/js/tracer_test.go | Updated to call evm.Run directly |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| v, overflow = uint256.FromBig(evm.Context.Difficulty) | ||
| if overflow { | ||
| return pc, nil, errors.New("interpreter.evm.Context.Difficulty higher than 2^256-1") | ||
| return pc, nil, errors.New("evm.Context.Difficulty higher than 2^256-1") |
There was a problem hiding this comment.
The error message refers to "evm.Context.Difficulty" which is misleading. The error occurs when converting the difficulty value, but the message structure suggests a field path. Consider rewording to "difficulty value exceeds 2^256-1" for clarity.
Suggested change
| return pc, nil, errors.New("evm.Context.Difficulty higher than 2^256-1") | |
| return pc, nil, errors.New("difficulty value exceeds 2^256-1") |
antonis19
reviewed
Jan 23, 2026
| @@ -1,436 +0,0 @@ | |||
| // Copyright 2024 The Erigon Authors | |||
Member
Author
There was a problem hiding this comment.
It was added in PR #2508 as part of the work on TEVM (transpiled EVM), which we abandoned since then.
AskAlexSharov
approved these changes
Jan 26, 2026
mattevans
added a commit
to ethpandaops/erigone-legacy
that referenced
this pull request
Jan 28, 2026
* main: (37 commits) Make `lastCommittedTxNum` atomic (erigontech#18820) integrity: fix redundant variable name in checkLogIdx (erigontech#18646) Fixed index building for v0 snapshot format (erigontech#18825) execution/vm: fold EVMInterpreter into EVM (erigontech#18765) fix: return correct prune mode value instead of nil (erigontech#18804) fix BuildMissedAccessors for caplin state (erigontech#18802) execution: EIP-7708: ETH transfers emit a log (erigontech#18761) refactor(rpc): remove redundant boolean comparison in AccountRange (erigontech#18814) Show the default P2P discovery bools in --help (erigontech#18818) fix(txpool): remove redundant Worst() calls in queued pool discard loop (erigontech#18810) node: remove unused logger and test helper (erigontech#18744) Disabled compression in collate function (erigontech#18813) Add missing tx.Commit() in stage_snapshots (erigontech#18816) Bumped major version of snapshot files (erigontech#18815) qa-tests: summary for RPC integration tests (erigontech#18809) perf: reuse hash buffer in witness storage leaf hash (erigontech#18803) execution/stagedsync: remove canPrune from serial_exec (erigontech#18800) Fixed deduplication intervals for rebuild cmd (erigontech#18796) Fix race due to warmup cache (erigontech#18799) fix(txpool): use instance logger instead of global log (erigontech#18797) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry pick ethereum/go-ethereum#32352