This repository was archived by the owner on Oct 11, 2024. It is now read-only.
Merge REVM upgrades #24
Merged
Conversation
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
clabby
commented
Sep 16, 2023
Comment on lines
-161
to
+168
| let tx_caller = env.tx.caller; | ||
| let tx_data = &env.tx.data; | ||
| let tx_is_create = env.tx.transact_to.is_create(); | ||
|
|
||
| let initial_gas_spend = initial_tx_gas::<GSPEC>(tx_data, tx_is_create, &env.tx.access_list); | ||
| let initial_gas_spend = initial_tx_gas::<GSPEC>( | ||
| &env.tx.data, | ||
| env.tx.transact_to.is_create(), | ||
| &env.tx.access_list, | ||
| ); |
Author
There was a problem hiding this comment.
This was the only conflict in the evm_impl.
clabby
commented
Sep 16, 2023
| @@ -1,6 +1,9 @@ | |||
| #![allow(non_camel_case_types)] | |||
Author
There was a problem hiding this comment.
The way SpecIds are implemented changed, there's now a direct enabled fn on the SpecId enum itself. I've added support for this and two more tests mirroring the other ones on the Spec trait impl.
clabby
commented
Sep 16, 2023
| } | ||
| } | ||
| } | ||
|
|
Author
There was a problem hiding this comment.
Some conflicts in this file; Mostly minimal around 4844 errors etc.
clabby
commented
Sep 16, 2023
| /// | ||
| /// [EIP-2930]: https://eips.ethereum.org/EIPS/eip-2930 | ||
| pub access_list: Vec<(B160, Vec<U256>)>, | ||
|
|
Author
There was a problem hiding this comment.
Conflicts in the env for 4844 support; Not too hard to resolve, new fields for blob txs.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Overview
Resolves all conflicts over a fairly large refactor in upstream REVM for 4844 and RETH's revm state integration.