@aztec/sequencer-client 0.53.0 → 0.55.0

package/dest/publisher/l1-publisher.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { type L2Block, type Signature } from '@aztec/circuit-types';
+import { type L2Block, type Signature, type TxHash } from '@aztec/circuit-types';
 import { EthAddress, type Header, type Proof } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
 import { type TelemetryClient } from '@aztec/telemetry-client';
@@ -40,6 +40,8 @@ export type L1ProcessArgs = {
     blockHash: Buffer;
     /** L2 block body. */
     body: Buffer;
+    /** L2 block tx hashes */
+    txHashes: TxHash[];
     /** Attestations */
     attestations?: Signature[];
 };
@@ -65,16 +67,15 @@ export type L1SubmitProofArgs = {
  * Adapted from https://github.com/AztecProtocol/aztec2-internal/blob/master/falafel/src/rollup_publisher.ts.
  */
 export declare class L1Publisher {
-    static SKIP_SIMULATION: boolean;
     private interruptibleSleep;
     private sleepTimeMs;
     private interrupted;
     private metrics;
     private log;
-    private availabilityOracleContract;
     private rollupContract;
     private publicClient;
     private account;
+    static PROPOSE_GAS_GUESS: bigint;
     constructor(config: TxSenderConfig & PublisherConfig, client: TelemetryClient);
     getSenderAddress(): Promise<EthAddress>;
     /**
@@ -101,14 +102,13 @@ export declare class L1Publisher {
         signatures: Signature[];
     }): Promise<void>;
     getCurrentEpochCommittee(): Promise<EthAddress[]>;
-    checkIfTxsAreAvailable(block: L2Block): Promise<boolean>;
     getTransactionStats(txHash: string): Promise<TransactionStats | undefined>;
     /**
-     * Publishes L2 block on L1.
-     * @param block - L2 block to publish.
+     * Proposes a L2 block on L1.
+     * @param block - L2 block to propose.
      * @returns True once the tx has been confirmed and is successful, false on revert or interrupt, blocks otherwise.
      */
-    processL2Block(block: L2Block, attestations?: Signature[]): Promise<boolean>;
+    proposeL2Block(block: L2Block, attestations?: Signature[], txHashes?: TxHash[]): Promise<boolean>;
     submitProof(header: Header, archiveRoot: Fr, proverId: Fr, aggregationObject: Fr[], proof: Proof): Promise<boolean>;
     /**
      * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
@@ -120,8 +120,6 @@ export declare class L1Publisher {
     /** Restarts the publisher after calling `interrupt`. */
     restart(): void;
     private sendSubmitProofTx;
-    private sendPublishTx;
-    private sendProposeWithoutBodyTx;
     private sendProposeTx;
     /**
      * Returns a tx receipt if the tx has been mined.

package/dest/publisher/l1-publisher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAA0B,UAAU,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEjG,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAMnD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAqB/D,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAGxE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,wDAAwD;IACxD,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC;CACb,CAAC;AAEF,6DAA6D;AAC7D,MAAM,MAAM,aAAa,GAAG;IAC1B,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB;IACnB,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;CAC5B,CAAC;AAEF,iEAAiE;AACjE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAChB,gCAAgC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,WAAW;IAQtB,OAAc,eAAe,UAAQ;IAErC,OAAO,CAAC,kBAAkB,CAA4B;IACtD,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,GAAG,CAAkD;IAE7D,OAAO,CAAC,0BAA0B,CAGhC;IACF,OAAO,CAAC,cAAc,CAGpB;IACF,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,OAAO,CAAoB;gBAEvB,MAAM,EAAE,cAAc,GAAG,eAAe,EAAE,MAAM,EAAE,eAAe;IA+BtE,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;IAI9C;;;;;;;;OAQG;IACU,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAMjF;;;;;;;;OAQG;IACU,0BAA0B,CACrC,MAAM,EAAE,MAAM,EACd,eAAe,GAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,SAAS,EAAE,CAAA;KAGzD,GACA,OAAO,CAAC,IAAI,CAAC;IA4BH,wBAAwB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAK9D,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlD,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAahF;;;;OAIG;IACU,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IA0E5E,WAAW,CACtB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,EAAE,EACf,QAAQ,EAAE,EAAE,EACZ,iBAAiB,EAAE,EAAE,EAAE,EACvB,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,OAAO,CAAC;IA8CnB;;;;;OAKG;IACI,SAAS;IAKhB,wDAAwD;IACjD,OAAO;YAIA,iBAAiB;YA8BjB,aAAa;YAoBb,wBAAwB;YAwCxB,aAAa;IA+C3B;;;;OAIG;IACG,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;cA8B3E,kBAAkB;CAGnC"}
+{"version":3,"file":"l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":"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"}

package/dest/publisher/l1-publisher.js

@@ -1,14 +1,16 @@
+import { getHashedSignaturePayload } from '@aztec/circuit-types';
 import { ETHEREUM_SLOT_DURATION, EthAddress } from '@aztec/circuits.js';
 import { createEthereumChain } from '@aztec/ethereum';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
 import { InterruptibleSleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
-import { AvailabilityOracleAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { RollupAbi } from '@aztec/l1-artifacts';
 import pick from 'lodash.pick';
-import { ContractFunctionRevertedError, createPublicClient, createWalletClient, getAddress, getContract, hexToBytes, http, } from 'viem';
+import { ContractFunctionRevertedError, createPublicClient, createWalletClient, encodeFunctionData, getAddress, getContract, hexToBytes, http, } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import { L1PublisherMetrics } from './l1-publisher-metrics.js';
+import { prettyLogVeimError } from './utils.js';
 /**
  * Publishes L2 blocks to L1. This implementation does *not* retry a transaction in
  * the event of network congestion, but should work for local development.
@@ -37,11 +39,6 @@ export class L1Publisher {
             chain: chain.chainInfo,
             transport: http(chain.rpcUrl),
         });
-        this.availabilityOracleContract = getContract({
-            address: getAddress(l1Contracts.availabilityOracleAddress.toString()),
-            abi: AvailabilityOracleAbi,
-            client: walletClient,
-        });
         this.rollupContract = getContract({
             address: getAddress(l1Contracts.rollupAddress.toString()),
             abi: RollupAbi,
@@ -86,6 +83,7 @@ export class L1Publisher {
             formattedSignatures,
             `0x${attestationData.digest.toString('hex')}`,
             ts,
+            `0x${header.contentCommitment.txsEffectsHash.toString('hex')}`,
             flags,
         ];
         try {
@@ -107,10 +105,6 @@ export class L1Publisher {
         const committee = await this.rollupContract.read.getCurrentEpochCommittee();
         return committee.map(EthAddress.fromString);
     }
-    checkIfTxsAreAvailable(block) {
-        const args = [`0x${block.body.getTxsEffectsHash().toString('hex').padStart(64, '0')}`];
-        return this.availabilityOracleContract.read.isAvailable(args);
-    }
     async getTransactionStats(txHash) {
         const tx = await this.publicClient.getTransaction({ hash: txHash });
         if (!tx) {
@@ -124,43 +118,37 @@ export class L1Publisher {
         };
     }
     /**
-     * Publishes L2 block on L1.
-     * @param block - L2 block to publish.
+     * Proposes a L2 block on L1.
+     * @param block - L2 block to propose.
      * @returns True once the tx has been confirmed and is successful, false on revert or interrupt, blocks otherwise.
      */
-    async processL2Block(block, attestations) {
+    async proposeL2Block(block, attestations, txHashes) {
         const ctx = {
             blockNumber: block.number,
             slotNumber: block.header.globalVariables.slotNumber.toBigInt(),
             blockHash: block.hash().toString(),
         };
-        const processTxArgs = {
+        const digest = getHashedSignaturePayload(block.archive.root, txHashes ?? []);
+        const proposeTxArgs = {
             header: block.header.toBuffer(),
             archive: block.archive.root.toBuffer(),
             blockHash: block.header.hash().toBuffer(),
             body: block.body.toBuffer(),
             attestations,
+            txHashes: txHashes ?? [],
         };
         // Publish body and propose block (if not already published)
         if (!this.interrupted) {
-            let txHash;
             const timer = new Timer();
-            const isAvailable = await this.checkIfTxsAreAvailable(block);
             // @note  This will make sure that we are passing the checks for our header ASSUMING that the data is also made available
             //        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.
             await this.validateBlockForSubmission(block.header, {
-                digest: block.archive.root.toBuffer(),
+                digest,
                 signatures: attestations ?? [],
             });
-            if (isAvailable) {
-                this.log.verbose(`Transaction effects of block ${block.number} already published.`, ctx);
-                txHash = await this.sendProposeWithoutBodyTx(processTxArgs);
-            }
-            else {
-                txHash = await this.sendProposeTx(processTxArgs);
-            }
+            const txHash = await this.sendProposeTx(proposeTxArgs);
             if (!txHash) {
                 this.log.info(`Failed to publish block ${block.number} to L1`, ctx);
                 return false;
@@ -255,11 +243,9 @@ export class L1Publisher {
                 `0x${aggregationObject.toString('hex')}`,
                 `0x${proof.toString('hex')}`,
             ];
-            if (!L1Publisher.SKIP_SIMULATION) {
-                await this.rollupContract.simulate.submitBlockRootProof(args, {
-                    account: this.account,
-                });
-            }
+            await this.rollupContract.simulate.submitBlockRootProof(args, {
+                account: this.account,
+            });
             return await this.rollupContract.write.submitBlockRootProof(args, {
                 account: this.account,
             });
@@ -269,102 +255,44 @@ export class L1Publisher {
             return undefined;
         }
     }
-    // This is used in `integration_l1_publisher.test.ts` currently. Could be removed though.
-    async sendPublishTx(encodedBody) {
+    async sendProposeTx(encodedData) {
         if (!this.interrupted) {
             try {
-                this.log.info(`TxEffects size=${encodedBody.length} bytes`);
-                const args = [`0x${encodedBody.toString('hex')}`];
-                await this.availabilityOracleContract.simulate.publish(args, {
-                    account: this.account,
+                // We have to jump a few hoops because viem is not happy around estimating gas for view functions
+                const computeTxsEffectsHashGas = await this.publicClient.estimateGas({
+                    to: this.rollupContract.address,
+                    data: encodeFunctionData({
+                        abi: this.rollupContract.abi,
+                        functionName: 'computeTxsEffectsHash',
+                        args: [`0x${encodedData.body.toString('hex')}`],
+                    }),
                 });
-                return await this.availabilityOracleContract.write.publish(args, {
+                const min = (a, b) => (a > b ? b : a);
+                // @note  We perform this guesstimate instead of the usual `gasEstimate` since
+                //        viem will use the current state to simulate against, which means that
+                //        we will fail estimation in the case where we are simulating for the
+                //        first ethereum block within our slot (as current time is not in the
+                //        slot yet).
+                const gasGuesstimate = min(computeTxsEffectsHashGas + L1Publisher.PROPOSE_GAS_GUESS, 15000000n);
+                const attestations = encodedData.attestations
+                    ? encodedData.attestations.map(attest => attest.toViemSignature())
+                    : [];
+                const txHashes = encodedData.txHashes ? encodedData.txHashes.map(txHash => txHash.to0xString()) : [];
+                const args = [
+                    `0x${encodedData.header.toString('hex')}`,
+                    `0x${encodedData.archive.toString('hex')}`,
+                    `0x${encodedData.blockHash.toString('hex')}`,
+                    txHashes,
+                    attestations,
+                    `0x${encodedData.body.toString('hex')}`,
+                ];
+                return await this.rollupContract.write.propose(args, {
                     account: this.account,
+                    gas: gasGuesstimate,
                 });
             }
             catch (err) {
-                this.log.error(`TxEffects publish failed`, err);
-                return undefined;
-            }
-        }
-    }
-    async sendProposeWithoutBodyTx(encodedData) {
-        if (!this.interrupted) {
-            try {
-                if (encodedData.attestations) {
-                    const attestations = encodedData.attestations.map(attest => attest.toViemSignature());
-                    const args = [
-                        `0x${encodedData.header.toString('hex')}`,
-                        `0x${encodedData.archive.toString('hex')}`,
-                        `0x${encodedData.blockHash.toString('hex')}`,
-                        attestations,
-                    ];
-                    if (!L1Publisher.SKIP_SIMULATION) {
-                        await this.rollupContract.simulate.propose(args, { account: this.account });
-                    }
-                    return await this.rollupContract.write.propose(args, {
-                        account: this.account,
-                    });
-                }
-                else {
-                    const args = [
-                        `0x${encodedData.header.toString('hex')}`,
-                        `0x${encodedData.archive.toString('hex')}`,
-                        `0x${encodedData.blockHash.toString('hex')}`,
-                    ];
-                    if (!L1Publisher.SKIP_SIMULATION) {
-                        await this.rollupContract.simulate.propose(args, { account: this.account });
-                    }
-                    return await this.rollupContract.write.propose(args, {
-                        account: this.account,
-                    });
-                }
-            }
-            catch (err) {
-                this.log.error(`Rollup publish failed`, err);
-                return undefined;
-            }
-        }
-    }
-    async sendProposeTx(encodedData) {
-        if (!this.interrupted) {
-            try {
-                if (encodedData.attestations) {
-                    const attestations = encodedData.attestations.map(attest => attest.toViemSignature());
-                    const args = [
-                        `0x${encodedData.header.toString('hex')}`,
-                        `0x${encodedData.archive.toString('hex')}`,
-                        `0x${encodedData.blockHash.toString('hex')}`,
-                        attestations,
-                        `0x${encodedData.body.toString('hex')}`,
-                    ];
-                    if (!L1Publisher.SKIP_SIMULATION) {
-                        await this.rollupContract.simulate.propose(args, {
-                            account: this.account,
-                        });
-                    }
-                    return await this.rollupContract.write.propose(args, {
-                        account: this.account,
-                    });
-                }
-                else {
-                    const args = [
-                        `0x${encodedData.header.toString('hex')}`,
-                        `0x${encodedData.archive.toString('hex')}`,
-                        `0x${encodedData.blockHash.toString('hex')}`,
-                        `0x${encodedData.body.toString('hex')}`,
-                    ];
-                    if (!L1Publisher.SKIP_SIMULATION) {
-                        await this.rollupContract.simulate.propose(args, {
-                            account: this.account,
-                        });
-                    }
-                    return await this.rollupContract.write.propose(args, {
-                        account: this.account,
-                    });
-                }
-            }
-            catch (err) {
+                prettyLogVeimError(err, this.log);
                 this.log.error(`Rollup publish failed`, err);
                 return undefined;
             }
@@ -406,14 +334,7 @@ export class L1Publisher {
         await this.interruptibleSleep.sleep(this.sleepTimeMs);
     }
 }
-// @note  If we want to simulate in the future, we have to skip the viem simulations and use `reads` instead
-//        This is because the viem simulations are not able to simulate the future, only the current state.
-//        This means that we will be simulating as if `block.timestamp` is the same for the next block
-//        as for the last block.
-//        Nevertheless, it can be quite useful for figuring out why exactly the transaction is failing
-//        as a middle ground right now, we will be skipping the simulation and just sending the transaction
-//        but only after we have done a successful run of the `validateHeader` for the timestamp in the future.
-L1Publisher.SKIP_SIMULATION = true;
+L1Publisher.PROPOSE_GAS_GUESS = 500000n;
 /**
  * Returns cost of calldata usage in Ethereum.
  * @param data - Calldata.
@@ -422,4 +343,4 @@ L1Publisher.SKIP_SIMULATION = true;
 function getCalldataGasUsage(data) {
     return data.filter(byte => byte === 0).length * 4 + data.filter(byte => byte !== 0).length * 16;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1-publisher.js","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1-publisher.js","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":"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"}

package/dest/publisher/utils.d.ts

@@ -0,0 +1,3 @@
+import { type Logger } from '@aztec/foundation/log';
+export declare function prettyLogVeimError(err: any, logger: Logger): void;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/publisher/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,QAU1D"}

package/dest/publisher/utils.js

@@ -0,0 +1,12 @@
+import { BaseError, ContractFunctionRevertedError } from 'viem';
+export function prettyLogVeimError(err, logger) {
+    if (err instanceof BaseError) {
+        const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
+        if (revertError instanceof ContractFunctionRevertedError) {
+            const errorName = revertError.data?.errorName ?? '';
+            const args = revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
+            logger.debug(`canProposeAtTime failed with "${errorName}${args}"`);
+        }
+    }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxTQUFTLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEUsTUFBTSxVQUFVLGtCQUFrQixDQUFDLEdBQVEsRUFBRSxNQUFjO0lBQ3pELElBQUksR0FBRyxZQUFZLFNBQVMsRUFBRSxDQUFDO1FBQzdCLE1BQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFlBQVksNkJBQTZCLENBQUMsQ0FBQztRQUNsRixJQUFJLFdBQVcsWUFBWSw2QkFBNkIsRUFBRSxDQUFDO1lBQ3pELE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQyxJQUFJLEVBQUUsU0FBUyxJQUFJLEVBQUUsQ0FBQztZQUNwRCxNQUFNLElBQUksR0FDUixXQUFXLENBQUMsWUFBWSxJQUFJLFdBQVcsQ0FBQyxZQUFZLEVBQUUsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ2xILE1BQU0sQ0FBQyxLQUFLLENBQUMsaUNBQWlDLFNBQVMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDO1FBQ3JFLENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQyJ9

package/dest/sequencer/sequencer.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" resolution-mode="require"/>
-import { type L1ToL2MessageSource, type L2Block, type L2BlockSource, type ProcessedTx, Signature, Tx, type TxValidator } from '@aztec/circuit-types';
+import { type L1ToL2MessageSource, type L2Block, type L2BlockSource, type ProcessedTx, Signature, Tx, type TxHash, type TxValidator } from '@aztec/circuit-types';
 import { AztecAddress, EthAddress, Header } from '@aztec/circuits.js';
 import { type P2P } from '@aztec/p2p';
 import { type PublicProcessorFactory } from '@aztec/simulator';
@@ -107,12 +107,12 @@ export declare class Sequencer {
     private buildBlockAndPublish;
     /** Forces the sequencer to bypass all time and tx count checks for the next block and build anyway. */
     flush(): void;
-    protected collectAttestations(block: L2Block): Promise<Signature[] | undefined>;
+    protected collectAttestations(block: L2Block, txHashes: TxHash[]): Promise<Signature[] | undefined>;
     /**
      * Publishes the L2Block to the rollup contract.
      * @param block - The L2Block to be published.
      */
-    protected publishL2Block(block: L2Block, attestations?: Signature[]): Promise<void>;
+    protected publishL2Block(block: L2Block, attestations?: Signature[], txHashes?: TxHash[]): Promise<void>;
     protected takeValidTxs<T extends Tx | ProcessedTx>(txs: T[], validator: TxValidator<T>): Promise<T[]>;
     protected takeTxsWithinMaxSize(txs: Tx[]): Tx[];
     /**

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":"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"}

package/dest/sequencer/sequencer.js

@@ -7,7 +7,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { Timer, elapsed } from '@aztec/foundation/timer';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
-import { BaseError, ContractFunctionRevertedError } from 'viem';
+import { prettyLogVeimError } from '../publisher/utils.js';
 import { SequencerMetrics } from './metrics.js';
 /**
  * Sequencer client
@@ -234,16 +234,7 @@ let Sequencer = (() => {
                     return slot;
                 }
                 catch (err) {
-                    if (err instanceof BaseError) {
-                        const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
-                        if (revertError instanceof ContractFunctionRevertedError) {
-                            const errorName = revertError.data?.errorName ?? '';
-                            const args = revertError.metaMessages && revertError.metaMessages?.length > 1
-                                ? revertError.metaMessages[1].trimStart()
-                                : '';
-                            this.log.debug(`canProposeAtTime failed with "${errorName}${args}"`);
-                        }
-                    }
+                    prettyLogVeimError(err, this.log);
                     throw err;
                 }
             }
@@ -361,10 +352,13 @@ let Sequencer = (() => {
                 if (this.isFlushing) {
                     this.log.verbose(`Flushing completed`);
                 }
+                const txHashes = validTxs.map(tx => tx.getTxHash());
                 this.isFlushing = false;
-                const attestations = await this.collectAttestations(block);
+                this.log.verbose('Collecting attestations');
+                const attestations = await this.collectAttestations(block, txHashes);
+                this.log.verbose('Attestations collected');
                 try {
-                    await this.publishL2Block(block, attestations);
+                    await this.publishL2Block(block, attestations, txHashes);
                     this.metrics.recordPublishedBlock(workDuration);
                     this.log.info(`Submitted rollup block ${block.number} with ${processedTxs.length} transactions duration=${workDuration}ms (Submitter: ${await this.publisher.getSenderAddress()})`);
                 }
@@ -377,10 +371,12 @@ let Sequencer = (() => {
             flush() {
                 this.isFlushing = true;
             }
-            async collectAttestations(block) {
+            async collectAttestations(block, txHashes) {
                 // 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();
+                this.log.debug(`Attesting committee length ${committee.length}`);
                 if (committee.length === 0) {
+                    this.log.debug(`Attesting committee length is 0, skipping`);
                     return undefined;
                 }
                 if (!this.validatorClient) {
@@ -389,13 +385,14 @@ let Sequencer = (() => {
                     throw new Error(msg);
                 }
                 const numberOfRequiredAttestations = Math.floor((committee.length * 2) / 3) + 1;
-                // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7974): we do not have transaction[] lists in the block for now
-                // Dont do anything with the proposals for now - just collect them
-                const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, []);
+                this.log.verbose('Creating block proposal');
+                const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, txHashes);
                 this.state = SequencerState.PUBLISHING_BLOCK_TO_PEERS;
+                this.log.verbose('Broadcasting block proposal to validators');
                 this.validatorClient.broadcastBlockProposal(proposal);
                 this.state = SequencerState.WAITING_FOR_ATTESTATIONS;
                 const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations);
+                this.log.verbose(`Collected attestations from validators, number of attestations: ${attestations.length}`);
                 // note: the smart contract requires that the signatures are provided in the order of the committee
                 return await orderAttestations(attestations, committee);
             }
@@ -403,10 +400,10 @@ let Sequencer = (() => {
              * Publishes the L2Block to the rollup contract.
              * @param block - The L2Block to be published.
              */
-            async publishL2Block(block, attestations) {
+            async publishL2Block(block, attestations, txHashes) {
                 // Publishes new block to the network and awaits the tx to be mined
                 this.state = SequencerState.PUBLISHING_BLOCK;
-                const publishedL2Block = await this.publisher.processL2Block(block, attestations);
+                const publishedL2Block = await this.publisher.proposeL2Block(block, attestations, txHashes);
                 if (publishedL2Block) {
                     this.lastPublishedBlock = block.number;
                 }
@@ -542,4 +539,4 @@ async function orderAttestations(attestations, orderAddresses) {
     });
     return orderedAttestations;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":";AAAA,OAAO,EAML,SAAS,EACT,EAAE,GAGH,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAuB,eAAe,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEvG,OAAO,EACL,sBAAsB,EACtB,YAAY,EACZ,iBAAiB,EACjB,UAAU,EACV,oBAAoB,EACpB,MAAM,EACN,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAqC,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAOnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAQhD;;;;;;;;GAQG;IACU,SAAS;;;;;sBAAT,SAAS;YAkBpB,YACU,SAAsB,EACtB,eAA4C,EAAE,wDAAwD;YACtG,cAAqC,EACrC,SAAc,EACd,UAAkC,EAClC,mBAAwC,EACxC,aAA4B,EAC5B,mBAAwC,EACxC,sBAA8C,EAC9C,kBAAsC,EAC9C,SAA0B,EAClB,SAA0B,EAAE,EAC5B,MAAM,iBAAiB,CAAC,iBAAiB,CAAC;gBAZ1C,cAAS,IAnBR,mDAAS,EAmBV,SAAS,EAAa;gBACtB,oBAAe,GAAf,eAAe,CAA6B;gBAC5C,mBAAc,GAAd,cAAc,CAAuB;gBACrC,cAAS,GAAT,SAAS,CAAK;gBACd,eAAU,GAAV,UAAU,CAAwB;gBAClC,wBAAmB,GAAnB,mBAAmB,CAAqB;gBACxC,kBAAa,GAAb,aAAa,CAAe;gBAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;gBACxC,2BAAsB,GAAtB,sBAAsB,CAAwB;gBAC9C,uBAAkB,GAAlB,kBAAkB,CAAoB;gBAEtC,WAAM,GAAN,MAAM,CAAsB;gBAC5B,QAAG,GAAH,GAAG,CAAuC;gBA7B5C,sBAAiB,GAAW,IAAI,CAAC;gBACjC,mBAAc,GAAG,EAAE,CAAC;gBACpB,mBAAc,GAAG,CAAC,CAAC;gBACnB,4BAAuB,GAAG,CAAC,CAAC;gBAC5B,4BAAuB,GAAG,CAAC,CAAC;gBACpC,6EAA6E;gBACrE,cAAS,GAAG,UAAU,CAAC,IAAI,CAAC;gBAC5B,kBAAa,GAAG,YAAY,CAAC,IAAI,CAAC;gBAClC,uBAAkB,GAAG,CAAC,CAAC;gBACvB,UAAK,GAAG,cAAc,CAAC,OAAO,CAAC;gBAC/B,mBAAc,GAAqB,EAAE,CAAC;gBACtC,sBAAiB,GAAqB,EAAE,CAAC;gBACzC,wBAAmB,GAAW,IAAI,GAAG,IAAI,CAAC;gBAE1C,eAAU,GAAY,KAAK,CAAC;gBAiBlC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gBAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBAC9E,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,8BAA8B,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,iBAAiB,CAAC,CAAC;YAC9G,CAAC;YAED,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC7B,CAAC;YAED;;;eAGG;YACI,YAAY,CAAC,MAAuB;gBACzC,IAAI,MAAM,CAAC,4BAA4B,KAAK,SAAS,EAAE,CAAC;oBACtD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,4BAA4B,CAAC;gBAC/D,CAAC;gBACD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;oBACxC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;gBAC9C,CAAC;gBACD,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;oBACxC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;gBAC9C,CAAC;gBACD,IAAI,MAAM,CAAC,uBAAuB,KAAK,SAAS,EAAE,CAAC;oBACjD,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAC;gBAChE,CAAC;gBACD,IAAI,MAAM,CAAC,uBAAuB,KAAK,SAAS,EAAE,CAAC;oBACjD,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAC;gBAChE,CAAC;gBACD,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;oBACpB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;gBACnC,CAAC;gBACD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;oBACxB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;gBAC3C,CAAC;gBACD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;oBAC1B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;gBAC9C,CAAC;gBACD,IAAI,MAAM,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;oBAC7C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;gBACxD,CAAC;gBACD,yGAAyG;gBACzG,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;oBAC7B,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;gBACpD,CAAC;gBACD,6GAA6G;gBAC7G,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,CAAC;YAED;;eAEG;YACI,KAAK,CAAC,KAAK;gBAChB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEzB,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBACvF,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC;gBACjC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACrC,CAAC;YAED;;eAEG;YACI,KAAK,CAAC,IAAI;gBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBACrC,MAAM,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC;gBACpC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACrC,CAAC;YAED;;eAEG;YACI,OAAO;gBACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBACtC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACzB,IAAI,CAAC,cAAe,CAAC,KAAK,EAAE,CAAC;gBAC7B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC;YACnC,CAAC;YAED;;;eAGG;YACI,MAAM;gBACX,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;YAC/B,CAAC;YAES,KAAK,CAAC,WAAW;gBACzB,kGAAkG;gBAClG,IAAI,CAAC,kBAAkB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;YAC5G,CAAC;YAED;;;;;;;eAOG;YACO,KAAK,CAAC,IAAI;gBAClB,uDAAuD;gBACvD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnD,wFAAwF;gBACxF,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;oBACtE,OAAO;gBACT,CAAC;gBAED,IAAI,eAAe,IAAI,IAAI,CAAC,KAAK,KAAK,cAAc,CAAC,gBAAgB,EAAE,CAAC;oBACtE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBACxC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC;gBACnC,CAAC;gBAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvD,MAAM,gBAAgB,GAAG,QAAQ,EAAE,MAAM,CAAC;gBAE1C,MAAM,cAAc,GAClB,CAAC,gBAAgB,KAAK,SAAS;oBAC7B,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE;oBAC3C,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBAE3E,mDAAmD;gBACnD,MAAM,eAAe,GACnB,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAEtG,IAAI,IAAY,CAAC;gBACjB,IAAI,CAAC;oBACH,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;gBAC7E,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,cAAc,EAAE,CAAC,CAAC;oBAC7D,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC,EAAE,CAAC;oBACnD,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,eAAe,CAAC;gBAE5C,kCAAkC;gBAClC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAEpD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,eAAe,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;oBACvF,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,UAAU,CAAC,MAAM,oBAAoB,CAAC,CAAC;gBAEnE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CACvE,IAAI,EAAE,CAAC,cAAc,CAAC,EACtB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,aAAa,EAClB,IAAI,CACL,CAAC;gBAEF,6EAA6E;gBAC7E,MAAM,cAAc,GAAG,IAAI,MAAM,CAC/B,IAAI,sBAAsB,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,EAC7D,iBAAiB,CAAC,KAAK,EAAE,EACzB,cAAc,CAAC,KAAK,EAAE,EACtB,kBAAkB,EAClB,EAAE,CAAC,IAAI,CACR,CAAC;gBAEF,iGAAiG;gBACjG,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CACzC,UAAU,EACV,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,IAAI,CAAC,cAAc,CAAC,CACpF,CAAC;gBAEF,sGAAsG;gBACtG,uGAAuG;gBACvG,uGAAuG;gBACvG,wGAAwG;gBACxG,oEAAoE;gBACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBAExD,yCAAyC;gBACzC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;oBACnF,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC;oBACH,8FAA8F;oBAC9F,8FAA8F;oBAC9F,oCAAoC;oBACpC,MAAM,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;gBAC9E,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,eAAe,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC3C,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;wBACvD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,QAAQ,CAAC,MAAM,gBAAgB,CAAC,CAAC;wBACjF,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;oBAC3C,CAAC;oBACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2DAA2D,EAAG,GAAW,CAAC,KAAK,CAAC,CAAC;oBAChG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC/C,CAAC;YACH,CAAC;YAED,+HAA+H;YACvH,uBAAuB,CAAC,gBAAoC;gBAClE,MAAM,aAAa,GAAG,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAClF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;gBAClD,MAAM,OAAO,GAAG,WAAW,GAAG,aAAa,CAAC;gBAE5C,OAAO,IAAI,CAAC,uBAAuB,GAAG,CAAC,IAAI,OAAO,IAAI,IAAI,CAAC,uBAAuB,CAAC;YACrF,CAAC;YAED,KAAK,CAAC,eAAe,CAAC,UAAkB,EAAE,mBAA2B;gBACnE,oFAAoF;gBACpF,IAAI,CAAC;oBACH,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;oBAEtF,IAAI,mBAAmB,KAAK,WAAW,EAAE,CAAC;wBACxC,MAAM,GAAG,GAAG,mCAAmC,mBAAmB,YAAY,WAAW,EAAE,CAAC;wBAC5F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;wBACpB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvB,CAAC;oBAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,mBAAmB,YAAY,IAAI,EAAE,CAAC,CAAC;oBAC3E,OAAO,IAAI,CAAC;gBACd,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;oBAClC,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;YAED,kBAAkB,CAAC,gBAAoC,EAAE,IAAuB;gBAC9E,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;oBAC1D,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,gDAAgD;gBAChD,MAAM,aAAa,GAAG,gBAAgB,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAClF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;gBAClD,MAAM,qBAAqB,GAAG,WAAW,GAAG,aAAa,CAAC;gBAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,uBAAuB,aAAa,oBAAoB,WAAW,aAAa,qBAAqB,GAAG,CACzG,CAAC;gBAEF,8FAA8F;gBAC9F,kFAAkF;gBAClF,IAAI,IAAI,CAAC,uBAAuB,GAAG,CAAC,IAAI,qBAAqB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC7F,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,8CAA8C,IAAI,CAAC,uBAAuB,8BAA8B,CACzG,CAAC;oBACF,OAAO,KAAK,CAAC;gBACf,CAAC;gBAED,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;gBAEjE,8FAA8F;gBAC9F,IAAI,IAAI,CAAC,eAAe,IAAI,SAAS,EAAE,CAAC;oBACtC,IAAI,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;wBAC/C,IAAI,SAAS,EAAE,CAAC;4BACd,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4BAA4B,IAAI,CAAC,eAAe,qBAAqB,IAAI,CAAC,uBAAuB,gCAAgC,CAClI,CAAC;wBACJ,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,8DAA8D,IAAI,CAAC,eAAe,QAAQ,IAAI,CAAC,cAAc,GAAG,CACjH,CAAC;4BACF,OAAO,KAAK,CAAC;wBACf,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,yCAAyC;gBACzC,IAAI,IAAI,CAAC,aAAa,IAAI,SAAS,EAAE,CAAC;oBACpC,yCAAyC;oBACzC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;wBAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,6EAA6E,IAAI,CAAC,aAAa,QAAQ,IAAI,CAAC,cAAc,GAAG,CAC9H,CAAC;wBACF,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;gBAED,yGAAyG;gBACzG,6GAA6G;gBAC7G,6GAA6G;gBAC7G,kBAAkB;gBAClB,IAAI,IAAI,CAAC,iBAAiB,IAAI,SAAS,EAAE,CAAC;oBACxC,IAAI,IAAI,CAAC,iBAAiB,KAAK,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;wBAC1E,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oDAAoD,CAAC,CAAC;wBACvE,OAAO,KAAK,CAAC;oBACf,CAAC;gBACH,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC;YAED;;;;;;;;;eASG;YAIK,KAAK,CAAC,oBAAoB,CAChC,QAAc,EACd,cAAsB,EACtB,gBAAoC;gBAEpC,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC;gBAEhE,MAAM,kBAAkB,GAAG,cAAc,CAAC,eAAe,CAAC;gBAE1D,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,kBAAkB,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACxF,MAAM,SAAS,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC9B,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,cAAc,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,kBAAkB,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,QAAQ,CAAC,MAAM,eAAe,CAAC,CAAC;gBAElH,0CAA0C;gBAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;gBAC7D,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACnH,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,aAAa,cAAc,CAAC,MAAM,gCAAgC,kBAAkB,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,CAC9G,CAAC;gBAEF,sFAAsF;gBACtF,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;gBAE3F,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;gBACnC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;gBAE1C,MAAM,kBAAkB,GAAG,IAAI,KAAK,EAAE,CAAC;gBACvC,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;gBAClF,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,SAAS,EAAE,kBAAkB,EAAE,cAAc,CAAC,CAAC;gBAEpG,MAAM,CAAC,uBAAuB,EAAE,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,CAC9E,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,EAAE,CAAC,CACzG,CAAC;gBACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACzB,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC/E,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;gBAC7D,CAAC;gBAED,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,cAAc,CAAC,CAAC;gBAEhE,IACE,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE;oBACzC,aAAa,EAAE,QAAQ,CAAC,MAAM;oBAC9B,iBAAiB,EAAE,YAAY,CAAC,MAAM;iBACvC,CAAC,EACF,CAAC;oBACD,YAAY,CAAC,WAAW,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBAClD,CAAC;gBAED,yFAAyF;gBACzF,MAAM,YAAY,CAAC,iBAAiB,EAAE,CAAC;gBAEvC,qFAAqF;gBACrF,kFAAkF;gBAClF,yEAAyE;gBACzE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,cAAc,CAAC;gBAChD,IAAI,MAAM,CAAC,MAAM,KAAK,cAAc,CAAC,OAAO,EAAE,CAAC;oBAC7C,MAAM,IAAI,KAAK,CAAC,iCAAiC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBACpE,CAAC;gBAED,+BAA+B;gBAC/B,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,YAAY,CAAC,aAAa,EAAE,CAAC;gBAErD,MAAM,IAAI,CAAC,SAAS,CAAC,0BAA0B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAE9D,MAAM,YAAY,GAAG,SAAS,CAAC,EAAE,EAAE,CAAC;gBACpC,IAAI,CAAC,GAAG,CAAC,OAAO,CACd,mBAAmB,KAAK,CAAC,MAAM,oBAAoB,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CACvG,KAAK,CACN,GAAG,EACJ;oBACE,SAAS,EAAE,gBAAgB;oBAC3B,QAAQ,EAAE,YAAY;oBACtB,qBAAqB,EAAE,uBAAuB;oBAC9C,sBAAsB,EAAE,kBAAkB,CAAC,EAAE,EAAE;oBAC/C,GAAG,KAAK,CAAC,QAAQ,EAAE;iBACQ,CAC9B,CAAC;gBAEF,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;gBACzC,CAAC;gBAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;gBAEpD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;gBACxB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;gBAC5C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBACrE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;gBAE3C,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;oBACzD,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;oBAChD,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,0BAA0B,KAAK,CAAC,MAAM,SACpC,YAAY,CAAC,MACf,0BAA0B,YAAY,kBAAkB,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,GAAG,CACnG,CAAC;gBACJ,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;oBACjC,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;YAED,uGAAuG;YAChG,KAAK;gBACV,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACzB,CAAC;YAES,KAAK,CAAC,mBAAmB,CAAC,KAAc,EAAE,QAAkB;gBACpE,sIAAsI;gBACtI,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,wBAAwB,EAAE,CAAC;gBAClE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;gBAEjE,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;oBAC5D,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC1B,MAAM,GAAG,GAAG,uDAAuD,CAAC;oBACpE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;gBACvB,CAAC;gBAED,MAAM,4BAA4B,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAEhF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;gBAC5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAE5G,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,yBAAyB,CAAC;gBACtD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;gBAC9D,IAAI,CAAC,eAAe,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;gBAEtD,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,wBAAwB,CAAC;gBACrD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC;gBAC5G,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mEAAmE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;gBAE3G,mGAAmG;gBACnG,OAAO,MAAM,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;YAC1D,CAAC;YAED;;;eAGG;YAIO,KAAK,CAAC,cAAc,CAAC,KAAc,EAAE,YAA0B,EAAE,QAAmB;gBAC5F,mEAAmE;gBACnE,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,gBAAgB,CAAC;gBAE7C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;gBAC5F,IAAI,gBAAgB,EAAE,CAAC;oBACrB,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,MAAM,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;YAES,KAAK,CAAC,YAAY,CAA6B,GAAQ,EAAE,SAAyB;gBAC1F,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBAC1D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC7F,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBACxD,CAAC;gBAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAC7C,CAAC;YAES,oBAAoB,CAAC,GAAS;gBACtC,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC;gBACzC,IAAI,SAAS,GAAG,CAAC,CAAC;gBAElB,MAAM,QAAQ,GAAS,EAAE,CAAC;gBAC1B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;oBACrB,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAAC;oBAC5E,IAAI,SAAS,GAAG,MAAM,GAAG,OAAO,EAAE,CAAC;wBACjC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,eAAe,EAAE,CAAC,SAAS,EAAE,wBAAwB,MAAM,qBAAqB,OAAO,mCAAmC,SAAS,GAAG,CACvI,CAAC;wBACF,SAAS;oBACX,CAAC;oBACD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAClB,SAAS,IAAI,MAAM,CAAC;gBACtB,CAAC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED;;;eAGG;YACO,KAAK,CAAC,aAAa;gBAC3B,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACrC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;oBACzE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;oBACvD,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE;oBACnC,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE;iBAC1C,CAAC,CAAC;gBACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;gBACtC,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE,aAAa,EAAE,mBAAmB,CAAC,GAAG,YAAY,CAAC;gBAC3E,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,kBAAkB,CAAC;gBAC9C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,kBAAkB,IAAI,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACjH,UAAU;oBACV,GAAG;oBACH,aAAa;oBACb,mBAAmB;iBACpB,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,IAAI,QAAQ;gBACV,OAAO,IAAI,CAAC,SAAS,CAAC;YACxB,CAAC;YAED,IAAI,YAAY;gBACd,OAAO,IAAI,CAAC,aAAa,CAAC;YAC5B,CAAC;;;;gDAlOA,SAAS,CAAC,gCAAgC,EAAE,CAAC,SAAS,EAAE,cAAc,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAC;oBAC9F,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE;iBACjF,CAAC,CAAC;0CAsJF,SAAS,CAAC,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBAC/C,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM;iBACxC,CAAC,CAAC;YAvJH,6MAAc,oBAAoB,6DAyGjC;YA+CD,2LAAgB,cAAc,6DAU7B;;;;;SAvfU,SAAS;AAujBtB;;GAEG;AACH,MAAM,CAAN,IAAY,cAiCX;AAjCD,WAAY,cAAc;IACxB;;OAEG;IACH,mDAAI,CAAA;IACJ;;OAEG;IACH,yEAAe,CAAA;IACf;;OAEG;IACH,uEAAc,CAAA;IACd;;OAEG;IACH,6FAAyB,CAAA;IACzB;;OAEG;IACH,2FAAwB,CAAA;IACxB;;OAEG;IACH,2FAAwB,CAAA;IACxB;;OAEG;IACH,2EAAgB,CAAA;IAChB;;OAEG;IACH,yDAAO,CAAA;AACT,CAAC,EAjCW,cAAc,KAAd,cAAc,QAiCzB;AAED;;;;;;GAMG;AACH,KAAK,UAAU,iBAAiB,CAAC,YAAgC,EAAE,cAA4B;IAC7F,wDAAwD;IACxD,MAAM,cAAc,GAAG,IAAI,GAAG,EAA4B,CAAC;IAE3D,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;QAC7C,IAAI,MAAM,EAAE,CAAC;YACX,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,uFAAuF;IACvF,MAAM,mBAAmB,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACvD,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACzC,OAAO,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,SAAS,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,OAAO,mBAAmB,CAAC;AAC7B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/sequencer-client",
-  "version": "0.53.0",
+  "version": "0.55.0",
   "type": "module",
   "exports": "./dest/index.js",
   "typedocOptions": {
@@ -24,24 +24,24 @@
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.53.0",
-    "@aztec/bb-prover": "0.53.0",
-    "@aztec/circuit-types": "0.53.0",
-    "@aztec/circuits.js": "0.53.0",
-    "@aztec/ethereum": "0.53.0",
-    "@aztec/foundation": "0.53.0",
-    "@aztec/l1-artifacts": "0.53.0",
-    "@aztec/merkle-tree": "0.53.0",
-    "@aztec/noir-contracts.js": "0.53.0",
-    "@aztec/noir-protocol-circuits-types": "0.53.0",
-    "@aztec/p2p": "0.53.0",
-    "@aztec/protocol-contracts": "0.53.0",
-    "@aztec/prover-client": "0.53.0",
-    "@aztec/simulator": "0.53.0",
-    "@aztec/telemetry-client": "0.53.0",
-    "@aztec/types": "0.53.0",
-    "@aztec/validator-client": "0.53.0",
-    "@aztec/world-state": "0.53.0",
+    "@aztec/aztec.js": "0.55.0",
+    "@aztec/bb-prover": "0.55.0",
+    "@aztec/circuit-types": "0.55.0",
+    "@aztec/circuits.js": "0.55.0",
+    "@aztec/ethereum": "0.55.0",
+    "@aztec/foundation": "0.55.0",
+    "@aztec/l1-artifacts": "0.55.0",
+    "@aztec/merkle-tree": "0.55.0",
+    "@aztec/noir-contracts.js": "0.55.0",
+    "@aztec/noir-protocol-circuits-types": "0.55.0",
+    "@aztec/p2p": "0.55.0",
+    "@aztec/protocol-contracts": "0.55.0",
+    "@aztec/prover-client": "0.55.0",
+    "@aztec/simulator": "0.55.0",
+    "@aztec/telemetry-client": "0.55.0",
+    "@aztec/types": "0.55.0",
+    "@aztec/validator-client": "0.55.0",
+    "@aztec/world-state": "0.55.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "lodash.chunk": "^4.2.0",

package/src/publisher/l1-publisher.ts

@@ -1,4 +1,5 @@
-import { type L2Block, type Signature } from '@aztec/circuit-types';
+import { type L2Block, type Signature, type TxHash } from '@aztec/circuit-types';
+import { getHashedSignaturePayload } from '@aztec/circuit-types';
 import { type L1PublishBlockStats, type L1PublishProofStats } from '@aztec/circuit-types/stats';
 import { ETHEREUM_SLOT_DURATION, EthAddress, type Header, type Proof } from '@aztec/circuits.js';
 import { createEthereumChain } from '@aztec/ethereum';
@@ -7,7 +8,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { serializeToBuffer } from '@aztec/foundation/serialize';
 import { InterruptibleSleep } from '@aztec/foundation/sleep';
 import { Timer } from '@aztec/foundation/timer';
-import { AvailabilityOracleAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { RollupAbi } from '@aztec/l1-artifacts';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 
 import pick from 'lodash.pick';
@@ -21,6 +22,7 @@ import {
   type WalletClient,
   createPublicClient,
   createWalletClient,
+  encodeFunctionData,
   getAddress,
   getContract,
   hexToBytes,
@@ -31,6 +33,7 @@ import type * as chains from 'viem/chains';
 
 import { type PublisherConfig, type TxSenderConfig } from './config.js';
 import { L1PublisherMetrics } from './l1-publisher-metrics.js';
+import { prettyLogVeimError } from './utils.js';
 
 /**
  * Stats for a sent transaction.
@@ -70,6 +73,8 @@ export type L1ProcessArgs = {
   blockHash: Buffer;
   /** L2 block body. */
   body: Buffer;
+  /** L2 block tx hashes */
+  txHashes: TxHash[];
   /** Attestations */
   attestations?: Signature[];
 };
@@ -97,25 +102,12 @@ export type L1SubmitProofArgs = {
  * Adapted from https://github.com/AztecProtocol/aztec2-internal/blob/master/falafel/src/rollup_publisher.ts.
  */
 export class L1Publisher {
-  // @note  If we want to simulate in the future, we have to skip the viem simulations and use `reads` instead
-  //        This is because the viem simulations are not able to simulate the future, only the current state.
-  //        This means that we will be simulating as if `block.timestamp` is the same for the next block
-  //        as for the last block.
-  //        Nevertheless, it can be quite useful for figuring out why exactly the transaction is failing
-  //        as a middle ground right now, we will be skipping the simulation and just sending the transaction
-  //        but only after we have done a successful run of the `validateHeader` for the timestamp in the future.
-  public static SKIP_SIMULATION = true;
-
   private interruptibleSleep = new InterruptibleSleep();
   private sleepTimeMs: number;
   private interrupted = false;
   private metrics: L1PublisherMetrics;
   private log = createDebugLogger('aztec:sequencer:publisher');
 
-  private availabilityOracleContract: GetContractReturnType<
-    typeof AvailabilityOracleAbi,
-    WalletClient<HttpTransport, chains.Chain, PrivateKeyAccount>
-  >;
   private rollupContract: GetContractReturnType<
     typeof RollupAbi,
     WalletClient<HttpTransport, chains.Chain, PrivateKeyAccount>
@@ -123,6 +115,8 @@ export class L1Publisher {
   private publicClient: PublicClient<HttpTransport, chains.Chain>;
   private account: PrivateKeyAccount;
 
+  public static PROPOSE_GAS_GUESS: bigint = 500_000n;
+
   constructor(config: TxSenderConfig & PublisherConfig, client: TelemetryClient) {
     this.sleepTimeMs = config?.l1PublishRetryIntervalMS ?? 60_000;
     this.metrics = new L1PublisherMetrics(client, 'L1Publisher');
@@ -142,11 +136,6 @@ export class L1Publisher {
       transport: http(chain.rpcUrl),
     });
 
-    this.availabilityOracleContract = getContract({
-      address: getAddress(l1Contracts.availabilityOracleAddress.toString()),
-      abi: AvailabilityOracleAbi,
-      client: walletClient,
-    });
     this.rollupContract = getContract({
       address: getAddress(l1Contracts.rollupAddress.toString()),
       abi: RollupAbi,
@@ -199,6 +188,7 @@ export class L1Publisher {
       formattedSignatures,
       `0x${attestationData.digest.toString('hex')}`,
       ts,
+      `0x${header.contentCommitment.txsEffectsHash.toString('hex')}`,
       flags,
     ] as const;
 
@@ -221,11 +211,6 @@ export class L1Publisher {
     return committee.map(EthAddress.fromString);
   }
 
-  checkIfTxsAreAvailable(block: L2Block): Promise<boolean> {
-    const args = [`0x${block.body.getTxsEffectsHash().toString('hex').padStart(64, '0')}`] as const;
-    return this.availabilityOracleContract.read.isAvailable(args);
-  }
-
   async getTransactionStats(txHash: string): Promise<TransactionStats | undefined> {
     const tx = await this.publicClient.getTransaction({ hash: txHash as Hex });
     if (!tx) {
@@ -240,47 +225,41 @@ export class L1Publisher {
   }
 
   /**
-   * Publishes L2 block on L1.
-   * @param block - L2 block to publish.
+   * Proposes a L2 block on L1.
+   * @param block - L2 block to propose.
    * @returns True once the tx has been confirmed and is successful, false on revert or interrupt, blocks otherwise.
    */
-  public async processL2Block(block: L2Block, attestations?: Signature[]): Promise<boolean> {
+  public async proposeL2Block(block: L2Block, attestations?: Signature[], txHashes?: TxHash[]): Promise<boolean> {
     const ctx = {
       blockNumber: block.number,
       slotNumber: block.header.globalVariables.slotNumber.toBigInt(),
       blockHash: block.hash().toString(),
     };
 
-    const processTxArgs = {
+    const digest = getHashedSignaturePayload(block.archive.root, txHashes ?? []);
+    const proposeTxArgs = {
       header: block.header.toBuffer(),
       archive: block.archive.root.toBuffer(),
       blockHash: block.header.hash().toBuffer(),
       body: block.body.toBuffer(),
       attestations,
+      txHashes: txHashes ?? [],
     };
 
     // Publish body and propose block (if not already published)
     if (!this.interrupted) {
-      let txHash;
       const timer = new Timer();
 
-      const isAvailable = await this.checkIfTxsAreAvailable(block);
-
       // @note  This will make sure that we are passing the checks for our header ASSUMING that the data is also made available
       //        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.
       await this.validateBlockForSubmission(block.header, {
-        digest: block.archive.root.toBuffer(),
+        digest,
         signatures: attestations ?? [],
       });
 
-      if (isAvailable) {
-        this.log.verbose(`Transaction effects of block ${block.number} already published.`, ctx);
-        txHash = await this.sendProposeWithoutBodyTx(processTxArgs);
-      } else {
-        txHash = await this.sendProposeTx(processTxArgs);
-      }
+      const txHash = await this.sendProposeTx(proposeTxArgs);
 
       if (!txHash) {
         this.log.info(`Failed to publish block ${block.number} to L1`, ctx);
@@ -400,11 +379,9 @@ export class L1Publisher {
         `0x${proof.toString('hex')}`,
       ] as const;
 
-      if (!L1Publisher.SKIP_SIMULATION) {
-        await this.rollupContract.simulate.submitBlockRootProof(args, {
-          account: this.account,
-        });
-      }
+      await this.rollupContract.simulate.submitBlockRootProof(args, {
+        account: this.account,
+      });
 
       return await this.rollupContract.write.submitBlockRootProof(args, {
         account: this.account,
@@ -415,108 +392,47 @@ export class L1Publisher {
     }
   }
 
-  // This is used in `integration_l1_publisher.test.ts` currently. Could be removed though.
-  private async sendPublishTx(encodedBody: Buffer): Promise<string | undefined> {
+  private async sendProposeTx(encodedData: L1ProcessArgs): Promise<string | undefined> {
     if (!this.interrupted) {
       try {
-        this.log.info(`TxEffects size=${encodedBody.length} bytes`);
-        const args = [`0x${encodedBody.toString('hex')}`] as const;
-
-        await this.availabilityOracleContract.simulate.publish(args, {
-          account: this.account,
+        // We have to jump a few hoops because viem is not happy around estimating gas for view functions
+        const computeTxsEffectsHashGas = await this.publicClient.estimateGas({
+          to: this.rollupContract.address,
+          data: encodeFunctionData({
+            abi: this.rollupContract.abi,
+            functionName: 'computeTxsEffectsHash',
+            args: [`0x${encodedData.body.toString('hex')}`],
+          }),
         });
 
-        return await this.availabilityOracleContract.write.publish(args, {
+        const min = (a: bigint, b: bigint) => (a > b ? b : a);
+
+        // @note  We perform this guesstimate instead of the usual `gasEstimate` since
+        //        viem will use the current state to simulate against, which means that
+        //        we will fail estimation in the case where we are simulating for the
+        //        first ethereum block within our slot (as current time is not in the
+        //        slot yet).
+        const gasGuesstimate = min(computeTxsEffectsHashGas + L1Publisher.PROPOSE_GAS_GUESS, 15_000_000n);
+
+        const attestations = encodedData.attestations
+          ? encodedData.attestations.map(attest => attest.toViemSignature())
+          : [];
+        const txHashes = encodedData.txHashes ? encodedData.txHashes.map(txHash => txHash.to0xString()) : [];
+        const args = [
+          `0x${encodedData.header.toString('hex')}`,
+          `0x${encodedData.archive.toString('hex')}`,
+          `0x${encodedData.blockHash.toString('hex')}`,
+          txHashes,
+          attestations,
+          `0x${encodedData.body.toString('hex')}`,
+        ] as const;
+
+        return await this.rollupContract.write.propose(args, {
           account: this.account,
+          gas: gasGuesstimate,
         });
       } catch (err) {
-        this.log.error(`TxEffects publish failed`, err);
-        return undefined;
-      }
-    }
-  }
-
-  private async sendProposeWithoutBodyTx(encodedData: L1ProcessArgs): Promise<string | undefined> {
-    if (!this.interrupted) {
-      try {
-        if (encodedData.attestations) {
-          const attestations = encodedData.attestations.map(attest => attest.toViemSignature());
-          const args = [
-            `0x${encodedData.header.toString('hex')}`,
-            `0x${encodedData.archive.toString('hex')}`,
-            `0x${encodedData.blockHash.toString('hex')}`,
-            attestations,
-          ] as const;
-
-          if (!L1Publisher.SKIP_SIMULATION) {
-            await this.rollupContract.simulate.propose(args, { account: this.account });
-          }
-
-          return await this.rollupContract.write.propose(args, {
-            account: this.account,
-          });
-        } else {
-          const args = [
-            `0x${encodedData.header.toString('hex')}`,
-            `0x${encodedData.archive.toString('hex')}`,
-            `0x${encodedData.blockHash.toString('hex')}`,
-          ] as const;
-
-          if (!L1Publisher.SKIP_SIMULATION) {
-            await this.rollupContract.simulate.propose(args, { account: this.account });
-          }
-          return await this.rollupContract.write.propose(args, {
-            account: this.account,
-          });
-        }
-      } catch (err) {
-        this.log.error(`Rollup publish failed`, err);
-        return undefined;
-      }
-    }
-  }
-
-  private async sendProposeTx(encodedData: L1ProcessArgs): Promise<string | undefined> {
-    if (!this.interrupted) {
-      try {
-        if (encodedData.attestations) {
-          const attestations = encodedData.attestations.map(attest => attest.toViemSignature());
-          const args = [
-            `0x${encodedData.header.toString('hex')}`,
-            `0x${encodedData.archive.toString('hex')}`,
-            `0x${encodedData.blockHash.toString('hex')}`,
-            attestations,
-            `0x${encodedData.body.toString('hex')}`,
-          ] as const;
-
-          if (!L1Publisher.SKIP_SIMULATION) {
-            await this.rollupContract.simulate.propose(args, {
-              account: this.account,
-            });
-          }
-
-          return await this.rollupContract.write.propose(args, {
-            account: this.account,
-          });
-        } else {
-          const args = [
-            `0x${encodedData.header.toString('hex')}`,
-            `0x${encodedData.archive.toString('hex')}`,
-            `0x${encodedData.blockHash.toString('hex')}`,
-            `0x${encodedData.body.toString('hex')}`,
-          ] as const;
-
-          if (!L1Publisher.SKIP_SIMULATION) {
-            await this.rollupContract.simulate.propose(args, {
-              account: this.account,
-            });
-          }
-
-          return await this.rollupContract.write.propose(args, {
-            account: this.account,
-          });
-        }
-      } catch (err) {
+        prettyLogVeimError(err, this.log);
         this.log.error(`Rollup publish failed`, err);
         return undefined;
       }

package/src/publisher/utils.ts

@@ -0,0 +1,15 @@
+import { type Logger } from '@aztec/foundation/log';
+
+import { BaseError, ContractFunctionRevertedError } from 'viem';
+
+export function prettyLogVeimError(err: any, logger: Logger) {
+  if (err instanceof BaseError) {
+    const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
+    if (revertError instanceof ContractFunctionRevertedError) {
+      const errorName = revertError.data?.errorName ?? '';
+      const args =
+        revertError.metaMessages && revertError.metaMessages?.length > 1 ? revertError.metaMessages[1].trimStart() : '';
+      logger.debug(`canProposeAtTime failed with "${errorName}${args}"`);
+    }
+  }
+}

package/src/sequencer/sequencer.ts

@@ -6,6 +6,7 @@ import {
   type ProcessedTx,
   Signature,
   Tx,
+  type TxHash,
   type TxValidator,
 } from '@aztec/circuit-types';
 import { type AllowedElement, BlockProofError, PROVING_STATUS } from '@aztec/circuit-types/interfaces';
@@ -29,11 +30,10 @@ import { Attributes, type TelemetryClient, type Tracer, trackSpan } from '@aztec
 import { type ValidatorClient } from '@aztec/validator-client';
 import { type WorldStateStatus, type WorldStateSynchronizer } from '@aztec/world-state';
 
-import { BaseError, ContractFunctionRevertedError } from 'viem';
-
 import { type BlockBuilderFactory } from '../block_builder/index.js';
 import { type GlobalVariableBuilder } from '../global_variable_builder/global_builder.js';
 import { type L1Publisher } from '../publisher/l1-publisher.js';
+import { prettyLogVeimError } from '../publisher/utils.js';
 import { type TxValidatorFactory } from '../tx_validator/tx_validator_factory.js';
 import { type SequencerConfig } from './config.js';
 import { SequencerMetrics } from './metrics.js';
@@ -310,17 +310,7 @@ export class Sequencer {
       this.log.debug(`Can propose block ${proposalBlockNumber} at slot ${slot}`);
       return slot;
     } catch (err) {
-      if (err instanceof BaseError) {
-        const revertError = err.walk(err => err instanceof ContractFunctionRevertedError);
-        if (revertError instanceof ContractFunctionRevertedError) {
-          const errorName = revertError.data?.errorName ?? '';
-          const args =
-            revertError.metaMessages && revertError.metaMessages?.length > 1
-              ? revertError.metaMessages[1].trimStart()
-              : '';
-          this.log.debug(`canProposeAtTime failed with "${errorName}${args}"`);
-        }
-      }
+      prettyLogVeimError(err, this.log);
       throw err;
     }
   }
@@ -490,11 +480,15 @@ export class Sequencer {
       this.log.verbose(`Flushing completed`);
     }
 
+    const txHashes = validTxs.map(tx => tx.getTxHash());
+
     this.isFlushing = false;
-    const attestations = await this.collectAttestations(block);
+    this.log.verbose('Collecting attestations');
+    const attestations = await this.collectAttestations(block, txHashes);
+    this.log.verbose('Attestations collected');
 
     try {
-      await this.publishL2Block(block, attestations);
+      await this.publishL2Block(block, attestations, txHashes);
       this.metrics.recordPublishedBlock(workDuration);
       this.log.info(
         `Submitted rollup block ${block.number} with ${
@@ -512,11 +506,13 @@ export class Sequencer {
     this.isFlushing = true;
   }
 
-  protected async collectAttestations(block: L2Block): Promise<Signature[] | undefined> {
+  protected async collectAttestations(block: L2Block, txHashes: TxHash[]): Promise<Signature[] | undefined> {
     // 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();
+    this.log.debug(`Attesting committee length ${committee.length}`);
 
     if (committee.length === 0) {
+      this.log.debug(`Attesting committee length is 0, skipping`);
       return undefined;
     }
 
@@ -528,16 +524,16 @@ export class Sequencer {
 
     const numberOfRequiredAttestations = Math.floor((committee.length * 2) / 3) + 1;
 
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/7974): we do not have transaction[] lists in the block for now
-    // Dont do anything with the proposals for now - just collect them
-
-    const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, []);
+    this.log.verbose('Creating block proposal');
+    const proposal = await this.validatorClient.createBlockProposal(block.header, block.archive.root, txHashes);
 
     this.state = SequencerState.PUBLISHING_BLOCK_TO_PEERS;
+    this.log.verbose('Broadcasting block proposal to validators');
     this.validatorClient.broadcastBlockProposal(proposal);
 
     this.state = SequencerState.WAITING_FOR_ATTESTATIONS;
     const attestations = await this.validatorClient.collectAttestations(proposal, numberOfRequiredAttestations);
+    this.log.verbose(`Collected attestations from validators, number of attestations: ${attestations.length}`);
 
     // note: the smart contract requires that the signatures are provided in the order of the committee
     return await orderAttestations(attestations, committee);
@@ -550,11 +546,11 @@ export class Sequencer {
   @trackSpan('Sequencer.publishL2Block', block => ({
     [Attributes.BLOCK_NUMBER]: block.number,
   }))
-  protected async publishL2Block(block: L2Block, attestations?: Signature[]) {
+  protected async publishL2Block(block: L2Block, attestations?: Signature[], txHashes?: TxHash[]) {
     // Publishes new block to the network and awaits the tx to be mined
     this.state = SequencerState.PUBLISHING_BLOCK;
 
-    const publishedL2Block = await this.publisher.processL2Block(block, attestations);
+    const publishedL2Block = await this.publisher.proposeL2Block(block, attestations, txHashes);
     if (publishedL2Block) {
       this.lastPublishedBlock = block.number;
     } else {