feat: implement EIP-7685 #8053
Merged
feat: implement EIP-7685 #8053
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
onbjerg
added
C-enhancement
This was referenced May 2, 2024
gakonst
reviewed
May 11, 2024
| @@ -325,6 +326,8 @@ impl StorageInner { | |||
| Some(calculate_excess_blob_gas(parent_excess_blob_gas, parent_blob_gas_used)) | |||
| } | |||
|
|
|||
| // todo: do we support requests root in auto-seal | |||
onbjerg
requested review from
mattsse,
rakita,
joshieDo,
shekhirin,
Rjected,
rkrasiuk and
emhane
as code owners
mattsse
approved these changes
May 13, 2024
Comment on lines
+9
to
+10
| #[derive(Debug, Clone, PartialEq, Eq, Default, Hash, RlpEncodableWrapper, RlpDecodableWrapper)] | ||
| pub struct Requests(pub Vec<Request>); |
There was a problem hiding this comment.
we're missing a few helper impls but this is ok
There was a problem hiding this comment.
will add before merge to main
Merged
shekhirin
force-pushed
the
onbjerg/eip-7685
branch
from
81f39e4
to
be76a64
Compare
gakonst
reviewed
May 13, 2024
| @@ -727,6 +736,7 @@ impl<TX: DbTxMut + DbTx> DatabaseProvider<TX> { | |||
| let block_ommers = self.get_or_take::<tables::BlockOmmers, TAKE>(range.clone())?; | |||
| let block_withdrawals = | |||
| self.get_or_take::<tables::BlockWithdrawals, TAKE>(range.clone())?; | |||
| let block_requests = self.get_or_take::<tables::BlockRequests, TAKE>(range.clone())?; | |||
There was a problem hiding this comment.
still dont love this get/take function we should investigate fixing later
Comment on lines
+248
to
+256
| // note(onbjerg): the rpc spec has not been changed to include requests, so for now we just | ||
| // set these to empty | ||
| let (requests, requests_root) = | ||
| if chain_spec.is_prague_active_at_timestamp(block_env.timestamp.to::<u64>()) { | ||
| (Some(Requests::default()), Some(EMPTY_ROOT_HASH)) | ||
| } else { | ||
| (None, None) | ||
| }; | ||
|
|
There was a problem hiding this comment.
the pr is for the engine api, this code snippet is for regular rpc which does not have any changes currently
| @@ -84,7 +84,7 @@ impl BlockBatchRecord { | |||
| } | |||
|
|
|||
| /// Returns all recorded requests. | |||
| pub fn take_requests(&mut self) -> Requests { | |||
| pub fn take_requests(&mut self) -> Vec<Requests> { | |||
There was a problem hiding this comment.
I think we start having a lot of these Vec<Vec<_>> outer / inner vecs so maybe we should do a generic Batch<T> to encapsulate that
Comment on lines
+16
to
+18
| // HACK(onbjerg): we need this to always set `requests` to `None` since we might otherwise generate | ||
| // a block with `None` withdrawals and `Some` requests, in which case we end up trying to decode the | ||
| // requests as withdrawals |
mattsse
approved these changes
May 13, 2024
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.
Adds types for EIP-7685, adds a new
Requeststable, and adjusts the code where appropriate.This still lacks:
Requestsin the bodies stageWill do these in separate PRs to unblock EIPs 6110 and 7002