Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: return INVALID again if block contains blob transactions pre-cancun #4845

Merged
merged 2 commits into from
Sep 28, 2023

Conversation

Rjected
Copy link
Member

@Rjected Rjected commented Sep 28, 2023

Fixes #4670 again

The test now expects an INVALID response instead of an RPC error, so we can get rid of the double nested Result, and just have a PayloadError to represent when a pre-cancun payload has blob transactions.

@Rjected Rjected added C-bug An unexpected or incorrect behavior C-test A change that impacts how or what we test E-cancun Related to the Cancun network upgrade labels Sep 28, 2023
Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes! this is way nicer

@codecov
Copy link

codecov bot commented Sep 28, 2023

Codecov Report

Merging #4845 (c5927d2) into main (486b289) will decrease coverage by 0.01%.
Report is 3 commits behind head on main.
The diff coverage is 83.33%.

Impacted file tree graph

Files Coverage Δ
crates/rpc/rpc-types/src/eth/engine/payload.rs 80.92% <ø> (ø)
crates/consensus/beacon/src/engine/mod.rs 73.21% <83.33%> (+<0.01%) ⬆️

... and 11 files with indirect coverage changes

Flag Coverage Δ
integration-tests 15.60% <0.00%> (-0.01%) ⬇️
unit-tests 62.70% <83.33%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
reth binary 32.06% <ø> (ø)
blockchain tree 83.76% <ø> (ø)
pipeline 88.43% <ø> (-0.02%) ⬇️
storage (db) 73.29% <ø> (ø)
trie 94.48% <ø> (-0.04%) ⬇️
txpool 49.54% <ø> (ø)
networking 76.47% <ø> (+0.01%) ⬆️
rpc 57.80% <ø> (-0.02%) ⬇️
consensus 62.63% <83.33%> (-0.02%) ⬇️
revm 28.54% <ø> (ø)
payload builder 8.16% <ø> (ø)
primitives 85.26% <ø> (-0.02%) ⬇️

@Rjected Rjected added this pull request to the merge queue Sep 28, 2023
Merged via the queue into main with commit ad78d4c Sep 28, 2023
@Rjected Rjected deleted the dan/return-invalid-for-blob-txs-pre-cancun branch September 28, 2023 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-bug An unexpected or incorrect behavior C-test A change that impacts how or what we test E-cancun Related to the Cancun network upgrade
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ensure pre-cancun payload does not have blob transactions
2 participants