chore: Properly compute finalized block by spypsy · Pull Request #21156 · AztecProtocol/aztec-packages

spypsy · 2026-03-05T11:04:31Z

Description

Replaces the heuristic finalized block computation (provenBlock - 2 * epochDuration) with L1 finality.

On each archiver sync iteration, we now:

Fetch the finalized L1 block via getBlock({ blockTag: 'finalized' })
Query the rollup contract for the proven checkpoint number at that L1 block
Persist that as the finalized checkpoint, from which the finalized L2 block number is derived

Failures in this step are caught and logged as warnings so they don't disrupt the rest of the sync loop (e.g. if the RPC node can't serve state at the finalized block).

Changes

RollupContract.getProvenCheckpointNumber now accepts an optional { blockNumber } to query historical contract state
BlockStore stores a lastFinalizedCheckpoint singleton and derives getFinalizedL2BlockNumber from it instead of the old arithmetic heuristic
ArchiverL1Synchronizer gains updateFinalizedCheckpoint(), called every sync iteration
KVArchiverDataStore constructor no longer takes l1Constants (the epochDuration it was used for is no longer needed)
FakeL1State updated to support blockTag: 'finalized' and getProvenCheckpointNumber with a block number, enabling new sync tests

spalladino

Looks good! Just two concerns:

1- There are some lingering TODOs about finalization that need to be removed now that this is implemented (search TODO(#13569)), and one that needs to be implemented (see rollbackTo in the archiver).

2- I'm very surprised that the e2e reorg tests that trigger a reorg that removes a proof via an L1 reorg still work with the change in anvil so that the L1 epoch length is 1. That setting means that proven becomes finalized immediately, so nodes shouldn't be able to handle a reorg to before the finalized checkpoint. No actionable here, just something I'm surprised/worried about.

PhilWindle · 2026-03-11T09:28:02Z

yarn-project/end-to-end/src/e2e_epochs/epochs_l1_reorgs.parallel.test.ts

    const getProvenCheckpointNumber = (node: AztecNode) => node.getL2Tips().then(tips => tips.proven.checkpoint.number);

-    it('prunes L2 blocks if a proof is removed due to an L1 reorg', async () => {
+    it.only('prunes L2 blocks if a proof is removed due to an L1 reorg', async () => {


Did you intend to add only?

…ztec-packages into spy/finalized-checkpoint

BEGIN_COMMIT_OVERRIDE fix: (A-623) increase committee timeout in scenario smoke test (#21193) feat: orchestrator enqueues via serial queue (#21247) feat: rollup mana limit gas validation (#21219) fix: make e2e HA test more deterministic (#21199) chore: fix chonk_browser lint warning (#21265) chore: deploy SPONSORED_FPC in test networks (#21254) fix: (A-635) e2e bot flake on nonce mismatch (#21288) chore: deflake duplicate attestations and proposals slash tests (#21294) fix(sequencer): fix log when not enough txs (#21297) chore: send env var to pods (#21307) fix: Simulate gas in n tps test. Set min txs per block to 1 (#21312) fix: update dependabot dependencies (#21238) test: run nightly bench of block capacity (#20726) fix: update block_capacity test to use new send() result types (#21345) fix(node): fix index misalignment in findLeavesIndexes (#21327) fix(log): do not log validation error if unregistered handler (#21111) fix: limit parallel blocks in prover to max AVM parallel simulations (#21320) fix: use native sha256 to speed up proving job id generation (#21292) chore: remove v4-devnet-1 (#21044) fix(validator): wait for l1 sync before processing block proposals (#21336) fix(txpool): cap priority fee with max fees when computing priority (#21279) chore: Properly compute finalized block (#21156) fix: remove extra argument in KVArchiverDataStore constructor call (#21361) chore: revert l2 slot time 72 -> 36 on scenario network (#21291) fix(archiver): do not error if proposed block matches checkpointed (#21367) fix(claude): rule to not append echo exit (#21368) chore: reduce severity of errors due to HA node not acquiring signature (#21311) fix: make reqresp batch retry test deterministic (#21322) fix: (A-643) add buffer to maxFeePerBlobGas for gas estimation and fix bump loop truncation (#21323) fix(e2e): use L2 priority fee in deploy_method same-block test (#21373) fix: reqresp flake & add logging (#21334) END_COMMIT_OVERRIDE

…ization race (#21452) ## Summary - Sets `anvilSlotsInAnEpoch: 32` in `e2e_offchain_payment` test setup, matching what `epochs_l1_reorgs` already does. ## Problem PR #21156 added `--slots-in-an-epoch 1` as the default for anvil, making `finalized = latest - 2`. PR #20893 added `e2e_offchain_payment` which simulates L1 reorgs. When both landed on `merge-train/fairies`, the reorg test fails deterministically because finalization races past the rollback target block. ## Fix Use `anvilSlotsInAnEpoch: 32` (matching Ethereum mainnet) so the finalized block stays far enough behind latest to allow rollbacks in the test. ClaudeBox log: https://claudebox.work/s/c5ac5d52da86e23a?run=4

AztecBot · 2026-03-16T12:27:24Z

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

Cherry-pick of 078737f from next. Conflicts present in: - yarn-project/archiver/src/factory.ts - yarn-project/archiver/src/store/block_store.ts - yarn-project/ethereum/src/test/start_anvil.ts

…ints (#21597) ## Summary - Updates the finalized block heuristic from `epochDuration * 2` to `epochDuration * 2 * 4` to subtract checkpoints (assumed 4 blocks each) instead of blocks. - The proper fix is in #21156 which replaces this heuristic with L1 finality. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

… test (#21642) ## Summary - Removes the historic/finalized block verification checks from `epochs_multiple.test.ts` - The finalization logic on v4 is incorrect: it subtracts a fixed number of blocks (`epochDuration * 2`) instead of accounting for variable blocks per slot (up to 4 per slot), causing test timeouts - The correct finalization implementation exists on `next` in #21156 but is non-trivial to backport to v4 - Keeps the proven sync check intact — only historic/finalized assertions are removed ## Context See discussion in Slack: the current `getFinalizedL2BlockNumber` uses `provenBlockNumber - epochDuration * 2` which doesn't account for variable blocks per slot. This causes the tx mempool to evict transactions too aggressively and the test to time out waiting for finalization. ## Test plan - CI should pass — the test still verifies epoch proving and proven block sync, just without the finalized block assertions ClaudeBox log: https://claudebox.work/s/a5e9cea005ce4a5a?run=1

chore: Properly compute finalized block

aca831d

spypsy marked this pull request as ready for review March 5, 2026 11:04

spypsy added 2 commits March 5, 2026 11:42

Merge branch 'merge-train/spartan' into spy/finalized-checkpoint

ddd3450

add option to start anvil with short eth epochs

460d936

spalladino reviewed Mar 5, 2026

View reviewed changes

PR comments

976a7e9

AztecBot requested a review from a team March 9, 2026 11:43

update test for 32 slots in epoch

e8462cd

PhilWindle requested changes Mar 11, 2026

View reviewed changes

rm .only

3da2c90

PhilWindle approved these changes Mar 11, 2026

View reviewed changes

spypsy added 3 commits March 11, 2026 10:35

update prune test

a40aebe

Merge branch 'spy/finalized-checkpoint' of github.com:AztecProtocol/a…

e11e7fc

…ztec-packages into spy/finalized-checkpoint

rm unused stuff

4b25657

spypsy enabled auto-merge (squash) March 11, 2026 13:08

spypsy merged commit 078737f into merge-train/spartan Mar 11, 2026
10 checks passed

spypsy deleted the spy/finalized-checkpoint branch March 11, 2026 13:25

This was referenced Mar 11, 2026

feat: merge-train/spartan #21248

Merged

fix: skip -march auto-detection for cross-compilation presets #21356

Merged

spypsy added the backport-to-v4-next label Mar 16, 2026

spypsy restored the spy/finalized-checkpoint branch March 16, 2026 12:26

AztecBot mentioned this pull request Mar 16, 2026

chore: Properly compute finalized block (#21156) #21594

Draft

spalladino mentioned this pull request Mar 16, 2026

fix(archiver): update finalized block lookback to account for checkpoints #21597

Merged

AztecBot mentioned this pull request Mar 17, 2026

fix(e2e): remove historic/finalized block checks from epochs_multiple test #21642

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Properly compute finalized block#21156

chore: Properly compute finalized block#21156
spypsy merged 9 commits intomerge-train/spartanfrom
spy/finalized-checkpoint

spypsy commented Mar 5, 2026

Uh oh!

spalladino left a comment

Uh oh!

PhilWindle Mar 11, 2026

Uh oh!

spypsy Mar 11, 2026

Uh oh!

Uh oh!

AztecBot commented Mar 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

spypsy commented Mar 5, 2026

Description

Changes

Uh oh!

spalladino left a comment

Choose a reason for hiding this comment

Uh oh!

PhilWindle Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

spypsy Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

AztecBot commented Mar 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants