Skip to content

refactor: extract checkpoint proposal handling to ProposalHandler#21999

Merged
alexghr merged 1 commit intomerge-train/spartanfrom
palla/extract-checkpoint-proposal-handler
Mar 25, 2026
Merged

refactor: extract checkpoint proposal handling to ProposalHandler#21999
alexghr merged 1 commit intomerge-train/spartanfrom
palla/extract-checkpoint-proposal-handler

Conversation

@spalladino
Copy link
Copy Markdown
Contributor

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 BlockProposalHandler to ProposalHandler and moved checkpoint proposal validation and blob upload logic from ValidatorClient into it. The handler's register() 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

  • validator-client: Renamed BlockProposalHandlerProposalHandler, added handleCheckpointProposal, validateCheckpointProposal, tryUploadBlobsForCheckpoint, uploadBlobsForCheckpoint, and extractCheckpointConstants methods (moved from ValidatorClient). Signature and fee-asset-price-modifier validation also moved into the handler.
  • validator-client (ValidatorClient): Delegates checkpoint validation and blob upload to ProposalHandler. Removed extracted methods and unused constructor params (blockSource, checkpointsBuilder).
  • validator-client (factory): Renamed createBlockProposalHandlercreateProposalHandler, added blobClient dependency.
  • aztec-node: Updated to use createProposalHandler and pass blobClient.
  • validator-client (tests): Updated references to renamed class and methods.

@spalladino spalladino force-pushed the palla/extract-checkpoint-proposal-handler branch from dd6b919 to 3104bff Compare March 25, 2026 15:09
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>
@spalladino spalladino force-pushed the palla/extract-checkpoint-proposal-handler branch from 3104bff to ee8810a Compare March 25, 2026 15:28
@alexghr alexghr merged commit 90d66e7 into merge-train/spartan Mar 25, 2026
19 of 23 checks passed
@alexghr alexghr deleted the palla/extract-checkpoint-proposal-handler branch March 25, 2026 16:14
@AztecBot
Copy link
Copy Markdown
Collaborator

❌ Failed to cherry-pick to v4 due to conflicts. (🤖) View backport run.

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants