chore: accumulated backports#22015
Merged
Merged
Conversation
spalladino
approved these changes
Mar 25, 2026
PhilWindle
approved these changes
Mar 25, 2026
#21998) ## Summary Backport of #21988 to v4. Adds full transaction validation (via `TxValidator`) to txs retrieved from the tx file store and node RPC sources, replacing the previous hash-only validation. This ensures downloaded txs are validated with the same rigor as txs received via p2p. ## Cherry-pick details - **Commit 1**: Raw cherry-pick with conflict markers in `yarn-project/p2p/src/client/factory.ts` - **Commit 2**: Conflict resolution — simplified import to only include functions used in this file The conflict was minor: the v4 branch had a single-line import while `next` had a multi-line import block with additional unused imports (`createCheckAllowedSetupCalls`, `getDefaultAllowedSetupFunctions`). Resolved by importing only the two functions actually used. ## Verification - Build passes (`yarn build`) - All related tests pass: - `p2p/src/services/tx_collection/tx_source.test.ts` (3/3) - `p2p/src/services/tx_file_store/tx_file_store.test.ts` (17/17) - `foundation/src/collection/array.test.ts` (61/61) ClaudeBox log: https://claudebox.work/s/9c69d8936952bb70?run=1 --------- Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>
…ckport #21999) (#22005) ## Summary Backport of #21999 to v4. Renames `BlockProposalHandler` to `ProposalHandler` and adds checkpoint proposal handling, so non-validator nodes with blob upload capability can validate checkpoint proposals and upload blobs to the filestore. The validator client now delegates checkpoint validation and blob upload to the `ProposalHandler` instead of doing it inline. ## Conflicts Resolved - **proposal_handler.ts**: Import conflict — added new imports (`accumulateCheckpointOutHashes`, `CheckpointProposalCore`, `MerkleTreeId`) needed for checkpoint handling. - **validator.ts**: Two conflicts around signature validation and fee modifier checks that were moved to `ProposalHandler`. Used v4's `slotNumber` variable name instead of `proposalSlotNumber` from next. - **validator.test.ts**: Added new HA peer test from the PR. ## Build Fix - Hoisted `validatorPrivateKeys` from `beforeEach` scope to `describe` scope in `validator.test.ts` so the new test can access it. ClaudeBox log: https://claudebox.work/s/bd9a0060cbf1923d?run=1 --------- Co-authored-by: Santiago Palladino <santiago@aztec-labs.com>
alexghr
force-pushed
the
backport-to-v4-staging
branch
from
78d5dc4 to
9ab6032
Compare
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
4 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.
.