@aztec/sequencer-client 0.87.7 → 1.0.0-nightly.20250604

package/dest/sequencer/sequencer.d.ts

@@ -1,24 +1,19 @@
-import { type L2Block } from '@aztec/aztec.js';
+import type { L2Block } from '@aztec/aztec.js';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import type { Signature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
-import { type DateProvider, Timer } from '@aztec/foundation/timer';
+import { type DateProvider } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
-import type { BlockBuilderFactory } from '@aztec/prover-client/block-builder';
-import type { PublicProcessorFactory } from '@aztec/simulator/server';
+import type { SlasherClient } from '@aztec/slasher';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { L2BlockSource } from '@aztec/stdlib/block';
-import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { CommitteeAttestation, L2BlockSource } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
-import { Gas } from '@aztec/stdlib/gas';
-import { type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
+import { type BuildBlockOptions, type IFullNodeBlockBuilder, type WorldStateSynchronizer } from '@aztec/stdlib/interfaces/server';
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
-import { GlobalVariables, ProposedBlockHeader, Tx, type TxHash } from '@aztec/stdlib/tx';
+import { Tx, type TxHash } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Tracer } from '@aztec/telemetry-client';
 import type { ValidatorClient } from '@aztec/validator-client';
 import type { GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { type SequencerPublisher } from '../publisher/sequencer-publisher.js';
-import type { SlasherClient } from '../slasher/slasher_client.js';
 import type { SequencerConfig } from './config.js';
 import { SequencerTimetable } from './timetable.js';
 import { SequencerState } from './utils.js';
@@ -40,14 +35,13 @@ export declare class Sequencer {
     protected p2pClient: P2P;
     protected worldState: WorldStateSynchronizer;
     protected slasherClient: SlasherClient;
-    protected blockBuilderFactory: BlockBuilderFactory;
     protected l2BlockSource: L2BlockSource;
     protected l1ToL2MessageSource: L1ToL2MessageSource;
-    protected publicProcessorFactory: PublicProcessorFactory;
-    protected contractDataSource: ContractDataSource;
+    protected blockBuilder: IFullNodeBlockBuilder;
     protected l1Constants: SequencerRollupConstants;
     protected dateProvider: DateProvider;
     protected config: SequencerConfig;
+    protected telemetry: TelemetryClient;
     protected log: import("@aztec/aztec.js").Logger;
     private runningPromise?;
     private pollingIntervalMs;
@@ -67,9 +61,9 @@ export declare class Sequencer {
     protected timetable: SequencerTimetable;
     protected enforceTimeTable: boolean;
     constructor(publisher: SequencerPublisher, validatorClient: ValidatorClient | undefined, // During migration the validator client can be inactive
-    globalsBuilder: GlobalVariableBuilder, p2pClient: P2P, worldState: WorldStateSynchronizer, slasherClient: SlasherClient, blockBuilderFactory: BlockBuilderFactory, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, publicProcessorFactory: PublicProcessorFactory, contractDataSource: ContractDataSource, l1Constants: SequencerRollupConstants, dateProvider: DateProvider, config?: SequencerConfig, telemetry?: TelemetryClient, log?: import("@aztec/aztec.js").Logger);
+    globalsBuilder: GlobalVariableBuilder, p2pClient: P2P, worldState: WorldStateSynchronizer, slasherClient: SlasherClient, l2BlockSource: L2BlockSource, l1ToL2MessageSource: L1ToL2MessageSource, blockBuilder: IFullNodeBlockBuilder, l1Constants: SequencerRollupConstants, dateProvider: DateProvider, config?: SequencerConfig, telemetry?: TelemetryClient, log?: import("@aztec/aztec.js").Logger);
     get tracer(): Tracer;
-    getValidatorAddress(): EthAddress | undefined;
+    getValidatorAddresses(): EthAddress[] | undefined;
     /**
      * Updates sequencer config.
      * @param config - New parameters.
@@ -108,13 +102,6 @@ export declare class Sequencer {
     protected doRealWork(): Promise<void>;
     protected work(): Promise<void>;
     getForwarderAddress(): EthAddress;
-    /**
-     * Checks if we can propose at the next block and returns the slot number if we can.
-     * @param tipArchive - The archive of the previous block.
-     * @param proposalBlockNumber - The block number of the proposal.
-     * @returns The slot number if we can propose at the next block, otherwise undefined.
-     */
-    slotForProposal(tipArchive: Buffer, proposalBlockNumber: bigint): Promise<bigint | undefined>;
     /**
      * Sets the sequencer state and checks if we have enough time left in the slot to transition to the new state.
      * @param proposedState - The new state to transition to.
@@ -125,45 +112,8 @@ export declare class Sequencer {
      * it is only used to check if we have enough time left in the slot to transition to the new state.
      */
     setState(proposedState: SequencerState, currentSlotNumber: bigint, force?: boolean): void;
-    /**
-     * Build a block
-     *
-     * @param pendingTxs - The pending transactions to construct the block from
-     * @param newGlobalVariables - The global variables for the new block
-     * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal
-     */
-    protected buildBlock(pendingTxs: Iterable<Tx> | AsyncIterable<Tx>, newGlobalVariables: GlobalVariables, opts?: {
-        validateOnly?: boolean;
-    }): Promise<{
-        block: L2Block;
-        publicGas: Gas;
-        publicProcessorDuration: number;
-        numMsgs: number;
-        numTxs: number;
-        numFailedTxs: number;
-        blockBuildingTimer: Timer;
-        usedTxs: Tx[];
-    }>;
-    /**
-     * Build a block from a proposal. Used by the validator to re-execute transactions.
-     *
-     * @param blockNumber - The block number of the proposal.
-     * @param header - The header of the proposal.
-     * @param pendingTxs - The pending transactions to construct the block from.
-     * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal.
-     */
-    buildBlockFromProposal(blockNumber: Fr, header: ProposedBlockHeader, pendingTxs: Iterable<Tx> | AsyncIterable<Tx>, opts?: {
-        validateOnly?: boolean;
-    }): Promise<{
-        block: L2Block;
-        publicGas: Gas;
-        publicProcessorDuration: number;
-        numMsgs: number;
-        numTxs: number;
-        numFailedTxs: number;
-        blockBuildingTimer: Timer;
-        usedTxs: Tx[];
-    }>;
+    private dropFailedTxsFromP2P;
+    protected getDefaultBlockBuilderOptions(slot: number): BuildBlockOptions;
     /**
      * @notice  Build and propose a block to the chain
      *
@@ -172,14 +122,16 @@ export declare class Sequencer {
      *
      * @param pendingTxs - Iterable of pending transactions to construct the block from
      * @param proposalHeader - The partial header constructed for the proposal
+     * @param newGlobalVariables - The global variables for the new block
+     * @param proposerAddress - The address of the proposer
      */
     private buildBlockAndEnqueuePublish;
-    protected collectAttestations(block: L2Block, txs: Tx[]): Promise<Signature[] | undefined>;
+    protected collectAttestations(block: L2Block, txs: Tx[], proposerAddress: EthAddress): Promise<CommitteeAttestation[] | undefined>;
     /**
      * Publishes the L2Block to the rollup contract.
      * @param block - The L2Block to be published.
      */
-    protected enqueuePublishL2Block(block: L2Block, attestations?: Signature[], txHashes?: TxHash[]): Promise<void>;
+    protected enqueuePublishL2Block(block: L2Block, attestations?: CommitteeAttestation[], txHashes?: TxHash[]): Promise<void>;
     /**
      * Returns whether all dependencies have caught up.
      * We don't check against the previous block submitted since it may have been reorg'd out.
@@ -195,5 +147,6 @@ export declare class Sequencer {
     get coinbase(): EthAddress;
     get feeRecipient(): AztecAddress;
     get maxL2BlockGas(): number | undefined;
+    getSlasherClient(): SlasherClient;
 }
 //# sourceMappingURL=sequencer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAI/C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,yBAAyB,CAAC;AACnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC5B,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAKnE,OAAO,EAKL,EAAE,EACF,KAAK,MAAM,EACZ,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,KAAK,kBAAkB,EAAY,MAAM,qCAAqC,CAAC;AACxF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAyB,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAqB,MAAM,YAAY,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,CAAC;AAE1B,KAAK,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,GAAG,eAAe,GAAG,cAAc,CAAC,CAAC;AAEnH;;;;;;;;GAQG;AACH,qBAAa,SAAS;IAuBlB,SAAS,CAAC,SAAS,EAAE,kBAAkB;IACvC,SAAS,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS;IACtD,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAC/C,SAAS,CAAC,SAAS,EAAE,GAAG;IACxB,SAAS,CAAC,UAAU,EAAE,sBAAsB;IAC5C,SAAS,CAAC,aAAa,EAAE,aAAa;IACtC,SAAS,CAAC,aAAa,EAAE,aAAa;IACtC,SAAS,CAAC,mBAAmB,EAAE,mBAAmB;IAClD,SAAS,CAAC,YAAY,EAAE,qBAAqB;IAC7C,SAAS,CAAC,WAAW,EAAE,wBAAwB;IAC/C,SAAS,CAAC,YAAY,EAAE,YAAY;IACpC,SAAS,CAAC,MAAM,EAAE,eAAe;IACjC,SAAS,CAAC,SAAS,EAAE,eAAe;IACpC,SAAS,CAAC,GAAG;IAnCf,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,4BAA4B,CAAK;IAEzC,OAAO,CAAC,SAAS,CAAmB;IACpC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,sBAAsB,CAAwB;IACtD,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,OAAO,CAAmB;IAClC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAkB;IAEpC,+GAA+G;IAC/G,SAAS,CAAC,SAAS,EAAG,kBAAkB,CAAC;IAEzC,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAGhC,SAAS,EAAE,kBAAkB,EAC7B,eAAe,EAAE,eAAe,GAAG,SAAS,EAAE,wDAAwD;IACtG,cAAc,EAAE,qBAAqB,EACrC,SAAS,EAAE,GAAG,EACd,UAAU,EAAE,sBAAsB,EAClC,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,YAAY,EAAE,qBAAqB,EACnC,WAAW,EAAE,wBAAwB,EACrC,YAAY,EAAE,YAAY,EAC1B,MAAM,GAAE,eAAoB,EAC5B,SAAS,GAAE,eAAsC,EACjD,GAAG,mCAA4B;IAmB3C,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEM,qBAAqB;IAI5B;;;OAGG;IACU,YAAY,CAAC,MAAM,EAAE,eAAe;IAoDjD,OAAO,CAAC,YAAY;IAYpB;;OAEG;IACU,KAAK;IAUlB;;OAEG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYlC;;OAEG;IACI,OAAO;IAOd;;;OAGG;IACI,MAAM;;;IAIb,uGAAuG;IAChG,KAAK;IAIZ;;;;;;;OAOG;cACa,UAAU;cAqHV,IAAI;IAeb,mBAAmB;IAI1B;;;;;;;;OAQG;IACH,QAAQ,CAAC,aAAa,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,GAAE,OAAe;YAW3E,oBAAoB;IAUlC,SAAS,CAAC,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;IAkBxE;;;;;;;;;;OAUG;YAIW,2BAA2B;cAgFzB,mBAAmB,CACjC,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,EAAE,EAAE,EACT,eAAe,EAAE,UAAU,GAC1B,OAAO,CAAC,oBAAoB,EAAE,GAAG,SAAS,CAAC;IAsD9C;;;OAGG;cAIa,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,YAAY,CAAC,EAAE,oBAAoB,EAAE,EACrC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC;IAiBhB;;;;OAIG;cACa,WAAW,IAAI,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,EAAE,CAAA;KAAE,GAAG,SAAS,CAAC;IA+CxF,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,kBAAkB;IAK1B,IAAI,iBAAiB,WAEpB;IAED,IAAI,QAAQ,IAAI,UAAU,CAEzB;IAED,IAAI,YAAY,IAAI,YAAY,CAE/B;IAED,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAEM,gBAAgB,IAAI,aAAa;CAGzC"}

package/dest/sequencer/sequencer.js

@@ -4,24 +4,23 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { retryUntil } from '@aztec/aztec.js';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+import { FormattedViemError } from '@aztec/ethereum';
 import { omit } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
-import { Timer, elapsed } from '@aztec/foundation/timer';
+import { Timer } from '@aztec/foundation/timer';
 import { getDefaultAllowedSetupFunctions } from '@aztec/p2p/msg_validators';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { Gas } from '@aztec/stdlib/gas';
 import { SequencerConfigSchema } from '@aztec/stdlib/interfaces/server';
 import { pickFromSchema } from '@aztec/stdlib/schemas';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
-import { ContentCommitment, GlobalVariables, ProposedBlockHeader, Tx } from '@aztec/stdlib/tx';
+import { ContentCommitment, ProposedBlockHeader, Tx } from '@aztec/stdlib/tx';
 import { Attributes, L1Metrics, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { VoteType } from '../publisher/sequencer-publisher.js';
-import { createValidatorForBlockBuilding } from '../tx_validator/tx_validator_factory.js';
 import { SequencerMetrics } from './metrics.js';
 import { SequencerTimetable, SequencerTooSlowError } from './timetable.js';
 import { SequencerState, orderAttestations } from './utils.js';
@@ -41,14 +40,13 @@ export { SequencerState };
     p2pClient;
     worldState;
     slasherClient;
-    blockBuilderFactory;
     l2BlockSource;
     l1ToL2MessageSource;
-    publicProcessorFactory;
-    contractDataSource;
+    blockBuilder;
     l1Constants;
     dateProvider;
     config;
+    telemetry;
     log;
     runningPromise;
     pollingIntervalMs;
@@ -67,21 +65,20 @@ export { SequencerState };
     isFlushing;
     /** The maximum number of seconds that the sequencer can be into a slot to transition to a particular state. */ timetable;
     enforceTimeTable;
-    constructor(publisher, validatorClient, globalsBuilder, p2pClient, worldState, slasherClient, blockBuilderFactory, l2BlockSource, l1ToL2MessageSource, publicProcessorFactory, contractDataSource, l1Constants, dateProvider, config = {}, telemetry = getTelemetryClient(), log = createLogger('sequencer')){
+    constructor(publisher, validatorClient, globalsBuilder, p2pClient, worldState, slasherClient, l2BlockSource, l1ToL2MessageSource, blockBuilder, l1Constants, dateProvider, config = {}, telemetry = getTelemetryClient(), log = createLogger('sequencer')){
         this.publisher = publisher;
         this.validatorClient = validatorClient;
         this.globalsBuilder = globalsBuilder;
         this.p2pClient = p2pClient;
         this.worldState = worldState;
         this.slasherClient = slasherClient;
-        this.blockBuilderFactory = blockBuilderFactory;
         this.l2BlockSource = l2BlockSource;
         this.l1ToL2MessageSource = l1ToL2MessageSource;
-        this.publicProcessorFactory = publicProcessorFactory;
-        this.contractDataSource = contractDataSource;
+        this.blockBuilder = blockBuilder;
         this.l1Constants = l1Constants;
         this.dateProvider = dateProvider;
         this.config = config;
+        this.telemetry = telemetry;
         this.log = log;
         this.pollingIntervalMs = 1000;
         this.maxTxsPerBlock = 32;
@@ -99,16 +96,14 @@ export { SequencerState };
         this.l1Metrics = new L1Metrics(telemetry.getMeter('SequencerL1Metrics'), publisher.l1TxUtils.client, [
             publisher.getSenderAddress()
         ]);
-        // Register the block builder with the validator client for re-execution
-        this.validatorClient?.registerBlockBuilder(this.buildBlockFromProposal.bind(this));
         // Register the slasher on the publisher to fetch slashing payloads
         this.publisher.registerSlashPayloadGetter(this.slasherClient.getSlashPayload.bind(this.slasherClient));
     }
     get tracer() {
         return this.metrics.tracer;
     }
-    getValidatorAddress() {
-        return this.validatorClient?.getValidatorAddress();
+    getValidatorAddresses() {
+        return this.validatorClient?.getValidatorAddresses();
     }
     /**
    * Updates sequencer config.
@@ -182,7 +177,7 @@ export { SequencerState };
         this.metrics.stop();
         await this.validatorClient?.stop();
         await this.runningPromise?.stop();
-        this.slasherClient.stop();
+        await this.slasherClient.stop();
         this.publisher.interrupt();
         this.setState(SequencerState.STOPPED, 0n, true);
         this.l1Metrics.stop();
@@ -226,10 +221,17 @@ export { SequencerState };
         const newBlockNumber = chainTip.blockNumber + 1;
         // If we cannot find a tip archive, assume genesis.
         const chainTipArchive = chainTip.archive;
-        const slot = await this.slotForProposal(chainTipArchive.toBuffer(), BigInt(newBlockNumber));
+        const { slot } = this.publisher.epochCache.getEpochAndSlotInNextSlot();
         this.metrics.observeSlotChange(slot, this.publisher.getSenderAddress().toString());
-        if (!slot) {
-            this.log.debug(`Cannot propose block ${newBlockNumber}`);
+        const proposerInNextSlot = await this.publisher.epochCache.getProposerAttesterAddressInNextSlot();
+        const validatorAddresses = this.validatorClient.getValidatorAddresses();
+        // If get proposer in next slot is undefined, then there is no proposer set, and it is in free for all (sandbox) so we continue
+        // If we calculate a proposer in the next slot, and it is not us, then stop
+        if (proposerInNextSlot !== undefined && !validatorAddresses.some((addr)=>addr.equals(proposerInNextSlot))) {
+            this.log.debug(`Cannot propose block ${newBlockNumber}`, {
+                us: validatorAddresses,
+                proposer: proposerInNextSlot
+            });
             return;
         }
         this.log.debug(`Can propose block ${newBlockNumber} at slot ${slot}`);
@@ -252,15 +254,21 @@ export { SequencerState };
         });
         let finishedFlushing = false;
         const pendingTxCount = await this.p2pClient.getPendingTxCount();
+        this.log.debug(`Pending tx count: ${pendingTxCount}`);
         if (pendingTxCount >= this.minTxsPerBlock || this.isFlushing) {
             // We don't fetch exactly maxTxsPerBlock txs here because we may not need all of them if we hit a limit before,
             // and also we may need to fetch more if we don't have enough valid txs.
             const pendingTxs = this.p2pClient.iteratePendingTxs();
-            await this.buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables).catch((err)=>{
-                this.log.error(`Error building/enqueuing block`, err, {
-                    blockNumber: newBlockNumber,
-                    slot
-                });
+            await this.buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables, proposerInNextSlot).catch((err)=>{
+                if (err instanceof FormattedViemError) {
+                    this.log.verbose(`Unable to build/enqueue block ${err.message}`);
+                    return;
+                } else {
+                    this.log.error(`Error building/enqueuing block`, err, {
+                        blockNumber: newBlockNumber,
+                        slot
+                    });
+                }
             });
             finishedFlushing = true;
         } else {
@@ -312,24 +320,6 @@ export { SequencerState };
         return this.publisher.getForwarderAddress();
     }
     /**
-   * Checks if we can propose at the next block and returns the slot number if we can.
-   * @param tipArchive - The archive of the previous block.
-   * @param proposalBlockNumber - The block number of the proposal.
-   * @returns The slot number if we can propose at the next block, otherwise undefined.
-   */ async slotForProposal(tipArchive, proposalBlockNumber) {
-        const result = await this.publisher.canProposeAtNextEthBlock(tipArchive);
-        if (!result) {
-            return undefined;
-        }
-        const [slot, blockNumber] = result;
-        if (proposalBlockNumber !== blockNumber) {
-            const msg = `Sequencer block number mismatch. Expected ${proposalBlockNumber} but got ${blockNumber}.`;
-            this.log.warn(msg);
-            throw new Error(msg);
-        }
-        return slot;
-    }
-    /**
    * Sets the sequencer state and checks if we have enough time left in the slot to transition to the new state.
    * @param proposedState - The new state to transition to.
    * @param currentSlotNumber - The current slot number.
@@ -347,133 +337,28 @@ export { SequencerState };
         this.log.debug(`Transitioning from ${this.state} to ${proposedState}`);
         this.state = proposedState;
     }
-    /**
-   * Build a block
-   *
-   * @param pendingTxs - The pending transactions to construct the block from
-   * @param newGlobalVariables - The global variables for the new block
-   * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal
-   */ async buildBlock(pendingTxs, newGlobalVariables, opts = {}) {
-        const blockNumber = newGlobalVariables.blockNumber.toNumber();
-        const slot = newGlobalVariables.slotNumber.toBigInt();
-        this.log.debug(`Requesting L1 to L2 messages from contract for block ${blockNumber}`);
-        const l1ToL2Messages = await this.l1ToL2MessageSource.getL1ToL2Messages(BigInt(blockNumber));
-        const msgCount = l1ToL2Messages.length;
-        this.log.verbose(`Building block ${blockNumber} for slot ${slot}`, {
-            slot,
-            blockNumber,
-            msgCount,
-            validator: opts.validateOnly
-        });
-        // Sync to the previous block at least. If we cannot sync to that block because the archiver hasn't caught up,
-        // we keep retrying until the reexecution deadline. Note that this could only happen when we are a validator,
-        // for if we are the proposer, then world-state should already be caught up, as we check this earlier.
-        await retryUntil(()=>this.worldState.syncImmediate(blockNumber - 1, true).then((syncedTo)=>syncedTo >= blockNumber - 1), 'sync to previous block', this.timetable.getValidatorReexecTimeEnd(), 0.1);
-        this.log.debug(`Synced to previous block ${blockNumber - 1}`);
-        // NB: separating the dbs because both should update the state
-        const publicProcessorDBFork = await this.worldState.fork();
-        const orchestratorDBFork = await this.worldState.fork();
-        const previousBlockHeader = (await this.l2BlockSource.getBlock(blockNumber - 1))?.header ?? orchestratorDBFork.getInitialHeader();
-        try {
-            const processor = this.publicProcessorFactory.create(publicProcessorDBFork, newGlobalVariables, true);
-            const blockBuildingTimer = new Timer();
-            const blockBuilder = this.blockBuilderFactory.create(orchestratorDBFork);
-            await blockBuilder.startNewBlock(newGlobalVariables, l1ToL2Messages, previousBlockHeader);
-            // Deadline for processing depends on whether we're proposing a block
-            const secondsIntoSlot = this.getSecondsIntoSlot(slot);
-            const processingEndTimeWithinSlot = opts.validateOnly ? this.timetable.getValidatorReexecTimeEnd(secondsIntoSlot) : this.timetable.getBlockProposalExecTimeEnd(secondsIntoSlot);
-            // Deadline is only set if enforceTimeTable is enabled.
-            const deadline = this.enforceTimeTable ? new Date((this.getSlotStartTimestamp(slot) + processingEndTimeWithinSlot) * 1000) : undefined;
-            this.log.verbose(`Processing pending txs`, {
-                slot,
-                slotStart: new Date(this.getSlotStartTimestamp(slot) * 1000),
-                now: new Date(this.dateProvider.now()),
-                deadline
-            });
-            const validator = createValidatorForBlockBuilding(publicProcessorDBFork, this.contractDataSource, newGlobalVariables, this.txPublicSetupAllowList);
-            // TODO(#11000): Public processor should just handle processing, one tx at a time. It should be responsibility
-            // of the sequencer to update world state and iterate over txs. We should refactor this along with unifying the
-            // publicProcessorFork and orchestratorFork, to avoid doing tree insertions twice when building the block.
-            const proposerLimits = {
-                maxTransactions: this.maxTxsPerBlock,
-                maxBlockSize: this.maxBlockSizeInBytes,
-                maxBlockGas: this.maxBlockGas
-            };
-            const limits = opts.validateOnly ? {
-                deadline
-            } : {
-                deadline,
-                ...proposerLimits
-            };
-            const [publicProcessorDuration, [processedTxs, failedTxs, usedTxs]] = await elapsed(()=>processor.process(pendingTxs, limits, validator));
-            if (!opts.validateOnly && failedTxs.length > 0) {
-                const failedTxData = failedTxs.map((fail)=>fail.tx);
-                const failedTxHashes = await Tx.getHashes(failedTxData);
-                this.log.verbose(`Dropping failed txs ${failedTxHashes.join(', ')}`);
-                await this.p2pClient.deleteTxs(failedTxHashes);
-            }
-            if (!opts.validateOnly && // We check for minTxCount only if we are proposing a block, not if we are validating it
-            !this.isFlushing && // And we skip the check when flushing, since we want all pending txs to go out, no matter if too few
-            this.minTxsPerBlock !== undefined && processedTxs.length < this.minTxsPerBlock) {
-                this.log.warn(`Block ${blockNumber} has too few txs to be proposed (got ${processedTxs.length} but required ${this.minTxsPerBlock})`, {
-                    slot,
-                    blockNumber,
-                    processedTxCount: processedTxs.length
-                });
-                throw new Error(`Block has too few successful txs to be proposed`);
-            }
-            const start = process.hrtime.bigint();
-            await blockBuilder.addTxs(processedTxs);
-            const end = process.hrtime.bigint();
-            const duration = Number(end - start) / 1_000;
-            this.metrics.recordBlockBuilderTreeInsertions(duration);
-            // All real transactions have been added, set the block as full and pad if needed
-            const block = await blockBuilder.setBlockCompleted();
-            // How much public gas was processed
-            const publicGas = processedTxs.reduce((acc, tx)=>acc.add(tx.gasUsed.publicGas), Gas.empty());
-            return {
-                block,
-                publicGas,
-                publicProcessorDuration,
-                numMsgs: l1ToL2Messages.length,
-                numTxs: processedTxs.length,
-                numFailedTxs: failedTxs.length,
-                blockBuildingTimer,
-                usedTxs
-            };
-        } finally{
-            // We create a fresh processor each time to reset any cached state (eg storage writes)
-            // We wait a bit to close the forks since the processor may still be working on a dangling tx
-            // which was interrupted due to the processingDeadline being hit.
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
-            setTimeout(async ()=>{
-                try {
-                    await publicProcessorDBFork.close();
-                    await orchestratorDBFork.close();
-                } catch (err) {
-                    // This can happen if the sequencer is stopped before we hit this timeout.
-                    this.log.warn(`Error closing forks for block processing`, err);
-                }
-            }, 5000);
+    async dropFailedTxsFromP2P(failedTxs) {
+        if (failedTxs.length === 0) {
+            return;
         }
+        const failedTxData = failedTxs.map((fail)=>fail.tx);
+        const failedTxHashes = await Tx.getHashes(failedTxData);
+        this.log.verbose(`Dropping failed txs ${failedTxHashes.join(', ')}`);
+        await this.p2pClient.deleteTxs(failedTxHashes);
     }
-    /**
-   * Build a block from a proposal. Used by the validator to re-execute transactions.
-   *
-   * @param blockNumber - The block number of the proposal.
-   * @param header - The header of the proposal.
-   * @param pendingTxs - The pending transactions to construct the block from.
-   * @param opts - Whether to just validate the block as a validator, as opposed to building it as a proposal.
-   */ async buildBlockFromProposal(blockNumber, header, pendingTxs, opts = {}) {
-        const { chainId, version } = await this.globalsBuilder.getGlobalConstantVariables();
-        const globalVariables = GlobalVariables.from({
-            ...header,
-            blockNumber,
-            timestamp: new Fr(header.timestamp),
-            chainId,
-            version
-        });
-        return await this.buildBlock(pendingTxs, globalVariables, opts);
+    getDefaultBlockBuilderOptions(slot) {
+        // Deadline for processing depends on whether we're proposing a block
+        const secondsIntoSlot = this.getSecondsIntoSlot(slot);
+        const processingEndTimeWithinSlot = this.timetable.getBlockProposalExecTimeEnd(secondsIntoSlot);
+        // Deadline is only set if enforceTimeTable is enabled.
+        const deadline = this.enforceTimeTable ? new Date((this.getSlotStartTimestamp(slot) + processingEndTimeWithinSlot) * 1000) : undefined;
+        return {
+            maxTransactions: this.maxTxsPerBlock,
+            maxBlockSize: this.maxBlockSizeInBytes,
+            maxBlockGas: this.maxBlockGas,
+            txPublicSetupAllowList: this.txPublicSetupAllowList,
+            deadline
+        };
     }
     /**
    * @notice  Build and propose a block to the chain
@@ -483,7 +368,9 @@ export { SequencerState };
    *
    * @param pendingTxs - Iterable of pending transactions to construct the block from
    * @param proposalHeader - The partial header constructed for the proposal
-   */ async buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables) {
+   * @param newGlobalVariables - The global variables for the new block
+   * @param proposerAddress - The address of the proposer
+   */ async buildBlockAndEnqueuePublish(pendingTxs, proposalHeader, newGlobalVariables, proposerAddress) {
         await this.publisher.validateBlockForSubmission(proposalHeader);
         const blockNumber = newGlobalVariables.blockNumber.toNumber();
         const slot = proposalHeader.slotNumber.toBigInt();
@@ -491,9 +378,20 @@ export { SequencerState };
         const workTimer = new Timer();
         this.setState(SequencerState.CREATING_BLOCK, slot);
         try {
-            const buildBlockRes = await this.buildBlock(pendingTxs, newGlobalVariables);
-            const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer, usedTxs } = buildBlockRes;
+            const blockBuilderOptions = this.getDefaultBlockBuilderOptions(Number(slot));
+            const buildBlockRes = await this.blockBuilder.buildBlock(pendingTxs, newGlobalVariables, blockBuilderOptions);
+            const { publicGas, block, publicProcessorDuration, numTxs, numMsgs, blockBuildingTimer, usedTxs, failedTxs } = buildBlockRes;
             this.metrics.recordBuiltBlock(workTimer.ms(), publicGas.l2Gas);
+            await this.dropFailedTxsFromP2P(failedTxs);
+            const minTxsPerBlock = this.isFlushing ? 0 : this.minTxsPerBlock;
+            if (numTxs < minTxsPerBlock) {
+                this.log.warn(`Block ${blockNumber} has too few txs to be proposed (got ${numTxs} but required ${minTxsPerBlock})`, {
+                    slot,
+                    blockNumber,
+                    numTxs
+                });
+                throw new Error(`Block has too few successful txs to be proposed`);
+            }
             // TODO(@PhilWindle) We should probably periodically check for things like another
             // block being published before ours instead of just waiting on our block
             await this.publisher.validateBlockForSubmission(block.header.toPropose());
@@ -515,7 +413,7 @@ export { SequencerState };
             });
             this.log.debug('Collecting attestations');
             const stopCollectingAttestationsTimer = this.metrics.startCollectingAttestationsTimer();
-            const attestations = await this.collectAttestations(block, usedTxs);
+            const attestations = await this.collectAttestations(block, usedTxs, proposerAddress);
             if (attestations !== undefined) {
                 this.log.verbose(`Collected ${attestations.length} attestations`, {
                     blockHash,
@@ -529,7 +427,7 @@ export { SequencerState };
             throw err;
         }
     }
-    async collectAttestations(block, txs) {
+    async collectAttestations(block, txs, proposerAddress) {
         // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7962): inefficient to have a round trip in here - this should be cached
         const committee = await this.publisher.getCurrentEpochCommittee();
         if (committee.length === 0) {
@@ -550,7 +448,7 @@ export { SequencerState };
         const blockProposalOptions = {
             publishFullTxs: !!this.config.publishTxsWithProposals
         };
-        const proposal = await this.validatorClient.createBlockProposal(block.header.globalVariables.blockNumber, block.header.toPropose(), block.archive.root, block.header.state, txs, blockProposalOptions);
+        const proposal = await this.validatorClient.createBlockProposal(block.header.globalVariables.blockNumber, block.header.toPropose(), block.archive.root, block.header.state, txs, proposerAddress, blockProposalOptions);
         if (!proposal) {
             const msg = `Failed to create block proposal`;
             throw new Error(msg);
@@ -643,6 +541,9 @@ export { SequencerState };
     get maxL2BlockGas() {
         return this.config.maxL2BlockGas;
     }
+    getSlasherClient() {
+        return this.slasherClient;
+    }
 }
 _ts_decorate([
     trackSpan('Sequencer.work')

package/dest/sequencer/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthAddress } from '@aztec/foundation/eth-address';
-import { Signature } from '@aztec/foundation/eth-signature';
+import { CommitteeAttestation } from '@aztec/stdlib/block';
 import type { BlockAttestation } from '@aztec/stdlib/p2p';
 export declare enum SequencerState {
     /**
@@ -44,5 +44,5 @@ export declare function sequencerStateToNumber(state: SequencerState): number;
  *
  * @todo: perform this logic within the memory attestation store instead?
  */
-export declare function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): Signature[];
+export declare function orderAttestations(attestations: BlockAttestation[], orderAddresses: EthAddress[]): CommitteeAttestation[];
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,oBAAY,cAAc;IACxB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,qBAAqB,0BAA0B;IAC/C;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,uBAAuB,4BAA4B;IACnD;;OAEG;IACH,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,SAAS,EAAE,CAgB7G"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/sequencer/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,oBAAY,cAAc;IACxB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,IAAI,SAAS;IACb;;OAEG;IACH,aAAa,kBAAkB;IAC/B;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,qBAAqB,0BAA0B;IAC/C;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,uBAAuB,4BAA4B;IACnD;;OAEG;IACH,gBAAgB,qBAAqB;CACtC;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,cAAc,CAAC;AAE1D,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CAEpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,gBAAgB,EAAE,EAChC,cAAc,EAAE,UAAU,EAAE,GAC3B,oBAAoB,EAAE,CAqBxB"}

package/dest/sequencer/utils.js

@@ -1,4 +1,4 @@
-import { Signature } from '@aztec/foundation/eth-signature';
+import { CommitteeAttestation } from '@aztec/stdlib/block';
 export var SequencerState = /*#__PURE__*/ function(SequencerState) {
     /**
    * Sequencer is stopped and not processing any txs from the pool.
@@ -40,12 +40,14 @@ export function sequencerStateToNumber(state) {
     const attestationMap = new Map();
     for (const attestation of attestations){
         const sender = attestation.getSender();
-        attestationMap.set(sender.toString(), attestation);
+        if (sender) {
+            attestationMap.set(sender.toString(), CommitteeAttestation.fromAddressAndSignature(sender, attestation.signature));
+        }
     }
-    // Create the ordered array based on the orderAddresses, else return an empty signature
+    // Create the ordered array based on the orderAddresses, else return an empty attestation
     const orderedAttestations = orderAddresses.map((address)=>{
         const addressString = address.toString();
-        return attestationMap.get(addressString)?.signature || Signature.empty();
+        return attestationMap.get(addressString) || CommitteeAttestation.fromAddress(address);
     });
     return orderedAttestations;
 }

package/dest/tx_validator/tx_validator_factory.d.ts

@@ -1,8 +1,7 @@
 import type { ContractDataSource } from '@aztec/stdlib/contract';
 import type { GasFees } from '@aztec/stdlib/gas';
-import type { AllowedElement, ClientProtocolCircuitVerifier, MerkleTreeReadOperations } from '@aztec/stdlib/interfaces/server';
+import type { AllowedElement, ClientProtocolCircuitVerifier, MerkleTreeReadOperations, PublicProcessorValidator } from '@aztec/stdlib/interfaces/server';
 import { GlobalVariables, type Tx, type TxValidator } from '@aztec/stdlib/tx';
-import { NullifierCache } from './nullifier_cache.js';
 export declare function createValidatorForAcceptingTxs(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, verifier: ClientProtocolCircuitVerifier | undefined, { blockNumber, l1ChainId, rollupVersion, setupAllowList, gasFees, skipFeeEnforcement, }: {
     blockNumber: number;
     l1ChainId: number;
@@ -11,8 +10,5 @@ export declare function createValidatorForAcceptingTxs(db: MerkleTreeReadOperati
     gasFees: GasFees;
     skipFeeEnforcement?: boolean;
 }): TxValidator<Tx>;
-export declare function createValidatorForBlockBuilding(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): {
-    preprocessValidator: TxValidator<Tx>;
-    nullifierCache: NullifierCache;
-};
+export declare function createValidatorForBlockBuilding(db: MerkleTreeReadOperations, contractDataSource: ContractDataSource, globalVariables: GlobalVariables, setupAllowList: AllowedElement[]): PublicProcessorValidator;
 //# sourceMappingURL=tx_validator_factory.d.ts.map

package/dest/tx_validator/tx_validator_factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,WAAW,EACX,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GACA,WAAW,CAAC,EAAE,CAAC,CAwBjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B;IACD,mBAAmB,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACrC,cAAc,EAAE,cAAc,CAAC;CAChC,CAgBA"}
+{"version":3,"file":"tx_validator_factory.d.ts","sourceRoot":"","sources":["../../src/tx_validator/tx_validator_factory.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAC7B,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI9E,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,6BAA6B,GAAG,SAAS,EACnD,EACE,WAAW,EACX,SAAS,EACT,aAAa,EACb,cAAc,EACd,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,cAAc,EAAE,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GACA,WAAW,CAAC,EAAE,CAAC,CAwBjB;AAED,wBAAgB,+BAA+B,CAC7C,EAAE,EAAE,wBAAwB,EAC5B,kBAAkB,EAAE,kBAAkB,EACtC,eAAe,EAAE,eAAe,EAChC,cAAc,EAAE,cAAc,EAAE,GAC/B,wBAAwB,CAgB1B"}