@aztec/aztec 0.0.1-commit.2f68f620 → 0.0.1-commit.3100065

package/dest/cli/util.js

@@ -1,8 +1,4 @@
-import { getNetworkConfig } from '@aztec/cli/config';
-import { RegistryContract } from '@aztec/ethereum/contracts';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { createLogger } from '@aztec/foundation/log';
-import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import chalk from 'chalk';
 import { aztecStartOptions } from './aztec_start_options.js';
 export var ExitCode = /*#__PURE__*/ function(ExitCode) {
@@ -38,6 +34,25 @@ export function shutdown(logFn, exitCode, cb) {
 export function isShuttingDown() {
     return shutdownPromise !== undefined;
 }
+/**
+ * Stops the node's subsystems (via the registered signal handlers) without exiting the process, leaving
+ * the HTTP health server listening so K8s liveness/readiness probes keep passing. Unlike {@link shutdown}
+ * this deliberately does not latch `shutdownPromise` or call `process.exit`; instead it re-arms
+ * SIGTERM/SIGINT so a later K8s pod deletion still terminates the wound-down pod with a clean exit.
+ */ export async function softShutdown(logFn, signalHandlers) {
+    logFn('Canonical rollup upgrade detected: stopping subsystems, health server stays up.', {
+        exitCode: 78
+    });
+    await Promise.allSettled(signalHandlers.map((fn)=>fn()));
+    for (const sig of [
+        'SIGTERM',
+        'SIGINT'
+    ]){
+        process.removeAllListeners(sig);
+        process.once(sig, ()=>process.exit(78));
+    }
+    logFn('Subsystems stopped due to rollup upgrade. Health server remains active.');
+}
 export const installSignalHandlers = (logFn, cb)=>{
     const signals = [
         [
@@ -79,7 +94,7 @@ export const installSignalHandlers = (logFn, cb)=>{
         if (registeredAccounts.find((a)=>a.item.equals(completeAddress.address))) {
             accountLogStrings.push(` Address: ${completeAddress.address.toString()}\n`);
             accountLogStrings.push(` Partial Address: ${completeAddress.partialAddress.toString()}\n`);
-            accountLogStrings.push(` Secret Key: ${account.getSecretKey().toString()}\n`);
+            accountLogStrings.push(` Secret Key: ${accountManager.getSecretKey().toString()}\n`);
             accountLogStrings.push(` Master nullifier public key hash: ${completeAddress.publicKeys.npkMHash.toString()}\n`);
             accountLogStrings.push(` Master incoming viewing public key: ${completeAddress.publicKeys.ivpkM.toString()}\n\n`);
             accountLogStrings.push(` Master outgoing viewing public key hash: ${completeAddress.publicKeys.ovpkMHash.toString()}\n\n`);
@@ -241,50 +256,6 @@ export const printAztecStartHelpText = ()=>{
         ]);
     }
 }
-export async function setupVersionChecker(network, followsCanonicalRollup, publicClient, signalHandlers, cacheDir) {
-    const networkConfig = await getNetworkConfig(network, cacheDir);
-    if (!networkConfig) {
-        return;
-    }
-    const { VersionChecker } = await import('@aztec/stdlib/update-checker');
-    const logger = createLogger('version_check');
-    const registry = new RegistryContract(publicClient, networkConfig.registryAddress);
-    const checks = [];
-    checks.push({
-        name: 'node',
-        currentVersion: getPackageVersion(),
-        getLatestVersion: async ()=>{
-            const cfg = await getNetworkConfig(network, cacheDir);
-            return cfg?.nodeVersion;
-        }
-    });
-    if (followsCanonicalRollup) {
-        const getLatestVersion = async ()=>{
-            const version = (await registry.getRollupVersions()).at(-1);
-            return version !== undefined ? String(version) : undefined;
-        };
-        const currentVersion = await getLatestVersion();
-        if (currentVersion !== undefined) {
-            checks.push({
-                name: 'rollup',
-                currentVersion,
-                getLatestVersion
-            });
-        }
-    }
-    const checker = new VersionChecker(checks, 600_000, logger);
-    checker.on('newVersion', ({ name, latestVersion, currentVersion })=>{
-        if (isShuttingDown()) {
-            return;
-        }
-        logger.warn(`New ${name} version available`, {
-            latestVersion,
-            currentVersion
-        });
-    });
-    checker.start();
-    signalHandlers.push(()=>checker.stop());
-}
 export function stringifyConfig(config) {
     return Object.entries(config).map(([key, value])=>`${key}=${jsonStringify(value)}`).join(' ');
 }

package/dest/examples/token.js

@@ -13,10 +13,10 @@ const TRANSFER_AMOUNT = 33n;
  */ async function main() {
     logger.info('Running token contract test on HTTP interface.');
     const wallet = await EmbeddedWallet.create(node);
-    // During local network setup we deploy a few accounts. Below we add them to our wallet.
+    // During local network setup we create a few initializerless accounts. Below we add them to our wallet.
     const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
-    await wallet.createSchnorrAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);
-    await wallet.createSchnorrAccount(bobInitialAccountData.secret, bobInitialAccountData.salt);
+    await wallet.createSchnorrInitializerlessAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt, aliceInitialAccountData.signingKey);
+    await wallet.createSchnorrInitializerlessAccount(bobInitialAccountData.secret, bobInitialAccountData.salt, bobInitialAccountData.signingKey);
     const alice = aliceInitialAccountData.address;
     const bob = bobInitialAccountData.address;
     logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);

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

@@ -1,5 +1,4 @@
 #!/usr/bin/env -S node --no-warnings
-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';
@@ -9,7 +8,7 @@ import { DateProvider } from '@aztec/foundation/timer';
 import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 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
@@ -32,7 +31,7 @@ export type LocalNetworkConfig = AztecNodeConfig & {
  * @param config - Optional local network settings.
  */
 export declare function createLocalNetwork(config: Partial<LocalNetworkConfig> | undefined, userLog: LogFn): Promise<{
-    node: AztecNodeService;
+    node: import("@aztec/aztec-node").AztecNodeService;
     stop: () => Promise<void>;
 }>;
 /**
@@ -46,5 +45,5 @@ export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?
     proverBroker?: ProvingJobBroker;
 }, options?: {
     genesis?: GenesisData;
-}): Promise<AztecNodeService>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQU92RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBSWpGLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFLekUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV4RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFLakMsT0FBTyxFQUFFLEtBQUssR0FBRyxFQUEyRCxNQUFNLE1BQU0sQ0FBQztBQXVCekY7Ozs7R0FJRztBQUNILHdCQUFzQixtQkFBbUIsQ0FDdkMsZUFBZSxFQUFFLGVBQWUsRUFDaEMsVUFBVSxFQUFFLEdBQUcsRUFDZixJQUFJLEdBQUU7SUFDSixrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUN4Qiw0QkFBNEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQyxHQUNMLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQW1COUI7QUFFRCw4QkFBOEI7QUFDOUIsTUFBTSxNQUFNLGtCQUFrQixHQUFHLGVBQWUsR0FBRztJQUNqRCwwREFBMEQ7SUFDMUQsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQiw2REFBNkQ7SUFDN0QsWUFBWSxFQUFFLE9BQU8sQ0FBQztDQUN2QixDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFzQixrQkFBa0IsQ0FBQyxNQUFNLHlDQUFrQyxFQUFFLE9BQU8sRUFBRSxLQUFLOzs7R0EwS2hHO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxHQUFFLE9BQU8sQ0FBQyxlQUFlLENBQU0sRUFDckMsSUFBSSxHQUFFO0lBQ0osU0FBUyxDQUFDLEVBQUUsZUFBZSxDQUFDO0lBQzVCLFVBQVUsQ0FBQyxFQUFFLG1CQUFtQixDQUFDO0lBQ2pDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQztJQUM1QixZQUFZLENBQUMsRUFBRSxnQkFBZ0IsQ0FBQztDQUM1QixFQUNOLE9BQU8sR0FBRTtJQUFFLE9BQU8sQ0FBQyxFQUFFLFdBQVcsQ0FBQTtDQUFPLDZCQWN4QyJ9
+}): Promise<import("@aztec/aztec-node").AztecNodeService>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBR0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQU12RixPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHVDQUF1QyxDQUFDO0FBR2pGLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFJekUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV4RSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFLakMsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBbUJoQzs7OztHQUlHO0FBQ0gsd0JBQXNCLG1CQUFtQixDQUN2QyxlQUFlLEVBQUUsZUFBZSxFQUNoQyxVQUFVLEVBQUUsR0FBRyxFQUNmLElBQUksR0FBRTtJQUNKLGtCQUFrQixDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQ3hCLDRCQUE0QixDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ2xDLEdBQ0wsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBbUI5QjtBQUVELDhCQUE4QjtBQUM5QixNQUFNLE1BQU0sa0JBQWtCLEdBQUcsZUFBZSxHQUFHO0lBQ2pELDBEQUEwRDtJQUMxRCxVQUFVLEVBQUUsTUFBTSxDQUFDO0lBQ25CLDZEQUE2RDtJQUM3RCxZQUFZLEVBQUUsT0FBTyxDQUFDO0NBQ3ZCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE1BQU0seUNBQWtDLEVBQUUsT0FBTyxFQUFFLEtBQUs7OztHQTRIaEc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxNQUFNLEdBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBTSxFQUNyQyxJQUFJLEdBQUU7SUFDSixTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7SUFDNUIsVUFBVSxDQUFDLEVBQUUsbUJBQW1CLENBQUM7SUFDakMsWUFBWSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQzVCLFlBQVksQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0NBQzVCLEVBQ04sT0FBTyxHQUFFO0lBQUUsT0FBTyxDQUFDLEVBQUUsV0FBVyxDQUFBO0NBQU8seURBY3hDIn0=

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;AAOvF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAIjF,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;AAExE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,KAAK,GAAG,EAA2D,MAAM,MAAM,CAAC;AAuBzF;;;;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;;;GA0KhG;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"}
+{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/local-network/local-network.ts"],"names":[],"mappings":";AAGA,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;;;GA4HhG;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,yDAcxC"}

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

@@ -1,36 +1,30 @@
 #!/usr/bin/env -S node --no-warnings
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { AztecNodeService } from '@aztec/aztec-node';
+import { createAztecNodeService } from '@aztec/aztec-node';
 import { getConfigEnvVars } from '@aztec/aztec-node/config';
 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';
@@ -43,7 +37,6 @@ const logger = createLogger('local-network');
 const setupWaitOpts = {
     waitForStatus: TxStatus.CHECKPOINTED
 };
-const localAnvil = foundry;
 /**
  * Function to deploy our L1 contracts to the local network L1
  * @param aztecNodeConfig - The Aztec Node Config
@@ -81,13 +74,36 @@ 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,
+        // The local network builds node config from env without a DATA_DIRECTORY, so the validator's
+        // local signing protection runs against an ephemeral store. That is acceptable for this dev
+        // network; production validators must persist it and fail-fast when the data directory is unset.
+        allowEphemeralSigningProtection: config.allowEphemeralSigningProtection ?? 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) {
@@ -106,7 +122,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,7 +132,7 @@ const localAnvil = foundry;
     })();
     const bananaFPC = await getBananaFPCAddress(initialAccounts);
     const sponsoredFPC = await getSponsoredFPCAddress();
-    const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map((a)=>AztecAddress.fromString(a));
+    const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map((a)=>AztecAddress.fromStringUnsafe(a));
     const fundedAddresses = [
         ...initialAccounts.map((a)=>a.address),
         ...initialAccounts.length ? [
@@ -127,32 +143,11 @@ const localAnvil = foundry;
     ];
     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
@@ -164,42 +159,6 @@ const localAnvil = foundry;
     }, {
         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'), {
-            pollingIntervalMs: 200
-        });
-        await epochTestSettler.start();
-    }
     if (initialAccounts.length) {
         const wallet = await EmbeddedWallet.create(node, {
             pxeConfig: {
@@ -208,7 +167,7 @@ const localAnvil = foundry;
             ephemeral: true
         });
         userLog('Setting up funded test accounts...');
-        const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts, setupWaitOpts);
+        const accountManagers = await createFundedInitializerlessAccounts(wallet, initialAccounts);
         const accLogs = await createAccountLogs(accountManagers, wallet);
         userLog(accLogs.join(''));
         userLog('Publishing standard AuthRegistry contract...');
@@ -220,8 +179,6 @@ const localAnvil = foundry;
     }
     const stop = async ()=>{
         await node.stop();
-        await watcher?.stop();
-        await epochTestSettler?.stop();
     };
     return {
         node,
@@ -238,7 +195,7 @@ const localAnvil = foundry;
         ...getConfigEnvVars(),
         ...config
     };
-    const node = await AztecNodeService.createAndSync(aztecNodeConfig, {
+    const node = await createAztecNodeService(aztecNodeConfig, {
         ...deps,
         proverNodeDeps: {
             broker: deps.proverBroker

package/dest/testing/cheat_codes.d.ts

@@ -1,44 +1,37 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 import type { DateProvider } from '@aztec/foundation/timer';
-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
- * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
- * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
+ * Wrapper for Aztec Debug API.
+ * @deprecated use the AztecNode debug API directly.
  */
 export declare class CheatCodes {
     /** Cheat codes for L1.*/
     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, 
-    /** 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>;
+    rollup: RollupCheatCodes);
+    static create(rpcUrls: string[], node: AztecNode, dateProvider: DateProvider): 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. 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)
+     * Warps the L1 timestamp to at least `targetTimestamp` and mines an L2 block advancing the L2 timestamp to at least
+     * the target. Forwards to the node's debug API, which serializes the warp through the automine sequencer queue.
+     * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
+     * @param targetTimestamp - The target timestamp to warp to (in seconds).
+     * @deprecated Call `node.warpL2TimeAtLeastTo(targetTimestamp)` on the node debug API directly.
      */
     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. 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)
+     * Warps the L1 timestamp forward by at least `duration` seconds and mines an L2 block advancing the L2 timestamp at
+     * least by the duration. Forwards to the node's debug API, which serializes the warp through the automine sequencer
+     * queue.
+     * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
+     * @param duration - The duration to advance time by (in seconds).
+     * @deprecated Call `node.warpL2TimeAtLeastBy(duration)` on the node debug API directly.
      */
     warpL2TimeAtLeastBy(node: AztecNode & AztecNodeDebug, duration: bigint | number): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUd2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUVqRjs7Ozs7R0FLRztBQUNILHFCQUFhLFVBQVU7SUFJbkIseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUN4RixPQUFPLENBQUMsUUFBUSxDQUFDO0lBUm5CLE9BQU8sQ0FBQyxNQUFNLENBQXVDO0lBRXJEO0lBQ0UseUJBQXlCO0lBQ2xCLEdBQUcsRUFBRSxhQUFhO0lBQ3pCLHVEQUF1RDtJQUNoRCxNQUFNLEVBQUUsZ0JBQWdCO0lBQy9CLHdGQUF3RjtJQUNoRixRQUFRLENBQUMsK0JBQW1CLEVBQ2xDO0lBRUosT0FBYSxNQUFNLENBQ2pCLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsSUFBSSxFQUFFLFNBQVMsRUFDZixZQUFZLEVBQUUsWUFBWSxFQUMxQixRQUFRLENBQUMsRUFBRSxpQkFBaUIsR0FDM0IsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQU9yQjtJQUVEOzs7Ozs7T0FNRztJQUNHLG1CQUFtQixDQUFDLElBQUksRUFBRSxTQUFTLEdBQUcsY0FBYyxFQUFFLGVBQWUsRUFBRSxNQUFNLEdBQUcsTUFBTSxpQkE0RDNGO0lBRUQ7Ozs7OztPQU1HO0lBQ0csbUJBQW1CLENBQUMsSUFBSSxFQUFFLFNBQVMsR0FBRyxjQUFjLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxNQUFNLGlCQWVwRjtDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlYXRfY29kZXMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2NoZWF0X2NvZGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFakY7OztHQUdHO0FBQ0gscUJBQWEsVUFBVTtJQUVuQix5QkFBeUI7SUFDbEIsR0FBRyxFQUFFLGFBQWE7SUFDekIsdURBQXVEO0lBQ2hELE1BQU0sRUFBRSxnQkFBZ0I7SUFKakM7SUFDRSx5QkFBeUI7SUFDbEIsR0FBRyxFQUFFLGFBQWE7SUFDekIsdURBQXVEO0lBQ2hELE1BQU0sRUFBRSxnQkFBZ0IsRUFDN0I7SUFFSixPQUFhLE1BQU0sQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsWUFBWSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FPdkc7SUFFRDs7Ozs7O09BTUc7SUFDSCxtQkFBbUIsQ0FBQyxJQUFJLEVBQUUsU0FBUyxHQUFHLGNBQWMsRUFBRSxlQUFlLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRXJHO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILG1CQUFtQixDQUFDLElBQUksRUFBRSxTQUFTLEdBQUcsY0FBYyxFQUFFLFFBQVEsRUFBRSxNQUFNLEdBQUcsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFOUY7Q0FDRiJ9

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,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"}
+{"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;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjF;;;GAGG;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;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErG;IAED;;;;;;;OAOG;IACH,mBAAmB,CAAC,IAAI,EAAE,SAAS,GAAG,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9F;CACF"}

package/dest/testing/cheat_codes.js

@@ -1,98 +1,36 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
-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
- * they became unused (we now have better testing tools). If you are introducing a new functionality to the cheat
- * codes, please consider whether it makes sense to just introduce new utils in your tests instead.
+ * Wrapper for Aztec Debug API.
+ * @deprecated use the AztecNode debug API directly.
  */ export class CheatCodes {
     eth;
     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){
+    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
         this.eth = eth;
         this.rollup = rollup;
-        this.automine = automine;
-        this.logger = createLogger('aztecjs:cheat_codes');
     }
-    static async create(rpcUrls, node, dateProvider, automine) {
+    static async create(rpcUrls, node, dateProvider) {
         const ethCheatCodes = new EthCheatCodes(rpcUrls, dateProvider);
         const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await node.getNodeInfo().then((n)=>n.l1ContractAddresses));
-        return new CheatCodes(ethCheatCodes, rollupCheatCodes, automine);
+        return new CheatCodes(ethCheatCodes, rollupCheatCodes);
     }
     /**
-   * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
-   * 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(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();
-        const targetSlot = await this.rollup.getSlotAt(targetBigInt);
-        let effectiveTimestamp = targetBigInt;
-        let effectiveTargetSlot = targetSlot;
-        if (targetSlot <= currentSlot) {
-            // Target lands in the same (or earlier) slot — auto-adjust to the next slot's start.
-            const nextSlot = SlotNumber(currentSlot + 1);
-            const nextSlotTimestamp = await this.rollup.getTimestampForSlot(nextSlot);
-            this.logger.warn(`warpL2TimeAtLeastTo: target timestamp ${targetBigInt} falls in current slot ${currentSlot}. ` + `Auto-adjusting to start of slot ${nextSlot} at timestamp ${nextSlotTimestamp}.`);
-            effectiveTimestamp = nextSlotTimestamp;
-            effectiveTargetSlot = nextSlot;
-        }
-        await this.eth.warp(effectiveTimestamp, {
-            resetBlockInterval: true
-        });
-        // 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 to at least `targetTimestamp` and mines an L2 block advancing the L2 timestamp to at least
+   * the target. Forwards to the node's debug API, which serializes the warp through the automine sequencer queue.
+   * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
+   * @param targetTimestamp - The target timestamp to warp to (in seconds).
+   * @deprecated Call `node.warpL2TimeAtLeastTo(targetTimestamp)` on the node debug API directly.
+   */ warpL2TimeAtLeastTo(node, targetTimestamp) {
+        return node.warpL2TimeAtLeastTo(Number(targetTimestamp));
     }
     /**
-   * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
-   * 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(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);
+   * Warps the L1 timestamp forward by at least `duration` seconds and mines an L2 block advancing the L2 timestamp at
+   * least by the duration. Forwards to the node's debug API, which serializes the warp through the automine sequencer
+   * queue.
+   * @param node - The Aztec node whose debug API performs the warp. Must run an automine sequencer.
+   * @param duration - The duration to advance time by (in seconds).
+   * @deprecated Call `node.warpL2TimeAtLeastBy(duration)` on the node debug API directly.
+   */ warpL2TimeAtLeastBy(node, duration) {
+        return node.warpL2TimeAtLeastBy(Number(duration));
     }
 }

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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfdGVzdF9zZXR0bGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9lcG9jaF90ZXN0X3NldHRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUFvQixNQUFNLHNCQUFzQixDQUFDO0FBQzVFLE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBYyxNQUFNLGlDQUFpQyxDQUFDO0FBQy9FLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxhQUFhLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRSxxQkFBYSxnQkFBZ0I7SUFPekIsT0FBTyxDQUFDLGFBQWE7SUFDckIsT0FBTyxDQUFDLEdBQUc7SUFDWCxPQUFPLENBQUMsT0FBTztJQVJqQixPQUFPLENBQUMsZ0JBQWdCLENBQW1CO0lBQzNDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBZTtJQUVwQyxZQUNFLFVBQVUsRUFBRSxhQUFhLEVBQ3pCLGFBQWEsRUFBRSxVQUFVLEVBQ2pCLGFBQWEsRUFBRSxhQUFhLEVBQzVCLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFO1FBQUUsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO1FBQUMsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsRUFHeEU7SUFFSyxLQUFLLGtCQUlWO0lBRUssSUFBSSxrQkFFVDtJQUVLLHVCQUF1QixDQUFDLEtBQUssRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQW1DbEU7Q0FDRiJ9
+//# 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,CAmClE;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,32 +26,12 @@ export class EpochTestSettler {
         await this.epochMonitor?.stop();
     }
     async handleEpochReadyToProve(epoch) {
-        const blocks = await this.l2BlockSource.getBlocks({
+        const lastCheckpoint = await settleEpochOutbox({
+            rollupCheatCodes: this.rollupCheatCodes,
+            l2BlockSource: this.l2BlockSource,
             epoch,
-            onlyCheckpointed: true
+            log: this.log
         });
-        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 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, messagesInEpoch.length, outHash.toBigInt());
-        } else {
-            this.log.info(`No L2 to L1 messages in epoch ${epoch}`);
-        }
-        const lastCheckpoint = blocks.at(-1)?.checkpointNumber;
         if (lastCheckpoint !== undefined) {
             await this.rollupCheatCodes.markAsProven(lastCheckpoint);
         } else {