feat(evm): EIP-7002 withdrawal requests #8212
Merged
Conversation
This file contains 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
shekhirin
force-pushed
the
alexey/eip-7002-withdrawal-requests
branch
from
198370e
to
602bd89
Compare
shekhirin
force-pushed
the
alexey/eip-7002-withdrawal-requests
branch
from
48f448f
to
dbfdbc8
Compare
…ithdrawal-requests
mattsse
requested changes
May 13, 2024
crates/ethereum/evm/src/execute.rs
Outdated
| /// | ||
| /// Returns an error if execution fails or receipt verification fails. | ||
| fn execute_and_verify( | ||
| &mut self, | ||
| block: &BlockWithSenders, | ||
| total_difficulty: U256, | ||
| ) -> Result<(Vec<Receipt>, u64), BlockExecutionError> { | ||
| ) -> Result<(Vec<Receipt>, Vec<Request>, u64), BlockExecutionError> { |
There was a problem hiding this comment.
can we add a type for this
Comment on lines
+84
to
+85
| /// All the EIP-7685 requests of the transactions in the block. | ||
| pub requests: Vec<Request>, |
There was a problem hiding this comment.
how would you improve it?
| Self { bundle, receipts, first_block } | ||
| } | ||
| } | ||
|
|
||
| // TODO(mattsse): unify the types, currently there's a cyclic dependency between | ||
| #[cfg(any(test, feature = "test-utils"))] |
There was a problem hiding this comment.
we still need this I believe
There was a problem hiding this comment.
yeah but it doesn't include the requests in the bundle state now, so for now I gated it behind the cfg and added a todo
…ithdrawal-requests
gakonst
reviewed
May 13, 2024
crates/ethereum/evm/src/execute.rs
Outdated
Comment on lines
200
to
208
| Ok((receipts, cumulative_gas_used)) | ||
| let withdrawal_requests = | ||
| post_block_withdrawal_requests(&self.chain_spec, block.timestamp, evm)?; | ||
|
|
||
| Ok((receipts, cumulative_gas_used, withdrawal_requests)) |
There was a problem hiding this comment.
TODO: we should convert this to a struct later
| /// If Prague is not active at the given timestamp, then this is a no-op, and an empty vector is | ||
| /// returned. Otherwise, the withdrawal requests are returned. | ||
| #[inline] | ||
| pub fn post_block_withdrawal_requests<EXT, DB: Database + DatabaseCommit>( |
There was a problem hiding this comment.
needs unit test but OK with moving fast
There was a problem hiding this comment.
gonna add it after we merge this PR
shekhirin
force-pushed
the
alexey/eip-7002-withdrawal-requests
branch
from
83139dd
to
0d9deb9
Compare
shekhirin
force-pushed
the
alexey/eip-7002-withdrawal-requests
branch
from
0d9deb9
to
f50b10c
Compare
…ithdrawal-requests
…ithdrawal-requests
…ithdrawal-requests
…ithdrawal-requests
shekhirin
requested review from
rakita,
joshieDo,
onbjerg,
rkrasiuk,
Rjected and
emhane
as code owners
shekhirin
added
C-enhancement
10 tasks
mattsse
approved these changes
May 13, 2024
Comment on lines
+110
to
+112
| /// Helper type for the output of executing a block. | ||
| #[derive(Debug, Clone)] | ||
| struct EthExecuteOutput { |
There was a problem hiding this comment.
I will combine this with the other output types separately
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Implements the EIP-7002 post-block system contract call. Tests are pending, will be added in the next PR.