@aztec/sequencer-client 0.0.1-commit.3fd054f6 → 0.0.1-commit.42ee6df9b

package/dest/sequencer/sequencer.js

@@ -454,6 +454,7 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
     /** The last slot for which we triggered a checkpoint proposal job, to prevent duplicate attempts. */ lastSlotForCheckpointProposalJob;
     /** Last successful checkpoint proposed */ lastCheckpointProposed;
     /** The last epoch for which we logged strategy comparison in fisherman mode. */ lastEpochForStrategyComparison;
+    /** The last checkpoint proposal job, tracked so we can await its pending L1 submission during shutdown. */ lastCheckpointProposalJob;
     /** The maximum number of seconds that the sequencer can be into a slot to transition to a particular state. */ timetable;
     /** Config for the sequencer */ config;
     constructor(publisherFactory, validatorClient, globalsBuilder, p2pClient, worldState, slasherClient, l2BlockSource, l1ToL2MessageSource, checkpointsBuilder, l1Constants, dateProvider, epochCache, rollupContract, config, telemetry = getTelemetryClient(), log = createLogger('sequencer')){
@@ -496,6 +497,7 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         });
         await this.publisherFactory.stopAll();
         await this.runningPromise?.stop();
+        await this.lastCheckpointProposalJob?.awaitPendingSubmission();
         this.setState(SequencerState.STOPPED, undefined, {
             force: true
         });
@@ -546,6 +548,8 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         if (!checkpointProposalJob) {
             return;
         }
+        // Track the job so we can await its pending L1 submission during shutdown
+        this.lastCheckpointProposalJob = checkpointProposalJob;
         // Execute the checkpoint proposal job
         const checkpoint = await checkpointProposalJob.execute();
         // Update last checkpoint proposed (currently unused)
@@ -612,6 +616,13 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
         }
         // Next checkpoint follows from the last synced one
         const checkpointNumber = CheckpointNumber(syncedTo.checkpointNumber + 1);
+        // Guard: don't exceed 1-deep pipeline. Without a proposed checkpoint, we can only build
+        // confirmed + 1. With a proposed checkpoint, we can build confirmed + 2.
+        const confirmedCkpt = syncedTo.checkpointedCheckpointNumber;
+        if (checkpointNumber > confirmedCkpt + 2) {
+            this.log.warn(`Skipping slot ${targetSlot}: checkpoint ${checkpointNumber} exceeds max pipeline depth (confirmed=${confirmedCkpt})`);
+            return undefined;
+        }
         const logCtx = {
             nowSeconds,
             syncedToL2Slot: syncedTo.syncedL2Slot,
@@ -651,12 +662,35 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             this.log.debug(`Set proposer address ${proposer} for simulation in fisherman mode`);
         }
         // Prepare invalidation request if the pending chain is invalid (returns undefined if no need)
-        const invalidateCheckpoint = await publisher.simulateInvalidateCheckpoint(syncedTo.pendingChainValidationStatus);
-        // Check with the rollup contract if we can indeed propose at the target slot. This check should not fail
-        // if all the previous checks are good, but we do it just in case.
-        const canProposeCheck = await publisher.canProposeAt(syncedTo.archive, proposer ?? EthAddress.ZERO, {
-            ...invalidateCheckpoint
-        });
+        let invalidateCheckpoint = await publisher.simulateInvalidateCheckpoint(syncedTo.pendingChainValidationStatus);
+        // Determine the correct archive and L1 state overrides for the canProposeAt check.
+        // The L1 contract reads archives[proposedCheckpointNumber] and compares it with the provided archive.
+        // When invalidating or pipelining, the local archive may differ from L1's, so we adjust accordingly.
+        let archiveForCheck = syncedTo.archive;
+        const l1Overrides = {};
+        if (this.epochCache.isProposerPipeliningEnabled() && syncedTo.hasProposedCheckpoint) {
+            // Parent checkpoint hasn't landed on L1 yet. Override both the proposed checkpoint number
+            // and the archive at that checkpoint so L1 simulation sees the correct chain tip.
+            const parentCheckpointNumber = CheckpointNumber(checkpointNumber - 1);
+            l1Overrides.forcePendingCheckpointNumber = parentCheckpointNumber;
+            l1Overrides.forceArchive = {
+                checkpointNumber: parentCheckpointNumber,
+                archive: syncedTo.archive
+            };
+            this.metrics.recordPipelineDepth(1);
+            this.log.verbose(`Building on top of proposed checkpoint (pending=${syncedTo.proposedCheckpointData?.checkpointNumber})`);
+            // Clear the invalidation - the proposed checkpoint should handle it.
+            invalidateCheckpoint = undefined;
+        } else if (invalidateCheckpoint) {
+            // After invalidation, L1 will roll back to checkpoint N-1. The archive at N-1 already
+            // exists on L1, so we just pass the matching archive (the lastArchive of the invalid checkpoint).
+            archiveForCheck = invalidateCheckpoint.lastArchive;
+            l1Overrides.forcePendingCheckpointNumber = invalidateCheckpoint.forcePendingCheckpointNumber;
+            this.metrics.recordPipelineDepth(0);
+        } else {
+            this.metrics.recordPipelineDepth(0);
+        }
+        const canProposeCheck = await publisher.canProposeAt(archiveForCheck, proposer ?? EthAddress.ZERO, l1Overrides);
         if (canProposeCheck === undefined) {
             this.log.warn(`Cannot propose checkpoint ${checkpointNumber} at slot ${slot} due to failed rollup contract check`, logCtx);
             this.emit('proposer-rollup-check-failed', {
@@ -700,10 +734,10 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             pipeliningEnabled: this.epochCache.isProposerPipeliningEnabled()
         });
         // Create and return the checkpoint proposal job
-        return this.createCheckpointProposalJob(slot, targetSlot, epoch, targetEpoch, checkpointNumber, syncedTo.blockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint);
+        return this.createCheckpointProposalJob(slot, targetSlot, targetEpoch, checkpointNumber, syncedTo.blockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, syncedTo.proposedCheckpointData);
     }
-    createCheckpointProposalJob(slot, targetSlot, epoch, targetEpoch, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint) {
-        return new CheckpointProposalJob(slot, targetSlot, epoch, targetEpoch, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, this.validatorClient, this.globalsBuilder, this.p2pClient, this.worldState, this.l1ToL2MessageSource, this.l2BlockSource, this.checkpointsBuilder, this.l2BlockSource, this.l1Constants, this.config, this.timetable, this.slasherClient, this.epochCache, this.dateProvider, this.metrics, this, this.setState.bind(this), this.tracer, this.log.getBindings());
+    createCheckpointProposalJob(slot, targetSlot, targetEpoch, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, proposedCheckpointData) {
+        return new CheckpointProposalJob(slot, targetSlot, targetEpoch, checkpointNumber, syncedToBlockNumber, proposer, publisher, attestorAddress, invalidateCheckpoint, this.validatorClient, this.globalsBuilder, this.p2pClient, this.worldState, this.l1ToL2MessageSource, this.l2BlockSource, this.checkpointsBuilder, this.l2BlockSource, this.l1Constants, this.config, this.timetable, this.slasherClient, this.epochCache, this.dateProvider, this.metrics, this, this.setState.bind(this), this.tracer, this.log.getBindings(), proposedCheckpointData);
     }
     /**
    * Returns the current sequencer state.
@@ -767,20 +801,25 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
                     number: syncSummary.latestBlockNumber,
                     hash: syncSummary.latestBlockHash
                 })),
-            this.l2BlockSource.getL2Tips().then((t)=>t.proposed),
+            this.l2BlockSource.getL2Tips().then((t)=>({
+                    proposed: t.proposed,
+                    checkpointed: t.checkpointed,
+                    proposedCheckpoint: t.proposedCheckpoint
+                })),
             this.p2pClient.getStatus().then((p2p)=>p2p.syncedToL2Block),
             this.l1ToL2MessageSource.getL2Tips().then((t)=>t.proposed),
-            this.l2BlockSource.getPendingChainValidationStatus()
+            this.l2BlockSource.getPendingChainValidationStatus(),
+            this.l2BlockSource.getProposedCheckpointOnly()
         ]);
-        const [worldState, l2BlockSource, p2p, l1ToL2MessageSource, pendingChainValidationStatus] = syncedBlocks;
+        const [worldState, l2Tips, p2p, l1ToL2MessageSource, pendingChainValidationStatus, proposedCheckpointData] = syncedBlocks;
         // Handle zero as a special case, since the block hash won't match across services if we're changing the prefilled data for the genesis block,
         // as the world state can compute the new genesis block hash, but other components use the hardcoded constant.
         // TODO(palla/mbps): Fix the above. All components should be able to handle dynamic genesis block hashes.
-        const result = l2BlockSource.number === 0 && worldState.number === 0 && p2p.number === 0 && l1ToL2MessageSource.number === 0 || worldState.hash === l2BlockSource.hash && p2p.hash === l2BlockSource.hash && l1ToL2MessageSource.hash === l2BlockSource.hash;
+        const result = l2Tips.proposed.number === 0 && worldState.number === 0 && p2p.number === 0 && l1ToL2MessageSource.number === 0 || worldState.hash === l2Tips.proposed.hash && p2p.hash === l2Tips.proposed.hash && l1ToL2MessageSource.hash === l2Tips.proposed.hash;
         if (!result) {
             this.log.debug(`Sequencer sync check failed`, {
                 worldState,
-                l2BlockSource,
+                l2BlockSource: l2Tips.proposed,
                 p2p,
                 l1ToL2MessageSource
             });
@@ -792,8 +831,10 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             const archive = new Fr((await this.worldState.getCommitted().getTreeInfo(MerkleTreeId.ARCHIVE)).root);
             return {
                 checkpointNumber: CheckpointNumber.ZERO,
+                checkpointedCheckpointNumber: CheckpointNumber.ZERO,
                 blockNumber: BlockNumber.ZERO,
                 archive,
+                hasProposedCheckpoint: false,
                 syncedL2Slot,
                 pendingChainValidationStatus
             };
@@ -804,11 +845,15 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
             this.log.error(`Failed to get L2 block data ${blockNumber} from the archiver with all components in sync`);
             return undefined;
         }
+        const hasProposedCheckpoint = l2Tips.proposedCheckpoint.checkpoint.number > l2Tips.checkpointed.checkpoint.number;
         return {
             blockData,
             blockNumber: blockData.header.getBlockNumber(),
             checkpointNumber: blockData.checkpointNumber,
+            checkpointedCheckpointNumber: l2Tips.checkpointed.checkpoint.number,
             archive: blockData.archive.root,
+            hasProposedCheckpoint,
+            proposedCheckpointData,
             syncedL2Slot,
             pendingChainValidationStatus
         };
@@ -864,7 +909,7 @@ _dec = trackSpan('Sequencer.work'), _dec1 = trackSpan('Sequencer.prepareCheckpoi
                 proposer
             ];
         }
-        this.log.debug(`We are the proposer for target slot ${targetSlot}`, {
+        this.log.info(`We are the proposer for pipeline slot ${targetSlot}`, {
             targetSlot,
             proposer
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.0.1-commit.3fd054f6",
+  "version": "0.0.1-commit.42ee6df9b",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -26,37 +26,37 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.0.1-commit.3fd054f6",
-    "@aztec/bb-prover": "0.0.1-commit.3fd054f6",
-    "@aztec/blob-client": "0.0.1-commit.3fd054f6",
-    "@aztec/blob-lib": "0.0.1-commit.3fd054f6",
-    "@aztec/constants": "0.0.1-commit.3fd054f6",
-    "@aztec/epoch-cache": "0.0.1-commit.3fd054f6",
-    "@aztec/ethereum": "0.0.1-commit.3fd054f6",
-    "@aztec/foundation": "0.0.1-commit.3fd054f6",
-    "@aztec/l1-artifacts": "0.0.1-commit.3fd054f6",
-    "@aztec/node-keystore": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-acvm_js": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-contracts.js": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.3fd054f6",
-    "@aztec/noir-types": "0.0.1-commit.3fd054f6",
-    "@aztec/p2p": "0.0.1-commit.3fd054f6",
-    "@aztec/protocol-contracts": "0.0.1-commit.3fd054f6",
-    "@aztec/prover-client": "0.0.1-commit.3fd054f6",
-    "@aztec/simulator": "0.0.1-commit.3fd054f6",
-    "@aztec/slasher": "0.0.1-commit.3fd054f6",
-    "@aztec/stdlib": "0.0.1-commit.3fd054f6",
-    "@aztec/telemetry-client": "0.0.1-commit.3fd054f6",
-    "@aztec/validator-client": "0.0.1-commit.3fd054f6",
-    "@aztec/validator-ha-signer": "0.0.1-commit.3fd054f6",
-    "@aztec/world-state": "0.0.1-commit.3fd054f6",
+    "@aztec/aztec.js": "0.0.1-commit.42ee6df9b",
+    "@aztec/bb-prover": "0.0.1-commit.42ee6df9b",
+    "@aztec/blob-client": "0.0.1-commit.42ee6df9b",
+    "@aztec/blob-lib": "0.0.1-commit.42ee6df9b",
+    "@aztec/constants": "0.0.1-commit.42ee6df9b",
+    "@aztec/epoch-cache": "0.0.1-commit.42ee6df9b",
+    "@aztec/ethereum": "0.0.1-commit.42ee6df9b",
+    "@aztec/foundation": "0.0.1-commit.42ee6df9b",
+    "@aztec/l1-artifacts": "0.0.1-commit.42ee6df9b",
+    "@aztec/node-keystore": "0.0.1-commit.42ee6df9b",
+    "@aztec/noir-acvm_js": "0.0.1-commit.42ee6df9b",
+    "@aztec/noir-contracts.js": "0.0.1-commit.42ee6df9b",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.42ee6df9b",
+    "@aztec/noir-types": "0.0.1-commit.42ee6df9b",
+    "@aztec/p2p": "0.0.1-commit.42ee6df9b",
+    "@aztec/protocol-contracts": "0.0.1-commit.42ee6df9b",
+    "@aztec/prover-client": "0.0.1-commit.42ee6df9b",
+    "@aztec/simulator": "0.0.1-commit.42ee6df9b",
+    "@aztec/slasher": "0.0.1-commit.42ee6df9b",
+    "@aztec/stdlib": "0.0.1-commit.42ee6df9b",
+    "@aztec/telemetry-client": "0.0.1-commit.42ee6df9b",
+    "@aztec/validator-client": "0.0.1-commit.42ee6df9b",
+    "@aztec/validator-ha-signer": "0.0.1-commit.42ee6df9b",
+    "@aztec/world-state": "0.0.1-commit.42ee6df9b",
     "lodash.chunk": "^4.2.0",
     "tslib": "^2.4.0",
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/archiver": "0.0.1-commit.3fd054f6",
-    "@aztec/kv-store": "0.0.1-commit.3fd054f6",
+    "@aztec/archiver": "0.0.1-commit.42ee6df9b",
+    "@aztec/kv-store": "0.0.1-commit.42ee6df9b",
     "@electric-sql/pglite": "^0.3.14",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",

package/src/global_variable_builder/global_builder.ts

@@ -10,6 +10,7 @@ import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type L1RollupConstants, getNextL1SlotTimestamp, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { GasFees } from '@aztec/stdlib/gas';
 import type {
+  BuildCheckpointGlobalVariablesOpts,
   CheckpointGlobalVariables,
   GlobalVariableBuilder as GlobalVariableBuilderInterface,
 } from '@aztec/stdlib/tx';
@@ -119,6 +120,7 @@ export class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
     coinbase: EthAddress,
     feeRecipient: AztecAddress,
     slotNumber: SlotNumber,
+    opts?: BuildCheckpointGlobalVariablesOpts,
   ): Promise<CheckpointGlobalVariables> {
     const { chainId, version } = this;
 
@@ -127,9 +129,19 @@ export class GlobalVariableBuilder implements GlobalVariableBuilderInterface {
       l1GenesisTime: this.l1GenesisTime,
     });
 
-    // We can skip much of the logic in getCurrentMinFees since it we already check that we are not within a slot elsewhere.
-    // TODO(palla/mbps): Can we use a cached value here?
-    const gasFees = new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true));
+    // When pipelining, force the proposed checkpoint number and fee header to the parent so that
+    // the fee computation matches what L1 will see when the previous pipelined checkpoint has landed.
+    const pendingNumberOverride = await this.rollupContract.makePendingCheckpointNumberOverride(
+      opts?.forcePendingCheckpointNumber,
+    );
+    const feeHeaderOverride = opts?.forceProposedFeeHeader
+      ? await this.rollupContract.makeFeeHeaderOverride(
+          opts.forceProposedFeeHeader.checkpointNumber,
+          opts.forceProposedFeeHeader.feeHeader,
+        )
+      : [];
+    const stateOverride = RollupContract.mergeStateOverrides(pendingNumberOverride, feeHeaderOverride);
+    const gasFees = new GasFees(0, await this.rollupContract.getManaMinFeeAt(timestamp, true, stateOverride));
 
     return { chainId, version, slotNumber, timestamp, coinbase, feeRecipient, gasFees };
   }