feat(p2p): reject and evict txs with insufficient max fee per gas (backport #21281)#21431
Closed
AztecBot wants to merge 4 commits intobackport-to-v4-next-stagingfrom
Closed
Conversation
ludamad
force-pushed
the
backport-to-v4-next-staging
branch
from
5c50c04 to
4eb8703
Compare
ludamad
force-pushed
the
claudebox/backport-21281-reject-evict-txs-v4-next
branch
from
9936b53 to
5f8f38b
Compare
Resolved conflicts in: - docs/docs-developers/docs/resources/migration_notes.md - noir-projects/aztec-nr/aztec/src/macros/aztec.nr - noir-projects/noir-protocol-circuits/crates/types/src/constants.nr - noir-projects/noir-protocol-circuits/crates/types/src/constants_tests.nr - yarn-project/end-to-end/src/composed/ha/e2e_ha_full.test.ts
Remove yarn-project/end-to-end/src/spartan/block_capacity.test.ts which was deleted in v4-next but modified by the cherry-picked commit. The file does not exist on the target branch so the modification is dropped.
AztecBot
changed the base branch from
backport-to-v4-next-staging
to
claudebox/backport-20775-v4-next
AztecBot
force-pushed
the
claudebox/backport-21281-reject-evict-txs-v4-next
branch
from
5f8f38b to
96d4ab8
Compare
AztecBot
changed the base branch from
claudebox/backport-20775-v4-next
to
claudebox/ff2dd4f68e9ac0be-2
Base automatically changed from
claudebox/ff2dd4f68e9ac0be-2
to
backport-to-v4-next-staging
March 13, 2026 13:52
Contributor
|
We have reverted the original PR |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Summary
Backport of #21281 to v4-next.
GasTxValidatorto returninvalidinstead ofskippedwhen a tx'smaxFeesPerGasis below current block fees, rejecting the tx outright.MaxFeePerGasValidatoras a standalone generic validator so it can be used in pool migration alongside fullTxvalidation.InsufficientFeePerGasEvictionRulethat evicts pending txs after a new block is mined if theirmaxFeesPerGasno longer meets the block's gas fees.maxFeesPerGastoTxMetaValidationDataso the eviction rule and pool migration validator can access it from metadata.Conflict Resolution
One conflict resolved:
yarn-project/end-to-end/src/spartan/block_capacity.test.ts: modify/delete conflict — file was deleted in v4-next but modified in the source PR. Resolved by dropping the file since it doesn't exist on v4-next.Commit Structure
ClaudeBox log: https://claudebox.work/s/f3e3c07614d5a047?run=1