core/vm: implement full EOF suite [WiP] #6215

ziogaschr · 2022-12-05T22:13:24Z

This PR fetches the changes done on ethereum/go-ethereum#26133 for EOF suite, which community aims to include at Shangai's fork.
The upstream's work is not finished yet, so this PR will remain open.
This PR has been created in order we get feedback on it, have progress on Erigon with regards EOF stuff and test them.

We tried to keep the code changes similar to upstream's PR, without changing the code at Erigon side, or bring in more changes than needed from upstream.

At this point tests are ~~passing~~ (after we fix a short glitch with regards Shandong's next PR, which make the test fail) and we are able to sync with Shandong testnet.

Please provide feedback, with changes would you like us do.

* core/vm: Define 0xfe opcode as INVALID * core/vm: Remove opInvalid as opUndefined handles it Co-authored-by: Alex Beregszaszi <[email protected]> # Conflicts: # eth/tracers/internal/tracetest/testdata/call_tracer_legacy/inner_throw_outer_revert.json

* core/vm: break loop on any error * core/vm: move ErrExecutionReverted to opRevert() * core/vm: use "stop token" to stop the loop * core/vm: unconditionally pc++ in the loop * core/vm: set return data in instruction impls

# Conflicts: # core/vm/analysis.go # core/vm/contract.go # core/vm/evm.go # core/vm/instructions.go # core/vm/instructions_test.go # core/vm/interpreter.go # core/vm/jump_table.go # core/vm/stack.go

go.mod

ziogaschr · 2022-12-06T10:00:44Z

@AskAlexSharov here you can find some comments on places in code that triggered our attention. We tried to stick to Erigon logic. Feel free to provide any feedback and we will catch up. Thanks

…ithub.com/ledgerwatch/erigon/common”

meowsbits · 2022-12-06T13:14:56Z

My force-push here drops the nearly-latest two commits that together uselessly add, then remove a configuration condition for Shandong that really belonged over here.

core/vm/contract.go

yperbasis · 2022-12-11T13:34:12Z

Please merge upstream so that there are no conflicts.

# Conflicts: # go.mod

tests/init.go

yperbasis · 2022-12-12T09:53:12Z

tests/testdata submodule was downgraded from ethereum/tests@9e058e5 to ethereum/tests@c76c5d2. This is probably by mistake and should be reverted.

ziogaschr · 2022-12-12T11:04:36Z

tests/testdata submodule was downgraded from ethereum/tests@9e058e5 to ethereum/tests@c76c5d2. This is probably by mistake and should be reverted.

Done

core/vm/eips.go

Co-authored-by: Andrew Ashikhmin <[email protected]>

core/vm/eips.go

ziogaschr · 2022-12-12T17:29:10Z

@yperbasis I will try to work on the remaining stuff at original go-ethereum PR or fetch any changes they do, whichever comes first.
Maybe you can focus on other stuff if you prefer.

core/vm/evm.go

yperbasis · 2022-12-20T09:56:01Z

Closing in favour of PR #6382.

gumb0 and others added 30 commits November 29, 2022 14:08

core/vm: fill gaps in jump table with opUndefined (#24031)

3a6ea15

core/vm: simplify error handling in interpreter loop (#23952)

4b34b5d

* core/vm: break loop on any error * core/vm: move ErrExecutionReverted to opRevert() * core/vm: use "stop token" to stop the loop * core/vm: unconditionally pc++ in the loop * core/vm: set return data in instruction impls

cmd/hack: temp fix build by breaking interpreter loop [WiP]

c5a9122

core/vm: implement EOF EIP-3540: EOF v1

80c6fe2

core/vm: implement EOF EIP-3670: Code Validation

ea50433

core/vm: handle multiple interpreters on evm EOF invocations

b5e6fab

core/vm: implement EOF EIP-4200: Static relative jumps

8bcab93

core/vm: implement EOF EIP-4750: Functions

70dc126

# Conflicts: # core/vm/analysis.go # core/vm/contract.go # core/vm/evm.go # core/vm/instructions.go # core/vm/instructions_test.go # core/vm/interpreter.go # core/vm/jump_table.go # core/vm/stack.go

core/vm: fix merge issues

7812105

core/vm: rework eof tests

c280427

core/vm: test eof container object

03aa0b1

core/vm: refactor eof structures

705ea5d

core/vm: simplify eof init in evm

304c7c4

core/vm: refactor instruction validator to use switch

f1482a1

core/vm: remove go1.19 dependency

0ca562f

core/vm: change the eof tests a bit

62bb42a

core/vm: refactor eof objects

28a7a27

core/vm: fix off-by-one in type section parser

2734fb8

core/vm: simplify eof parsing interface

68d1834

core/vm: refactor eof more, move validation to separate file

011293d

core/vm: misc clean up

d54f5c3

core/vm: use parse arg helper

2572feb

tests: add shanghai to tests list

8ff2493

core/vm: don't validate code if EOF parse fails

528b340

core/vm: update callf and retf ops to b0 and b1

d338bd0

core/vm: ensure type section size is 2n code sections

ef63306

core/vm: properly return error during contract deploy

63ff89e

Merge branch 'devel' into eof

e38a059

core/vm: remove OpTstore test as it's not implemented yet

7d4305e

AskAlexSharov requested changes Dec 6, 2022

View reviewed changes

go.mod Outdated Show resolved Hide resolved

yperbasis added the shanghai label Dec 6, 2022

core/vm: switch dep of “github.com/ethereum/go-ethereum/common” to “g…

4fca79c

…ithub.com/ledgerwatch/erigon/common”

meowsbits force-pushed the eof branch from 52816a7 to 4fca79c Compare December 6, 2022 13:12

AskAlexSharov approved these changes Dec 6, 2022

View reviewed changes

yperbasis reviewed Dec 8, 2022

View reviewed changes

core/vm/contract.go Outdated Show resolved Hide resolved

yperbasis marked this pull request as draft December 8, 2022 13:44

core/vm: remove superfluous code

e30257c

yperbasis marked this pull request as ready for review December 11, 2022 13:35

ziogaschr added 2 commits December 11, 2022 23:47

Merge branch 'devel' of github.com:ledgerwatch/erigon into eof

b2a7893

# Conflicts: # go.mod

tests: fix tests by /s/ShanghaiBlock/ShanghaiTime

a457a34

yperbasis requested changes Dec 12, 2022

View reviewed changes

tests/init.go Show resolved Hide resolved

ziogaschr added 2 commits December 12, 2022 13:00

tests: keep ArrowGlacierToMergeAtDiffC0000 as a fork in tests

581f18f

tests: revert head for testdata to 9e058e5

4e57c8c

ziogaschr requested a review from yperbasis December 12, 2022 11:04

yperbasis reviewed Dec 12, 2022

View reviewed changes

core/vm/eips.go Outdated Show resolved Hide resolved

Update core/vm/eips.go

c4708a9

Co-authored-by: Andrew Ashikhmin <[email protected]>

yperbasis reviewed Dec 12, 2022

View reviewed changes

core/vm/eips.go Outdated Show resolved Hide resolved

ziogaschr added 2 commits December 12, 2022 18:51

core/vm: mark CALLCODE & SELFDESTRUCT as legacyOnly based on EIP3670

6fbc90f

common/compiler: fix vyper test

f4c02ba

yperbasis reviewed Dec 12, 2022

View reviewed changes

core/vm/evm.go Outdated Show resolved Hide resolved

core/vm: remove superfluous check

6171a3c

yperbasis closed this Dec 20, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

core/vm: implement full EOF suite [WiP] #6215

core/vm: implement full EOF suite [WiP] #6215

ziogaschr commented Dec 5, 2022 •

edited

Loading

ziogaschr commented Dec 6, 2022

meowsbits commented Dec 6, 2022

yperbasis commented Dec 11, 2022

yperbasis commented Dec 12, 2022

ziogaschr commented Dec 12, 2022

ziogaschr commented Dec 12, 2022

yperbasis commented Dec 20, 2022

core/vm: implement full EOF suite [WiP] #6215

core/vm: implement full EOF suite [WiP] #6215

Conversation

ziogaschr commented Dec 5, 2022 • edited Loading

ziogaschr commented Dec 6, 2022

meowsbits commented Dec 6, 2022

yperbasis commented Dec 11, 2022

yperbasis commented Dec 12, 2022

ziogaschr commented Dec 12, 2022

ziogaschr commented Dec 12, 2022

yperbasis commented Dec 20, 2022

ziogaschr commented Dec 5, 2022 •

edited

Loading