fix: ensure no blob transactions in payloads pre-cancun #4779
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
Rjected
added
C-bug
Codecov Report
... and 8 files with indirect coverage changes
Flags with carried forward coverage won't be shown. Click here to find out more.
|
mattsse
approved these changes
Sep 26, 2023
| Ok(block) => block, | ||
| Err(error) => { | ||
| // TODO: need to fix this to use the correct type |
rkrasiuk
reviewed
Sep 26, 2023
There was a problem hiding this comment.
how is this not a noop given version/fork validation performed in disregard this qEngineApi::validate_payload_timestamp method?
Comment on lines
1141
to
1169
| // make sure there are no blob transactions in the payload if it is pre-cancun | ||
| // we perform this check before validating the block hash because INVALID_PARAMS | ||
| // must be returned over an INVALID response. | ||
| if !self.chain_spec().is_cancun_activated_at_timestamp(block.timestamp) && | ||
| block.has_blob_transactions() | ||
| { | ||
| return Err(BeaconOnNewPayloadError::PreCancunBlockWithBlobTransactions) | ||
| } | ||
|
|
||
| validate_block_hash(block_hash, block) |
There was a problem hiding this comment.
imo this should be handled on payload validation step inside EngineApi handlers
There was a problem hiding this comment.
It's possible, but a bit more hacky to do this because the actual transaction decoding happens later, i.e. it happens in try_into_block. Forgot to link #4670, see:
they are still stored as Bytes in the ExecutionPayload
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Rjected
force-pushed
the
dan/ensure-no-blob-transactions-pre-cancun
branch
from
6129476
to
0e48f72
Compare
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.
This ensures there are no blob transactions pre-cancun, adding a new error variant that maps to
INVALID_PARAMS_CODE.Makes the
/cancun/eip4844_blobs/blob_txs/blob_type_tx_pre_fork/001-fork=ShanghaiToCancunAtTime15k-one_blob_txtest pass.Not really happy on the new return type of
ensure_well_formed_payload- am considering adding a separate error type that makes this easier.Fixes #4670