@aztec/sequencer-client 0.0.1-commit.d3ec352c → 0.0.1-commit.fcb71a6

package/dest/publisher/sequencer-publisher.js

@@ -1,9 +1,12 @@
 import { Blob, getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
-import { FormattedViemError, MULTI_CALL_3_ADDRESS, Multicall3, RollupContract, WEI_CONST, formatViemError, tryExtractEvent } from '@aztec/ethereum';
+import { MULTI_CALL_3_ADDRESS, Multicall3, RollupContract } from '@aztec/ethereum/contracts';
+import { L1FeeAnalyzer } from '@aztec/ethereum/l1-fee-analysis';
+import { WEI_CONST } from '@aztec/ethereum/l1-tx-utils';
+import { FormattedViemError, formatViemError, tryExtractEvent } from '@aztec/ethereum/utils';
 import { sumBigint } from '@aztec/foundation/bigint';
 import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
 import { BlockNumber, CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { pick } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { createLogger } from '@aztec/foundation/log';
@@ -11,7 +14,7 @@ import { bufferToHex } from '@aztec/foundation/string';
 import { Timer } from '@aztec/foundation/timer';
 import { EmpireBaseAbi, ErrorsAbi, RollupAbi } from '@aztec/l1-artifacts';
 import { encodeSlashConsensusVotes } from '@aztec/slasher';
-import { CommitteeAttestation, CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
+import { CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { encodeFunctionData, toHex } from 'viem';
 import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
@@ -36,10 +39,12 @@ export class SequencerPublisher {
     governanceLog;
     slashingLog;
     lastActions;
+    isPayloadEmptyCache;
     log;
     ethereumSlotDuration;
-    blobSinkClient;
+    blobClient;
     /** Address to use for simulations in fisherman mode (actual proposer's address) */ proposerAddressForSimulation;
+    /** L1 fee analyzer for fisherman mode */ l1FeeAnalyzer;
     // @note - with blobs, the below estimate seems too large.
     // Total used for full block from int_l1_pub e2e test: 1m (of which 86k is 1x blob)
     // Total used for emptier block from above test: 429k (of which 84k is 1x blob)
@@ -60,14 +65,13 @@ export class SequencerPublisher {
         this.governanceLog = createLogger('sequencer:publisher:governance');
         this.slashingLog = createLogger('sequencer:publisher:slashing');
         this.lastActions = {};
+        this.isPayloadEmptyCache = new Map();
         this.requests = [];
         this.log = deps.log ?? createLogger('sequencer:publisher');
         this.ethereumSlotDuration = BigInt(config.ethereumSlotDuration);
         this.epochCache = deps.epochCache;
         this.lastActions = deps.lastActions;
-        this.blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config, {
-            logger: createLogger('sequencer:blob-sink:client')
-        });
+        this.blobClient = deps.blobClient;
         const telemetry = deps.telemetry ?? getTelemetryClient();
         this.metrics = deps.metrics ?? new SequencerPublisherMetrics(telemetry, 'SequencerPublisher');
         this.l1TxUtils = deps.l1TxUtils;
@@ -80,6 +84,10 @@ export class SequencerPublisher {
             this.slashingProposerContract = newSlashingProposer;
         });
         this.slashFactoryContract = deps.slashFactoryContract;
+        // Initialize L1 fee analyzer for fisherman mode
+        if (config.fishermanMode) {
+            this.l1FeeAnalyzer = new L1FeeAnalyzer(this.l1TxUtils.client, deps.dateProvider, createLogger('sequencer:publisher:fee-analyzer'));
+        }
     }
     getRollupContract() {
         return this.rollupContract;
@@ -88,6 +96,11 @@ export class SequencerPublisher {
         return this.l1TxUtils.getSenderAddress();
     }
     /**
+   * Gets the L1 fee analyzer instance (only available in fisherman mode)
+   */ getL1FeeAnalyzer() {
+        return this.l1FeeAnalyzer;
+    }
+    /**
    * Sets the proposer address to use for simulations in fisherman mode.
    * @param proposerAddress - The actual proposer's address to use for balance lookups in simulations
    */ setProposerAddressForSimulation(proposerAddress) {
@@ -109,6 +122,46 @@ export class SequencerPublisher {
         }
     }
     /**
+   * Analyzes L1 fees for the pending requests without sending them.
+   * This is used in fisherman mode to validate fee calculations.
+   * @param l2SlotNumber - The L2 slot number for this analysis
+   * @param onComplete - Optional callback to invoke when analysis completes (after block is mined)
+   * @returns The analysis result (incomplete until block mines), or undefined if no requests
+   */ async analyzeL1Fees(l2SlotNumber, onComplete) {
+        if (!this.l1FeeAnalyzer) {
+            this.log.warn('L1 fee analyzer not available (not in fisherman mode)');
+            return undefined;
+        }
+        const requestsToAnalyze = [
+            ...this.requests
+        ];
+        if (requestsToAnalyze.length === 0) {
+            this.log.debug('No requests to analyze for L1 fees');
+            return undefined;
+        }
+        // Extract blob config from requests (if any)
+        const blobConfigs = requestsToAnalyze.filter((request)=>request.blobConfig).map((request)=>request.blobConfig);
+        const blobConfig = blobConfigs[0];
+        // Get gas configs
+        const gasConfigs = requestsToAnalyze.filter((request)=>request.gasConfig).map((request)=>request.gasConfig);
+        const gasLimits = gasConfigs.map((g)=>g?.gasLimit).filter((g)=>g !== undefined);
+        const gasLimit = gasLimits.length > 0 ? gasLimits.reduce((sum, g)=>sum + g, 0n) : 0n;
+        // Get the transaction requests
+        const l1Requests = requestsToAnalyze.map((r)=>r.request);
+        // Start the analysis
+        const analysisId = await this.l1FeeAnalyzer.startAnalysis(l2SlotNumber, gasLimit > 0n ? gasLimit : SequencerPublisher.PROPOSE_GAS_GUESS, l1Requests, blobConfig, onComplete);
+        this.log.info('Started L1 fee analysis', {
+            analysisId,
+            l2SlotNumber: l2SlotNumber.toString(),
+            requestCount: requestsToAnalyze.length,
+            hasBlobConfig: !!blobConfig,
+            gasLimit: gasLimit.toString(),
+            actions: requestsToAnalyze.map((r)=>r.action)
+        });
+        // Return the analysis result (will be incomplete until block mines)
+        return this.l1FeeAnalyzer.getAnalysis(analysisId);
+    }
+    /**
    * Sends all requests that are still valid.
    * @returns one of:
    * - A receipt and stats if the tx succeeded
@@ -119,7 +172,7 @@ export class SequencerPublisher {
             ...this.requests
         ];
         this.requests = [];
-        if (this.interrupted) {
+        if (this.interrupted || requestsToProcess.length === 0) {
             return undefined;
         }
         const currentL2Slot = this.getCurrentL2Slot();
@@ -378,34 +431,29 @@ export class SequencerPublisher {
             throw new Error(`Unknown reason for invalidation`);
         }
     }
-    /**
-   * @notice  Will simulate `propose` to make sure that the block is valid for submission
-   *
-   * @dev     Throws if unable to propose
-   *
-   * @param block - The block to propose
-   * @param attestationData - The block's attestation data
-   *
-   */ async validateBlockForSubmission(block, attestationsAndSigners, attestationsAndSignersSignature, options) {
+    /** Simulates `propose` to make sure that the checkpoint is valid for submission */ async validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, options) {
         const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
+        // TODO(palla/mbps): This should not be needed, there's no flow where we propose with zero attestations. Or is there?
         // If we have no attestations, we still need to provide the empty attestations
         // so that the committee is recalculated correctly
-        const ignoreSignatures = attestationsAndSigners.attestations.length === 0;
-        if (ignoreSignatures) {
-            const { committee } = await this.epochCache.getCommittee(block.header.globalVariables.slotNumber);
-            if (!committee) {
-                this.log.warn(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
-                throw new Error(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
-            }
-            attestationsAndSigners.attestations = committee.map((committeeMember)=>CommitteeAttestation.fromAddress(committeeMember));
-        }
-        const blobFields = block.getCheckpointBlobFields();
+        // const ignoreSignatures = attestationsAndSigners.attestations.length === 0;
+        // if (ignoreSignatures) {
+        //   const { committee } = await this.epochCache.getCommittee(block.header.globalVariables.slotNumber);
+        //   if (!committee) {
+        //     this.log.warn(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
+        //     throw new Error(`No committee found for slot ${block.header.globalVariables.slotNumber}`);
+        //   }
+        //   attestationsAndSigners.attestations = committee.map(committeeMember =>
+        //     CommitteeAttestation.fromAddress(committeeMember),
+        //   );
+        // }
+        const blobFields = checkpoint.toBlobFields();
         const blobs = getBlobsPerL1Block(blobFields);
         const blobInput = getPrefixedEthBlobCommitments(blobs);
         const args = [
             {
-                header: block.getCheckpointHeader().toViem(),
-                archive: toHex(block.archive.root.toBuffer()),
+                header: checkpoint.header.toViem(),
+                archive: toHex(checkpoint.archive.root.toBuffer()),
                 oracleInput: {
                     feeAssetPriceModifier: 0n
                 }
@@ -432,9 +480,16 @@ export class SequencerPublisher {
         }
         const round = await base.computeRound(slotNumber);
         const roundInfo = await base.getRoundInfo(this.rollupContract.address, round);
+        if (roundInfo.quorumReached) {
+            return false;
+        }
         if (roundInfo.lastSignalSlot >= slotNumber) {
             return false;
         }
+        if (await this.isPayloadEmpty(payload)) {
+            this.log.warn(`Skipping vote cast for payload with empty code`);
+            return false;
+        }
         const cachedLastVote = this.lastActions[signalType];
         this.lastActions[signalType] = slotNumber;
         const action = signalType;
@@ -473,17 +528,27 @@ export class SequencerPublisher {
                     payload: payload.toString()
                 };
                 if (!success) {
-                    this.log.error(`Signaling in [${action}] for ${payload} at slot ${slotNumber} in round ${round} failed`, logData);
+                    this.log.error(`Signaling in ${action} for ${payload} at slot ${slotNumber} in round ${round} failed`, logData);
                     this.lastActions[signalType] = cachedLastVote;
                     return false;
                 } else {
-                    this.log.info(`Signaling in [${action}] for ${payload} at slot ${slotNumber} in round ${round} succeeded`, logData);
+                    this.log.info(`Signaling in ${action} for ${payload} at slot ${slotNumber} in round ${round} succeeded`, logData);
                     return true;
                 }
             }
         });
         return true;
     }
+    async isPayloadEmpty(payload) {
+        const key = payload.toString();
+        const cached = this.isPayloadEmptyCache.get(key);
+        if (cached) {
+            return cached;
+        }
+        const isEmpty = !await this.l1TxUtils.getCode(payload);
+        this.isPayloadEmptyCache.set(key, isEmpty);
+        return isEmpty;
+    }
     /**
    * Enqueues a governance castSignal transaction to cast a signal for a given slot number.
    * @param slotNumber - The slot number to cast a signal for.
@@ -579,19 +644,13 @@ export class SequencerPublisher {
         }
         return true;
     }
-    /**
-   * Proposes a L2 block on L1.
-   *
-   * @param block - L2 block to propose.
-   * @returns True if the tx has been enqueued, throws otherwise. See #9315
-   */ async enqueueProposeL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, opts = {}) {
-        const checkpointHeader = block.getCheckpointHeader();
-        const blobFields = block.getCheckpointBlobFields();
+    /** Simulates and enqueues a proposal for a checkpoint on L1 */ async enqueueProposeCheckpoint(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts = {}) {
+        const checkpointHeader = checkpoint.header;
+        const blobFields = checkpoint.toBlobFields();
         const blobs = getBlobsPerL1Block(blobFields);
         const proposeTxArgs = {
             header: checkpointHeader,
-            archive: block.archive.root.toBuffer(),
-            body: block.body.toBuffer(),
+            archive: checkpoint.archive.root.toBuffer(),
             blobs,
             attestationsAndSigners,
             attestationsAndSignersSignature
@@ -603,21 +662,20 @@ export class SequencerPublisher {
             //        By simulation issue, I mean the fact that the block.timestamp is equal to the last block, not the next, which
             //        make time consistency checks break.
             // TODO(palla): Check whether we're validating twice, once here and once within addProposeTx, since we call simulateProposeTx in both places.
-            ts = await this.validateBlockForSubmission(block, attestationsAndSigners, attestationsAndSignersSignature, opts);
+            ts = await this.validateCheckpointForSubmission(checkpoint, attestationsAndSigners, attestationsAndSignersSignature, opts);
         } catch (err) {
-            this.log.error(`Block validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
-                ...block.getStats(),
-                slotNumber: block.header.globalVariables.slotNumber,
+            this.log.error(`Checkpoint validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
+                ...checkpoint.getStats(),
+                slotNumber: checkpoint.header.slotNumber,
                 forcePendingBlockNumber: opts.forcePendingBlockNumber
             });
             throw err;
         }
-        this.log.verbose(`Enqueuing block propose transaction`, {
-            ...block.toBlockInfo(),
+        this.log.verbose(`Enqueuing checkpoint propose transaction`, {
+            ...checkpoint.toCheckpointInfo(),
             ...opts
         });
-        await this.addProposeTx(block, proposeTxArgs, opts, ts);
-        return true;
+        await this.addProposeTx(checkpoint, proposeTxArgs, opts, ts);
     }
     enqueueInvalidateBlock(request, opts = {}) {
         if (!request) {
@@ -855,24 +913,25 @@ export class SequencerPublisher {
             simulationResult
         };
     }
-    async addProposeTx(block, encodedData, opts = {}, timestamp) {
+    async addProposeTx(checkpoint, encodedData, opts = {}, timestamp) {
+        const slot = checkpoint.header.slotNumber;
         const timer = new Timer();
         const kzg = Blob.getViemKzgInstance();
         const { rollupData, simulationResult, blobEvaluationGas } = await this.prepareProposeTx(encodedData, timestamp, opts);
         const startBlock = await this.l1TxUtils.getBlockNumber();
         const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(simulationResult.gasUsed) * 64 / 63)) + blobEvaluationGas + SequencerPublisher.MULTICALL_OVERHEAD_GAS_GUESS);
-        // Send the blobs to the blob sink preemptively. This helps in tests where the sequencer mistakingly thinks that the propose
-        // tx fails but it does get mined. We make sure that the blobs are sent to the blob sink regardless of the tx outcome.
-        void this.blobSinkClient.sendBlobsToBlobSink(encodedData.blobs).catch((_err)=>{
-            this.log.error('Failed to send blobs to blob sink');
-        });
+        // Send the blobs to the blob client preemptively. This helps in tests where the sequencer mistakingly thinks that the propose
+        // tx fails but it does get mined. We make sure that the blobs are sent to the blob client regardless of the tx outcome.
+        void Promise.resolve().then(()=>this.blobClient.sendBlobsToFilestore(encodedData.blobs).catch((_err)=>{
+                this.log.error('Failed to send blobs to blob client');
+            }));
         return this.addRequest({
             action: 'propose',
             request: {
                 to: this.rollupContract.address,
                 data: rollupData
             },
-            lastValidL2Slot: block.header.globalVariables.slotNumber,
+            lastValidL2Slot: checkpoint.header.slotNumber,
             gasConfig: {
                 ...opts,
                 gasLimit
@@ -900,25 +959,23 @@ export class SequencerPublisher {
                         calldataGas,
                         calldataSize,
                         sender,
-                        ...block.getStats(),
+                        ...checkpoint.getStats(),
                         eventName: 'rollup-published-to-l1',
                         blobCount: encodedData.blobs.length,
                         inclusionBlocks
                     };
-                    this.log.info(`Published L2 block to L1 rollup contract`, {
+                    this.log.info(`Published checkpoint ${checkpoint.number} at slot ${slot} to rollup contract`, {
                         ...stats,
-                        ...block.getStats(),
-                        ...receipt
+                        ...checkpoint.getStats(),
+                        ...pick(receipt, 'transactionHash', 'blockHash')
                     });
                     this.metrics.recordProcessBlockTx(timer.ms(), publishStats);
                     return true;
                 } else {
                     this.metrics.recordFailedTx('process');
-                    this.log.error(`Rollup process tx failed: ${errorMsg ?? 'no error message'}`, undefined, {
-                        ...block.getStats(),
-                        receipt,
-                        txHash: receipt.transactionHash,
-                        slotNumber: block.header.globalVariables.slotNumber
+                    this.log.error(`Publishing checkpoint at slot ${slot} failed with ${errorMsg ?? 'no error message'}`, undefined, {
+                        ...checkpoint.getStats(),
+                        ...receipt
                     });
                     return false;
                 }

package/dest/sequencer/block_builder.d.ts

@@ -1,13 +1,11 @@
 import { BlockNumber } from '@aztec/foundation/branded-types';
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { DateProvider } from '@aztec/foundation/timer';
 import { PublicProcessor } from '@aztec/simulator/server';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
-import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import type { BuildBlockResult, FullNodeBlockBuilderConfig, IFullNodeBlockBuilder, MerkleTreeWriteOperations, PublicProcessorLimits, PublicProcessorValidator, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import { GlobalVariables, Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-export declare function buildBlock(pendingTxs: Iterable<Tx> | AsyncIterable<Tx>, l1ToL2Messages: Fr[], newGlobalVariables: GlobalVariables, opts: PublicProcessorLimits | undefined, worldStateFork: MerkleTreeWriteOperations, processor: PublicProcessor, validator: PublicProcessorValidator, l1Constants: Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'>, dateProvider: DateProvider, telemetryClient?: TelemetryClient): Promise<BuildBlockResult>;
 export declare class FullNodeBlockBuilder implements IFullNodeBlockBuilder {
     private config;
     private worldState;
@@ -25,4 +23,4 @@ export declare class FullNodeBlockBuilder implements IFullNodeBlockBuilder {
     buildBlock(pendingTxs: Iterable<Tx> | AsyncIterable<Tx>, l1ToL2Messages: Fr[], globalVariables: GlobalVariables, opts: PublicProcessorLimits, suppliedFork?: MerkleTreeWriteOperations): Promise<BuildBlockResult>;
     getFork(blockNumber: BlockNumber): Promise<MerkleTreeWriteOperations>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfYnVpbGRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9ibG9ja19idWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUluRCxPQUFPLEVBQUUsWUFBWSxFQUFrQixNQUFNLHlCQUF5QixDQUFDO0FBR3ZFLE9BQU8sRUFHTCxlQUFlLEVBRWhCLE1BQU0seUJBQXlCLENBQUM7QUFFakMsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNqRSxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBdUIsTUFBTSw2QkFBNkIsQ0FBQztBQUUxRixPQUFPLEtBQUssRUFDVixnQkFBZ0IsRUFDaEIsMEJBQTBCLEVBQzFCLHFCQUFxQixFQUNyQix5QkFBeUIsRUFDekIscUJBQXFCLEVBQ3JCLHdCQUF3QixFQUN4QixzQkFBc0IsRUFDdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEVBQUUsZUFBZSxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQU1uRix3QkFBc0IsVUFBVSxDQUM5QixVQUFVLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQyxHQUFHLGFBQWEsQ0FBQyxFQUFFLENBQUMsRUFDNUMsY0FBYyxFQUFFLEVBQUUsRUFBRSxFQUNwQixrQkFBa0IsRUFBRSxlQUFlLEVBQ25DLElBQUksbUNBQTRCLEVBQ2hDLGNBQWMsRUFBRSx5QkFBeUIsRUFDekMsU0FBUyxFQUFFLGVBQWUsRUFDMUIsU0FBUyxFQUFFLHdCQUF3QixFQUNuQyxXQUFXLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixFQUFFLGVBQWUsR0FBRyxjQUFjLENBQUMsRUFDdEUsWUFBWSxFQUFFLFlBQVksRUFDMUIsZUFBZSxHQUFFLGVBQXNDLEdBQ3RELE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQTRDM0I7QUFXRCxxQkFBYSxvQkFBcUIsWUFBVyxxQkFBcUI7SUFFOUQsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsVUFBVTtJQUNsQixPQUFPLENBQUMsa0JBQWtCO0lBQzFCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxlQUFlO0lBTHpCLFlBQ1UsTUFBTSxFQUFFLDBCQUEwQixFQUNsQyxVQUFVLEVBQUUsc0JBQXNCLEVBQ2xDLGtCQUFrQixFQUFFLGtCQUFrQixFQUN0QyxZQUFZLEVBQUUsWUFBWSxFQUMxQixlQUFlLEdBQUUsZUFBc0MsRUFDN0Q7SUFFRyxTQUFTLElBQUksMEJBQTBCLENBRTdDO0lBRU0sWUFBWSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsMEJBQTBCLENBQUMsUUFFOUQ7SUFFWSxvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSx5QkFBeUI7OztPQXlDbEc7WUFFYSxtQkFBbUI7SUFVM0IsVUFBVSxDQUNkLFVBQVUsRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsYUFBYSxDQUFDLEVBQUUsQ0FBQyxFQUM1QyxjQUFjLEVBQUUsRUFBRSxFQUFFLEVBQ3BCLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLElBQUksRUFBRSxxQkFBcUIsRUFDM0IsWUFBWSxDQUFDLEVBQUUseUJBQXlCLEdBQ3ZDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQXNDM0I7SUFFRCxPQUFPLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FFcEU7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvY2tfYnVpbGRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcXVlbmNlci9ibG9ja19idWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUl6RCxPQUFPLEVBQUUsWUFBWSxFQUFrQixNQUFNLHlCQUF5QixDQUFDO0FBR3ZFLE9BQU8sRUFHTCxlQUFlLEVBRWhCLE1BQU0seUJBQXlCLENBQUM7QUFDakMsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUdqRSxPQUFPLEtBQUssRUFDVixnQkFBZ0IsRUFDaEIsMEJBQTBCLEVBQzFCLHFCQUFxQixFQUNyQix5QkFBeUIsRUFDekIscUJBQXFCLEVBQ3JCLHdCQUF3QixFQUN4QixzQkFBc0IsRUFDdkIsTUFBTSxpQ0FBaUMsQ0FBQztBQUN6QyxPQUFPLEVBQUUsZUFBZSxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQTJFbkYscUJBQWEsb0JBQXFCLFlBQVcscUJBQXFCO0lBRTlELE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLFVBQVU7SUFDbEIsT0FBTyxDQUFDLGtCQUFrQjtJQUMxQixPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsZUFBZTtJQUx6QixZQUNVLE1BQU0sRUFBRSwwQkFBMEIsRUFDbEMsVUFBVSxFQUFFLHNCQUFzQixFQUNsQyxrQkFBa0IsRUFBRSxrQkFBa0IsRUFDdEMsWUFBWSxFQUFFLFlBQVksRUFDMUIsZUFBZSxHQUFFLGVBQXNDLEVBQzdEO0lBRUcsU0FBUyxJQUFJLDBCQUEwQixDQUU3QztJQUVNLFlBQVksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLDBCQUEwQixDQUFDLFFBRTlEO0lBRVksb0JBQW9CLENBQUMsZUFBZSxFQUFFLGVBQWUsRUFBRSxJQUFJLEVBQUUseUJBQXlCOzs7T0FrQ2xHO1lBRWEsbUJBQW1CO0lBVTNCLFVBQVUsQ0FDZCxVQUFVLEVBQUUsUUFBUSxDQUFDLEVBQUUsQ0FBQyxHQUFHLGFBQWEsQ0FBQyxFQUFFLENBQUMsRUFDNUMsY0FBYyxFQUFFLEVBQUUsRUFBRSxFQUNwQixlQUFlLEVBQUUsZUFBZSxFQUNoQyxJQUFJLEVBQUUscUJBQXFCLEVBQzNCLFlBQVksQ0FBQyxFQUFFLHlCQUF5QixHQUN2QyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FzQzNCO0lBRUQsT0FBTyxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLHlCQUF5QixDQUFDLENBRXBFO0NBQ0YifQ==

package/dest/sequencer/block_builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_builder.d.ts","sourceRoot":"","sources":["../../src/sequencer/block_builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,EAAE,YAAY,EAAkB,MAAM,yBAAyB,CAAC;AAGvE,OAAO,EAGL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AAE1F,OAAO,KAAK,EACV,gBAAgB,EAChB,0BAA0B,EAC1B,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF,wBAAsB,UAAU,CAC9B,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EAC5C,cAAc,EAAE,EAAE,EAAE,EACpB,kBAAkB,EAAE,eAAe,EACnC,IAAI,mCAA4B,EAChC,cAAc,EAAE,yBAAyB,EACzC,SAAS,EAAE,eAAe,EAC1B,SAAS,EAAE,wBAAwB,EACnC,WAAW,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,GAAG,cAAc,CAAC,EACtE,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC,GACtD,OAAO,CAAC,gBAAgB,CAAC,CA4C3B;AAWD,qBAAa,oBAAqB,YAAW,qBAAqB;IAE9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IALzB,YACU,MAAM,EAAE,0BAA0B,EAClC,UAAU,EAAE,sBAAsB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC,EAC7D;IAEG,SAAS,IAAI,0BAA0B,CAE7C;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,0BAA0B,CAAC,QAE9D;IAEY,oBAAoB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB;;;OAyClG;YAEa,mBAAmB;IAU3B,UAAU,CACd,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EAC5C,cAAc,EAAE,EAAE,EAAE,EACpB,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,qBAAqB,EAC3B,YAAY,CAAC,EAAE,yBAAyB,GACvC,OAAO,CAAC,gBAAgB,CAAC,CAsC3B;IAED,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAEpE;CACF"}
+{"version":3,"file":"block_builder.d.ts","sourceRoot":"","sources":["../../src/sequencer/block_builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAIzD,OAAO,EAAE,YAAY,EAAkB,MAAM,yBAAyB,CAAC;AAGvE,OAAO,EAGL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,OAAO,KAAK,EACV,gBAAgB,EAChB,0BAA0B,EAC1B,qBAAqB,EACrB,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AA2EnF,qBAAa,oBAAqB,YAAW,qBAAqB;IAE9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IALzB,YACU,MAAM,EAAE,0BAA0B,EAClC,UAAU,EAAE,sBAAsB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC,EAC7D;IAEG,SAAS,IAAI,0BAA0B,CAE7C;IAEM,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,0BAA0B,CAAC,QAE9D;IAEY,oBAAoB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB;;;OAkClG;YAEa,mBAAmB;IAU3B,UAAU,CACd,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EAC5C,cAAc,EAAE,EAAE,EAAE,EACpB,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,qBAAqB,EAC3B,YAAY,CAAC,EAAE,yBAAyB,GACvC,OAAO,CAAC,gBAAgB,CAAC,CAsC3B;IAED,OAAO,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAEpE;CACF"}

package/dest/sequencer/block_builder.js

@@ -7,14 +7,13 @@ import { bufferToHex } from '@aztec/foundation/string';
 import { Timer, elapsed } from '@aztec/foundation/timer';
 import { getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
 import { LightweightBlockFactory } from '@aztec/prover-client/block-factory';
-import { GuardedMerkleTreeOperations, PublicContractsDB, PublicProcessor, TelemetryCppPublicTxSimulator } from '@aztec/simulator/server';
-import { PublicSimulatorConfig } from '@aztec/stdlib/avm';
+import { GuardedMerkleTreeOperations, PublicContractsDB, PublicProcessor, createPublicTxSimulatorForBlockBuilding } from '@aztec/simulator/server';
 import { getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import { Gas } from '@aztec/stdlib/gas';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { createValidatorForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
 const log = createLogger('block-builder');
-export async function buildBlock(pendingTxs, l1ToL2Messages, newGlobalVariables, opts = {}, worldStateFork, processor, validator, l1Constants, dateProvider, telemetryClient = getTelemetryClient()) {
+/** Builds a block out of pending txs */ async function buildBlock(pendingTxs, l1ToL2Messages, newGlobalVariables, opts = {}, worldStateFork, processor, validator, l1Constants, dateProvider, telemetryClient = getTelemetryClient()) {
     const blockBuildingTimer = new Timer();
     const blockNumber = newGlobalVariables.blockNumber;
     const slot = newGlobalVariables.slotNumber;
@@ -58,8 +57,10 @@ const FullNodeBlockBuilderConfigKeys = [
     'l1ChainId',
     'rollupVersion',
     'txPublicSetupAllowList',
-    'fakeProcessingDelayPerTxMs'
+    'fakeProcessingDelayPerTxMs',
+    'fakeThrowAfterProcessingTxCount'
 ];
+// TODO(palla/mbps): Try killing this in favor of the CheckpointsBuilder
 export class FullNodeBlockBuilder {
     config;
     worldState;
@@ -83,13 +84,7 @@ export class FullNodeBlockBuilder {
         const txPublicSetupAllowList = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
         const contractsDB = new PublicContractsDB(this.contractDataSource);
         const guardedFork = new GuardedMerkleTreeOperations(fork);
-        const publicTxSimulator = new TelemetryCppPublicTxSimulator(guardedFork, contractsDB, globalVariables, this.telemetryClient, PublicSimulatorConfig.from({
-            skipFeeEnforcement: false,
-            collectDebugLogs: false,
-            collectHints: false,
-            collectStatistics: false,
-            collectCallMetadata: false
-        }));
+        const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(guardedFork, contractsDB, globalVariables, this.telemetryClient);
         const processor = new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient, undefined, this.config);
         const validator = createValidatorForBlockBuilding(fork, this.contractDataSource, globalVariables, txPublicSetupAllowList);
         return {

package/dest/sequencer/checkpoint_builder.d.ts

@@ -0,0 +1,63 @@
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { DateProvider, Timer } from '@aztec/foundation/timer';
+import { LightweightCheckpointBuilder } from '@aztec/prover-client/light';
+import { PublicProcessor } from '@aztec/simulator/server';
+import { L2BlockNew } from '@aztec/stdlib/block';
+import { Checkpoint } from '@aztec/stdlib/checkpoint';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import { Gas } from '@aztec/stdlib/gas';
+import { type FullNodeBlockBuilderConfig, type MerkleTreeWriteOperations, type PublicProcessorLimits } from '@aztec/stdlib/interfaces/server';
+import { type CheckpointGlobalVariables, type FailedTx, GlobalVariables, Tx } from '@aztec/stdlib/tx';
+import { type TelemetryClient } from '@aztec/telemetry-client';
+export interface BuildBlockInCheckpointResult {
+    block: L2BlockNew;
+    publicGas: Gas;
+    publicProcessorDuration: number;
+    numTxs: number;
+    failedTxs: FailedTx[];
+    blockBuildingTimer: Timer;
+    usedTxs: Tx[];
+}
+/**
+ * Builder for a single checkpoint. Handles building blocks within the checkpoint
+ * and completing it.
+ */
+export declare class CheckpointBuilder {
+    private checkpointBuilder;
+    private fork;
+    private config;
+    private contractDataSource;
+    private dateProvider;
+    private telemetryClient;
+    constructor(checkpointBuilder: LightweightCheckpointBuilder, fork: MerkleTreeWriteOperations, config: FullNodeBlockBuilderConfig, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient: TelemetryClient);
+    getConstantData(): CheckpointGlobalVariables;
+    /**
+     * Builds a single block within this checkpoint.
+     */
+    buildBlock(pendingTxs: Iterable<Tx> | AsyncIterable<Tx>, blockNumber: BlockNumber, timestamp: bigint, opts: PublicProcessorLimits): Promise<BuildBlockInCheckpointResult>;
+    /** Completes the checkpoint and returns it. */
+    completeCheckpoint(): Promise<Checkpoint>;
+    /** Gets the checkpoint currently in progress. */
+    getCheckpoint(): Promise<Checkpoint>;
+    protected makeBlockBuilderDeps(globalVariables: GlobalVariables, fork: MerkleTreeWriteOperations): Promise<{
+        processor: PublicProcessor;
+        validator: import("@aztec/stdlib/interfaces/server").PublicProcessorValidator;
+    }>;
+}
+/**
+ * Factory for creating checkpoint builders.
+ */
+export declare class FullNodeCheckpointsBuilder {
+    private config;
+    private contractDataSource;
+    private dateProvider;
+    private telemetryClient;
+    constructor(config: FullNodeBlockBuilderConfig, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient?: TelemetryClient);
+    updateConfig(config: Partial<FullNodeBlockBuilderConfig>): void;
+    /**
+     * Starts a new checkpoint and returns a CheckpointBuilder to build blocks within it.
+     */
+    startCheckpoint(checkpointNumber: CheckpointNumber, constants: CheckpointGlobalVariables, l1ToL2Messages: Fr[], fork: MerkleTreeWriteOperations): Promise<CheckpointBuilder>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2twb2ludF9idWlsZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VxdWVuY2VyL2NoZWNrcG9pbnRfYnVpbGRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsV0FBVyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFaEYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBR3BELE9BQU8sRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkUsT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDMUUsT0FBTyxFQUdMLGVBQWUsRUFFaEIsTUFBTSx5QkFBeUIsQ0FBQztBQUNqQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDakQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3RELE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDakUsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3hDLE9BQU8sRUFDTCxLQUFLLDBCQUEwQixFQUUvQixLQUFLLHlCQUF5QixFQUM5QixLQUFLLHFCQUFxQixFQUMzQixNQUFNLGlDQUFpQyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxLQUFLLHlCQUF5QixFQUFFLEtBQUssUUFBUSxFQUFFLGVBQWUsRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN0RyxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0seUJBQXlCLENBQUM7QUFNbkYsTUFBTSxXQUFXLDRCQUE0QjtJQUMzQyxLQUFLLEVBQUUsVUFBVSxDQUFDO0lBQ2xCLFNBQVMsRUFBRSxHQUFHLENBQUM7SUFDZix1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFDaEMsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLFNBQVMsRUFBRSxRQUFRLEVBQUUsQ0FBQztJQUN0QixrQkFBa0IsRUFBRSxLQUFLLENBQUM7SUFDMUIsT0FBTyxFQUFFLEVBQUUsRUFBRSxDQUFDO0NBQ2Y7QUFFRDs7O0dBR0c7QUFDSCxxQkFBYSxpQkFBaUI7SUFFMUIsT0FBTyxDQUFDLGlCQUFpQjtJQUN6QixPQUFPLENBQUMsSUFBSTtJQUNaLE9BQU8sQ0FBQyxNQUFNO0lBQ2QsT0FBTyxDQUFDLGtCQUFrQjtJQUMxQixPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsZUFBZTtJQU56QixZQUNVLGlCQUFpQixFQUFFLDRCQUE0QixFQUMvQyxJQUFJLEVBQUUseUJBQXlCLEVBQy9CLE1BQU0sRUFBRSwwQkFBMEIsRUFDbEMsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQ3RDLFlBQVksRUFBRSxZQUFZLEVBQzFCLGVBQWUsRUFBRSxlQUFlLEVBQ3RDO0lBRUosZUFBZSxJQUFJLHlCQUF5QixDQUUzQztJQUVEOztPQUVHO0lBQ0csVUFBVSxDQUNkLFVBQVUsRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsYUFBYSxDQUFDLEVBQUUsQ0FBQyxFQUM1QyxXQUFXLEVBQUUsV0FBVyxFQUN4QixTQUFTLEVBQUUsTUFBTSxFQUNqQixJQUFJLEVBQUUscUJBQXFCLEdBQzFCLE9BQU8sQ0FBQyw0QkFBNEIsQ0FBQyxDQXdDdkM7SUFFRCwrQ0FBK0M7SUFDekMsa0JBQWtCLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQVU5QztJQUVELGlEQUFpRDtJQUNqRCxhQUFhLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUVuQztJQUVELFVBQWdCLG9CQUFvQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLHlCQUF5Qjs7O09Ba0NyRztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSwwQkFBMEI7SUFFbkMsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsa0JBQWtCO0lBQzFCLE9BQU8sQ0FBQyxZQUFZO0lBQ3BCLE9BQU8sQ0FBQyxlQUFlO0lBSnpCLFlBQ1UsTUFBTSxFQUFFLDBCQUEwQixFQUNsQyxrQkFBa0IsRUFBRSxrQkFBa0IsRUFDdEMsWUFBWSxFQUFFLFlBQVksRUFDMUIsZUFBZSxHQUFFLGVBQXNDLEVBQzdEO0lBRUcsWUFBWSxDQUFDLE1BQU0sRUFBRSxPQUFPLENBQUMsMEJBQTBCLENBQUMsUUFFOUQ7SUFFRDs7T0FFRztJQUNHLGVBQWUsQ0FDbkIsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLFNBQVMsRUFBRSx5QkFBeUIsRUFDcEMsY0FBYyxFQUFFLEVBQUUsRUFBRSxFQUNwQixJQUFJLEVBQUUseUJBQXlCLEdBQzlCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQTJCNUI7Q0FDRiJ9

package/dest/sequencer/checkpoint_builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkpoint_builder.d.ts","sourceRoot":"","sources":["../../src/sequencer/checkpoint_builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAE,KAAK,EAAW,MAAM,yBAAyB,CAAC;AAEvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAGL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EACL,KAAK,0BAA0B,EAE/B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC3B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,KAAK,yBAAyB,EAAE,KAAK,QAAQ,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtG,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAMnF,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;IACf,uBAAuB,EAAE,MAAM,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,kBAAkB,EAAE,KAAK,CAAC;IAC1B,OAAO,EAAE,EAAE,EAAE,CAAC;CACf;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAE1B,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IANzB,YACU,iBAAiB,EAAE,4BAA4B,EAC/C,IAAI,EAAE,yBAAyB,EAC/B,MAAM,EAAE,0BAA0B,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EACtC;IAEJ,eAAe,IAAI,yBAAyB,CAE3C;IAED;;OAEG;IACG,UAAU,CACd,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,EAC5C,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,qBAAqB,GAC1B,OAAO,CAAC,4BAA4B,CAAC,CAwCvC;IAED,+CAA+C;IACzC,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC,CAU9C;IAED,iDAAiD;IACjD,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CAEnC;IAED,UAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB;;;OAkCrG;CACF;AAED;;GAEG;AACH,qBAAa,0BAA0B;IAEnC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IAJzB,YACU,MAAM,EAAE,0BAA0B,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC,EAC7D;IAEG,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,0BAA0B,CAAC,QAE9D;IAED;;OAEG;IACG,eAAe,CACnB,gBAAgB,EAAE,gBAAgB,EAClC,SAAS,EAAE,yBAAyB,EACpC,cAAc,EAAE,EAAE,EAAE,EACpB,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CA2B5B;CACF"}

package/dest/sequencer/checkpoint_builder.js

@@ -0,0 +1,131 @@
+import { MerkleTreeId } from '@aztec/aztec.js/trees';
+import { merge, pick } from '@aztec/foundation/collection';
+import { createLogger } from '@aztec/foundation/log';
+import { bufferToHex } from '@aztec/foundation/string';
+import { Timer, elapsed } from '@aztec/foundation/timer';
+import { getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
+import { LightweightCheckpointBuilder } from '@aztec/prover-client/light';
+import { GuardedMerkleTreeOperations, PublicContractsDB, PublicProcessor, createPublicTxSimulatorForBlockBuilding } from '@aztec/simulator/server';
+import { Gas } from '@aztec/stdlib/gas';
+import { FullNodeBlockBuilderConfigKeys } from '@aztec/stdlib/interfaces/server';
+import { GlobalVariables } from '@aztec/stdlib/tx';
+import { getTelemetryClient } from '@aztec/telemetry-client';
+import { createValidatorForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
+const log = createLogger('checkpoint-builder');
+/**
+ * Builder for a single checkpoint. Handles building blocks within the checkpoint
+ * and completing it.
+ */ export class CheckpointBuilder {
+    checkpointBuilder;
+    fork;
+    config;
+    contractDataSource;
+    dateProvider;
+    telemetryClient;
+    constructor(checkpointBuilder, fork, config, contractDataSource, dateProvider, telemetryClient){
+        this.checkpointBuilder = checkpointBuilder;
+        this.fork = fork;
+        this.config = config;
+        this.contractDataSource = contractDataSource;
+        this.dateProvider = dateProvider;
+        this.telemetryClient = telemetryClient;
+    }
+    getConstantData() {
+        return this.checkpointBuilder.constants;
+    }
+    /**
+   * Builds a single block within this checkpoint.
+   */ async buildBlock(pendingTxs, blockNumber, timestamp, opts) {
+        const blockBuildingTimer = new Timer();
+        const slot = this.checkpointBuilder.constants.slotNumber;
+        log.verbose(`Building block ${blockNumber} for slot ${slot} within checkpoint`, {
+            slot,
+            blockNumber,
+            ...opts
+        });
+        const constants = this.checkpointBuilder.constants;
+        const globalVariables = GlobalVariables.from({
+            chainId: constants.chainId,
+            version: constants.version,
+            blockNumber,
+            slotNumber: constants.slotNumber,
+            timestamp,
+            coinbase: constants.coinbase,
+            feeRecipient: constants.feeRecipient,
+            gasFees: constants.gasFees
+        });
+        const { processor, validator } = await this.makeBlockBuilderDeps(globalVariables, this.fork);
+        const [publicProcessorDuration, [processedTxs, failedTxs, usedTxs]] = await elapsed(()=>processor.process(pendingTxs, opts, validator));
+        // Add block to checkpoint
+        const block = await this.checkpointBuilder.addBlock(globalVariables, processedTxs);
+        // How much public gas was processed
+        const publicGas = processedTxs.reduce((acc, tx)=>acc.add(tx.gasUsed.publicGas), Gas.empty());
+        const res = {
+            block,
+            publicGas,
+            publicProcessorDuration,
+            numTxs: processedTxs.length,
+            failedTxs,
+            blockBuildingTimer,
+            usedTxs
+        };
+        log.debug('Built block within checkpoint', res.block.header);
+        return res;
+    }
+    /** Completes the checkpoint and returns it. */ async completeCheckpoint() {
+        const checkpoint = await this.checkpointBuilder.completeCheckpoint();
+        log.verbose(`Completed checkpoint ${checkpoint.number}`, {
+            checkpointNumber: checkpoint.number,
+            numBlocks: checkpoint.blocks.length,
+            archiveRoot: checkpoint.archive.root.toString()
+        });
+        return checkpoint;
+    }
+    /** Gets the checkpoint currently in progress. */ getCheckpoint() {
+        return this.checkpointBuilder.clone().completeCheckpoint();
+    }
+    async makeBlockBuilderDeps(globalVariables, fork) {
+        const txPublicSetupAllowList = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
+        const contractsDB = new PublicContractsDB(this.contractDataSource);
+        const guardedFork = new GuardedMerkleTreeOperations(fork);
+        const publicTxSimulator = createPublicTxSimulatorForBlockBuilding(guardedFork, contractsDB, globalVariables, this.telemetryClient);
+        const processor = new PublicProcessor(globalVariables, guardedFork, contractsDB, publicTxSimulator, this.dateProvider, this.telemetryClient, undefined, this.config);
+        const validator = createValidatorForBlockBuilding(fork, this.contractDataSource, globalVariables, txPublicSetupAllowList);
+        return {
+            processor,
+            validator
+        };
+    }
+}
+/**
+ * Factory for creating checkpoint builders.
+ */ export class FullNodeCheckpointsBuilder {
+    config;
+    contractDataSource;
+    dateProvider;
+    telemetryClient;
+    constructor(config, contractDataSource, dateProvider, telemetryClient = getTelemetryClient()){
+        this.config = config;
+        this.contractDataSource = contractDataSource;
+        this.dateProvider = dateProvider;
+        this.telemetryClient = telemetryClient;
+    }
+    updateConfig(config) {
+        this.config = merge(this.config, pick(config, ...FullNodeBlockBuilderConfigKeys));
+    }
+    /**
+   * Starts a new checkpoint and returns a CheckpointBuilder to build blocks within it.
+   */ async startCheckpoint(checkpointNumber, constants, l1ToL2Messages, fork) {
+        const stateReference = await fork.getStateReference();
+        const archiveTree = await fork.getTreeInfo(MerkleTreeId.ARCHIVE);
+        log.verbose(`Building checkpoint ${checkpointNumber}`, {
+            checkpointNumber,
+            msgCount: l1ToL2Messages.length,
+            initialStateReference: stateReference.toInspect(),
+            initialArchiveRoot: bufferToHex(archiveTree.root),
+            constants
+        });
+        const lightweightBuilder = await LightweightCheckpointBuilder.startNewCheckpoint(checkpointNumber, constants, l1ToL2Messages, fork);
+        return new CheckpointBuilder(lightweightBuilder, fork, this.config, this.contractDataSource, this.dateProvider, this.telemetryClient);
+    }
+}