@aztec/aztec 5.0.0-private.20260318 → 5.0.0-rc.1

package/dest/local-network/local-network.d.ts

@@ -3,13 +3,13 @@ import { AztecNodeService } from '@aztec/aztec-node';
 import { type AztecNodeConfig } from '@aztec/aztec-node/config';
 import { Fr } from '@aztec/aztec.js/fields';
 import { type BlobClientInterface } from '@aztec/blob-client/client';
-import { EthAddress } from '@aztec/foundation/eth-address';
+import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import type { LogFn } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
-import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import type { GenesisData } from '@aztec/stdlib/world-state';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-import { type Hex } from 'viem';
+import type { Hex } from 'viem';
 /**
  * Function to deploy our L1 contracts to the local network L1
  * @param aztecNodeConfig - The Aztec Node Config
@@ -18,30 +18,7 @@ import { type Hex } from 'viem';
 export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, privateKey: Hex, opts?: {
     genesisArchiveRoot?: Fr;
     feeJuicePortalInitialBalance?: bigint;
-}): Promise<{
-    coinIssuerAddress: EthAddress;
-    feeJuiceAddress: EthAddress;
-    feeJuicePortalAddress: EthAddress;
-    governanceAddress: EthAddress;
-    governanceProposerAddress: EthAddress;
-    inboxAddress: EthAddress;
-    outboxAddress: EthAddress;
-    registryAddress: EthAddress;
-    rewardDistributorAddress: EthAddress;
-    rollupAddress: EthAddress;
-    stakingAssetAddress: EthAddress;
-} & {
-    slashFactoryAddress?: EthAddress | undefined;
-    feeAssetHandlerAddress?: EthAddress | undefined;
-    stakingAssetHandlerAddress?: EthAddress | undefined;
-    zkPassportVerifierAddress?: EthAddress | undefined;
-    gseAddress?: EthAddress | undefined;
-    dateGatedRelayerAddress?: EthAddress | undefined;
-} & {
-    rollupAddress: EthAddress;
-} & Pick<import("@aztec/ethereum/l1-contract-addresses").L1ContractAddresses, "rollupAddress"> & {
-    rollupAddress: EthAddress;
-}>;
+}): Promise<L1ContractAddresses>;
 /** Local network settings. */
 export type LocalNetworkConfig = AztecNodeConfig & {
     /** Mnemonic used to derive the L1 deployer private key.*/
@@ -68,6 +45,6 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
     dateProvider?: DateProvider;
     proverBroker?: ProvingJobBroker;
 }, options?: {
-    prefilledPublicData?: PublicDataTreeLeaf[];
+    genesis?: GenesisData;
 }): Promise<AztecNodeService>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUt6RSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUdyQixNQUFNLHlCQUF5QixDQUFDO0FBS2pDLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBMkQsTUFBTSxNQUFNLENBQUM7QUFnQnpGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBd0poRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUNKLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUM1QixVQUFVLENBQUMsRUFBRSxtQkFBbUIsQ0FBQztJQUNqQyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsWUFBWSxDQUFDLEVBQUUsZ0JBQWdCLENBQUM7Q0FDNUIsRUFDTixPQUFPLEdBQUU7SUFBRSxtQkFBbUIsQ0FBQyxFQUFFLGtCQUFrQixFQUFFLENBQUE7Q0FBTyw2QkFlN0QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQU12RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBR2pGLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFJekUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV4RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFLakMsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBbUJoQzs7OztHQUlHO0FBQ0gsd0JBQXNCLG1CQUFtQixDQUN2QyxlQUFlLEVBQUUsZUFBZSxFQUNoQyxVQUFVLEVBQUUsR0FBRyxFQUNmLElBQUksR0FBRTtJQUNKLGtCQUFrQixDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3hCLDRCQUE0QixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2xDLEdBQ0wsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBbUI5QjtBQUVELDhCQUE4QjtBQUM5QixNQUFNLE1BQU0sa0JBQWtCLEdBQUcsZUFBZSxHQUFHO0lBQ2pELDBEQUEwRDtJQUMxRCxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLDZEQUE2RDtJQUM3RCxZQUFZLEVBQUUsT0FBTyxDQUFDO0NBQ3ZCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE1BQU0seUNBQWtDLEVBQUUsT0FBTyxFQUFFLEtBQUs7OztHQXdIaEc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxNQUFNLEdBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBTSxFQUNyQyxJQUFJLEdBQUU7SUFDSixTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7SUFDNUIsVUFBVSxDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDakMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLFlBQVksQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0NBQzVCLEVBQ04sT0FBTyxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsV0FBVyxDQUFBO0NBQU8sNkJBY3hDIn0=

package/dest/local-network/local-network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AASvF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAKzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAgBzF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAoBP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAwJhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAe7D"}
+{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,KAAK,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,OAAO,EAAE,KAAK,mBAAmB,EAAoB,MAAM,2BAA2B,CAAC;AAMvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAIzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAmBhC;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,GAAG,EACf,IAAI,GAAE;IACJ,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC,GACL,OAAO,CAAC,mBAAmB,CAAC,CAmB9B;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAwHhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IACJ,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,gBAAgB,CAAC;CAC5B,EACN,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,WAAW,CAAA;CAAO,6BAcxC"}

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

@@ -6,35 +6,37 @@ import { Fr } from '@aztec/aztec.js/fields';
 import { createLogger } from '@aztec/aztec.js/log';
 import { createBlobClient } from '@aztec/blob-client/client';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
-import { createEthereumChain } from '@aztec/ethereum/chain';
 import { waitForPublicClient } from '@aztec/ethereum/client';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { NULL_KEY } from '@aztec/ethereum/constants';
 import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
-import { EthCheatCodes } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 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 { EmbeddedWallet } from '@aztec/wallets/embedded';
-import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
+import { createFundedInitializerlessAccounts } 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';
 import { foundry } from 'viem/chains';
 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');
-const localAnvil = foundry;
+// 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
+};
 /**
  * Function to deploy our L1 contracts to the local network L1
  * @param aztecNodeConfig - The Aztec Node Config
@@ -49,12 +51,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.
@@ -72,13 +74,32 @@ const localAnvil = foundry;
     // 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 envConfig = getConfigEnvVars();
     const aztecNodeConfig = {
-        ...getConfigEnvVars(),
+        ...envConfig,
         ...config,
+        skipOrphanProposedBlockPruning: true,
         txPublicSetupAllowListExtend: [
             ...tokenAllowList,
             ...config.txPublicSetupAllowListExtend ?? []
-        ]
+        ],
+        // The local network runs against anvil with no committee, so it defaults to the deterministic
+        // AutomineSequencer, which owns L1 time control (warps the dateProvider and L1 timestamps to slot
+        // boundaries as it builds), replacing the deleted AnvilTestWatcher. This remains true when p2p is
+        // enabled for local peer testing; local-network is not a mode for connecting to an existing network.
+        useAutomineSequencer: config.useAutomineSequencer ?? true,
+        // The AutomineSequencer owns epoch proving in the local network — it writes epoch out hashes to
+        // the L1 Outbox and advances the proven tip as checkpoints land, through the same serial queue as
+        // its builds — replacing the standalone EpochTestSettler that used to race the build loop.
+        automineEnableProveEpoch: config.automineEnableProveEpoch ?? true,
+        // Defaults for the local network / sandbox; callers (e.g. the CLI) may override. No real proving
+        // happens here — the AutomineSequencer synthetically settles epochs. Short epochs let it write out
+        // hashes quickly (so users can consume L2-to-L1 messages without a long wait), with a wider
+        // proof-submission window so the synthetic settler has headroom before the rollup would prune an
+        // unproven checkpoint.
+        realProofs: config.realProofs ?? false,
+        aztecEpochDuration: config.aztecEpochDuration ?? 4,
+        aztecProofSubmissionEpochs: config.aztecProofSubmissionEpochs ?? 2
     };
     const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
     if (aztecNodeConfig.sequencerPublisherPrivateKeys == undefined || !aztecNodeConfig.sequencerPublisherPrivateKeys.length || aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY) {
@@ -97,7 +118,7 @@ const localAnvil = foundry;
     const initialAccounts = await (async ()=>{
         if (config.testAccounts === true || config.testAccounts === undefined) {
             if (aztecNodeConfig.p2pEnabled) {
-                userLog(`Not setting up test accounts as we are connecting to a network`);
+                userLog(`Not setting up test accounts when p2p is enabled`);
             } else {
                 userLog(`Setting up test accounts`);
                 return await getInitialTestAccountsData();
@@ -116,34 +137,13 @@ const localAnvil = foundry;
         ] : [],
         ...prefundAddresses
     ];
-    const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
+    const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(fundedAddresses);
     const dateProvider = new TestDateProvider();
-    let cheatcodes;
-    let rollupAddress;
-    let watcher;
     if (!aztecNodeConfig.p2pEnabled) {
-        ({ rollupAddress } = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
+        await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
             genesisArchiveRoot,
             feeJuicePortalInitialBalance: fundingNeeded
-        }));
-        const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
-            l1RpcUrl
-        ], aztecNodeConfig.l1ChainId) : {
-            chainInfo: localAnvil
-        };
-        const publicClient = createPublicClient({
-            chain: chain.chainInfo,
-            transport: fallback([
-                httpViemTransport(l1RpcUrl)
-            ])
         });
-        cheatcodes = new EthCheatCodes([
-            l1RpcUrl
-        ], dateProvider);
-        watcher = new AnvilTestWatcher(cheatcodes, rollupAddress, publicClient, dateProvider);
-        watcher.setisLocalNetwork(true);
-        watcher.setIsMarkingAsProven(false); // Do not mark as proven in the watcher. It's marked in the epochTestSettler after the out hash is set.
-        await watcher.start();
     }
     const telemetry = await initTelemetryClient(getTelemetryClientConfig());
     // Create a local blob client client inside the local network, no http connectivity
@@ -153,29 +153,8 @@ 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()));
-    }
-    let epochTestSettler;
-    if (!aztecNodeConfig.p2pEnabled) {
-        epochTestSettler = new EpochTestSettler(cheatcodes, rollupAddress, node.getBlockSource(), logger.createChild('epoch-settler'), {
-            pollingIntervalMs: 200
-        });
-        await epochTestSettler.start();
-    }
     if (initialAccounts.length) {
         const wallet = await EmbeddedWallet.create(node, {
             pxeConfig: {
@@ -184,18 +163,18 @@ const localAnvil = foundry;
             ephemeral: true
         });
         userLog('Setting up funded test accounts...');
-        const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
+        const accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccounts);
         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();
     }
     const stop = async ()=>{
         await node.stop();
-        await watcher?.stop();
-        await epochTestSettler?.stop();
     };
     return {
         node,
@@ -207,14 +186,10 @@ 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,

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/automine';
+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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRjs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFJbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsUUFBUSxDQUFDO0lBUm5CLE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBRXJEO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUNoRixRQUFRLENBQUMsK0JBQW1CLEVBQ2xDO0lBRUosT0FBYSxNQUFNLENBQ2pCLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsSUFBSSxFQUFFLFNBQVMsRUFDZixZQUFZLEVBQUUsWUFBWSxFQUMxQixRQUFRLENBQUMsRUFBRSxpQkFBaUIsR0FDM0IsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQU9yQjtJQUVEOzs7Ozs7T0FNRztJQUNHLG1CQUFtQixDQUFDLElBQUksRUFBRSxTQUFTLEdBQUcsY0FBYyxFQUFFLGVBQWUsRUFBRSxNQUFNLEdBQUcsTUFBTSxpQkF5RDNGO0lBRUQ7Ozs7OztPQU1HO0lBQ0csbUJBQW1CLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxjQUFjLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQWVwRjtDQUNGIn0=

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,kCAAkC,CAAC;AAC1E,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,iBAyD3F;IAED;;;;;;OAMG;IACG,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,iBAepF;CACF"}

package/dest/testing/cheat_codes.js

@@ -1,5 +1,6 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-import { retryUntil } from '@aztec/foundation/retry';
+import { SlotNumber } from '@aztec/foundation/branded-types';
+import { createLogger } from '@aztec/foundation/log';
 /**
  * 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
@@ -8,55 +9,88 @@ import { retryUntil } from '@aztec/foundation/retry';
  */ export class CheatCodes {
     eth;
     rollup;
-    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
+    automine;
+    logger;
+    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup, /** When wired, redirects time-warps through the AutomineSequencer queue (test-only). */ automine){
         this.eth = eth;
         this.rollup = rollup;
+        this.automine = automine;
+        this.logger = createLogger('aztecjs:cheat_codes');
     }
-    static async create(rpcUrls, node, dateProvider) {
+    static async create(rpcUrls, node, dateProvider, automine) {
         const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
         const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await node.getNodeInfo().then((n)=>n.l1ContractAddresses));
-        return new CheatCodes(ethCheatCodes, rollupCheatCodes);
+        return new CheatCodes(ethCheatCodes, rollupCheatCodes, automine);
     }
     /**
    * 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)
-   */ async warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp) {
-        const currentL2BlockNumber = await node.getBlockNumber();
-        // We warp the L1 timestamp
-        await this.eth.warp(targetTimestamp, {
+   */ async warpL2TimeAtLeastTo(node, targetTimestamp) {
+        const targetBigInt = BigInt(targetTimestamp);
+        const currentTimestamp = BigInt(await this.eth.lastBlockTimestamp());
+        if (targetBigInt <= currentTimestamp) {
+            throw new Error(`warpL2TimeAtLeastTo: target timestamp ${targetBigInt} is not in the future (current L1 timestamp is ${currentTimestamp}).`);
+        }
+        // AutomineSequencer owns time control through its serial queue — delegate to keep warps atomic
+        // with respect to any in-flight build, and avoid the mineBlock-loop hack below.
+        // `warpTo` internally builds an empty L2 checkpoint, which auto-mines exactly one L1 block at
+        // the target slot boundary, so no separate `node.mineBlock()` is needed here.
+        if (this.automine) {
+            await this.automine.warpTo(Number(targetBigInt));
+            return;
+        }
+        const currentSlot = await this.rollup.getSlot();
+        let effectiveTargetSlot = await this.rollup.getSlotAt(targetBigInt);
+        let effectiveTimestamp = await this.rollup.getTimestampForSlot(effectiveTargetSlot);
+        if (effectiveTimestamp < targetBigInt || effectiveTargetSlot <= currentSlot) {
+            const adjustedSlot = SlotNumber(Math.max(effectiveTargetSlot + 1, currentSlot + 1));
+            const adjustedTimestamp = await this.rollup.getTimestampForSlot(adjustedSlot);
+            this.logger.warn(`warpL2TimeAtLeastTo: target timestamp ${targetBigInt} does not align with a future L2 slot boundary. ` + `Auto-adjusting to start of slot ${adjustedSlot} at timestamp ${adjustedTimestamp}.`);
+            effectiveTimestamp = adjustedTimestamp;
+            effectiveTargetSlot = adjustedSlot;
+        }
+        await this.eth.warp(effectiveTimestamp, {
             resetBlockInterval: true
         });
-        // Wait until an L2 block is mined
-        const sequencer = sequencerClient.getSequencer();
-        const minTxsPerBlock = sequencer.getConfig().minTxsPerBlock;
-        sequencer.updateConfig({
-            minTxsPerBlock: 0
-        });
-        await retryUntil(async ()=>{
-            const newL2BlockNumber = await node.getBlockNumber();
-            return newL2BlockNumber > currentL2BlockNumber;
-        }, 'new block after warping L2 time', 36, 1);
-        // Restore original minTxsPerBlock
-        sequencer.updateConfig({
-            minTxsPerBlock
-        });
+        // The sequencer's polling loop may have a `work()` cycle in flight that captured pre-warp slot/timestamp values
+        // just before our warp landed. That cycle would mine an L2 block at the stale slot — the L1 sync prunes such a
+        // block from the canonical chain, but it lingers in local world state and the PXE will use it as the anchor for
+        // subsequent txs, leading to `expiration_timestamp` values that are already in the past relative to L1. Mine
+        // until we observe an L2 block at (or past) the post-warp slot, ensuring the next tx anchors to a fresh block.
+        const maxAttempts = 5;
+        for(let attempt = 1; attempt <= maxAttempts; attempt++){
+            await node.mineBlock();
+            const blockData = await node.getBlockData('latest');
+            const blockSlot = blockData?.header.globalVariables.slotNumber;
+            if (blockSlot !== undefined && BigInt(blockSlot) >= BigInt(effectiveTargetSlot)) {
+                return;
+            }
+            this.logger.warn(`warpL2TimeAtLeastTo: mined L2 block at slot ${blockSlot}, expected at least ${effectiveTargetSlot}. ` + `Retrying mineBlock (attempt ${attempt}/${maxAttempts}).`);
+        }
+        throw new Error(`warpL2TimeAtLeastTo: failed to mine an L2 block at or past slot ${effectiveTargetSlot} after ${maxAttempts} attempts.`);
     }
     /**
    * 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)
-   */ async warpL2TimeAtLeastBy(sequencerClient, node, duration) {
-        const currentTimestamp = await this.eth.timestamp();
-        const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
-        await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
+   */ async warpL2TimeAtLeastBy(node, duration) {
+        if (BigInt(duration) <= 0n) {
+            throw new Error(`warpL2TimeAtLeastBy: duration must be positive, got ${duration} seconds.`);
+        }
+        // Advance relative to whichever clock leads. A live sequencer mines L2 blocks at slot boundaries that can run
+        // ahead of anvil's L1 timestamp, so basing the target on L1 alone would advance the L2 timestamp by less than
+        // `duration`. Anchoring to the latest L2 block timestamp when it leads guarantees the post-warp L2 block is at
+        // least `duration` ahead of the current one.
+        const currentL1Timestamp = BigInt(await this.eth.lastBlockTimestamp());
+        const latestBlockData = await node.getBlockData('latest');
+        const latestL2Timestamp = latestBlockData ? BigInt(latestBlockData.header.globalVariables.timestamp) : 0n;
+        const baseTimestamp = latestL2Timestamp > currentL1Timestamp ? latestL2Timestamp : currentL1Timestamp;
+        const targetTimestamp = baseTimestamp + BigInt(duration);
+        await this.warpL2TimeAtLeastTo(node, targetTimestamp);
     }
 }

package/dest/testing/epoch_test_settler.d.ts

@@ -1,5 +1,5 @@
 import { type EthCheatCodes } from '@aztec/ethereum/test';
-import { type EpochNumber } from '@aztec/foundation/branded-types';
+import type { EpochNumber } from '@aztec/foundation/branded-types';
 import type { Logger } from '@aztec/foundation/log';
 import type { EthAddress, L2BlockSource } from '@aztec/stdlib/block';
 export declare class EpochTestSettler {
@@ -16,4 +16,4 @@ export declare class EpochTestSettler {
     stop(): Promise<void>;
     handleEpochReadyToProve(epoch: EpochNumber): Promise<boolean>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQW9DbEU7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQWNsRTtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,KAAK,WAAW,EAAc,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGrE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAoClE;CACF"}
+{"version":3,"file":"epoch_test_settler.d.ts","sourceRoot":"","sources":["../../src/testing/epoch_test_settler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAErE,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,OAAO;IARjB,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,YACE,UAAU,EAAE,aAAa,EACzB,aAAa,EAAE,UAAU,EACjB,aAAa,EAAE,aAAa,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,EAGxE;IAEK,KAAK,kBAIV;IAEK,IAAI,kBAET;IAEK,uBAAuB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAclE;CACF"}

package/dest/testing/epoch_test_settler.js

@@ -1,7 +1,6 @@
 import { RollupCheatCodes } from '@aztec/ethereum/test';
-import { SlotNumber } from '@aztec/foundation/branded-types';
+import { settleEpochOutbox } from '@aztec/prover-client/test';
 import { EpochMonitor } from '@aztec/prover-node';
-import { computeEpochOutHash } from '@aztec/stdlib/messaging';
 export class EpochTestSettler {
     l2BlockSource;
     log;
@@ -27,30 +26,12 @@ export class EpochTestSettler {
         await this.epochMonitor?.stop();
     }
     async handleEpochReadyToProve(epoch) {
-        const checkpointedBlocks = await this.l2BlockSource.getCheckpointedBlocksForEpoch(epoch);
-        const blocks = checkpointedBlocks.map((b)=>b.block);
-        this.log.info(`Settling epoch ${epoch} with blocks ${blocks[0]?.header.getBlockNumber()} to ${blocks.at(-1)?.header.getBlockNumber()}`, {
-            blocks: blocks.map((b)=>b.toBlockInfo())
+        const lastCheckpoint = await settleEpochOutbox({
+            rollupCheatCodes: this.rollupCheatCodes,
+            l2BlockSource: this.l2BlockSource,
+            epoch,
+            log: this.log
         });
-        const messagesInEpoch = [];
-        let previousSlotNumber = SlotNumber.ZERO;
-        let checkpointIndex = -1;
-        for (const block of blocks){
-            const slotNumber = block.header.globalVariables.slotNumber;
-            if (slotNumber !== previousSlotNumber) {
-                checkpointIndex++;
-                messagesInEpoch[checkpointIndex] = [];
-                previousSlotNumber = slotNumber;
-            }
-            messagesInEpoch[checkpointIndex].push(block.body.txEffects.map((txEffect)=>txEffect.l2ToL1Msgs));
-        }
-        const outHash = computeEpochOutHash(messagesInEpoch);
-        if (!outHash.isZero()) {
-            await this.rollupCheatCodes.insertOutbox(epoch, outHash.toBigInt());
-        } else {
-            this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
-        }
-        const lastCheckpoint = checkpointedBlocks.at(-1)?.checkpointNumber;
         if (lastCheckpoint !== undefined) {
             await this.rollupCheatCodes.markAsProven(lastCheckpoint);
         } else {

package/dest/testing/index.d.ts

@@ -1,6 +1,5 @@
-export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
 export { EpochTestSettler } from './epoch_test_settler.js';
 export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sMEJBQTBCLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sMEJBQTBCLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}

package/dest/testing/index.js

@@ -1,4 +1,3 @@
-export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
 export { EpochTestSettler } from './epoch_test_settler.js';