@aztec/sequencer-client 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/dest/publisher/sequencer-publisher.js

@@ -1,25 +1,19 @@
-import { Blob } from '@aztec/blob-lib';
+import { Blob, getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { FormattedViemError, MULTI_CALL_3_ADDRESS, Multicall3, RollupContract, formatViemError, tryExtractEvent } from '@aztec/ethereum';
 import { sumBigint } from '@aztec/foundation/bigint';
 import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
+import { Signature } from '@aztec/foundation/eth-signature';
 import { createLogger } from '@aztec/foundation/log';
 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 } from '@aztec/stdlib/block';
-import { ConsensusPayload, SignatureDomainSeparator, getHashedSignaturePayload } from '@aztec/stdlib/p2p';
+import { CommitteeAttestation, CommitteeAttestationsAndSigners } from '@aztec/stdlib/block';
 import { getTelemetryClient } from '@aztec/telemetry-client';
-import pick from 'lodash.pick';
 import { encodeFunctionData, toHex } from 'viem';
 import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
-export var SignalType = /*#__PURE__*/ function(SignalType) {
-    SignalType[SignalType["GOVERNANCE"] = 0] = "GOVERNANCE";
-    SignalType[SignalType["SLASHING"] = 1] = "SLASHING";
-    return SignalType;
-}({});
 export const Actions = [
     'invalidate-by-invalid-attestation',
     'invalidate-by-insufficient-attestations',
@@ -40,7 +34,7 @@ export class SequencerPublisher {
     epochCache;
     governanceLog;
     slashingLog;
-    myLastSignals;
+    lastActions;
     log;
     ethereumSlotDuration;
     blobSinkClient;
@@ -63,14 +57,12 @@ export class SequencerPublisher {
         this.interrupted = false;
         this.governanceLog = createLogger('sequencer:publisher:governance');
         this.slashingLog = createLogger('sequencer:publisher:slashing');
-        this.myLastSignals = {
-            [0]: 0n,
-            [1]: 0n
-        };
-        this.log = createLogger('sequencer:publisher');
+        this.lastActions = {};
         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')
         });
@@ -148,7 +140,7 @@ export class SequencerPublisher {
         const gasLimit = gasLimits.length > 0 ? sumBigint(gasLimits) : undefined; // sum
         const txTimeoutAts = gasConfigs.map((g)=>g?.txTimeoutAt).filter((g)=>g !== undefined);
         const txTimeoutAt = txTimeoutAts.length > 0 ? new Date(Math.min(...txTimeoutAts.map((g)=>g.getTime()))) : undefined; // earliest
-        const gasConfig = {
+        const txConfig = {
             gasLimit,
             txTimeoutAt
         };
@@ -157,9 +149,10 @@ export class SequencerPublisher {
         validRequests.sort((a, b)=>compareActions(a.action, b.action));
         try {
             this.log.debug('Forwarding transactions', {
-                validRequests: validRequests.map((request)=>request.action)
+                validRequests: validRequests.map((request)=>request.action),
+                txConfig
             });
-            const result = await Multicall3.forward(validRequests.map((request)=>request.request), this.l1TxUtils, gasConfig, blobConfig, this.rollupContract.address, this.log);
+            const result = await Multicall3.forward(validRequests.map((request)=>request.request), this.l1TxUtils, txConfig, blobConfig, this.rollupContract.address, this.log);
             const { successfulActions = [], failedActions = [] } = this.callbackBundledTransactions(validRequests, result);
             return {
                 result,
@@ -241,8 +234,9 @@ export class SequencerPublisher {
         };
         const args = [
             header.toViem(),
-            RollupContract.packAttestations([]),
+            CommitteeAttestationsAndSigners.empty().getPackedAttestations(),
             [],
+            Signature.empty().toViemSignature(),
             `0x${'0'.repeat(64)}`,
             header.contentCommitment.blobsHash.toString(),
             flags
@@ -278,13 +272,13 @@ export class SequencerPublisher {
             return undefined;
         }
         const { reason, block } = validationResult;
-        const blockNumber = block.block.number;
+        const blockNumber = block.blockNumber;
         const logData = {
-            ...block.block.toBlockInfo(),
+            ...block,
             reason
         };
         const currentBlockNumber = await this.rollupContract.getBlockNumber();
-        if (currentBlockNumber < validationResult.block.block.number) {
+        if (currentBlockNumber < validationResult.block.blockNumber) {
             this.log.verbose(`Skipping block ${blockNumber} invalidation since it has already been removed from the pending chain`, {
                 currentBlockNumber,
                 ...logData
@@ -292,7 +286,10 @@ export class SequencerPublisher {
             return undefined;
         }
         const request = this.buildInvalidateBlockRequest(validationResult);
-        this.log.debug(`Simulating invalidate block ${blockNumber}`, logData);
+        this.log.debug(`Simulating invalidate block ${blockNumber}`, {
+            ...logData,
+            request
+        });
         try {
             const { gasUsed } = await this.l1TxUtils.simulate(request, undefined, undefined, ErrorsAbi);
             this.log.verbose(`Simulation for invalidate block ${blockNumber} succeeded`, {
@@ -343,14 +340,15 @@ export class SequencerPublisher {
         }
         const { block, committee, reason } = validationResult;
         const logData = {
-            ...block.block.toBlockInfo(),
+            ...block,
             reason
         };
-        this.log.debug(`Simulating invalidate block ${block.block.number}`, logData);
+        this.log.debug(`Simulating invalidate block ${block.blockNumber}`, logData);
+        const attestationsAndSigners = new CommitteeAttestationsAndSigners(validationResult.attestations).getPackedAttestations();
         if (reason === 'invalid-attestation') {
-            return this.rollupContract.buildInvalidateBadAttestationRequest(block.block.number, block.attestations.map((a)=>a.toViem()), committee, validationResult.invalidIndex);
+            return this.rollupContract.buildInvalidateBadAttestationRequest(block.blockNumber, attestationsAndSigners, committee, validationResult.invalidIndex);
         } else if (reason === 'insufficient-attestations') {
-            return this.rollupContract.buildInvalidateInsufficientAttestationsRequest(block.block.number, block.attestations.map((a)=>a.toViem()), committee);
+            return this.rollupContract.buildInvalidateInsufficientAttestationsRequest(block.blockNumber, attestationsAndSigners, committee);
         } else {
             const _ = reason;
             throw new Error(`Unknown reason for invalidation`);
@@ -364,45 +362,42 @@ export class SequencerPublisher {
    * @param block - The block to propose
    * @param attestationData - The block's attestation data
    *
-   */ async validateBlockForSubmission(block, attestationData = {
-        digest: Buffer.alloc(32),
-        attestations: []
-    }, options) {
+   */ async validateBlockForSubmission(block, attestationsAndSigners, attestationsAndSignersSignature, options) {
         const ts = BigInt((await this.l1TxUtils.getBlock()).timestamp + this.ethereumSlotDuration);
         // If we have no attestations, we still need to provide the empty attestations
         // so that the committee is recalculated correctly
-        const ignoreSignatures = attestationData.attestations.length === 0;
+        const ignoreSignatures = attestationsAndSigners.attestations.length === 0;
         if (ignoreSignatures) {
             const { committee } = await this.epochCache.getCommittee(block.header.globalVariables.slotNumber.toBigInt());
             if (!committee) {
                 this.log.warn(`No committee found for slot ${block.header.globalVariables.slotNumber.toBigInt()}`);
                 throw new Error(`No committee found for slot ${block.header.globalVariables.slotNumber.toBigInt()}`);
             }
-            attestationData.attestations = committee.map((committeeMember)=>CommitteeAttestation.fromAddress(committeeMember));
+            attestationsAndSigners.attestations = committee.map((committeeMember)=>CommitteeAttestation.fromAddress(committeeMember));
         }
-        const blobs = await Blob.getBlobsPerBlock(block.body.toBlobFields());
-        const blobInput = Blob.getPrefixedEthBlobCommitments(blobs);
-        const formattedAttestations = attestationData.attestations.map((attest)=>attest.toViem());
-        const signers = attestationData.attestations.filter((attest)=>!attest.signature.isEmpty()).map((attest)=>attest.address.toString());
+        const blobFields = block.getCheckpointBlobFields();
+        const blobs = getBlobsPerL1Block(blobFields);
+        const blobInput = getPrefixedEthBlobCommitments(blobs);
         const args = [
             {
-                header: block.header.toPropose().toViem(),
+                header: block.getCheckpointHeader().toViem(),
                 archive: toHex(block.archive.root.toBuffer()),
                 stateReference: block.header.state.toViem(),
-                txHashes: block.body.txEffects.map((txEffect)=>txEffect.txHash.toString()),
                 oracleInput: {
                     feeAssetPriceModifier: 0n
                 }
             },
-            RollupContract.packAttestations(formattedAttestations),
-            signers,
+            attestationsAndSigners.getPackedAttestations(),
+            attestationsAndSigners.getSigners().map((signer)=>signer.toString()),
+            attestationsAndSignersSignature.toViemSignature(),
             blobInput
         ];
         await this.simulateProposeTx(args, ts, options);
         return ts;
     }
     async enqueueCastSignalHelper(slotNumber, timestamp, signalType, payload, base, signerAddress, signer) {
-        if (this.myLastSignals[signalType] >= slotNumber) {
+        if (this.lastActions[signalType] && this.lastActions[signalType] === slotNumber) {
+            this.log.debug(`Skipping duplicate vote cast signal ${signalType} for slot ${slotNumber}`);
             return false;
         }
         if (payload.equals(EthAddress.ZERO)) {
@@ -417,9 +412,9 @@ export class SequencerPublisher {
         if (roundInfo.lastSignalSlot >= slotNumber) {
             return false;
         }
-        const cachedLastVote = this.myLastSignals[signalType];
-        this.myLastSignals[signalType] = slotNumber;
-        const action = signalType === 0 ? 'governance-signal' : 'empire-slashing-signal';
+        const cachedLastVote = this.lastActions[signalType];
+        this.lastActions[signalType] = slotNumber;
+        const action = signalType;
         const request = await base.createSignalRequestWithSignature(payload.toString(), slotNumber, this.config.l1ChainId, signerAddress.toString(), signer);
         this.log.debug(`Created ${action} request with signature`, {
             request,
@@ -456,7 +451,7 @@ export class SequencerPublisher {
                 };
                 if (!success) {
                     this.log.error(`Signaling in [${action}] for ${payload} at slot ${slotNumber} in round ${round} failed`, logData);
-                    this.myLastSignals[signalType] = cachedLastVote;
+                    this.lastActions[signalType] = cachedLastVote;
                     return false;
                 } else {
                     this.log.info(`Signaling in [${action}] for ${payload} at slot ${slotNumber} in round ${round} succeeded`, logData);
@@ -472,7 +467,7 @@ export class SequencerPublisher {
    * @param timestamp - The timestamp of the slot to cast a signal for.
    * @returns True if the signal was successfully enqueued, false otherwise.
    */ enqueueGovernanceCastSignal(governancePayload, slotNumber, timestamp, signerAddress, signer) {
-        return this.enqueueCastSignalHelper(slotNumber, timestamp, 0, governancePayload, this.govProposerContract, signerAddress, signer);
+        return this.enqueueCastSignalHelper(slotNumber, timestamp, 'governance-signal', governancePayload, this.govProposerContract, signerAddress, signer);
     }
     /** Enqueues all slashing actions as returned by the slasher client. */ async enqueueSlashingActions(actions, slotNumber, timestamp, signerAddress, signer) {
         if (actions.length === 0) {
@@ -490,7 +485,7 @@ export class SequencerPublisher {
                         this.log.debug(`Enqueuing slashing vote for payload ${action.payload} at slot ${slotNumber}`, {
                             signerAddress
                         });
-                        await this.enqueueCastSignalHelper(slotNumber, timestamp, 1, action.payload, this.slashingProposerContract, signerAddress, signer);
+                        await this.enqueueCastSignalHelper(slotNumber, timestamp, 'empire-slashing-signal', action.payload, this.slashingProposerContract, signerAddress, signer);
                         break;
                     }
                 case 'create-empire-payload':
@@ -566,19 +561,18 @@ export class SequencerPublisher {
    *
    * @param block - L2 block to propose.
    * @returns True if the tx has been enqueued, throws otherwise. See #9315
-   */ async enqueueProposeL2Block(block, attestations, txHashes, opts = {}) {
-        const proposedBlockHeader = block.header.toPropose();
-        const consensusPayload = ConsensusPayload.fromBlock(block);
-        const digest = getHashedSignaturePayload(consensusPayload, SignatureDomainSeparator.blockAttestation);
-        const blobs = await Blob.getBlobsPerBlock(block.body.toBlobFields());
+   */ async enqueueProposeL2Block(block, attestationsAndSigners, attestationsAndSignersSignature, opts = {}) {
+        const checkpointHeader = block.getCheckpointHeader();
+        const blobFields = block.getCheckpointBlobFields();
+        const blobs = getBlobsPerL1Block(blobFields);
         const proposeTxArgs = {
-            header: proposedBlockHeader,
+            header: checkpointHeader,
             archive: block.archive.root.toBuffer(),
             stateReference: block.header.state,
             body: block.body.toBuffer(),
             blobs,
-            attestations,
-            txHashes: txHashes ?? []
+            attestationsAndSigners,
+            attestationsAndSignersSignature
         };
         let ts;
         try {
@@ -586,12 +580,8 @@ export class SequencerPublisher {
             //        This means that we can avoid the simulation issues in later checks.
             //        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.
-            const attestationData = {
-                digest: digest.toBuffer(),
-                attestations: attestations ?? []
-            };
             // 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, attestationData, opts);
+            ts = await this.validateBlockForSubmission(block, attestationsAndSigners, attestationsAndSignersSignature, opts);
         } catch (err) {
             this.log.error(`Block validation failed. ${err instanceof Error ? err.message : 'No error message'}`, err, {
                 ...block.getStats(),
@@ -613,8 +603,10 @@ export class SequencerPublisher {
         }
         // We issued the simulation against the rollup contract, so we need to account for the overhead of the multicall3
         const gasLimit = this.l1TxUtils.bumpGasLimit(BigInt(Math.ceil(Number(request.gasUsed) * 64 / 63)));
+        const { gasUsed, blockNumber } = request;
         const logData = {
-            ...pick(request, 'gasUsed', 'blockNumber'),
+            gasUsed,
+            blockNumber,
             gasLimit,
             opts
         };
@@ -650,8 +642,14 @@ export class SequencerPublisher {
             timestamp,
             gasLimit: undefined
         };
+        if (this.lastActions[action] && this.lastActions[action] === slotNumber) {
+            this.log.debug(`Skipping duplicate action ${action} for slot ${slotNumber}`);
+            return false;
+        }
+        const cachedLastActionSlot = this.lastActions[action];
+        this.lastActions[action] = slotNumber;
+        this.log.debug(`Simulating ${action} for slot ${slotNumber}`, logData);
         let gasUsed;
-        this.log.debug(`Simulating ${action}`, logData);
         try {
             ({ gasUsed } = await this.l1TxUtils.simulate(request, {
                 time: timestamp
@@ -684,6 +682,7 @@ export class SequencerPublisher {
                         ...result,
                         ...logData
                     });
+                    this.lastActions[action] = cachedLastActionSlot;
                 } else {
                     this.log.info(`Action ${action} at ${slotNumber} succeeded`, {
                         ...result,
@@ -710,7 +709,7 @@ export class SequencerPublisher {
     }
     async prepareProposeTx(encodedData, timestamp, options) {
         const kzg = Blob.getViemKzgInstance();
-        const blobInput = Blob.getPrefixedEthBlobCommitments(encodedData.blobs);
+        const blobInput = getPrefixedEthBlobCommitments(encodedData.blobs);
         this.log.debug('Validating blob input', {
             blobInput
         });
@@ -733,9 +732,7 @@ export class SequencerPublisher {
             });
             throw new Error('Failed to validate blobs');
         });
-        const attestations = encodedData.attestations ? encodedData.attestations.map((attest)=>attest.toViem()) : [];
-        const txHashes = encodedData.txHashes ? encodedData.txHashes.map((txHash)=>txHash.toString()) : [];
-        const signers = encodedData.attestations?.filter((attest)=>!attest.signature.isEmpty()).map((attest)=>attest.address.toString());
+        const signers = encodedData.attestationsAndSigners.getSigners().map((signer)=>signer.toString());
         const args = [
             {
                 header: encodedData.header.toViem(),
@@ -744,11 +741,11 @@ export class SequencerPublisher {
                 oracleInput: {
                     // We are currently not modifying these. See #9963
                     feeAssetPriceModifier: 0n
-                },
-                txHashes
+                }
             },
-            RollupContract.packAttestations(attestations),
-            signers ?? [],
+            encodedData.attestationsAndSigners.getPackedAttestations(),
+            signers,
+            encodedData.attestationsAndSignersSignature.toViemSignature(),
             blobInput
         ];
         const { rollupData, simulationResult } = await this.simulateProposeTx(args, timestamp, options);
@@ -840,13 +837,16 @@ export class SequencerPublisher {
                 if (success) {
                     const endBlock = receipt.blockNumber;
                     const inclusionBlocks = Number(endBlock - startBlock);
+                    const { calldataGas, calldataSize, sender } = stats;
                     const publishStats = {
                         gasPrice: receipt.effectiveGasPrice,
                         gasUsed: receipt.gasUsed,
                         blobGasUsed: receipt.blobGasUsed ?? 0n,
                         blobDataGas: receipt.blobGasPrice ?? 0n,
                         transactionHash: receipt.transactionHash,
-                        ...pick(stats, 'calldataGas', 'calldataSize', 'sender'),
+                        calldataGas,
+                        calldataSize,
+                        sender,
                         ...block.getStats(),
                         eventName: 'rollup-published-to-l1',
                         blobCount: encodedData.blobs.length,

package/dest/sequencer/block_builder.d.ts

@@ -1,14 +1,12 @@
 import type { Fr } from '@aztec/foundation/fields';
 import { DateProvider } from '@aztec/foundation/timer';
 import { PublicProcessor } from '@aztec/simulator/server';
-import type { ChainConfig, SequencerConfig } from '@aztec/stdlib/config';
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import type { BuildBlockResult, IFullNodeBlockBuilder, MerkleTreeWriteOperations, PublicProcessorLimits, PublicProcessorValidator, WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+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>;
-type FullNodeBlockBuilderConfig = Pick<L1RollupConstants, 'l1GenesisTime' | 'slotDuration'> & Pick<ChainConfig, 'l1ChainId' | 'rollupVersion'> & Pick<SequencerConfig, 'txPublicSetupAllowList' | 'fakeProcessingDelayPerTxMs'>;
 export declare class FullNodeBlockBuilder implements IFullNodeBlockBuilder {
     private config;
     private worldState;
@@ -17,7 +15,7 @@ export declare class FullNodeBlockBuilder implements IFullNodeBlockBuilder {
     private telemetryClient;
     constructor(config: FullNodeBlockBuilderConfig, worldState: WorldStateSynchronizer, contractDataSource: ContractDataSource, dateProvider: DateProvider, telemetryClient?: TelemetryClient);
     getConfig(): FullNodeBlockBuilderConfig;
-    updateConfig(config: FullNodeBlockBuilderConfig): void;
+    updateConfig(config: Partial<FullNodeBlockBuilderConfig>): void;
     makeBlockBuilderDeps(globalVariables: GlobalVariables, fork: MerkleTreeWriteOperations): Promise<{
         processor: PublicProcessor;
         validator: PublicProcessorValidator;
@@ -26,5 +24,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: number): Promise<MerkleTreeWriteOperations>;
 }
-export {};
 //# sourceMappingURL=block_builder.d.ts.map

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":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,EAAE,YAAY,EAAS,MAAM,yBAAyB,CAAC;AAG9D,OAAO,EAGL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,KAAK,iBAAiB,EAAuB,MAAM,6BAA6B,CAAC;AAE1F,OAAO,KAAK,EACV,gBAAgB,EAChB,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,EAAE,qBAAqB,YAAK,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;AAED,KAAK,0BAA0B,GAAG,IAAI,CAAC,iBAAiB,EAAE,eAAe,GAAG,cAAc,CAAC,GACzF,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,eAAe,CAAC,GAChD,IAAI,CAAC,eAAe,EAAE,wBAAwB,GAAG,4BAA4B,CAAC,CAAC;AAEjF,qBAAa,oBAAqB,YAAW,qBAAqB;IAE9D,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;gBAJf,MAAM,EAAE,0BAA0B,EAClC,UAAU,EAAE,sBAAsB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC;IAG1D,SAAS,IAAI,0BAA0B;IAYvC,YAAY,CAAC,MAAM,EAAE,0BAA0B;IAIzC,oBAAoB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB;;;;YAuCrF,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;IAwC5B,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAGjE"}
+{"version":3,"file":"block_builder.d.ts","sourceRoot":"","sources":["../../src/sequencer/block_builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,EAAE,YAAY,EAAkB,MAAM,yBAAyB,CAAC;AAGvE,OAAO,EAGL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,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,EAAE,qBAAqB,YAAK,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;gBAJf,MAAM,EAAE,0BAA0B,EAClC,UAAU,EAAE,sBAAsB,EAClC,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY,EAC1B,eAAe,GAAE,eAAsC;IAG1D,SAAS,IAAI,0BAA0B;IAIvC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,0BAA0B,CAAC;IAIlD,oBAAoB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,yBAAyB;;;;YAyCrF,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;IAwC5B,OAAO,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC;CAGjE"}

package/dest/sequencer/block_builder.js

@@ -1,9 +1,9 @@
-import { MerkleTreeId, elapsed } from '@aztec/aztec.js';
-import { pick } from '@aztec/foundation/collection';
+import { MerkleTreeId } from '@aztec/aztec.js/trees';
+import { merge, pick } from '@aztec/foundation/collection';
 import { createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { bufferToHex } from '@aztec/foundation/string';
-import { Timer } from '@aztec/foundation/timer';
+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, TelemetryPublicTxSimulator } from '@aztec/simulator/server';
@@ -50,6 +50,14 @@ export async function buildBlock(pendingTxs, l1ToL2Messages, newGlobalVariables,
     log.trace('Built block', res.block.header);
     return res;
 }
+const FullNodeBlockBuilderConfigKeys = [
+    'l1GenesisTime',
+    'slotDuration',
+    'l1ChainId',
+    'rollupVersion',
+    'txPublicSetupAllowList',
+    'fakeProcessingDelayPerTxMs'
+];
 export class FullNodeBlockBuilder {
     config;
     worldState;
@@ -64,16 +72,20 @@ export class FullNodeBlockBuilder {
         this.telemetryClient = telemetryClient;
     }
     getConfig() {
-        return pick(this.config, 'l1GenesisTime', 'slotDuration', 'l1ChainId', 'rollupVersion', 'txPublicSetupAllowList', 'fakeProcessingDelayPerTxMs');
+        return pick(this.config, ...FullNodeBlockBuilderConfigKeys);
     }
     updateConfig(config) {
-        this.config = config;
+        this.config = merge(this.config, pick(config, ...FullNodeBlockBuilderConfigKeys));
     }
     async makeBlockBuilderDeps(globalVariables, fork) {
         const txPublicSetupAllowList = this.config.txPublicSetupAllowList ?? await getDefaultAllowedSetupFunctions();
         const contractsDB = new PublicContractsDB(this.contractDataSource);
         const guardedFork = new GuardedMerkleTreeOperations(fork);
-        const publicTxSimulator = new TelemetryPublicTxSimulator(guardedFork, contractsDB, globalVariables, /*doMerkleOperations=*/ true, /*skipFeeEnforcement=*/ true, /*clientInitiatedSimulation=*/ false, this.telemetryClient);
+        const publicTxSimulator = new TelemetryPublicTxSimulator(guardedFork, contractsDB, globalVariables, this.telemetryClient, {
+            doMerkleOperations: true,
+            skipFeeEnforcement: true,
+            clientInitiatedSimulation: false
+        });
         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/errors.d.ts

@@ -0,0 +1,11 @@
+import type { SequencerState } from './utils.js';
+export declare class SequencerTooSlowError extends Error {
+    readonly proposedState: SequencerState;
+    readonly maxAllowedTime: number;
+    readonly currentTime: number;
+    constructor(proposedState: SequencerState, maxAllowedTime: number, currentTime: number);
+}
+export declare class SequencerInterruptedError extends Error {
+    constructor();
+}
+//# sourceMappingURL=errors.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/sequencer/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,qBAAa,qBAAsB,SAAQ,KAAK;aAE5B,aAAa,EAAE,cAAc;aAC7B,cAAc,EAAE,MAAM;aACtB,WAAW,EAAE,MAAM;gBAFnB,aAAa,EAAE,cAAc,EAC7B,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM;CAOtC;AAED,qBAAa,yBAA0B,SAAQ,KAAK;;CAKnD"}

package/dest/sequencer/errors.js

@@ -0,0 +1,15 @@
+export class SequencerTooSlowError extends Error {
+    proposedState;
+    maxAllowedTime;
+    currentTime;
+    constructor(proposedState, maxAllowedTime, currentTime){
+        super(`Too far into slot for ${proposedState} (time into slot ${currentTime}s greater than ${maxAllowedTime}s allowance)`), this.proposedState = proposedState, this.maxAllowedTime = maxAllowedTime, this.currentTime = currentTime;
+        this.name = 'SequencerTooSlowError';
+    }
+}
+export class SequencerInterruptedError extends Error {
+    constructor(){
+        super(`Sequencer was interrupted`);
+        this.name = 'SequencerInterruptedError';
+    }
+}

package/dest/sequencer/metrics.d.ts

@@ -1,9 +1,9 @@
-import type { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import type { RollupContract } from '@aztec/ethereum';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
-import { type SequencerState, type SequencerStateCallback } from './utils.js';
+import { type Hex } from 'viem';
+import type { SequencerState } from './utils.js';
 export declare class SequencerMetrics {
-    private coinbase;
     private rollup;
     readonly tracer: Tracer;
     private meter;
@@ -11,9 +11,6 @@ export declare class SequencerMetrics {
     private blockBuildDuration;
     private blockBuildManaPerSecond;
     private stateTransitionBufferDuration;
-    private currentBlockNumber;
-    private currentBlockSize;
-    private blockBuilderInsertions;
     private timeToCollectAttestations;
     private allowanceToCollectAttestations;
     private requiredAttestions;
@@ -21,23 +18,14 @@ export declare class SequencerMetrics {
     private rewards;
     private slots;
     private filledSlots;
-    private missedSlots;
     private lastSeenSlot?;
-    constructor(client: TelemetryClient, getState: SequencerStateCallback, coinbase: EthAddress, rollup: RollupContract, name?: string);
-    setCoinbase(coinbase: EthAddress): void;
-    start(): void;
-    stop(): void;
-    private observe;
+    constructor(client: TelemetryClient, rollup: RollupContract, name?: string);
     recordRequiredAttestations(requiredAttestationsCount: number, allowanceMs: number): void;
     recordCollectedAttestations(count: number, durationMs: number): void;
-    recordBlockBuilderTreeInsertions(timeUs: number): void;
-    recordCancelledBlock(): void;
     recordBuiltBlock(buildDurationMs: number, totalMana: number): void;
     recordFailedBlock(): void;
-    recordNewBlock(blockNumber: number, txCount: number): void;
     recordStateTransitionBufferMs(durationMs: number, state: SequencerState): void;
-    observeSlotChange(slot: bigint | undefined, proposer: string): void;
-    incFilledSlot(proposer: string): void;
-    private setCurrentBlock;
+    incOpenSlot(slot: bigint, proposer: string): void;
+    incFilledSlot(proposer: string, coinbase: Hex | EthAddress | undefined): Promise<void>;
 }
 //# sourceMappingURL=metrics.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/sequencer/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAQL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,sBAAsB,EAA0B,MAAM,YAAY,CAAC;AAEtG,qBAAa,gBAAgB;IA6BzB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IA7BhB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,KAAK,CAAQ;IAErB,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,6BAA6B,CAAY;IACjD,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,gBAAgB,CAAQ;IAChC,OAAO,CAAC,sBAAsB,CAAY;IAG1C,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,8BAA8B,CAAQ;IAC9C,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,mBAAmB,CAAQ;IAEnC,OAAO,CAAC,OAAO,CAAkB;IAEjC,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,WAAW,CAAgB;IACnC,OAAO,CAAC,WAAW,CAAgB;IAEnC,OAAO,CAAC,YAAY,CAAC,CAAS;gBAG5B,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,sBAAsB,EACxB,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,cAAc,EAC9B,IAAI,SAAc;IA+Gb,WAAW,CAAC,QAAQ,EAAE,UAAU;IAIhC,KAAK;IAIL,IAAI;IAIX,OAAO,CAAC,OAAO,CAQb;IAEK,0BAA0B,CAAC,yBAAyB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IASjF,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAKpE,gCAAgC,CAAC,MAAM,EAAE,MAAM;IAI/C,oBAAoB;IAOpB,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAQ3D,iBAAiB;IAOjB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAInD,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc;IAMvE,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM;IAqB5D,aAAa,CAAC,QAAQ,EAAE,MAAM;IAO9B,OAAO,CAAC,eAAe;CAIxB"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/sequencer/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAML,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,GAAG,EAAe,MAAM,MAAM,CAAC;AAE7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,qBAAa,gBAAgB;IAwBzB,OAAO,CAAC,MAAM;IAvBhB,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,KAAK,CAAQ;IAErB,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,kBAAkB,CAAY;IACtC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,6BAA6B,CAAY;IAGjD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,8BAA8B,CAAQ;IAC9C,OAAO,CAAC,kBAAkB,CAAQ;IAClC,OAAO,CAAC,mBAAmB,CAAQ;IAEnC,OAAO,CAAC,OAAO,CAAQ;IAEvB,OAAO,CAAC,KAAK,CAAgB;IAC7B,OAAO,CAAC,WAAW,CAAgB;IAEnC,OAAO,CAAC,YAAY,CAAC,CAAS;gBAG5B,MAAM,EAAE,eAAe,EACf,MAAM,EAAE,cAAc,EAC9B,IAAI,SAAc;IAkFb,0BAA0B,CAAC,yBAAyB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IASjF,2BAA2B,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAKpE,gBAAgB,CAAC,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;IAQ3D,iBAAiB;IAMjB,6BAA6B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc;IAMvE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAapC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,UAAU,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAkB7F"}