Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Bump revm to newest #6357

Merged
merged 27 commits into from
Feb 6, 2024
Merged

chore: Bump revm to newest #6357

merged 27 commits into from
Feb 6, 2024

Conversation

rakita
Copy link
Collaborator

@rakita rakita commented Feb 2, 2024

Integrate revm to newest branch.

@rakita rakita marked this pull request as ready for review February 5, 2024 00:22
@rkrasiuk
Copy link
Member

rkrasiuk commented Feb 6, 2024

@rakita merkle scripts do not only verify the correctness of state root calculation, they also verify the correctness of the state. more specifically, i'd recommend running debug execution script since it also checks whether state reverts were written correctly

@rakita
Copy link
Collaborator Author

rakita commented Feb 6, 2024

@rakita merkle scripts do not only verify the correctness of state root calculation, they also verify the correctness of the state. more specifically, i'd recommend running debug execution script since it also checks whether state reverts were written correctly

revm State was not touched and had minimal changes. So revert creation and state change is the same and i didn't felt the need to run it as the fixes that we have were already merged in reth_freeze.

The best test for this change is syncing reth, and this, I already did with Holesky.

Copy link
Member

@DaniPopes DaniPopes left a comment

Choose a reason for hiding this comment

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

Code LGTM

Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

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

This is less invasive than expected, I think overall this lgtm, though I'm having some reservations wrt naming.

I'm being particularly pedantic here:

It's a bit challenging to get familiar with the names, takes some time to get used to this for example:

there's EnvWithHandlerCfg and CfgEnvWithHandlerCfg

and HandlerCfg is just the wrapped SpecId, unclear what this has to do with a handler config, besides a feature gated optimism field.
Can we get rid of optimism cfgs eventually by any chance?

there are no docs that cover what the nomenclature is here,
I know they're most likely in the revm mdbook, but this is not very useful, should be directly in the code imo.

the evm type would benefit from some additional helper functions as well

although, I like that we don't have any generics on the handler type, this should make it easier to move this into a config trait

Copy link
Member

@Rjected Rjected left a comment

Choose a reason for hiding this comment

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

LGTM!

@Rjected
Copy link
Member

Rjected commented Feb 6, 2024

there's EnvWithHandlerCfg and CfgEnvWithHandlerCfg

and HandlerCfg is just the wrapped SpecId, unclear what this has to do with a handler config, besides a feature gated optimism field.

Yeah, I found this pretty confusing too, worth considering renames

@Rjected Rjected closed this Feb 6, 2024
@Rjected Rjected reopened this Feb 6, 2024
@Rjected
Copy link
Member

Rjected commented Feb 6, 2024

oops meant to click "comment" not "close with comment"

@rakita
Copy link
Collaborator Author

rakita commented Feb 6, 2024

About EnvWithHandlerCfg and CfgEnvWithHandlerCfg I want to break those and remove Env soonish (After EOF) with generic tx/block bluealloy/revm#916

I don't especially like these names, but want to have separated HandlerCfg from Env and it came up to this. I would look at them as temporary helpers for transitioning that are going to be modified/removed in few months.

HandlerCfg allowed me to wrap Optimism changes and to have the same behaviour as previously.

@rakita rakita requested a review from mattsse February 6, 2024 19:32
Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

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

lgtm

ack on EOF

@rakita rakita enabled auto-merge February 6, 2024 21:38
@Rjected
Copy link
Member

Rjected commented Feb 6, 2024

needs a re review / approve from @emhane i think to merge

@rakita rakita added this pull request to the merge queue Feb 6, 2024
Merged via the queue into main with commit 13947e5 Feb 6, 2024
29 checks passed
@rakita rakita deleted the rakita/revm_handler_integration branch February 6, 2024 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants