Skip to content
This repository was archived by the owner on Sep 8, 2025. It is now read-only.

EIP-3541 london test fixes#2029

Merged
kclowes merged 2 commits intoethereum:masterfrom
fselmo:london-test-fixes
Sep 20, 2021
Merged

EIP-3541 london test fixes#2029
kclowes merged 2 commits intoethereum:masterfrom
fselmo:london-test-fixes

Conversation

@fselmo
Copy link
Copy Markdown
Collaborator

@fselmo fselmo commented Sep 17, 2021 •
edited
Loading

What was wrong?

  • LondonComputation was raising an error where it should set the error and return the computation. This fixes broken ethereum tests related to this new logic from EIP-3541.
  • Ethereum tests released a new version (v10.0)

How was it fixed?

  • Set the computation.error and return the computation rather than raise the VMError
  • Updated ethereum tests submodule to new version v10.0

To-Do

  • Clean up commit history

Cute Animal Picture

IMG_20210915_165945

@fselmo fselmo changed the title London test fixes EIP-3541 london test fixes Sep 17, 2021
@fselmo fselmo changed the title EIP-3541 london test fixes [WIP] EIP-3541 london test fixes Sep 17, 2021
@fselmo fselmo force-pushed the london-test-fixes branch 5 times, most recently from a88ed9c to 2947b42 Compare September 17, 2021 19:26
@fselmo fselmo changed the title [WIP] EIP-3541 london test fixes EIP-3541 london test fixes Sep 17, 2021
@fselmo fselmo marked this pull request as ready for review September 17, 2021 19:41
@fselmo
Copy link
Copy Markdown
Collaborator Author

fselmo commented Sep 17, 2021

@carver @kclowes, these changes should resolve the failing tests on #2021 related to the reserved bytecode (EIP-3541).

carver
carver approved these changes Sep 17, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@carver carver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, all of the refactor & fix in the spurious_dragon computation looks like an improvement to me. Yay for fewer branches.

The big glaring issue is: no cute animal picture! X)

Comment thread tests/core/vm/test_london.py Outdated
Comment thread newsfragments/2029.bugfix.rst Outdated
@fselmo
Copy link
Copy Markdown
Collaborator Author

fselmo commented Sep 17, 2021

The big glaring issue is: no cute animal picture! X)

I'm a monster... how could I forget 😞

@fselmo
fix reserved bytecode logic and tests for london (EIP-3541)
ec6c29f 
Don't raise VMError for reserved bytecode. Instead, set the error on the computation and return the computation.
@fselmo
update test fixtures to v10.0
bfce09c
@fselmo
Copy link
Copy Markdown
Collaborator Author

fselmo commented Sep 17, 2021

@kclowes @carver updated. I am good to merge this if you are. No write permissions on my end.

@kclowes kclowes merged commit 421ebbc into ethereum:master Sep 20, 2021
@carver
Copy link
Copy Markdown
Contributor

carver commented Sep 20, 2021

Also just added you for write access @fselmo

@fselmo fselmo mentioned this pull request Sep 29, 2021
Merged
11 tasks
@fselmo fselmo deleted the london-test-fixes branch October 5, 2021 20:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@carver carver carver approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fselmo @carver @kclowes