@aztec/end-to-end 1.2.0 → 2.0.0-nightly.20250813

package/dest/spartan/setup_test_wallets.js

@@ -1,8 +1,12 @@
 import { getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
 import { generateSchnorrAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
-import { FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, createAztecNodeClient, createCompatibleClient, retryUntil } from '@aztec/aztec.js';
+import { FeeJuicePaymentMethodWithClaim, Fr, L1FeeJuicePortalManager, SponsoredFeePaymentMethod, createAztecNodeClient, createCompatibleClient, retryUntil } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { createPXEService } from '@aztec/pxe/server';
+import { getACVMConfig } from '../fixtures/get_acvm_config.js';
+import { getBBConfig } from '../fixtures/get_bb_config.js';
+import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.js';
 const TOKEN_NAME = 'USDC';
 const TOKEN_SYMBOL = 'USD';
 const TOKEN_DECIMALS = 18n;
@@ -11,17 +15,51 @@ export async function setupTestWalletsWithTokens(pxeUrl, mintAmount, logger) {
     const pxe = await createCompatibleClient(pxeUrl, logger);
     const [recipientWallet, ...wallets] = (await getDeployedTestAccountsWallets(pxe)).slice(0, WALLET_COUNT + 1);
     const tokenAdmin = wallets[0];
-    const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, logger);
+    const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, undefined, logger);
     const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
     return {
         pxe,
         wallets,
         tokenAdminWallet,
+        tokenAdminAddress: tokenAdmin.getAddress(),
         tokenName: TOKEN_NAME,
         tokenAddress,
+        recipientAddress: recipientWallet.getAddress(),
         recipientWallet
     };
 }
+export async function deploySponsoredTestWallets(pxe, mintAmount, logger, numberOfFundedWallets = 1) {
+    const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
+    const recipientWallet = await getSchnorrWalletWithSecretKey(pxe, recipient.secret, recipient.signingKey, recipient.salt);
+    const fundedAccounts = await Promise.all(funded.map((a)=>getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
+    await registerSponsoredFPC(pxe);
+    const wallets = await Promise.all(fundedAccounts.map(async (a)=>{
+        const wallet = await a.getWallet();
+        const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
+        await a.deploy({
+            fee: {
+                paymentMethod
+            }
+        }).wait({
+            timeout: 2400
+        }); // increase timeout on purpose in order to account for two empty epochs
+        logger.info(`Account deployed at ${a.getAddress()}`);
+        return wallet;
+    }));
+    const tokenAdmin = wallets[0];
+    const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()), logger);
+    const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
+    return {
+        pxe,
+        wallets,
+        tokenAdminAddress: tokenAdmin.getAddress(),
+        tokenAdminWallet,
+        tokenName: TOKEN_NAME,
+        tokenAddress,
+        recipientWallet,
+        recipientAddress: recipientWallet.getAddress()
+    };
+}
 export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mnemonicOrPrivateKey, mintAmount, logger, numberOfFundedWallets = 1) {
     const pxe = await createCompatibleClient(pxeUrl, logger);
     const node = createAztecNodeClient(nodeUrl);
@@ -45,15 +83,17 @@ export async function deployTestWalletWithTokens(pxeUrl, nodeUrl, l1RpcUrls, mne
         return wallet;
     }));
     const tokenAdmin = wallets[0];
-    const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, logger);
+    const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, undefined, logger);
     const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
     return {
         pxe,
         wallets,
+        tokenAdminAddress: tokenAdmin.getAddress(),
         tokenAdminWallet,
         tokenName: TOKEN_NAME,
         tokenAddress,
-        recipientWallet
+        recipientWallet,
+        recipientAddress: recipientWallet.getAddress()
     };
 }
 async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, recipient, amount, log) {
@@ -71,17 +111,38 @@ async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, recipient,
 }
 async function advanceL2Block(node, nodeAdmin) {
     const initialBlockNumber = await node.getBlockNumber();
-    await nodeAdmin?.flushTxs();
+    let minTxsPerBlock = undefined;
+    if (nodeAdmin) {
+        ({ minTxsPerBlock } = await nodeAdmin.getConfig());
+        await nodeAdmin.setConfig({
+            minTxsPerBlock: 0
+        }); // Set to 0 to ensure we can advance the block
+    }
     await retryUntil(async ()=>await node.getBlockNumber() >= initialBlockNumber + 1);
+    if (nodeAdmin && minTxsPerBlock !== undefined) {
+        await nodeAdmin.setConfig({
+            minTxsPerBlock
+        });
+    }
 }
-async function deployTokenAndMint(wallets, admin, mintAmount, logger) {
+async function deployTokenAndMint(wallets, admin, mintAmount, paymentMethod, logger) {
     logger.verbose(`Deploying TokenContract...`);
-    const tokenContract = await TokenContract.deploy(wallets[0], admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS).send().deployed({
+    const tokenContract = await TokenContract.deploy(wallets[0], admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS).send({
+        from: admin,
+        fee: {
+            paymentMethod
+        }
+    }).deployed({
         timeout: 600
     });
     const tokenAddress = tokenContract.address;
     logger.verbose(`Minting ${mintAmount} public assets to the ${wallets.length} wallets...`);
-    await Promise.all(wallets.map(async (w)=>(await TokenContract.at(tokenAddress, w)).methods.mint_to_public(w.getAddress(), mintAmount).send().wait({
+    await Promise.all(wallets.map(async (w)=>(await TokenContract.at(tokenAddress, w)).methods.mint_to_public(w.getAddress(), mintAmount).send({
+            from: admin,
+            fee: {
+                paymentMethod
+            }
+        }).wait({
             timeout: 600
         })));
     logger.verbose(`Minting complete.`);
@@ -90,11 +151,35 @@ async function deployTokenAndMint(wallets, admin, mintAmount, logger) {
 export async function performTransfers({ testWallets, rounds, transferAmount, logger }) {
     const recipient = testWallets.recipientWallet.getAddress();
     for(let i = 0; i < rounds; i++){
-        const interactions = await Promise.all(testWallets.wallets.map(async (w)=>(await TokenContract.at(testWallets.tokenAddress, w)).methods.transfer_in_public(w.getAddress(), recipient, transferAmount, 0)));
-        const txs = await Promise.all(interactions.map(async (i)=>await i.prove()));
-        await Promise.all(txs.map((t)=>t.send().wait({
+        const txs = testWallets.wallets.map(async (w)=>(await TokenContract.at(testWallets.tokenAddress, w)).methods.transfer_in_public(w.getAddress(), recipient, transferAmount, 0).prove({
+                from: w.getAddress()
+            }));
+        const provenTxs = await Promise.all(txs);
+        await Promise.all(provenTxs.map((t)=>t.send().wait({
                 timeout: 600
             })));
         logger.info(`Completed round ${i + 1} / ${rounds}`);
     }
 }
+export async function startCompatiblePXE(nodeUrl, proverEnabled, logger) {
+    const node = createAztecNodeClient(nodeUrl);
+    const [bbConfig, acvmConfig] = await Promise.all([
+        getBBConfig(logger),
+        getACVMConfig(logger)
+    ]);
+    const pxe = await createPXEService(node, {
+        dataDirectory: undefined,
+        dataStoreMapSizeKB: 1024 * 1024,
+        ...bbConfig,
+        ...acvmConfig,
+        proverEnabled
+    });
+    return {
+        pxe,
+        async cleanup () {
+            await pxe.stop();
+            await bbConfig?.cleanup();
+            await acvmConfig?.cleanup();
+        }
+    };
+}

package/dest/spartan/utils.d.ts

@@ -1,4 +1,4 @@
-import type { RollupCheatCodes } from '@aztec/aztec.js/testing';
+import type { RollupCheatCodes } from '@aztec/aztec/testing';
 import type { Logger } from '@aztec/foundation/log';
 import type { SequencerConfig } from '@aztec/sequencer-client';
 import { ChildProcess } from 'child_process';
@@ -9,6 +9,7 @@ declare const k8sLocalConfigSchema: z.ZodObject<{
     AZTEC_SLOT_DURATION: z.ZodNumber;
     AZTEC_EPOCH_DURATION: z.ZodNumber;
     AZTEC_PROOF_SUBMISSION_WINDOW: z.ZodNumber;
+    AZTEC_REAL_PROOFS: z.ZodDefault<z.ZodString>;
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -30,6 +31,7 @@ declare const k8sLocalConfigSchema: z.ZodObject<{
     AZTEC_SLOT_DURATION: number;
     AZTEC_EPOCH_DURATION: number;
     AZTEC_PROOF_SUBMISSION_WINDOW: number;
+    AZTEC_REAL_PROOFS: string;
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
@@ -56,6 +58,7 @@ declare const k8sLocalConfigSchema: z.ZodObject<{
     SPARTAN_DIR: string;
     K8S: "local";
     ETHEREUM_HOSTS?: string | undefined;
+    AZTEC_REAL_PROOFS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
     CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
@@ -73,6 +76,7 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
     AZTEC_SLOT_DURATION: z.ZodNumber;
     AZTEC_EPOCH_DURATION: z.ZodNumber;
     AZTEC_PROOF_SUBMISSION_WINDOW: z.ZodNumber;
+    AZTEC_REAL_PROOFS: z.ZodDefault<z.ZodString>;
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -93,11 +97,13 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
     K8S: z.ZodLiteral<"gcloud">;
     CLUSTER_NAME: z.ZodString;
     REGION: z.ZodString;
+    PROJECT_ID: z.ZodString;
 }>, "strip", z.ZodTypeAny, {
     ETHEREUM_SLOT_DURATION: number;
     AZTEC_SLOT_DURATION: number;
     AZTEC_EPOCH_DURATION: number;
     AZTEC_PROOF_SUBMISSION_WINDOW: number;
+    AZTEC_REAL_PROOFS: string;
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
@@ -114,6 +120,7 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
     K8S: "gcloud";
     CLUSTER_NAME: string;
     REGION: string;
+    PROJECT_ID: string;
     ETHEREUM_HOSTS?: string | undefined;
     GRAFANA_PASSWORD?: string | undefined;
 }, {
@@ -127,7 +134,9 @@ declare const k8sGCloudConfigSchema: z.ZodObject<z.objectUtil.extendShape<{
     K8S: "gcloud";
     CLUSTER_NAME: string;
     REGION: string;
+    PROJECT_ID: string;
     ETHEREUM_HOSTS?: string | undefined;
+    AZTEC_REAL_PROOFS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
     CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
@@ -164,6 +173,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     AZTEC_SLOT_DURATION: z.ZodNumber;
     AZTEC_EPOCH_DURATION: z.ZodNumber;
     AZTEC_PROOF_SUBMISSION_WINDOW: z.ZodNumber;
+    AZTEC_REAL_PROOFS: z.ZodDefault<z.ZodString>;
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -185,6 +195,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     AZTEC_SLOT_DURATION: number;
     AZTEC_EPOCH_DURATION: number;
     AZTEC_PROOF_SUBMISSION_WINDOW: number;
+    AZTEC_REAL_PROOFS: string;
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
@@ -211,6 +222,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     SPARTAN_DIR: string;
     K8S: "local";
     ETHEREUM_HOSTS?: string | undefined;
+    AZTEC_REAL_PROOFS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
     CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
@@ -227,6 +239,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     AZTEC_SLOT_DURATION: z.ZodNumber;
     AZTEC_EPOCH_DURATION: z.ZodNumber;
     AZTEC_PROOF_SUBMISSION_WINDOW: z.ZodNumber;
+    AZTEC_REAL_PROOFS: z.ZodDefault<z.ZodString>;
     INSTANCE_NAME: z.ZodString;
     NAMESPACE: z.ZodString;
     CONTAINER_NODE_PORT: z.ZodDefault<z.ZodNumber>;
@@ -247,11 +260,13 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     K8S: z.ZodLiteral<"gcloud">;
     CLUSTER_NAME: z.ZodString;
     REGION: z.ZodString;
+    PROJECT_ID: z.ZodString;
 }>, "strip", z.ZodTypeAny, {
     ETHEREUM_SLOT_DURATION: number;
     AZTEC_SLOT_DURATION: number;
     AZTEC_EPOCH_DURATION: number;
     AZTEC_PROOF_SUBMISSION_WINDOW: number;
+    AZTEC_REAL_PROOFS: string;
     INSTANCE_NAME: string;
     NAMESPACE: string;
     CONTAINER_NODE_PORT: number;
@@ -268,6 +283,7 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     K8S: "gcloud";
     CLUSTER_NAME: string;
     REGION: string;
+    PROJECT_ID: string;
     ETHEREUM_HOSTS?: string | undefined;
     GRAFANA_PASSWORD?: string | undefined;
 }, {
@@ -281,7 +297,9 @@ declare const envSchema: z.ZodDiscriminatedUnion<"K8S", [z.ZodObject<{
     K8S: "gcloud";
     CLUSTER_NAME: string;
     REGION: string;
+    PROJECT_ID: string;
     ETHEREUM_HOSTS?: string | undefined;
+    AZTEC_REAL_PROOFS?: string | undefined;
     CONTAINER_NODE_PORT?: number | undefined;
     CONTAINER_NODE_ADMIN_PORT?: number | undefined;
     CONTAINER_SEQUENCER_PORT?: number | undefined;
@@ -344,10 +362,11 @@ export declare function deleteResourceByName({ resource, namespace, name, force,
     name: string;
     force?: boolean;
 }): Promise<string>;
-export declare function deleteResourceByLabel({ resource, namespace, label, }: {
+export declare function deleteResourceByLabel({ resource, namespace, label, timeout, }: {
     resource: string;
     namespace: string;
     label: string;
+    timeout?: string;
 }): Promise<string>;
 export declare function waitForResourceByLabel({ resource, label, namespace, condition, timeout, }: {
     resource: string;
@@ -407,10 +426,11 @@ export declare function applyBootNodeFailure({ namespace, spartanDir, durationSe
     durationSeconds: number;
     logger: Logger;
 }): Promise<string>;
-export declare function applyValidatorKill({ namespace, spartanDir, logger, }: {
+export declare function applyValidatorKill({ namespace, spartanDir, logger, values, }: {
     namespace: string;
     spartanDir: string;
     logger: Logger;
+    values?: Record<string, string | number>;
 }): Promise<string>;
 export declare function applyNetworkShaping({ valuesFile, namespace, spartanDir, logger, }: {
     valuesFile: string;

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/spartan/utils.ts"],"names":[],"mappings":"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"}

package/dest/spartan/utils.js

@@ -21,6 +21,7 @@ const k8sLocalConfigSchema = z.object({
     AZTEC_SLOT_DURATION: z.coerce.number().min(1, 'AZTEC_SLOT_DURATION env variable must be set'),
     AZTEC_EPOCH_DURATION: z.coerce.number().min(1, 'AZTEC_EPOCH_DURATION env variable must be set'),
     AZTEC_PROOF_SUBMISSION_WINDOW: z.coerce.number().min(1, 'AZTEC_PROOF_SUBMISSION_WINDOW env variable must be set'),
+    AZTEC_REAL_PROOFS: z.string().default('false'),
     INSTANCE_NAME: z.string().min(1, 'INSTANCE_NAME env variable must be set'),
     NAMESPACE: z.string().min(1, 'NAMESPACE env variable must be set'),
     CONTAINER_NODE_PORT: z.coerce.number().default(8080),
@@ -41,7 +42,8 @@ const k8sLocalConfigSchema = z.object({
 const k8sGCloudConfigSchema = k8sLocalConfigSchema.extend({
     K8S: z.literal('gcloud'),
     CLUSTER_NAME: z.string().min(1, 'CLUSTER_NAME env variable must be set'),
-    REGION: z.string().min(1, 'REGION env variable must be set')
+    REGION: z.string().min(1, 'REGION env variable must be set'),
+    PROJECT_ID: z.string().min(1, 'PROJECT_ID env variable must be set')
 });
 const directConfigSchema = z.object({
     PXE_URL: z.string().url('PXE_URL must be a valid URL'),
@@ -64,7 +66,7 @@ export function isGCloudConfig(config) {
 export function setupEnvironment(env) {
     const config = envSchema.parse(env);
     if (isGCloudConfig(config)) {
-        const command = `gcloud container clusters get-credentials ${config.CLUSTER_NAME} --region=${config.REGION}`;
+        const command = `gcloud container clusters get-credentials ${config.CLUSTER_NAME} --region=${config.REGION} --project=${config.PROJECT_ID}`;
         execSync(command);
     }
     return config;
@@ -188,8 +190,8 @@ export async function deleteResourceByName({ resource, namespace, name, force =
     const { stdout } = await execAsync(command);
     return stdout;
 }
-export async function deleteResourceByLabel({ resource, namespace, label }) {
-    const command = `kubectl delete ${resource} -l ${label} -n ${namespace} --ignore-not-found=true --wait=true`;
+export async function deleteResourceByLabel({ resource, namespace, label, timeout = '5m' }) {
+    const command = `kubectl delete ${resource} -l ${label} -n ${namespace} --ignore-not-found=true --wait=true --timeout=${timeout}`;
     logger.info(`command: ${command}`);
     const { stdout } = await execAsync(command);
     return stdout;
@@ -310,13 +312,14 @@ export function applyBootNodeFailure({ namespace, spartanDir, durationSeconds, l
         logger
     });
 }
-export function applyValidatorKill({ namespace, spartanDir, logger }) {
+export function applyValidatorKill({ namespace, spartanDir, logger, values }) {
     return installChaosMeshChart({
         instanceName: 'validator-kill',
         targetNamespace: namespace,
         valuesFile: 'validator-kill.yaml',
         helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
-        logger
+        logger,
+        values
     });
 }
 export function applyNetworkShaping({ valuesFile, namespace, spartanDir, logger }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "1.2.0",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,43 +25,43 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "1.2.0",
-    "@aztec/archiver": "1.2.0",
-    "@aztec/aztec": "1.2.0",
-    "@aztec/aztec-node": "1.2.0",
-    "@aztec/aztec.js": "1.2.0",
-    "@aztec/bb-prover": "1.2.0",
-    "@aztec/blob-lib": "1.2.0",
-    "@aztec/blob-sink": "1.2.0",
-    "@aztec/bot": "1.2.0",
-    "@aztec/cli": "1.2.0",
-    "@aztec/constants": "1.2.0",
-    "@aztec/entrypoints": "1.2.0",
-    "@aztec/epoch-cache": "1.2.0",
-    "@aztec/ethereum": "1.2.0",
-    "@aztec/foundation": "1.2.0",
-    "@aztec/kv-store": "1.2.0",
-    "@aztec/l1-artifacts": "1.2.0",
-    "@aztec/merkle-tree": "1.2.0",
-    "@aztec/noir-contracts.js": "1.2.0",
-    "@aztec/noir-noirc_abi": "1.2.0",
-    "@aztec/noir-protocol-circuits-types": "1.2.0",
-    "@aztec/noir-test-contracts.js": "1.2.0",
-    "@aztec/p2p": "1.2.0",
-    "@aztec/protocol-contracts": "1.2.0",
-    "@aztec/prover-client": "1.2.0",
-    "@aztec/prover-node": "1.2.0",
-    "@aztec/pxe": "1.2.0",
-    "@aztec/sequencer-client": "1.2.0",
-    "@aztec/simulator": "1.2.0",
-    "@aztec/slasher": "1.2.0",
-    "@aztec/stdlib": "1.2.0",
-    "@aztec/telemetry-client": "1.2.0",
-    "@aztec/validator-client": "1.2.0",
-    "@aztec/world-state": "1.2.0",
+    "@aztec/accounts": "2.0.0-nightly.20250813",
+    "@aztec/archiver": "2.0.0-nightly.20250813",
+    "@aztec/aztec": "2.0.0-nightly.20250813",
+    "@aztec/aztec-node": "2.0.0-nightly.20250813",
+    "@aztec/aztec.js": "2.0.0-nightly.20250813",
+    "@aztec/bb-prover": "2.0.0-nightly.20250813",
+    "@aztec/blob-lib": "2.0.0-nightly.20250813",
+    "@aztec/blob-sink": "2.0.0-nightly.20250813",
+    "@aztec/bot": "2.0.0-nightly.20250813",
+    "@aztec/cli": "2.0.0-nightly.20250813",
+    "@aztec/constants": "2.0.0-nightly.20250813",
+    "@aztec/entrypoints": "2.0.0-nightly.20250813",
+    "@aztec/epoch-cache": "2.0.0-nightly.20250813",
+    "@aztec/ethereum": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/kv-store": "2.0.0-nightly.20250813",
+    "@aztec/l1-artifacts": "2.0.0-nightly.20250813",
+    "@aztec/merkle-tree": "2.0.0-nightly.20250813",
+    "@aztec/noir-contracts.js": "2.0.0-nightly.20250813",
+    "@aztec/noir-noirc_abi": "2.0.0-nightly.20250813",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250813",
+    "@aztec/noir-test-contracts.js": "2.0.0-nightly.20250813",
+    "@aztec/p2p": "2.0.0-nightly.20250813",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250813",
+    "@aztec/prover-client": "2.0.0-nightly.20250813",
+    "@aztec/prover-node": "2.0.0-nightly.20250813",
+    "@aztec/pxe": "2.0.0-nightly.20250813",
+    "@aztec/sequencer-client": "2.0.0-nightly.20250813",
+    "@aztec/simulator": "2.0.0-nightly.20250813",
+    "@aztec/slasher": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
+    "@aztec/telemetry-client": "2.0.0-nightly.20250813",
+    "@aztec/validator-client": "2.0.0-nightly.20250813",
+    "@aztec/world-state": "2.0.0-nightly.20250813",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
-    "@noble/curves": "^1.0.0",
+    "@noble/curves": "=1.0.0",
     "@swc/core": "^1.4.11",
     "@swc/jest": "^0.2.36",
     "@types/fs-extra": "^11.0.2",

package/src/bench/client_flows/benchmark.ts

@@ -36,7 +36,8 @@ const GATE_TYPES = [
   'arithmetic',
   'delta_range',
   'elliptic',
-  'aux',
+  'memory',
+  'nnf',
   'poseidon2_external',
   'poseidon2_internal',
   'overflow',
@@ -126,9 +127,13 @@ type ClientFlowBenchmark = {
 };
 
 function getMinimumTrace(logs: Log[]): StructuredTrace {
+  const LOG_MESSAGE_CANDIDATE_PADDING = 5;
   const minimumMessage = 'Minimum required block sizes for structured trace';
   const minimumMessageIndex = logs.findIndex(log => log.message.includes(minimumMessage));
-  const candidateLogs = logs.slice(minimumMessageIndex - GATE_TYPES.length, minimumMessageIndex + 5);
+  const candidateLogs = logs.slice(
+    minimumMessageIndex - GATE_TYPES.length,
+    minimumMessageIndex + LOG_MESSAGE_CANDIDATE_PADDING,
+  );
 
   const traceLogs = candidateLogs
     .filter(log => GATE_TYPES.some(type => log.message.includes(type)))
@@ -296,7 +301,7 @@ export function convertProfileToGHBenchmark(benchmark: ClientFlowBenchmark): Git
 export async function captureProfile(
   label: string,
   interaction: ContractFunctionInteraction | DeployMethod,
-  opts?: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>,
+  opts: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>,
   expectedSteps?: number,
 ) {
   // Make sure the proxy logger starts from a clean slate

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -15,7 +15,7 @@ import {
   type Wallet,
   createLogger,
 } from '@aztec/aztec.js';
-import { CheatCodes } from '@aztec/aztec.js/testing';
+import { CheatCodes } from '@aztec/aztec/testing';
 import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
 import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -145,7 +145,7 @@ export class ClientFlowsBenchmark {
     await context.aztecNode.setConfig({ feeRecipient: this.sequencerAddress, coinbase: this.coinbase });
 
     const rollupContract = RollupContract.getFromConfig(context.aztecNodeConfig);
-    this.chainMonitor = new ChainMonitor(rollupContract, this.logger, 200).start();
+    this.chainMonitor = new ChainMonitor(rollupContract, context.dateProvider, this.logger, 200).start();
 
     return this;
   }
@@ -158,16 +158,20 @@ export class ClientFlowsBenchmark {
   async mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint) {
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, address);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await this.feeJuiceContract.methods.claim(address, amount, secret, index).send().wait();
+    await this.feeJuiceContract.methods.claim(address, amount, secret, index).send({ from: this.adminAddress }).wait();
   }
 
   /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
   async mintPrivateBananas(amount: bigint, address: AztecAddress) {
-    const balanceBefore = await this.bananaCoin.methods.balance_of_private(address).simulate();
+    const balanceBefore = await this.bananaCoin.methods
+      .balance_of_private(address)
+      .simulate({ from: this.adminAddress });
 
-    await mintTokensToPrivate(this.bananaCoin, this.adminWallet, address, amount);
+    await mintTokensToPrivate(this.bananaCoin, this.adminAddress, this.adminWallet, address, amount);
 
-    const balanceAfter = await this.bananaCoin.methods.balance_of_private(address).simulate();
+    const balanceAfter = await this.bananaCoin.methods
+      .balance_of_private(address)
+      .simulate({ from: this.adminAddress });
     expect(balanceAfter).toEqual(balanceBefore + amount);
   }
 
@@ -259,7 +263,7 @@ export class ClientFlowsBenchmark {
       'deploy_banana_token',
       async () => {
         const bananaCoin = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
         return { bananaCoinAddress: bananaCoin.address };
@@ -275,7 +279,7 @@ export class ClientFlowsBenchmark {
       'deploy_candy_bar_token',
       async () => {
         const candyBarCoin = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
         return { candyBarCoinAddress: candyBarCoin.address };
@@ -291,16 +295,20 @@ export class ClientFlowsBenchmark {
       'fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPubliclyDeployed).toBe(true);
+        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
         const bananaFPC = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
 
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(FEE_FUNDING_FOR_TESTER_ACCOUNT, bananaFPC.address);
+        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(
+          FEE_FUNDING_FOR_TESTER_ACCOUNT,
+          bananaFPC.address,
+          this.adminAddress,
+        );
 
         return { bananaFPCAddress: bananaFPC.address };
       },
@@ -339,6 +347,7 @@ export class ClientFlowsBenchmark {
       this.pxe,
       l1Client,
       owner,
+      owner.getAddress(),
       this.logger,
       underlyingERC20Address,
     );
@@ -378,7 +387,7 @@ export class ClientFlowsBenchmark {
       'deploy_amm',
       async () => {
         const liquidityToken = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n)
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         const amm = await AMMContract.deploy(
           this.adminWallet,
@@ -386,10 +395,10 @@ export class ClientFlowsBenchmark {
           this.candyBarCoin.address,
           liquidityToken.address,
         )
-          .send()
+          .send({ from: this.adminAddress })
           .deployed();
         this.logger.info(`AMM deployed at ${amm.address}`);
-        await liquidityToken.methods.set_minter(amm.address, true).send().wait();
+        await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
         return { ammAddress: amm.address, liquidityTokenAddress: liquidityToken.address };
       },
       async ({ ammAddress, liquidityTokenAddress }) => {