chore: backport PR #21788 (feat(p2p): add tx validation for contract class id verification) to v4-next#21852
Merged
spalladino merged 3 commits intobackport-to-v4-next-stagingfrom Mar 20, 2026
Conversation
spalladino
approved these changes
Mar 20, 2026
056d18b to
519a92f
Compare
Collaborator
Author
Flakey Tests🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry. |
AztecBot
added a commit
that referenced
this pull request
Mar 21, 2026
BEGIN_COMMIT_OVERRIDE chore: backport #21754 (feat!: make isContractInitialized a tri-state enum) to v4-next (#21792) fix(stdlib): zero-pad bufferFromFields when declared length exceeds payload (#21802) test(protocol-contracts): verify max-size bytecode fits in contract class log (#21818) chore: port P2P mesh topic deflake fix to v4-next (#21825) fix(archiver): throw on duplicate contract class or instance additions (#21799) feat: sync poseidon in the browser (#21833) chore: backport #21824 (fix(aztec-up): add sensible defaults to installer y/n prompts) to v4-next (#21844) fix(sequencer): backport wall-clock time for slot estimation to v4-next (#21769) (#21847) chore: backport PR #21788 (feat(p2p): add tx validation for contract class id verification) to v4-next (#21852) feat: sync poseidon browser (#21851) END_COMMIT_OVERRIDE
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
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 #21788 to v4-next.
Adds contract class ID validation to the
DataTxValidatorand archiver'supdatePublishedContractClasses, preventing malicious txs from registering classes with mismatched IDs. Also simplifiestoContractClassPublic()to be synchronous with explicit validation at call sites.Conflicts Resolved
Cherry-pick had 7 conflict regions across 5 files. Key differences on v4-next:
ContractClassPublictype includesprivateFunctions/utilityFunctionsarrays (not present on next)DataStoreConfigandL1RollupConstantsFull conflict resolution analysis: https://gist.github.com/AztecBot/7bae9da9cdc612e1df373324a58e6b24
Test plan
ClaudeBox log: https://claudebox.work/s/4066b8ad44d62582?run=1