Added logic changes and CI test for pectra #53
+574
−62
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
debjit-bw
changed the title
dapplion
reviewed
Mar 6, 2025
dapplion
reviewed
Mar 6, 2025
| &self.chain_spec, | ||
| self.block_rewards_contract, | ||
| block.timestamp, | ||
| block.body().withdrawals.as_ref(), | ||
| block.beneficiary, | ||
| &mut evm, | ||
| blob_fee_to_refund, |
There was a problem hiding this comment.
This is not really a system call, why not just do the addition into the map here after apply_post_block_system_calls call?
There was a problem hiding this comment.
i want all the gnosis-specific stuff to be inside the gnosis.rs file, would renaming the function apply_post_block_system_calls be better?
dapplion
reviewed
Mar 6, 2025
| .config | ||
| .extra_fields | ||
| .get("eip1559collector") | ||
| .expect("no eip1559collector field"); |
There was a problem hiding this comment.
Config issues are expected and should not panic. You should parse this field at startup and store it in the GnosisExecutionStrategy or EvmConfig, and be infallible here
dapplion
reviewed
Mar 6, 2025
dapplion
reviewed
Mar 6, 2025
| blob_gas_used * blob_gasprice | ||
| } else { | ||
| 0 | ||
| }; |
There was a problem hiding this comment.
The logic
if prage { collect } else { not }
is duplicated once, dedup. Also it's not a refund, it's a collection since it goes to a different party
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.
Changes
The core logic changes for Pectra are limited to
gnosis.rs,execute.rsandpayload.rs. On EVM side, they include additions of deposit, withdrawal and consolidation requests to therequestsfield (following upstream).The Gnosis-specific change would be the fee-accounting for blob transactions. Reth doesn't provide an evm hook for the blob fee like it does for base fee. Therefore we need to separately add the blob fee used to the fee collector. We do it as part of the post block processing. We calculate the blob fee after the block execution or after payload building and send the value in
apply_post_block_system_calls. Internally, it adds the value to theincrement_balanceshashmap for post-pectra blocks.This PR also includes a pectra version for EIP4844 test, which is exactly similar to the cancun version, except the blob tx is sent at a timestamp later than pectra. We also add this test to CI.