@aztec/aztec 0.0.1-commit.fce3e4f → 0.0.1-commit.ffe5b04ea

package/dest/cli/util.js

@@ -1,6 +1,8 @@
+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 { UpdateChecker } from '@aztec/stdlib/update-checker';
-import { getTelemetryClient } from '@aztec/telemetry-client';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import chalk from 'chalk';
 import { aztecStartOptions } from './aztec_start_options.js';
 export var ExitCode = /*#__PURE__*/ function(ExitCode) {
@@ -25,7 +27,7 @@ export function shutdown(logFn, exitCode, cb) {
         exitCode
     });
     if (cb) {
-        shutdownPromise = Promise.allSettled(cb).then(()=>process.exit(exitCode));
+        shutdownPromise = Promise.allSettled(cb.map((fn)=>fn())).then(()=>process.exit(exitCode));
     } else {
         // synchronously shuts down the process
         // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
@@ -64,19 +66,20 @@ export const installSignalHandlers = (logFn, cb)=>{
 /**
  * Creates logs for the initial accounts
  * @param accounts - The initial accounts
- * @param wallet - A TestWallet instance to get the registered accounts
+ * @param wallet - A EmbeddedWallet instance to get the registered accounts
  * @returns A string array containing the initial accounts details
- */ export async function createAccountLogs(accountsWithSecretKeys, wallet) {
+ */ export async function createAccountLogs(accountManagers, wallet) {
     const registeredAccounts = await wallet.getAccounts();
     const accountLogStrings = [
         `Initial Accounts:\n\n`
     ];
-    for (const accountWithSecretKey of accountsWithSecretKeys){
-        const completeAddress = await accountWithSecretKey.account.getCompleteAddress();
+    for (const accountManager of accountManagers){
+        const account = await accountManager.getAccount();
+        const completeAddress = account.getCompleteAddress();
         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: ${accountWithSecretKey.secretKey.toString()}\n`);
+            accountLogStrings.push(` Secret Key: ${account.getSecretKey().toString()}\n`);
             accountLogStrings.push(` Master nullifier public key: ${completeAddress.publicKeys.masterNullifierPublicKey.toString()}\n`);
             accountLogStrings.push(` Master incoming viewing public key: ${completeAddress.publicKeys.masterIncomingViewingPublicKey.toString()}\n\n`);
             accountLogStrings.push(` Master outgoing viewing public key: ${completeAddress.publicKeys.masterOutgoingViewingPublicKey.toString()}\n\n`);
@@ -219,7 +222,7 @@ export const printAztecStartHelpText = ()=>{
         const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
         await Promise.all([
             Crs.new(2 ** 1, undefined, log),
-            GrumpkinCrs.new(2 ** 16 + 1, undefined, log)
+            GrumpkinCrs.new(2 ** 16, undefined, log)
         ]);
     }
 }
@@ -231,94 +234,55 @@ export const printAztecStartHelpText = ()=>{
     if (realProofs) {
         const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
         await Promise.all([
-            Crs.new(2 ** 25 + 1, undefined, log),
-            GrumpkinCrs.new(2 ** 18 + 1, undefined, log)
+            Crs.new(2 ** 25, undefined, log),
+            GrumpkinCrs.new(2 ** 18, undefined, log)
         ]);
     }
 }
-export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, followsCanonicalRollup, publicClient, registryContractAddress, signalHandlers, updateNodeConfig) {
-    const logger = createLogger('update-check');
-    const checker = await UpdateChecker.new({
-        baseURL: updatesLocation,
-        publicClient,
-        registryContractAddress
-    });
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    checker.on('newRollupVersion', async ({ latestVersion, currentVersion })=>{
-        if (isShuttingDown()) {
-            return;
-        }
-        // if node follows canonical rollup then this is equivalent to a config update
-        if (!followsCanonicalRollup) {
-            return;
-        }
-        if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
-            logger.info(`New rollup version detected. Please restart the node`, {
-                latestVersion,
-                currentVersion
-            });
-            await shutdown(logger.info, 78, signalHandlers);
-        } else if (autoUpdateMode === 'notify') {
-            logger.warn(`New rollup detected. Please restart the node`, {
-                latestVersion,
-                currentVersion
-            });
+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() ?? 'unknown',
+        getLatestVersion: async ()=>{
+            const cfg = await getNetworkConfig(network, cacheDir);
+            return cfg?.nodeVersion;
         }
     });
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    checker.on('newNodeVersion', async ({ latestVersion, currentVersion })=>{
-        if (isShuttingDown()) {
-            return;
-        }
-        if (autoUpdateMode === 'config-and-version') {
-            logger.info(`New node version detected. Please update and restart the node`, {
-                latestVersion,
-                currentVersion
-            });
-            await shutdown(logger.info, 79, signalHandlers);
-        } else if (autoUpdateMode === 'notify') {
-            logger.info(`New node version detected. Please update and restart the node`, {
-                latestVersion,
-                currentVersion
+    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
             });
         }
-    });
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    checker.on('updateNodeConfig', async (config)=>{
+    }
+    const checker = new VersionChecker(checks, 600_000, logger);
+    checker.on('newVersion', ({ name, latestVersion, currentVersion })=>{
         if (isShuttingDown()) {
             return;
         }
-        if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
-            logger.warn(`Config change detected. Updating node`, config);
-            try {
-                await updateNodeConfig(config);
-            } catch (err) {
-                logger.warn('Failed to update config', {
-                    err
-                });
-            }
-        }
-    // don't notify on these config changes
-    });
-    checker.on('updatePublicTelemetryConfig', (config)=>{
-        if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
-            logger.warn(`Public telemetry config change detected. Updating telemetry client`, config);
-            try {
-                const publicIncludeMetrics = config.publicIncludeMetrics;
-                if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every((m)=>typeof m === 'string')) {
-                    getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
-                }
-                const publicMetricsCollectFrom = config.publicMetricsCollectFrom;
-                if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every((m)=>typeof m === 'string')) {
-                    getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
-                }
-            } catch (err) {
-                logger.warn('Failed to update config', {
-                    err
-                });
-            }
-        }
-    // don't notify on these config changes
+        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

@@ -2,7 +2,7 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { createLogger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { TestWallet } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
 const logger = createLogger('example:token');
 const nodeUrl = 'http://localhost:8080';
 const node = createAztecNodeClient(nodeUrl);
@@ -12,7 +12,7 @@ const TRANSFER_AMOUNT = 33n;
  * Main function.
  */ async function main() {
     logger.info('Running token contract test on HTTP interface.');
-    const wallet = await TestWallet.create(node);
+    const wallet = await EmbeddedWallet.create(node);
     // During local network setup we deploy a few accounts. Below we add them to our wallet.
     const [aliceInitialAccountData, bobInitialAccountData] = await getInitialTestAccountsData();
     await wallet.createSchnorrAccount(aliceInitialAccountData.secret, aliceInitialAccountData.salt);
@@ -21,17 +21,17 @@ const TRANSFER_AMOUNT = 33n;
     const bob = bobInitialAccountData.address;
     logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);
     logger.info('Deploying Token...');
-    const token = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
+    const { contract: token } = await TokenContract.deploy(wallet, alice, 'TokenName', 'TokenSymbol', 18).send({
         from: alice
-    }).deployed();
+    });
     logger.info('Token deployed');
     // Mint tokens to Alice
     logger.info(`Minting ${ALICE_MINT_BALANCE} more coins to Alice...`);
     await token.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({
         from: alice
-    }).wait();
+    });
     logger.info(`${ALICE_MINT_BALANCE} tokens were successfully minted by Alice and transferred to private`);
-    const balanceAfterMint = await token.methods.balance_of_private(alice).simulate({
+    const { result: balanceAfterMint } = await token.methods.balance_of_private(alice).simulate({
         from: alice
     });
     logger.info(`Tokens successfully minted. New Alice's balance: ${balanceAfterMint}`);
@@ -39,13 +39,13 @@ const TRANSFER_AMOUNT = 33n;
     logger.info(`Transferring ${TRANSFER_AMOUNT} tokens from Alice to Bob...`);
     await token.methods.transfer(bob, TRANSFER_AMOUNT).send({
         from: alice
-    }).wait();
+    });
     // Check the new balances
-    const aliceBalance = await token.methods.balance_of_private(alice).simulate({
+    const { result: aliceBalance } = await token.methods.balance_of_private(alice).simulate({
         from: alice
     });
     logger.info(`Alice's balance ${aliceBalance}`);
-    const bobBalance = await token.methods.balance_of_private(bob).simulate({
+    const { result: bobBalance } = await token.methods.balance_of_private(bob).simulate({
         from: bob
     });
     logger.info(`Bob's balance ${bobBalance}`);

package/dest/examples/util.d.ts

@@ -1,5 +1,5 @@
 import { EthAddress } from '@aztec/aztec.js/addresses';
-import type { ExtendedViemWalletClient } from '@aztec/ethereum';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import type { Abi, Narrow } from 'abitype';
 import type { Hex } from 'viem';
 /**
@@ -16,4 +16,4 @@ export declare function deployL1Contract(l1Client: ExtendedViemWalletClient, abi
  * @param ms - the number of milliseconds to sleep for
  */
 export declare function delay(ms: number): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4YW1wbGVzL3V0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHaEUsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUMzQyxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEM7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FDcEMsUUFBUSxFQUFFLHdCQUF3QixFQUNsQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxDQUFDLEVBQ3JDLFFBQVEsRUFBRSxHQUFHLEVBQ2IsSUFBSSxHQUFFLFNBQVMsT0FBTyxFQUFPLEdBQzVCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FjckI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsS0FBSyxDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUvQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4YW1wbGVzL3V0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHdEUsT0FBTyxLQUFLLEVBQUUsR0FBRyxFQUFFLE1BQU0sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUMzQyxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEM7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixnQkFBZ0IsQ0FDcEMsUUFBUSxFQUFFLHdCQUF3QixFQUNsQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsR0FBRyxTQUFTLE9BQU8sRUFBRSxDQUFDLEVBQ3JDLFFBQVEsRUFBRSxHQUFHLEVBQ2IsSUFBSSxHQUFFLFNBQVMsT0FBTyxFQUFPLEdBQzVCLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FjckI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsS0FBSyxDQUFDLEVBQUUsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUUvQyJ9

package/dest/examples/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}

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

@@ -7,4 +7,4 @@ export declare function getBananaFPCAddress(initialAccounts: InitialAccountData[
 export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn): Promise<void>;
 export declare function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
 export declare function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuYW5hX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYmFuYW5hX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBOEIsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF3QjNELHdCQUFzQixvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUseUJBRS9FO0FBV0Qsd0JBQXNCLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSx5QkFFOUU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssaUJBY3JHO0FBRUQsd0JBQXNCLCtDQUErQyxDQUFDLE1BQU0sRUFBRSxNQUFNLHlCQU1uRjtBQUVELHdCQUFzQiw4Q0FBOEMsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFNbEYifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFuYW5hX2ZwYy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvYmFuYW5hX2ZwYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxrQkFBa0IsRUFBOEIsTUFBTSx5QkFBeUIsQ0FBQztBQUM5RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUF3QjNELHdCQUFzQixvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsa0JBQWtCLEVBQUUseUJBRS9FO0FBV0Qsd0JBQXNCLG1CQUFtQixDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSx5QkFFOUU7QUFFRCx3QkFBc0IsY0FBYyxDQUFDLGVBQWUsRUFBRSxrQkFBa0IsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssaUJBa0JyRztBQUVELHdCQUFzQiwrQ0FBK0MsQ0FBQyxNQUFNLEVBQUUsTUFBTSx5QkFNbkY7QUFFRCx3QkFBc0IsOENBQThDLENBQUMsTUFBTSxFQUFFLE1BQU0seUJBTWxGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAAC,eAAe,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAcrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}
+{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/local-network/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAAC,eAAe,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAkBrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}

package/dest/local-network/banana_fpc.js

@@ -1,5 +1,5 @@
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -46,17 +46,17 @@ export async function getBananaFPCAddress(initialAccounts) {
 export async function setupBananaFPC(initialAccounts, wallet, log) {
     const bananaCoinAddress = await getBananaCoinAddress(initialAccounts);
     const admin = getBananaAdmin(initialAccounts);
-    const [bananaCoin, fpc] = await Promise.all([
+    const [{ contract: bananaCoin }, { contract: fpc }] = await Promise.all([
         TokenContract.deploy(wallet, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal).send({
             from: admin,
             contractAddressSalt: BANANA_COIN_SALT,
             universalDeploy: true
-        }).deployed(),
+        }),
         FPCContract.deploy(wallet, bananaCoinAddress, admin).send({
             from: admin,
             contractAddressSalt: BANANA_FPC_SALT,
             universalDeploy: true
-        }).deployed()
+        })
     ]);
     log(`BananaCoin: ${bananaCoin.address}`);
     log(`FPC: ${fpc.address}`);

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

@@ -1,21 +1,21 @@
 #!/usr/bin/env -S node --no-warnings
-import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { EthAddress } from '@aztec/aztec.js/addresses';
-import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
-import { Fr } from '@aztec/foundation/fields';
-import { type LogFn } from '@aztec/foundation/log';
+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 { 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 TelemetryClient } from '@aztec/telemetry-client';
-import { type HDAccount, type PrivateKeyAccount } from 'viem';
+import { type Hex } from 'viem';
 /**
  * Function to deploy our L1 contracts to the local network L1
  * @param aztecNodeConfig - The Aztec Node Config
  * @param hdAccount - Account for publishing L1 contracts
  */
-export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount | PrivateKeyAccount, contractDeployLogger?: import("@aztec/foundation/log").Logger, opts?: {
-    assumeProvenThroughBlockNumber?: number;
-    salt?: number;
+export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, privateKey: Hex, opts?: {
     genesisArchiveRoot?: Fr;
     feeJuicePortalInitialBalance?: bigint;
 }): Promise<{
@@ -39,15 +39,13 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
     dateGatedRelayerAddress?: EthAddress | undefined;
 } & {
     rollupAddress: EthAddress;
-} & {
+} & Pick<import("@aztec/ethereum/l1-contract-addresses").L1ContractAddresses, "rollupAddress"> & {
     rollupAddress: EthAddress;
 }>;
 /** Local network settings. */
 export type LocalNetworkConfig = AztecNodeConfig & {
     /** Mnemonic used to derive the L1 deployer private key.*/
     l1Mnemonic: string;
-    /** Salt used to deploy L1 contracts.*/
-    deployAztecContractsSalt: string;
     /** Whether to deploy test accounts on local network start.*/
     testAccounts: boolean;
 };
@@ -66,9 +64,10 @@ export declare function createLocalNetwork(config: Partial<LocalNetworkConfig> |
  */
 export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?: {
     telemetry?: TelemetryClient;
-    blobSinkClient?: BlobSinkClientInterface;
+    blobClient?: BlobClientInterface;
     dateProvider?: DateProvider;
+    proverBroker?: ProvingJobBroker;
 }, options?: {
     prefilledPublicData?: PublicDataTreeLeaf[];
 }): Promise<AztecNodeService>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFFLGdCQUFnQixFQUFvQixNQUFNLG1CQUFtQixDQUFDO0FBQzdGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN2RCxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBd0IsTUFBTSx5QkFBeUIsQ0FBQztBQVk3RixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLEtBQUssS0FBSyxFQUFnQixNQUFNLHVCQUF1QixDQUFDO0FBQ2pFLE9BQU8sRUFBRSxZQUFZLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFHekUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUM5RCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBR3JCLE1BQU0seUJBQXlCLENBQUM7QUFJakMsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssaUJBQWlCLEVBQTJELE1BQU0sTUFBTSxDQUFDO0FBY3ZIOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFNBQVMsRUFBRSxTQUFTLEdBQUcsaUJBQWlCLEVBQ3hDLG9CQUFvQix5Q0FBUyxFQUM3QixJQUFJLEdBQUU7SUFDSiw4QkFBOEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN4QyxJQUFJLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZCxrQkFBa0IsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUN4Qiw0QkFBNEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNsQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FrQ1A7QUFFRCw4QkFBOEI7QUFDOUIsTUFBTSxNQUFNLGtCQUFrQixHQUFHLGVBQWUsR0FBRztJQUNqRCwwREFBMEQ7SUFDMUQsVUFBVSxFQUFFLE1BQU0sQ0FBQztJQUNuQix1Q0FBdUM7SUFDdkMsd0JBQXdCLEVBQUUsTUFBTSxDQUFDO0lBQ2pDLDZEQUE2RDtJQUM3RCxZQUFZLEVBQUUsT0FBTyxDQUFDO0NBQ3ZCLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE1BQU0seUNBQWtDLEVBQUUsT0FBTyxFQUFFLEtBQUs7OztHQWdIaEc7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsZUFBZSxDQUNuQyxNQUFNLEdBQUUsT0FBTyxDQUFDLGVBQWUsQ0FBTSxFQUNyQyxJQUFJLEdBQUU7SUFBRSxTQUFTLENBQUMsRUFBRSxlQUFlLENBQUM7SUFBQyxjQUFjLENBQUMsRUFBRSx1QkFBdUIsQ0FBQztJQUFDLFlBQVksQ0FBQyxFQUFFLFlBQVksQ0FBQTtDQUFPLEVBQ2pILE9BQU8sR0FBRTtJQUFFLG1CQUFtQixDQUFDLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQTtDQUFPLDZCQVc3RCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvY2FsLW5ldHdvcmsvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFvQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1QyxPQUFPLEVBQUUsS0FBSyxtQkFBbUIsRUFBb0IsTUFBTSwyQkFBMkIsQ0FBQztBQVN2RixPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFlBQVksRUFBb0IsTUFBTSx5QkFBeUIsQ0FBQztBQUt6RSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDOUQsT0FBTyxFQUNMLEtBQUssZUFBZSxFQUdyQixNQUFNLHlCQUF5QixDQUFDO0FBS2pDLE9BQU8sRUFBRSxLQUFLLEdBQUcsRUFBMkQsTUFBTSxNQUFNLENBQUM7QUFnQnpGOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQ3ZDLGVBQWUsRUFBRSxlQUFlLEVBQ2hDLFVBQVUsRUFBRSxHQUFHLEVBQ2YsSUFBSSxHQUFFO0lBQ0osa0JBQWtCLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDeEIsNEJBQTRCLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDbEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JQO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sTUFBTSxrQkFBa0IsR0FBRyxlQUFlLEdBQUc7SUFDakQsMERBQTBEO0lBQzFELFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsNkRBQTZEO0lBQzdELFlBQVksRUFBRSxPQUFPLENBQUM7Q0FDdkIsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSx5Q0FBa0MsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBd0poRztBQUVEOzs7R0FHRztBQUNILHdCQUFzQixlQUFlLENBQ25DLE1BQU0sR0FBRSxPQUFPLENBQUMsZUFBZSxDQUFNLEVBQ3JDLElBQUksR0FBRTtJQUNKLFNBQVMsQ0FBQyxFQUFFLGVBQWUsQ0FBQztJQUM1QixVQUFVLENBQUMsRUFBRSxtQkFBbUIsQ0FBQztJQUNqQyxZQUFZLENBQUMsRUFBRSxZQUFZLENBQUM7SUFDNUIsWUFBWSxDQUFDLEVBQUUsZ0JBQWdCLENBQUM7Q0FDNUIsRUFDTixPQUFPLEdBQUU7SUFBRSxtQkFBbUIsQ0FBQyxFQUFFLGtCQUFrQixFQUFFLENBQUE7Q0FBTyw2QkFlN0QifQ==

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,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAY7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,8BAA8B;AAC9B,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG;IACjD,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,6DAA6D;IAC7D,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,yCAAkC,EAAE,OAAO,EAAE,KAAK;;;GAgHhG;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}
+{"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"}

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

@@ -1,19 +1,27 @@
 #!/usr/bin/env -S node --no-warnings
 import { getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { EthAddress } from '@aztec/aztec.js/addresses';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
+import { AztecNodeService } 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 { NULL_KEY, createEthereumChain, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, waitForPublicClient } from '@aztec/ethereum';
+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 { Fr } from '@aztec/foundation/fields';
-import { createLogger } from '@aztec/foundation/log';
+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 { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
 import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
@@ -21,6 +29,8 @@ 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 { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
 import { getSponsoredFPCAddress } from './sponsored_fpc.js';
 const logger = createLogger('local-network');
@@ -29,24 +39,19 @@ const localAnvil = foundry;
  * Function to deploy our L1 contracts to the local network L1
  * @param aztecNodeConfig - The Aztec Node Config
  * @param hdAccount - Account for publishing L1 contracts
- */ export async function deployContractsToL1(aztecNodeConfig, hdAccount, contractDeployLogger = logger, opts = {}) {
-    const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain(aztecNodeConfig.l1RpcUrls, aztecNodeConfig.l1ChainId) : {
-        chainInfo: localAnvil
-    };
+ */ export async function deployContractsToL1(aztecNodeConfig, privateKey, opts = {}) {
     await waitForPublicClient(aztecNodeConfig);
-    const l1Contracts = await deployL1Contracts(aztecNodeConfig.l1RpcUrls, hdAccount, chain.chainInfo, contractDeployLogger, {
+    const l1Contracts = await deployAztecL1Contracts(aztecNodeConfig.l1RpcUrls[0], privateKey, foundry.id, {
         ...getL1ContractsConfigEnvVars(),
         ...aztecNodeConfig,
         vkTreeRoot: getVKTreeRoot(),
         protocolContractsHash,
         genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
-        salt: opts.salt,
         feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
         aztecTargetCommitteeSize: 0,
         slasherFlavor: 'none',
         realVerifier: false
     });
-    await deployMulticall3(l1Contracts.l1Client, logger);
     aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
     aztecNodeConfig.rollupVersion = l1Contracts.rollupVersion;
     return aztecNodeConfig.l1Contracts;
@@ -64,14 +69,21 @@ const localAnvil = foundry;
     if ((config.l1RpcUrls?.length || 0) > 1) {
         logger.warn(`Multiple L1 RPC URLs provided. Local networks will only use the first one: ${l1RpcUrl}`);
     }
+    // The local network deploys a banana FPC with Token contracts, so include Token entries
+    // in the setup allowlist so FPC-based fee payments work out of the box.
+    const tokenAllowList = await getTokenAllowedSetupFunctions();
     const aztecNodeConfig = {
         ...getConfigEnvVars(),
-        ...config
+        ...config,
+        txPublicSetupAllowListExtend: [
+            ...tokenAllowList,
+            ...config.txPublicSetupAllowListExtend ?? []
+        ]
     };
     const hdAccount = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic);
-    if (aztecNodeConfig.publisherPrivateKeys == undefined || !aztecNodeConfig.publisherPrivateKeys.length || aztecNodeConfig.publisherPrivateKeys[0].getValue() === NULL_KEY) {
+    if (aztecNodeConfig.sequencerPublisherPrivateKeys == undefined || !aztecNodeConfig.sequencerPublisherPrivateKeys.length || aztecNodeConfig.sequencerPublisherPrivateKeys[0].getValue() === NULL_KEY) {
         const privKey = hdAccount.getHdKey().privateKey;
-        aztecNodeConfig.publisherPrivateKeys = [
+        aztecNodeConfig.sequencerPublisherPrivateKeys = [
             new SecretValue(`0x${Buffer.from(privKey).toString('hex')}`)
         ];
     }
@@ -95,21 +107,25 @@ const localAnvil = foundry;
     })();
     const bananaFPC = await getBananaFPCAddress(initialAccounts);
     const sponsoredFPC = await getSponsoredFPCAddress();
-    const fundedAddresses = initialAccounts.length ? [
+    const prefundAddresses = (aztecNodeConfig.prefundAddresses ?? []).map((a)=>AztecAddress.fromString(a));
+    const fundedAddresses = [
         ...initialAccounts.map((a)=>a.address),
-        bananaFPC,
-        sponsoredFPC
-    ] : [];
+        ...initialAccounts.length ? [
+            bananaFPC,
+            sponsoredFPC
+        ] : [],
+        ...prefundAddresses
+    ];
     const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
-    let watcher = undefined;
     const dateProvider = new TestDateProvider();
+    let cheatcodes;
+    let rollupAddress;
+    let watcher;
     if (!aztecNodeConfig.p2pEnabled) {
-        const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, hdAccount, undefined, {
-            assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
+        ({ rollupAddress } = await deployContractsToL1(aztecNodeConfig, aztecNodeConfig.validatorPrivateKeys.getValue()[0], {
             genesisArchiveRoot,
-            salt: config.deployAztecContractsSalt ? parseInt(config.deployAztecContractsSalt) : undefined,
             feeJuicePortalInitialBalance: fundingNeeded
-        });
+        }));
         const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
             l1RpcUrl
         ], aztecNodeConfig.l1ChainId) : {
@@ -121,34 +137,55 @@ const localAnvil = foundry;
                 httpViemTransport(l1RpcUrl)
             ])
         });
-        watcher = new AnvilTestWatcher(new EthCheatCodes([
+        cheatcodes = new EthCheatCodes([
             l1RpcUrl
-        ], dateProvider), l1ContractAddresses.rollupAddress, publicClient, dateProvider);
+        ], 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 = initTelemetryClient(getTelemetryClientConfig());
-    // Create a local blob sink client inside the local network, no http connectivity
-    const blobSinkClient = createBlobSinkClient();
+    const telemetry = await initTelemetryClient(getTelemetryClientConfig());
+    // Create a local blob client client inside the local network, no http connectivity
+    const blobClient = createBlobClient();
     const node = await createAztecNode(aztecNodeConfig, {
         telemetry,
-        blobSinkClient,
+        blobClient,
         dateProvider
     }, {
         prefilledPublicData
     });
+    // 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 PXEConfig = {
-            proverEnabled: aztecNodeConfig.realProofs
-        };
-        const wallet = await TestWallet.create(node, PXEConfig);
+        const wallet = await EmbeddedWallet.create(node, {
+            pxeConfig: {
+                proverEnabled: aztecNodeConfig.realProofs
+            },
+            ephemeral: true
+        });
         userLog('Setting up funded test accounts...');
-        const accountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccounts);
-        const accountsWithSecrets = accountManagers.map((manager, i)=>({
-                account: manager,
-                secretKey: initialAccounts[i].secret
-            }));
-        const accLogs = await createAccountLogs(accountsWithSecrets, wallet);
+        const accountManagers = await deployFundedSchnorrAccounts(wallet, initialAccounts);
+        const accLogs = await createAccountLogs(accountManagers, wallet);
         userLog(accLogs.join(''));
         await setupBananaFPC(initialAccounts, wallet, userLog);
         userLog(`SponsoredFPC: ${await getSponsoredFPCAddress()}`);
@@ -158,6 +195,7 @@ const localAnvil = foundry;
     const stop = async ()=>{
         await node.stop();
         await watcher?.stop();
+        await epochTestSettler?.stop();
     };
     return {
         node,
@@ -178,6 +216,11 @@ const localAnvil = foundry;
             ...config.l1Contracts
         }
     };
-    const node = await AztecNodeService.createAndSync(aztecNodeConfig, deps, options);
+    const node = await AztecNodeService.createAndSync(aztecNodeConfig, {
+        ...deps,
+        proverNodeDeps: {
+            broker: deps.proverBroker
+        }
+    }, options);
     return node;
 }