@aztec/end-to-end 3.0.0-devnet.2 → 3.0.0-devnet.20251212

package/dest/spartan/utils.js

@@ -1,4 +1,5 @@
 import { createLogger } from '@aztec/aztec.js/log';
+import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import { schemas } from '@aztec/foundation/schemas';
 import { sleep } from '@aztec/foundation/sleep';
@@ -137,9 +138,35 @@ export async function startPortForward({ resource, namespace, containerPort, hos
         port
     };
 }
-export function startPortForwardForRPC(namespace) {
+export function getExternalIP(namespace, serviceName) {
+    const { promise, resolve, reject } = promiseWithResolvers();
+    const process1 = spawn('kubectl', [
+        'get',
+        'service',
+        '-n',
+        namespace,
+        `${namespace}-${serviceName}`,
+        '--output',
+        "jsonpath='{.status.loadBalancer.ingress[0].ip}'"
+    ], {
+        stdio: 'pipe'
+    });
+    let ip = '';
+    process1.stdout.on('data', (data)=>{
+        ip += data;
+    });
+    process1.on('error', (err)=>{
+        reject(err);
+    });
+    process1.on('exit', ()=>{
+        // kubectl prints JSON. Remove the quotes
+        resolve(ip.replace(/"|'/g, ''));
+    });
+    return promise;
+}
+export function startPortForwardForRPC(namespace, index = 0) {
     return startPortForward({
-        resource: `services/${namespace}-rpc-aztec-node`,
+        resource: `pod/${namespace}-rpc-aztec-node-${index}`,
         namespace,
         containerPort: 8080
     });
@@ -197,6 +224,33 @@ async function execHelmCommand(args) {
     const { stdout } = await execAsync(helmCommand);
     return stdout;
 }
+export async function uninstallChaosMesh(instanceName, namespace, logger) {
+    // uninstall the helm chart if it exists
+    logger.info(`Uninstalling helm chart ${instanceName}`);
+    await execAsync(`helm uninstall ${instanceName} --namespace ${namespace} --wait --ignore-not-found`);
+    // and delete the chaos-mesh resources created by this release
+    const deleteByLabel = async (resource)=>{
+        const args = {
+            resource,
+            namespace: namespace,
+            label: `app.kubernetes.io/instance=${instanceName}`
+        };
+        logger.info(`Deleting ${resource} resources for release ${instanceName}`);
+        await deleteResourceByLabel(args).catch((e)=>{
+            logger.error(`Error deleting ${resource}: ${e}`);
+            logger.info(`Force deleting ${resource}`);
+            return deleteResourceByLabel({
+                ...args,
+                force: true
+            });
+        });
+    };
+    await deleteByLabel('podchaos');
+    await deleteByLabel('networkchaos');
+    await deleteByLabel('podnetworkchaos');
+    await deleteByLabel('workflows');
+    await deleteByLabel('workflownodes');
+}
 /**
  * Installs a Helm chart with the given parameters.
  * @param instanceName - The name of the Helm chart instance.
@@ -213,35 +267,14 @@ async function execHelmCommand(args) {
  * const stdout = await installChaosMeshChart({ instanceName: 'force-reorg', targetNamespace: 'smoke', valuesFile: 'prover-failure.yaml'});
  * console.log(stdout);
  * ```
- */ export async function installChaosMeshChart({ instanceName, targetNamespace, valuesFile, helmChartDir, chaosMeshNamespace = 'chaos-mesh', timeout = '10m', clean = true, values = {}, logger }) {
+ */ export async function installChaosMeshChart({ instanceName, targetNamespace, valuesFile, helmChartDir, timeout = '10m', clean = true, values = {}, logger }) {
     if (clean) {
-        // uninstall the helm chart if it exists
-        logger.info(`Uninstalling helm chart ${instanceName}`);
-        await execAsync(`helm uninstall ${instanceName} --namespace ${chaosMeshNamespace} --wait --ignore-not-found`);
-        // and delete the chaos-mesh resources created by this release
-        const deleteByLabel = async (resource)=>{
-            const args = {
-                resource,
-                namespace: chaosMeshNamespace,
-                label: `app.kubernetes.io/instance=${instanceName}`
-            };
-            logger.info(`Deleting ${resource} resources for release ${instanceName}`);
-            await deleteResourceByLabel(args).catch((e)=>{
-                logger.error(`Error deleting ${resource}: ${e}`);
-                logger.info(`Force deleting ${resource}`);
-                return deleteResourceByLabel({
-                    ...args,
-                    force: true
-                });
-            });
-        };
-        await deleteByLabel('podchaos');
-        await deleteByLabel('networkchaos');
+        await uninstallChaosMesh(instanceName, targetNamespace, logger);
     }
     return execHelmCommand({
         instanceName,
         helmChartDir,
-        namespace: chaosMeshNamespace,
+        namespace: targetNamespace,
         valuesFile,
         timeout,
         values: {
@@ -313,19 +346,19 @@ export function applyNetworkShaping({ valuesFile, namespace, spartanDir, logger
         logger
     });
 }
-export async function awaitL2BlockNumber(rollupCheatCodes, blockNumber, timeoutSeconds, logger) {
-    logger.info(`Waiting for L2 Block ${blockNumber}`);
+export async function awaitCheckpointNumber(rollupCheatCodes, checkpointNumber, timeoutSeconds, logger) {
+    logger.info(`Waiting for checkpoint ${checkpointNumber}`);
     let tips = await rollupCheatCodes.getTips();
     const endTime = Date.now() + timeoutSeconds * 1000;
-    while(tips.pending < blockNumber && Date.now() < endTime){
-        logger.info(`At L2 Block ${tips.pending}`);
+    while(tips.pending < checkpointNumber && Date.now() < endTime){
+        logger.info(`At checkpoint ${tips.pending}`);
         await sleep(1000);
         tips = await rollupCheatCodes.getTips();
     }
-    if (tips.pending < blockNumber) {
-        throw new Error(`Timeout waiting for L2 Block ${blockNumber}, only reached ${tips.pending}`);
+    if (tips.pending < checkpointNumber) {
+        throw new Error(`Timeout waiting for checkpoint ${checkpointNumber}, only reached ${tips.pending}`);
     } else {
-        logger.info(`Reached L2 Block ${tips.pending}`);
+        logger.info(`Reached checkpoint ${tips.pending}`);
     }
 }
 export async function restartBot(namespace, logger) {
@@ -720,3 +753,30 @@ export async function withSequencersAdmin(env, fn) {
         throw new Error(`Failed to determine git project root: ${error}`);
     }
 }
+/** Returns a client to the RPC of the given sequencer (defaults to first) */ export async function getNodeClient(env, index = 0) {
+    const namespace = env.NAMESPACE;
+    const containerPort = 8080;
+    const sequencers = await getSequencers(namespace);
+    const sequencer = sequencers[index];
+    if (!sequencer) {
+        throw new Error(`No sequencer found at index ${index} in namespace ${namespace}`);
+    }
+    const { process: process1, port } = await startPortForward({
+        resource: `pod/${sequencer}`,
+        namespace,
+        containerPort
+    });
+    const url = `http://localhost:${port}`;
+    await retry(()=>fetch(`${url}/status`).then((res)=>res.status === 200), 'forward port', makeBackoff([
+        1,
+        1,
+        2,
+        6
+    ]), logger, true);
+    const client = createAztecNodeClient(url);
+    return {
+        node: client,
+        port,
+        process: process1
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "3.0.0-devnet.2",
+  "version": "3.0.0-devnet.20251212",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -8,8 +8,8 @@
     "./package.local.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test:with-alerts": "./scripts/test-with-alerts.sh",
     "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
@@ -25,42 +25,43 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-devnet.2",
-    "@aztec/archiver": "3.0.0-devnet.2",
-    "@aztec/aztec": "3.0.0-devnet.2",
-    "@aztec/aztec-node": "3.0.0-devnet.2",
-    "@aztec/aztec.js": "3.0.0-devnet.2",
-    "@aztec/bb-prover": "3.0.0-devnet.2",
-    "@aztec/blob-lib": "3.0.0-devnet.2",
-    "@aztec/blob-sink": "3.0.0-devnet.2",
-    "@aztec/bot": "3.0.0-devnet.2",
-    "@aztec/cli": "3.0.0-devnet.2",
-    "@aztec/constants": "3.0.0-devnet.2",
-    "@aztec/entrypoints": "3.0.0-devnet.2",
-    "@aztec/epoch-cache": "3.0.0-devnet.2",
-    "@aztec/ethereum": "3.0.0-devnet.2",
-    "@aztec/foundation": "3.0.0-devnet.2",
-    "@aztec/kv-store": "3.0.0-devnet.2",
-    "@aztec/l1-artifacts": "3.0.0-devnet.2",
-    "@aztec/merkle-tree": "3.0.0-devnet.2",
-    "@aztec/node-keystore": "3.0.0-devnet.2",
-    "@aztec/noir-contracts.js": "3.0.0-devnet.2",
-    "@aztec/noir-noirc_abi": "3.0.0-devnet.2",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.2",
-    "@aztec/noir-test-contracts.js": "3.0.0-devnet.2",
-    "@aztec/p2p": "3.0.0-devnet.2",
-    "@aztec/protocol-contracts": "3.0.0-devnet.2",
-    "@aztec/prover-client": "3.0.0-devnet.2",
-    "@aztec/prover-node": "3.0.0-devnet.2",
-    "@aztec/pxe": "3.0.0-devnet.2",
-    "@aztec/sequencer-client": "3.0.0-devnet.2",
-    "@aztec/simulator": "3.0.0-devnet.2",
-    "@aztec/slasher": "3.0.0-devnet.2",
-    "@aztec/stdlib": "3.0.0-devnet.2",
-    "@aztec/telemetry-client": "3.0.0-devnet.2",
-    "@aztec/test-wallet": "3.0.0-devnet.2",
-    "@aztec/validator-client": "3.0.0-devnet.2",
-    "@aztec/world-state": "3.0.0-devnet.2",
+    "@aztec/accounts": "3.0.0-devnet.20251212",
+    "@aztec/archiver": "3.0.0-devnet.20251212",
+    "@aztec/aztec": "3.0.0-devnet.20251212",
+    "@aztec/aztec-node": "3.0.0-devnet.20251212",
+    "@aztec/aztec.js": "3.0.0-devnet.20251212",
+    "@aztec/bb-prover": "3.0.0-devnet.20251212",
+    "@aztec/bb.js": "3.0.0-devnet.20251212",
+    "@aztec/blob-lib": "3.0.0-devnet.20251212",
+    "@aztec/blob-sink": "3.0.0-devnet.20251212",
+    "@aztec/bot": "3.0.0-devnet.20251212",
+    "@aztec/cli": "3.0.0-devnet.20251212",
+    "@aztec/constants": "3.0.0-devnet.20251212",
+    "@aztec/entrypoints": "3.0.0-devnet.20251212",
+    "@aztec/epoch-cache": "3.0.0-devnet.20251212",
+    "@aztec/ethereum": "3.0.0-devnet.20251212",
+    "@aztec/foundation": "3.0.0-devnet.20251212",
+    "@aztec/kv-store": "3.0.0-devnet.20251212",
+    "@aztec/l1-artifacts": "3.0.0-devnet.20251212",
+    "@aztec/merkle-tree": "3.0.0-devnet.20251212",
+    "@aztec/node-keystore": "3.0.0-devnet.20251212",
+    "@aztec/noir-contracts.js": "3.0.0-devnet.20251212",
+    "@aztec/noir-noirc_abi": "3.0.0-devnet.20251212",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.20251212",
+    "@aztec/noir-test-contracts.js": "3.0.0-devnet.20251212",
+    "@aztec/p2p": "3.0.0-devnet.20251212",
+    "@aztec/protocol-contracts": "3.0.0-devnet.20251212",
+    "@aztec/prover-client": "3.0.0-devnet.20251212",
+    "@aztec/prover-node": "3.0.0-devnet.20251212",
+    "@aztec/pxe": "3.0.0-devnet.20251212",
+    "@aztec/sequencer-client": "3.0.0-devnet.20251212",
+    "@aztec/simulator": "3.0.0-devnet.20251212",
+    "@aztec/slasher": "3.0.0-devnet.20251212",
+    "@aztec/stdlib": "3.0.0-devnet.20251212",
+    "@aztec/telemetry-client": "3.0.0-devnet.20251212",
+    "@aztec/test-wallet": "3.0.0-devnet.20251212",
+    "@aztec/validator-client": "3.0.0-devnet.20251212",
+    "@aztec/world-state": "3.0.0-devnet.20251212",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -97,7 +98,7 @@
     "tslib": "^2.4.0",
     "typescript": "^5.3.3",
     "util": "^0.12.5",
-    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0",
+    "viem": "npm:@aztec/viem@2.38.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -106,6 +107,7 @@
     "@types/jest": "^30.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash.chunk": "^4.2.9",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "concurrently": "^7.6.0",
     "jest": "^30.0.0",
     "jest-extended": "^6.0.0",

package/src/bench/client_flows/benchmark.ts

@@ -315,12 +315,12 @@ export async function captureProfile(
 
   const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
   if (ivcFolder) {
-    logger.info(`Capturing client ivc execution profile for ${label}`);
+    logger.info(`Capturing chonk execution profile for ${label}`);
 
     const resultsDirectory = join(ivcFolder, label);
     logger.info(`Writing private execution steps to ${resultsDirectory}`);
     await mkdir(resultsDirectory, { recursive: true });
-    // Write the client IVC files read by the prover.
+    // Write the chonk files read by the prover.
     const ivcInputsPath = join(resultsDirectory, 'ivc-inputs.msgpack');
     await writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
     await writeFile(join(resultsDirectory, 'logs.json'), JSON.stringify(logs, null, 2));

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -5,11 +5,13 @@ import { type Logger, createLogger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import type { Wallet } from '@aztec/aztec.js/wallet';
 import { CheatCodes } from '@aztec/aztec/testing';
-import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import { type DeployL1ContractsArgs, deployL1Contract } from '@aztec/ethereum/deploy-l1-contracts';
 import { ChainMonitor } from '@aztec/ethereum/test';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
@@ -20,6 +22,7 @@ import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contract
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { TestWallet } from '@aztec/test-wallet/server';
@@ -69,15 +72,21 @@ export class ClientFlowsBenchmark {
   public feeJuiceContract!: FeeJuiceContract;
   // Asset in which fees are paid via FPC
   public bananaCoin!: BananaCoin;
+  public bananaCoinInstance!: ContractInstanceWithAddress;
   public bananaFPC!: FPCContract;
+  public bananaFPCInstance!: ContractInstanceWithAddress;
   // Random asset we want to trade
   public candyBarCoin!: TokenContract;
+  public candyBarCoinInstance!: ContractInstanceWithAddress;
   // AMM contract
   public amm!: AMMContract;
+  public ammInstance!: ContractInstanceWithAddress;
   // Liquidity token for AMM
   public liquidityToken!: TokenContract;
+  public liquidityTokenInstance!: ContractInstanceWithAddress;
   // Sponsored FPC contract
   public sponsoredFPC!: SponsoredFPCContract;
+  public sponsoredFPCInstance!: ContractInstanceWithAddress;
 
   // PXE and Wallet used by the benchmarking user. It can be set up with client-side proving enabled
   public userWallet!: TestWallet;
@@ -204,7 +213,7 @@ export class ClientFlowsBenchmark {
         this.sequencerAddress = sequencerAddress;
 
         const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
+        this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
         this.coinbase = EthAddress.random();
 
         const userPXEConfig = getPXEConfig();
@@ -229,7 +238,7 @@ export class ClientFlowsBenchmark {
       async (_data, context) => {
         this.context = context;
 
-        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
+        this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
 
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
           aztecNode: context.aztecNode,
@@ -246,14 +255,22 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_banana_token',
       async () => {
-        const bananaCoin = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n)
+        const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'BC',
+          'BC',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
-        return { bananaCoinAddress: bananaCoin.address };
+        return { bananaCoinAddress: bananaCoin.address, bananaCoinInstance };
       },
-      async ({ bananaCoinAddress }) => {
-        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.adminWallet);
+      ({ bananaCoinAddress, bananaCoinInstance }) => {
+        this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.adminWallet);
+        this.bananaCoinInstance = bananaCoinInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -262,14 +279,22 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_candy_bar_token',
       async () => {
-        const candyBarCoin = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n)
+        const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TokenContract.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'CBC',
+          'CBC',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
-        return { candyBarCoinAddress: candyBarCoin.address };
+        return { candyBarCoinAddress: candyBarCoin.address, candyBarCoinInstance };
       },
-      async ({ candyBarCoinAddress }) => {
-        this.candyBarCoin = await TokenContract.at(candyBarCoinAddress, this.adminWallet);
+      ({ candyBarCoinAddress, candyBarCoinInstance }) => {
+        this.candyBarCoin = TokenContract.at(candyBarCoinAddress, this.adminWallet);
+        this.candyBarCoinInstance = candyBarCoinInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -282,18 +307,24 @@ export class ClientFlowsBenchmark {
         expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
-        const bananaFPC = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress)
+        const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(
+          this.adminWallet,
+          bananaCoin.address,
+          this.adminAddress,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
 
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
         await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
 
-        return { bananaFPCAddress: bananaFPC.address };
+        return { bananaFPCAddress: bananaFPC.address, bananaFPCInstance };
       },
-      async data => {
-        this.bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.adminWallet);
+      data => {
+        this.bananaFPC = FPCContract.at(data.bananaFPCAddress, this.adminWallet);
+        this.bananaFPCInstance = data.bananaFPCInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -302,12 +333,14 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_sponsored_fpc',
       async () => {
-        const sponsoredFPC = await setupSponsoredFPC(this.adminWallet);
-        this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
-        return { sponsoredFPCAddress: sponsoredFPC.address };
+        const sponsoredFPCInstance = await setupSponsoredFPC(this.adminWallet);
+        this.logger.info(`SponsoredFPC at ${sponsoredFPCInstance.address}`);
+        return { sponsoredFPCAddress: sponsoredFPCInstance.address, sponsoredFPCInstance };
       },
-      async ({ sponsoredFPCAddress }) => {
-        this.sponsoredFPC = await SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+      ({ sponsoredFPCAddress, sponsoredFPCInstance }) => {
+        this.sponsoredFPC = SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+        this.sponsoredFPCInstance = sponsoredFPCInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -361,24 +394,38 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_amm',
       async () => {
-        const liquidityToken = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n)
+        const { contract: liquidityToken, instance: liquidityTokenInstance } = await TokenContract.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'LPT',
+          'LPT',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
-        const amm = await AMMContract.deploy(
+          .wait();
+        const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
           this.adminWallet,
           this.bananaCoin.address,
           this.candyBarCoin.address,
           liquidityToken.address,
         )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`AMM deployed at ${amm.address}`);
         await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
-        return { ammAddress: amm.address, liquidityTokenAddress: liquidityToken.address };
+        return {
+          ammAddress: amm.address,
+          ammInstance,
+          liquidityTokenAddress: liquidityToken.address,
+          liquidityTokenInstance,
+        };
       },
-      async ({ ammAddress, liquidityTokenAddress }) => {
-        this.liquidityToken = await TokenContract.at(liquidityTokenAddress, this.adminWallet);
-        this.amm = await AMMContract.at(ammAddress, this.adminWallet);
+      ({ ammAddress, ammInstance, liquidityTokenAddress, liquidityTokenInstance }) => {
+        this.liquidityToken = TokenContract.at(liquidityTokenAddress, this.adminWallet);
+        this.liquidityTokenInstance = liquidityTokenInstance;
+        this.amm = AMMContract.at(ammAddress, this.adminWallet);
+        this.ammInstance = ammInstance;
+        return Promise.resolve();
       },
     );
   }

package/src/bench/client_flows/data_extractor.ts

@@ -1,6 +1,4 @@
-import type { Logger } from '@aztec/aztec.js/log';
-import { BBNativePrivateKernelProver } from '@aztec/bb-prover/client/native';
-import { BBWASMBundlePrivateKernelProver } from '@aztec/bb-prover/client/wasm/bundle';
+import { BBBundlePrivateKernelProver } from '@aztec/bb-prover/client/bundle';
 import { createLogger, logger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
 import { WASMSimulator } from '@aztec/simulator/client';
@@ -11,26 +9,7 @@ import { Decoder } from 'msgpackr';
 import { readFile, readdir, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 
-import { type Log, type ProverType, ProxyLogger, generateBenchmark } from './benchmark.js';
-
-type NativeProverConfig = { bbBinaryPath?: string; bbWorkingDirectory?: string };
-
-async function createProver(config: NativeProverConfig = {}, log: Logger) {
-  const simulator = new WASMSimulator();
-  if (!config.bbBinaryPath || !config.bbWorkingDirectory) {
-    return { prover: new BBWASMBundlePrivateKernelProver(simulator, 16, log), type: 'wasm' as ProverType };
-  } else {
-    const bbConfig = config as Required<NativeProverConfig>;
-    return {
-      prover: await BBNativePrivateKernelProver.new(
-        { bbSkipCleanup: false, numConcurrentIVCVerifiers: 1, bbIVCConcurrency: 1, ...bbConfig },
-        simulator,
-        log,
-      ),
-      type: 'native' as ProverType,
-    };
-  }
-}
+import { type Log, ProxyLogger, generateBenchmark } from './benchmark.js';
 
 async function main() {
   ProxyLogger.create();
@@ -41,12 +20,11 @@ async function main() {
   }
   const flows = await readdir(ivcFolder);
   logger.info(`Flows in ${ivcFolder}: \n${flows.map(flowName => `\t- ${flowName}`).join('\n')}`);
-  const { prover, type: proverType } = await createProver(
-    { bbBinaryPath: process.env.BB_BINARY_PATH, bbWorkingDirectory: process.env.BB_WORKING_DIRECTORY },
-    proxyLogger.createLogger('bb:prover'),
-  );
+  const simulator = new WASMSimulator();
+  const log = proxyLogger.createLogger('bb:prover');
+  const prover = new BBBundlePrivateKernelProver(simulator, log);
 
-  const userLog = createLogger('client_ivc_flows:data_processor');
+  const userLog = createLogger('chonk_flows:data_processor');
 
   for (const flow of flows) {
     userLog.info(`Processing flow ${flow}`);
@@ -84,10 +62,10 @@ async function main() {
     let provingTime;
     try {
       const provingTimer = new Timer();
-      await prover.createClientIvcProof(privateExecutionSteps);
+      await prover.createChonkProof(privateExecutionSteps);
       provingTime = provingTimer.ms();
     } catch (e) {
-      userLog.error(`Failed to generate client ivc proof for ${flow}`, e);
+      userLog.error(`Failed to generate chonk proof for ${flow}`, e);
       error = (e as Error).message;
     }
     // Extract logs from this run from the proxy and write them to disk unconditionally
@@ -96,7 +74,7 @@ async function main() {
     if (!(profile.stats.timings as ProvingTimings).proving) {
       (profile.stats.timings as ProvingTimings).proving = provingTime;
     }
-    const benchmark = generateBenchmark(flow, currentLogs, profile.stats, privateExecutionSteps, proverType, error);
+    const benchmark = generateBenchmark(flow, currentLogs, profile.stats, privateExecutionSteps, 'native', error);
     await writeFile(join(ivcFolder, flow, 'benchmark.json'), JSON.stringify(benchmark, null, 2));
     proxyLogger.flushLogs();
   }

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -130,7 +130,7 @@ export class BlacklistTokenContractTest {
       },
       async ({ tokenContractAddress, badAccountAddress }) => {
         // Restore the token contract state.
-        this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallet);
+        this.asset = TokenBlacklistContract.at(tokenContractAddress, this.wallet);
         this.logger.verbose(`Token contract address: ${this.asset.address}`);
 
         this.tokenSim = new TokenSimulator(
@@ -141,7 +141,7 @@ export class BlacklistTokenContractTest {
           [this.adminAddress, this.otherAddress, this.blacklistedAddress],
         );
 
-        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallet);
+        this.badAccount = InvalidAccountContract.at(badAccountAddress, this.wallet);
         this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
 
         expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -3,13 +3,13 @@ import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
 import { type Logger, createLogger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { CheatCodes } from '@aztec/aztec/testing';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
 import {
   type DeployL1ContractsArgs,
   type DeployL1ContractsReturnType,
-  type ExtendedViemWalletClient,
-  createExtendedL1Client,
   deployL1Contract,
-} from '@aztec/ethereum';
+} from '@aztec/ethereum/deploy-l1-contracts';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum/types';
 import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
@@ -134,9 +134,9 @@ export class CrossChainMessagingTest {
 
         return this.crossChainTestHarness.toCrossChainContext();
       },
-      async crossChainContext => {
-        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.wallet);
-        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
+      crossChainContext => {
+        this.l2Token = TokenContract.at(crossChainContext.l2Token, this.wallet);
+        this.l2Bridge = TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
 
         // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
         this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
@@ -172,6 +172,7 @@ export class CrossChainMessagingTest {
         this.l1Client = l1Client;
         this.inbox = inbox;
         this.outbox = outbox;
+        return Promise.resolve();
       },
     );
   }