refactor: extract checkpoint proposal handling to ProposalHandler#21999
Merged
alexghr merged 1 commit intomerge-train/spartanfrom Mar 25, 2026
Merged
Conversation
dd6b919 to
3104bff
Compare
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. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
3104bff to
ee8810a
Compare
alexghr
approved these changes
Mar 25, 2026
Collaborator
|
❌ Failed to cherry-pick to |
AztecBot
pushed a commit
that referenced
this pull request
Mar 25, 2026
AztecBot
pushed a commit
that referenced
this pull request
Mar 25, 2026
Resolved conflicts in validator.ts and validator.test.ts: - Removed signature/fee validation from attestToCheckpointProposal (moved to ProposalHandler) - Added null check on proposer for self-proposal detection - Used v4 variable name 'slotNumber' instead of 'proposalSlotNumber' - Added new HA peer test
spalladino
added a commit
that referenced
this pull request
Mar 25, 2026
…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
pushed a commit
that referenced
this pull request
Mar 25, 2026
…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>
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Mar 27, 2026
BEGIN_COMMIT_OVERRIDE fix: only clear provenBlockNumber when it exceeds prune point (#21946) chore: (A-779) load all accounts before calling LogService.#getSecretsForSenders (#21923) fix: align staging-public mana target with testnet/mainnet (#21983) chore: (A-777) add warn logs for regressive path in block synchronizer (#21925) fix: fully validate txs retrieved from tx file store (#21988) refactor: extract checkpoint proposal handling to ProposalHandler (#21999) fix: unbounded memory in calldataRetriever (#22004) fix(p2p): check peer rate limit before global to prevent quota starvation (#21997) fix(p2p): evict expired failed-auth-handshake entries on heartbeat (#21992) chore: defensively handle skipPushProposedBlocksToArchiver (#22017) chore: bump testnet prover resource profile to prod-hi-tps (#22019) chore: (A-835) remove unused serializer (#22037) fix(p2p): remove disconnected peers from scoring maps (#22009) fix(e2e): set anvilSlotsInAnEpoch in slashing tests (#21869) fix(ethereum): Audit fixes A-810, A-812 (nonce race, isEscapeHatchOpen logging) (#21948) chore: remove old TxPool implementation (#22028) fix: Fix blob encoding when uploaded from proposals (#22045) chore: Adds /cycle and /fix skills. Also configures linear mcp server (#22043) chore: remove validatorReexecute config option (#22024) fix(sequencer): use last L1 slot of L2 slot as eth_simulateV1 timestamp (#22023) docs(simulator): clarify teardown gas billing is intentional (#22057) chore: revert account loading optimization in log service (#22062) fix: use DateProvider in PeerScoring (#22070) fix(aztec.js): preserve extraHashedArgs in DeployMethod.with() (#22053) fix(p2p): replace process.exit() with graceful shutdown in worker cleanup (#22046) chore: merge next (#22089) fix(stdlib): correct NoteDao size (#22068) feat: improve blob download from filestores (#22096) fix: remove stale tx_pool v1 benchmark reference (#22104) 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.
Motivation
Non-validator nodes with blob upload capability had no way to handle checkpoint proposals — only the validator client processed them. This meant non-validators couldn't validate checkpoint proposals or upload blobs to the filestore, which is needed for blob availability.
Approach
Renamed
BlockProposalHandlertoProposalHandlerand moved checkpoint proposal validation and blob upload logic fromValidatorClientinto it. The handler'sregister()method now also registers a checkpoint proposal handler on the p2p client when the blob client can upload. The validator client delegates to the handler for checkpoint validation and blob upload instead of doing it inline.Changes
BlockProposalHandler→ProposalHandler, addedhandleCheckpointProposal,validateCheckpointProposal,tryUploadBlobsForCheckpoint,uploadBlobsForCheckpoint, andextractCheckpointConstantsmethods (moved fromValidatorClient). Signature and fee-asset-price-modifier validation also moved into the handler.ProposalHandler. Removed extracted methods and unused constructor params (blockSource,checkpointsBuilder).createBlockProposalHandler→createProposalHandler, addedblobClientdependency.createProposalHandlerand passblobClient.