@aztec/aztec 0.0.1-commit.e558bd1c → 0.0.1-commit.e57c76e

package/dest/local-network/local-network.js

@@ -17,8 +17,12 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { SequencerState } from '@aztec/sequencer-client';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { TxStatus } from '@aztec/stdlib/tx';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
@@ -27,9 +31,18 @@ import { createAccountLogs } from '../cli/util.js';
 import { DefaultMnemonic } from '../mnemonic.js';
 import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
 import { EpochTestSettler } from '../testing/epoch_test_settler.js';
+import { getTokenAllowedSetupFunctions } from '../testing/token_allowed_setup.js';
+import { publishStandardAuthRegistry } from './auth_registry.js';
 import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
 import { getSponsoredFPCAddress } from './sponsored_fpc.js';
 const logger = createLogger('local-network');
+// The embedded wallet defaults to waiting for PROPOSED, which returns as soon as a tx lands in a
+// proposed L2 block. That is flaky for the serial sandbox setup below: a proposed block can be
+// pruned before its checkpoint is published, dropping a tx we already moved on from ("Tx dropped by
+// P2P node"). Wait for the checkpoint so each setup tx is durably included before the next is sent.
+const setupWaitOpts = {
+    waitForStatus: TxStatus.CHECKPOINTED
+};
 const localAnvil = foundry;
 /**
  * Function to deploy our L1 contracts to the local network L1
@@ -45,12 +58,12 @@ const localAnvil = foundry;
         genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
         feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
         aztecTargetCommitteeSize: 0,
-        slasherFlavor: 'none',
+        slasherEnabled: false,
         realVerifier: false
     });
-    aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
+    Object.assign(aztecNodeConfig, l1Contracts.l1ContractAddresses);
     aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
-    return aztecNodeConfig.l1Contracts;
+    return l1Contracts.l1ContractAddresses;
 }
 /**
  * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
@@ -65,14 +78,21 @@ const localAnvil = foundry;
     if ((config.l1RpcUrls?.length || 0) > 1) {
         logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
     }
+    // The local network deploys a banana FPC with Token contracts, so include Token entries
+    // in the setup allowlist so FPC-based fee payments work out of the box.
+    const tokenAllowList = await getTokenAllowedSetupFunctions();
     const aztecNodeConfig = {
         ...getConfigEnvVars(),
-        ...config
+        ...config,
+        txPublicSetupAllowListExtend: [
+            ...tokenAllowList,
+            ...config.txPublicSetupAllowListExtend ?? []
+        ]
     };
     const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
-    if (aztecNodeConfig.publisherPrivateKeys == undefined || !aztecNodeConfig.publisherPrivateKeys.length || aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY) {
+    if (aztecNodeConfig.sequencerPublisherPrivateKeys == undefined || !aztecNodeConfig.sequencerPublisherPrivateKeys.length || aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY) {
         const privKey = hdAccount.getHdKey().privateKey;
-        aztecNodeConfig.publisherPrivateKeys = [
+        aztecNodeConfig.sequencerPublisherPrivateKeys = [
             new SecretValue(`0x${Buffer.from(privKey).toString('hex')}`)
         ];
     }
@@ -96,12 +116,16 @@ const localAnvil = foundry;
     })();
     const bananaFPC = await getBananaFPCAddress(initialAccounts);
     const sponsoredFPC = await getSponsoredFPCAddress();
-    const fundedAddresses = initialAccounts.length ? [
+    const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map((a)=>AztecAddress.fromString(a));
+    const fundedAddresses = [
         ...initialAccounts.map((a)=>a.address),
-        bananaFPC,
-        sponsoredFPC
-    ] : [];
-    const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
+        ...initialAccounts.length ? [
+            bananaFPC,
+            sponsoredFPC
+        ] : [],
+        ...prefundAddresses
+    ];
+    const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(fundedAddresses);
     const dateProvider = new TestDateProvider();
     let cheatcodes;
     let rollupAddress;
@@ -138,8 +162,37 @@ const localAnvil = foundry;
         blobClient,
         dateProvider
     }, {
-        prefilledPublicData
+        genesis
     });
+    // Now that the node is up, let the watcher check for pending txs so it can skip unfilled slots faster when
+    // transactions are waiting in the mempool. Also let it check if the sequencer is actively building, to avoid
+    // warping time out from under an in-progress block.
+    watcher?.setGetPendingTxCount(()=>node.getPendingTxCount());
+    const sequencer = node.getSequencer()?.getSequencer();
+    if (sequencer) {
+        const idleStates = new Set([
+            SequencerState.STOPPED,
+            SequencerState.STOPPING,
+            SequencerState.IDLE,
+            SequencerState.SYNCHRONIZING
+        ]);
+        watcher?.setIsSequencerBuilding(()=>!idleStates.has(sequencer.getState()));
+        // Under proposer pipelining the L1 publish for slot N happens during wall-clock slot N,
+        // but the proposer for slot N has already built the checkpoint during slot N-1 and is
+        // waiting for L1 to advance. We need to fast-forward L1 to wake that wait — and the wait
+        // we have to break first is `waitForValidParentCheckpointOnL1`, which blocks the
+        // checkpoint_proposal_job's background submission task until the archiver has synced past
+        // the build slot. That wait happens *before* `PUBLISHING_CHECKPOINT` is set, so a hook on
+        // that state transition would be circular (L1 has to advance before the state we'd use to
+        // advance L1 fires). The earliest pre-wait signal is `block-proposed`, which the sequencer
+        // emits once each block is built. In sandbox single-block-per-slot mode this is
+        // effectively "checkpoint built", and the watcher warp is harmless if a subsequent
+        // assembly/validation/parent-wait step aborts: L1 just sits one slot ahead, which the
+        // cascade absorbs.
+        if (watcher) {
+            sequencer.on('block-proposed', ({ slot })=>watcher.setProposedTargetSlot(Number(slot)));
+        }
+    }
     let epochTestSettler;
     if (!aztecNodeConfig.p2pEnabled) {
         epochTestSettler = new EpochTestSettler(cheatcodes, rollupAddress, node.getBlockSource(), logger.createChild('epoch-settler'), {
@@ -148,19 +201,19 @@ const localAnvil = foundry;
         await epochTestSettler.start();
     }
     if (initialAccounts.length) {
-        const PXEConfig = {
-            proverEnabled: aztecNodeConfig.realProofs
-        };
-        const wallet = await TestWallet.create(node, PXEConfig);
+        const wallet = await EmbeddedWallet.create(node, {
+            pxeConfig: {
+                proverEnabled: aztecNodeConfig.realProofs
+            },
+            ephemeral: true
+        });
         userLog('Setting up funded test accounts...');
-        const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
-        const accountsWithSecrets = accountManagers.map((manager, i)=>({
-                account: manager,
-                secretKey: initialAccounts[i].secret
-            }));
-        const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
+        const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts, setupWaitOpts);
+        const accLogs = await createAccountLogs(accountManagers, wallet);
         userLog(accLogs.join(''));
-        await setupBananaFPC(initialAccounts, wallet, userLog);
+        userLog('Publishing standard AuthRegistry contract...');
+        await publishStandardAuthRegistry(wallet, initialAccounts[0].address, setupWaitOpts);
+        await setupBananaFPC(initialAccounts, wallet, userLog, setupWaitOpts);
         userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
         // We no longer need the wallet once we've setup the accounts so we stop the underlying PXE job queue
         await wallet.stop();
@@ -180,15 +233,16 @@ const localAnvil = foundry;
  * @param config - Optional Aztec node settings.
  */ export async function createAztecNode(config = {}, deps = {}, options = {}) {
     // TODO(#12272): will clean this up. This is criminal.
-    const { l1Contracts, ...rest } = getConfigEnvVars();
+    // Not sure why this was ever done. Will be fixed in A-989, A-991, A-990.
     const aztecNodeConfig = {
-        ...rest,
-        ...config,
-        l1Contracts: {
-            ...l1Contracts,
-            ...config.l1Contracts
-        }
+        ...getConfigEnvVars(),
+        ...config
     };
-    const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
+    const node = await AztecNodeService.createAndSync(aztecNodeConfig, {
+        ...deps,
+        proverNodeDeps: {
+            broker: deps.proverBroker
+        }
+    }, options);
     return node;
 }

package/dest/testing/anvil_test_watcher.d.ts

@@ -2,6 +2,10 @@ import { EthCheatCodes } from '@aztec/ethereum/test';
 import type { ViemClient } from '@aztec/ethereum/types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { TestDateProvider } from '@aztec/foundation/timer';
+export type AnvilTestWatcherOpts = {
+    isLocalNetwork?: boolean;
+    isMarkingAsProven?: boolean;
+};
 /**
  * Represents a watcher for a rollup contract.
  *
@@ -13,6 +17,7 @@ export declare class AnvilTestWatcher {
     private cheatcodes;
     private dateProvider?;
     private isLocalNetwork;
+    private isMarkingAsProven;
     private rollup;
     private rollupCheatCodes;
     private l2SlotDuration;
@@ -20,15 +25,30 @@ export declare class AnvilTestWatcher {
     private syncDateProviderPromise?;
     private markingAsProvenRunningPromise?;
     private logger;
-    private isMarkingAsProven;
-    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined);
+    private getPendingTxCount?;
+    private isSequencerBuilding?;
+    private unfilledSlotFirstSeen?;
+    private proposedTargetSlot?;
+    constructor(cheatcodes: EthCheatCodes, rollupAddress: EthAddress, l1Client: ViemClient, dateProvider?: TestDateProvider | undefined, opts?: AnvilTestWatcherOpts);
     setIsMarkingAsProven(isMarkingAsProven: boolean): void;
     setisLocalNetwork(isLocalNetwork: boolean): void;
+    /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */
+    setGetPendingTxCount(fn: () => Promise<number>): void;
+    /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */
+    setIsSequencerBuilding(fn: () => boolean): void;
+    /**
+     * Records the target slot for which the proposer has built a block destined for L1. Used by
+     * the local-network watcher to fast-forward L1 (and the injected date provider) ahead of the
+     * pipelined publisher's `sendRequestsAt` sleep so it ends promptly instead of waiting a full
+     * wall-clock slot. Only ratchets up — late warps for stale slots are no-ops.
+     */
+    setProposedTargetSlot(slot: number): void;
     start(): Promise<void>;
     stop(): Promise<void>;
     trigger(): Promise<void>;
     markAsProven(): Promise<void>;
     syncDateProviderToL1IfBehind(): Promise<void>;
     warpTimeIfNeeded(): Promise<void>;
+    private warpToTimestamp;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQWdCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQWxCdkIsT0FBTyxDQUFDLGNBQWMsQ0FBa0I7SUFFeEMsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRS9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBUTtJQUVqQyxZQUNVLFVBQVUsRUFBRSxhQUFhLEVBQ2pDLGFBQWEsRUFBRSxVQUFVLEVBQ3pCLFFBQVEsRUFBRSxVQUFVLEVBQ1osWUFBWSxDQUFDLDhCQUFrQixFQWF4QztJQUVELG9CQUFvQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sUUFHOUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUsT0FBTyxRQUV4QztJQUVLLEtBQUssa0JBeUJWO0lBRUssSUFBSSxrQkFJVDtJQUVLLE9BQU8sa0JBSVo7SUFFSyxZQUFZLGtCQUtqQjtJQUVLLDRCQUE0QixrQkFlakM7SUFFSyxnQkFBZ0Isa0JBd0NyQjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW52aWxfdGVzdF93YXRjaGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9hbnZpbF90ZXN0X3dhdGNoZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGFBQWEsRUFBb0IsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUV4RCxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUdoRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBS2hFLE1BQU0sTUFBTSxvQkFBb0IsR0FBRztJQUNqQyxjQUFjLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDekIsaUJBQWlCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDN0IsQ0FBQztBQUVGOzs7Ozs7R0FNRztBQUNILHFCQUFhLGdCQUFnQjtJQThCekIsT0FBTyxDQUFDLFVBQVU7SUFHbEIsT0FBTyxDQUFDLFlBQVksQ0FBQztJQWhDdkIsT0FBTyxDQUFDLGNBQWMsQ0FBQztJQUN2QixPQUFPLENBQUMsaUJBQWlCLENBQUM7SUFFMUIsT0FBTyxDQUFDLE1BQU0sQ0FBc0Q7SUFDcEUsT0FBTyxDQUFDLGdCQUFnQixDQUFtQjtJQUMzQyxPQUFPLENBQUMsY0FBYyxDQUFVO0lBRWhDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFpQjtJQUM5QyxPQUFPLENBQUMsdUJBQXVCLENBQUMsQ0FBaUI7SUFDakQsT0FBTyxDQUFDLDZCQUE2QixDQUFDLENBQWlCO0lBRXZELE9BQU8sQ0FBQyxNQUFNLENBQWlEO0lBRy9ELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUF3QjtJQUdsRCxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBZ0I7SUFHNUMsT0FBTyxDQUFDLHFCQUFxQixDQUFDLENBQXFDO0lBTW5FLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFTO0lBRXBDLFlBQ1UsVUFBVSxFQUFFLGFBQWEsRUFDakMsYUFBYSxFQUFFLFVBQVUsRUFDekIsUUFBUSxFQUFFLFVBQVUsRUFDWixZQUFZLENBQUMsOEJBQWtCLEVBQ3ZDLElBQUksR0FBRSxvQkFBeUIsRUFnQmhDO0lBRUQsb0JBQW9CLENBQUMsaUJBQWlCLEVBQUUsT0FBTyxRQUc5QztJQUVELGlCQUFpQixDQUFDLGNBQWMsRUFBRSxPQUFPLFFBRXhDO0lBRUQseUdBQXlHO0lBQ3pHLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxNQUFNLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFFN0M7SUFFRCx1R0FBdUc7SUFDdkcsc0JBQXNCLENBQUMsRUFBRSxFQUFFLE1BQU0sT0FBTyxRQUV2QztJQUVEOzs7OztPQUtHO0lBQ0gscUJBQXFCLENBQUMsSUFBSSxFQUFFLE1BQU0sUUFJakM7SUFFSyxLQUFLLGtCQXlCVjtJQUVLLElBQUksa0JBSVQ7SUFFSyxPQUFPLGtCQUlaO0lBRUssWUFBWSxrQkFLakI7SUFFSyw0QkFBNEIsa0JBc0JqQztJQUVLLGdCQUFnQixrQkEwRXJCO1lBTWEsZUFBZTtDQWdCOUIifQ==

package/dest/testing/anvil_test_watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE;;;;;;GAMG;AACH,qBAAa,gBAAgB;IAgBzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAlBvB,OAAO,CAAC,cAAc,CAAkB;IAExC,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAE/D,OAAO,CAAC,iBAAiB,CAAQ;IAEjC,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EAaxC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAejC;IAEK,gBAAgB,kBAwCrB;CACF"}
+{"version":3,"file":"anvil_test_watcher.d.ts","sourceRoot":"","sources":["../../src/testing/anvil_test_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAKhE,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF;;;;;;GAMG;AACH,qBAAa,gBAAgB;IA8BzB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY,CAAC;IAhCvB,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,iBAAiB,CAAC;IAE1B,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAAU;IAEhC,OAAO,CAAC,oBAAoB,CAAC,CAAiB;IAC9C,OAAO,CAAC,uBAAuB,CAAC,CAAiB;IACjD,OAAO,CAAC,6BAA6B,CAAC,CAAiB;IAEvD,OAAO,CAAC,MAAM,CAAiD;IAG/D,OAAO,CAAC,iBAAiB,CAAC,CAAwB;IAGlD,OAAO,CAAC,mBAAmB,CAAC,CAAgB;IAG5C,OAAO,CAAC,qBAAqB,CAAC,CAAqC;IAMnE,OAAO,CAAC,kBAAkB,CAAC,CAAS;IAEpC,YACU,UAAU,EAAE,aAAa,EACjC,aAAa,EAAE,UAAU,EACzB,QAAQ,EAAE,UAAU,EACZ,YAAY,CAAC,8BAAkB,EACvC,IAAI,GAAE,oBAAyB,EAgBhC;IAED,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,QAG9C;IAED,iBAAiB,CAAC,cAAc,EAAE,OAAO,QAExC;IAED,yGAAyG;IACzG,oBAAoB,CAAC,EAAE,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,QAE7C;IAED,uGAAuG;IACvG,sBAAsB,CAAC,EAAE,EAAE,MAAM,OAAO,QAEvC;IAED;;;;;OAKG;IACH,qBAAqB,CAAC,IAAI,EAAE,MAAM,QAIjC;IAEK,KAAK,kBAyBV;IAEK,IAAI,kBAIT;IAEK,OAAO,kBAIZ;IAEK,YAAY,kBAKjB;IAEK,4BAA4B,kBAsBjC;IAEK,gBAAgB,kBA0ErB;YAMa,eAAe;CAgB9B"}

package/dest/testing/anvil_test_watcher.js

@@ -14,6 +14,7 @@ import { getAddress, getContract } from 'viem';
     cheatcodes;
     dateProvider;
     isLocalNetwork;
+    isMarkingAsProven;
     rollup;
     rollupCheatCodes;
     l2SlotDuration;
@@ -21,13 +22,21 @@ import { getAddress, getContract } from 'viem';
     syncDateProviderPromise;
     markingAsProvenRunningPromise;
     logger;
-    isMarkingAsProven;
-    constructor(cheatcodes, rollupAddress, l1Client, dateProvider){
+    // Optional callback to check if there are pending txs in the mempool.
+    getPendingTxCount;
+    // Optional callback to check if the sequencer is actively building a block.
+    isSequencerBuilding;
+    // Tracks when we first observed the current unfilled slot with pending txs (real wall time).
+    unfilledSlotFirstSeen;
+    // Latest target slot for which the proposer has built a block destined for L1 but which has
+    // not yet been committed. Set by the proposer-pipelining hook from `block-proposed` events so
+    // the watcher can advance L1 (and the injected date provider) to the target slot ahead of the
+    // publisher's `sendRequestsAt` sleep, instead of waiting a full wall-clock slot.
+    proposedTargetSlot;
+    constructor(cheatcodes, rollupAddress, l1Client, dateProvider, opts = {}){
         this.cheatcodes = cheatcodes;
         this.dateProvider = dateProvider;
-        this.isLocalNetwork = false;
         this.logger = createLogger(`aztecjs:utils:watcher`);
-        this.isMarkingAsProven = true;
         this.rollup = getContract({
             address: getAddress(rollupAddress.toString()),
             abi: RollupAbi,
@@ -36,6 +45,8 @@ import { getAddress, getContract } from 'viem';
         this.rollupCheatCodes = new RollupCheatCodes(this.cheatcodes, {
             rollupAddress
         });
+        this.isLocalNetwork = opts.isLocalNetwork ?? false;
+        this.isMarkingAsProven = opts.isMarkingAsProven ?? true;
         this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
     }
     setIsMarkingAsProven(isMarkingAsProven) {
@@ -45,6 +56,22 @@ import { getAddress, getContract } from 'viem';
     setisLocalNetwork(isLocalNetwork) {
         this.isLocalNetwork = isLocalNetwork;
     }
+    /** Sets a callback to check for pending txs, used to skip unfilled slots faster when txs are waiting. */ setGetPendingTxCount(fn) {
+        this.getPendingTxCount = fn;
+    }
+    /** Sets a callback to check if the sequencer is actively building, to avoid warping while it works. */ setIsSequencerBuilding(fn) {
+        this.isSequencerBuilding = fn;
+    }
+    /**
+   * Records the target slot for which the proposer has built a block destined for L1. Used by
+   * the local-network watcher to fast-forward L1 (and the injected date provider) ahead of the
+   * pipelined publisher's `sendRequestsAt` sleep so it ends promptly instead of waiting a full
+   * wall-clock slot. Only ratchets up — late warps for stale slots are no-ops.
+   */ setProposedTargetSlot(slot) {
+        if (this.proposedTargetSlot === undefined || slot > this.proposedTargetSlot) {
+            this.proposedTargetSlot = slot;
+        }
+    }
     async start() {
         if (this.filledRunningPromise) {
             throw new Error('Watcher already watching for filled slot');
@@ -89,14 +116,25 @@ import { getAddress, getContract } from 'viem';
         if (!this.dateProvider) {
             return;
         }
-        const l1Time = await this.cheatcodes.timestamp() * 1000;
+        const l1Time = await this.cheatcodes.lastBlockTimestamp() * 1000;
         const wallTime = this.dateProvider.now();
         if (l1Time > wallTime) {
             this.logger.warn(`L1 is ahead of wall time. Syncing wall time to L1 time`);
             this.dateProvider.setTime(l1Time);
         } else if (l1Time + Number(this.l2SlotDuration) * 1000 < wallTime) {
-            this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to wall time`);
-            await this.cheatcodes.warp(Math.ceil(wallTime / 1000));
+            // Warp L1 to the slot boundary at-or-before wall time. Rounding to a slot boundary (rather than
+            // `ceil(wallTime / 1000)`) keeps this loop's target aligned with `warpTimeIfNeeded`'s
+            // `nextSlotTimestamp` target, avoiding a race where the two loops pick timestamps a fraction of
+            // a second apart and one of them is then rejected by anvil as non-monotonic.
+            const wallSec = Math.floor(wallTime / 1000);
+            const targetSlot = await this.rollup.read.getSlotAt([
+                BigInt(wallSec)
+            ]);
+            const targetTimestamp = Number(await this.rollup.read.getTimestampForSlot([
+                targetSlot
+            ]));
+            this.logger.warn(`L1 is more than 1 L2 slot behind wall time. Warping to slot ${targetSlot} boundary`);
+            await this.warpToTimestamp(targetTimestamp);
         }
     }
     async warpTimeIfNeeded() {
@@ -111,34 +149,87 @@ import { getAddress, getContract } from 'viem';
                 BigInt(nextSlot)
             ]));
             if (BigInt(currentSlot) === checkpointLog.slotNumber) {
-                // We should jump to the next slot
-                try {
-                    await this.cheatcodes.warp(nextSlotTimestamp, {
-                        resetBlockInterval: true
-                    });
-                } catch (e) {
-                    this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
+                // The current slot has been filled, we should jump to the next slot.
+                if (await this.warpToTimestamp(nextSlotTimestamp)) {
+                    this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
                 }
-                this.logger.info(`Slot ${currentSlot} was filled, jumped to next slot`);
                 return;
             }
             // If we are not in local network, we don't need to warp time
             if (!this.isLocalNetwork) {
                 return;
             }
+            // Pipelined-publish shortcut: if the proposer has built a block destined for a slot
+            // beyond the current L1 slot, fast-forward L1 to that slot's timestamp so the publisher's
+            // `sendRequestsAt(targetSlot)` sleep ends and the multicall mines inside the target slot.
+            // Without this, the publisher waits up to a full real-time slot for wall clock to catch up.
+            if (this.proposedTargetSlot !== undefined && this.proposedTargetSlot > currentSlot) {
+                const targetSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([
+                    BigInt(this.proposedTargetSlot)
+                ]));
+                if (await this.warpToTimestamp(targetSlotTimestamp)) {
+                    this.logger.info(`Warped L1 to target slot ${this.proposedTargetSlot} for pipelined publish`);
+                }
+                return;
+            }
+            // If there are pending txs and the sequencer missed them, warp quickly (after a 2s real-time debounce) so the
+            // sequencer can retry in the next slot. Without this, we'd have to wait a full real-time slot duration (~36s) for
+            // the dateProvider to catch up to the next slot timestamp. We skip the warp if the sequencer is actively building
+            // to avoid invalidating its in-progress work.
+            if (this.getPendingTxCount) {
+                const pendingTxs = await this.getPendingTxCount();
+                if (pendingTxs > 0) {
+                    if (this.isSequencerBuilding?.()) {
+                        this.unfilledSlotFirstSeen = undefined;
+                        return;
+                    }
+                    const realNow = Date.now();
+                    if (!this.unfilledSlotFirstSeen || this.unfilledSlotFirstSeen.slot !== currentSlot) {
+                        this.unfilledSlotFirstSeen = {
+                            slot: currentSlot,
+                            realTime: realNow
+                        };
+                        return;
+                    }
+                    if (realNow - this.unfilledSlotFirstSeen.realTime > 2000) {
+                        if (await this.warpToTimestamp(nextSlotTimestamp)) {
+                            this.logger.info(`Slot ${currentSlot} was missed with pending txs, jumped to next slot`);
+                        }
+                        this.unfilledSlotFirstSeen = undefined;
+                    }
+                    return;
+                }
+            }
+            // Fallback: warp when the dateProvider time has passed the next slot timestamp.
             const currentTimestamp = this.dateProvider?.now() ?? Date.now();
             if (currentTimestamp > nextSlotTimestamp * 1000) {
-                try {
-                    await this.cheatcodes.warp(nextSlotTimestamp, {
-                        resetBlockInterval: true
-                    });
-                } catch (e) {
-                    this.logger.error(`Failed to warp to timestamp ${nextSlotTimestamp}: ${e}`);
+                if (await this.warpToTimestamp(nextSlotTimestamp)) {
+                    this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
                 }
-                this.logger.info(`Slot ${currentSlot} was missed, jumped to next slot`);
             }
         } catch  {
             this.logger.error('mineIfSlotFilled failed');
         }
     }
+    /**
+   * Warps L1 to `timestamp`, unless L1 is already at or past it. Returns true when a warp actually
+   * happened, false when skipped or on error. Callers use the return value to gate success logs.
+   */ async warpToTimestamp(timestamp) {
+        try {
+            // Anvil rejects evm_setNextBlockTimestamp values <= the current block's timestamp. The two
+            // watcher loops can race and pick targets a fraction of a second apart; skip here rather than
+            // letting the second one error out noisily.
+            const lastTimestamp = await this.cheatcodes.lastBlockTimestamp();
+            if (timestamp <= lastTimestamp) {
+                return false;
+            }
+            await this.cheatcodes.warp(timestamp, {
+                resetBlockInterval: true
+            });
+            return true;
+        } catch (e) {
+            this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
+            return false;
+        }
+    }
 }

package/dest/testing/cheat_codes.d.ts

@@ -1,7 +1,7 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { SequencerClient } from '@aztec/sequencer-client';
-import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { AutomineSequencer } from '@aztec/sequencer-client';
+import type { AztecNode, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
 /**
  * A class that provides utility functions for interacting with the chain.
  * @deprecated There used to be 3 kinds of cheat codes: eth, rollup and aztec. We have nuked the Aztec ones because
@@ -13,31 +13,32 @@ export declare class CheatCodes {
     eth: EthCheatCodes;
     /** Cheat codes for the Aztec Rollup contract on L1. */
     rollup: RollupCheatCodes;
+    /** When wired, redirects time-warps through the AutomineSequencer queue (test-only). */
+    private automine?;
+    private logger;
     constructor(
     /** Cheat codes for L1.*/
     eth: EthCheatCodes, 
     /** Cheat codes for the Aztec Rollup contract on L1. */
-    rollup: RollupCheatCodes);
-    static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): Promise<CheatCodes>;
+    rollup: RollupCheatCodes, 
+    /** When wired, redirects time-warps through the AutomineSequencer queue (test-only). */
+    automine?: AutomineSequencer | undefined);
+    static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider, automine?: AutomineSequencer): Promise<CheatCodes>;
     /**
      * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
-     * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
-     * by the slot number, which advances in fixed intervals.
-     * This is useful for testing time-dependent contract behavior.
-     * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
-     * @param node - The Aztec node used to query if a new block has been mined.
+     * the target timestamp. If the target timestamp falls within the current L2 slot (which already has a block),
+     * the timestamp is automatically adjusted forward to the start of the next slot so that `mineBlock()` succeeds.
+     * @param node - The Aztec node used to force an empty block to be mined.
      * @param targetTimestamp - The target timestamp to warp to (in seconds)
      */
-    warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, targetTimestamp: bigint | number): Promise<void>;
+    warpL2TimeAtLeastTo(node: AztecNode & AztecNodeDebug, targetTimestamp: bigint | number): Promise<void>;
     /**
      * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
-     * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
-     * number, which advances in fixed intervals.
-     * This is useful for testing time-dependent contract behavior.
-     * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
-     * @param node - The Aztec node used to query if a new block has been mined.
+     * least by the duration. If the duration is too short to cross an L2 slot boundary, the warp is automatically
+     * extended to the start of the next slot so that `mineBlock()` succeeds.
+     * @param node - The Aztec node used to force an empty block to be mined.
      * @param duration - The duration to advance time by (in seconds)
      */
-    warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
+    warpL2TimeAtLeastBy(node: AztecNode & AztecNodeDebug, duration: bigint | number): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRTs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFFbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBSmpDO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCLEVBQzdCO0lBRUosT0FBYSxNQUFNLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBT3ZHO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDRyxtQkFBbUIsQ0FBQyxlQUFlLEVBQUUsZUFBZSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsZUFBZSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQXVCNUc7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxlQUFlLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLE1BQU0saUJBSXJHO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRjs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFJbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsUUFBUSxDQUFDO0lBUm5CLE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBRXJEO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUNoRixRQUFRLENBQUMsK0JBQW1CLEVBQ2xDO0lBRUosT0FBYSxNQUFNLENBQ2pCLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsSUFBSSxFQUFFLFNBQVMsRUFDZixZQUFZLEVBQUUsWUFBWSxFQUMxQixRQUFRLENBQUMsRUFBRSxpQkFBaUIsR0FDM0IsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQU9yQjtJQUVEOzs7Ozs7T0FNRztJQUNHLG1CQUFtQixDQUFDLElBQUksRUFBRSxTQUFTLEdBQUcsY0FBYyxFQUFFLGVBQWUsRUFBRSxNQUFNLEdBQUcsTUFBTSxpQkE0RDNGO0lBRUQ7Ozs7OztPQU1HO0lBQ0csbUJBQW1CLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxjQUFjLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQWVwRjtDQUNGIn0=

package/dest/testing/cheat_codes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAJjC;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB,EAC7B;IAEJ,OAAa,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAOvG;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBAuB5G;IAED;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAIrG;CACF"}
+{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF;;;;;GAKG;AACH,qBAAa,UAAU;IAInB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAC/B,wFAAwF;IACxF,OAAO,CAAC,QAAQ,CAAC;IARnB,OAAO,CAAC,MAAM,CAAuC;IAErD;IACE,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;IAC/B,wFAAwF;IAChF,QAAQ,CAAC,+BAAmB,EAClC;IAEJ,OAAa,MAAM,CACjB,OAAO,EAAE,MAAM,EAAE,EACjB,IAAI,EAAE,SAAS,EACf,YAAY,EAAE,YAAY,EAC1B,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,UAAU,CAAC,CAOrB;IAED;;;;;;OAMG;IACG,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,iBA4D3F;IAED;;;;;;OAMG;IACG,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAepF;CACF"}