@aztec/end-to-end 0.0.1-commit.9593d84 → 0.0.1-commit.96bb3f7

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';
@@ -17,6 +18,7 @@ const testConfigSchema = z.object({
     L1_RPC_URLS_JSON: z.string().optional(),
     L1_ACCOUNT_MNEMONIC: z.string().optional(),
     AZTEC_SLOT_DURATION: z.coerce.number().optional().default(24),
+    AZTEC_EPOCH_DURATION: z.coerce.number().optional().default(32),
     AZTEC_PROOF_SUBMISSION_WINDOW: z.coerce.number().optional().default(5)
 });
 export function setupEnvironment(env) {
@@ -137,9 +139,35 @@ export async function startPortForward({ resource, namespace, containerPort, hos
         port
     };
 }
-export function startPortForwardForRPC(namespace, resourceType = 'services', index = 0) {
+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: `${resourceType}/${namespace}-rpc-aztec-node-${index}`,
+        resource: `pod/${namespace}-rpc-aztec-node-${index}`,
         namespace,
         containerPort: 8080
     });
@@ -158,9 +186,11 @@ export async function deleteResourceByName({ resource, namespace, name, force =
     return stdout;
 }
 export async function deleteResourceByLabel({ resource, namespace, label, timeout = '5m', force = false }) {
-    // Check if the resource type exists before attempting to delete
     try {
-        await execAsync(`kubectl api-resources --api-group="" --no-headers -o name | grep -q "^${resource}$" || kubectl api-resources --no-headers -o name | grep -q "^${resource}$"`);
+        // Match both plain and group-qualified names (e.g., "podchaos" or "podchaos.chaos-mesh.org")
+        const escaped = resource.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+        const regex = `(^|\\.)${escaped}(\\.|$)`;
+        await execAsync(`kubectl api-resources --no-headers -o name | grep -Eq '${regex}'`);
     } catch (error) {
         logger.warn(`Resource type '${resource}' not found in cluster, skipping deletion ${error}`);
         return '';
@@ -176,6 +206,31 @@ export async function waitForResourceByLabel({ resource, label, namespace, condi
     const { stdout } = await execAsync(command);
     return stdout;
 }
+export async function waitForResourceByName({ resource, name, namespace, condition = 'Ready', timeout = '10m' }) {
+    const command = `kubectl wait ${resource}/${name} --for=condition=${condition} -n ${namespace} --timeout=${timeout}`;
+    logger.info(`command: ${command}`);
+    const { stdout } = await execAsync(command);
+    return stdout;
+}
+export async function waitForResourcesByName({ resource, names, namespace, condition = 'Ready', timeout = '10m' }) {
+    if (!names.length) {
+        throw new Error(`No ${resource} names provided to waitForResourcesByName`);
+    }
+    // Wait all in parallel; if any fails, surface which one.
+    await Promise.all(names.map(async (name)=>{
+        try {
+            await waitForResourceByName({
+                resource,
+                name,
+                namespace,
+                condition,
+                timeout
+            });
+        } catch (err) {
+            throw new Error(`Failed waiting for ${resource}/${name} condition=${condition} timeout=${timeout} namespace=${namespace}: ${String(err)}`);
+        }
+    }));
+}
 export function getChartDir(spartanDir, chartName) {
     return path.join(spartanDir.trim(), chartName);
 }
@@ -197,6 +252,57 @@ async function execHelmCommand(args) {
     const { stdout } = await execAsync(helmCommand);
     return stdout;
 }
+async function getHelmReleaseStatus(instanceName, namespace) {
+    try {
+        const { stdout } = await execAsync(`helm list --namespace ${namespace} --all --filter '^${instanceName}$' --output json | cat`);
+        const parsed = JSON.parse(stdout);
+        const row = parsed.find((r)=>r.name === instanceName);
+        return row?.status;
+    } catch  {
+        return undefined;
+    }
+}
+async function forceDeleteHelmReleaseRecord(instanceName, namespace, logger) {
+    const labelSelector = `owner=helm,name=${instanceName}`;
+    const cmd = `kubectl delete secret -n ${namespace} -l ${labelSelector} --ignore-not-found=true`;
+    logger.warn(`Force deleting Helm release record: ${cmd}`);
+    await execAsync(cmd).catch(()=>undefined);
+}
+async function hasDeployedHelmRelease(instanceName, namespace) {
+    try {
+        const status = await getHelmReleaseStatus(instanceName, namespace);
+        return status?.toLowerCase() === 'deployed';
+    } catch  {
+        return false;
+    }
+}
+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 +319,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: {
@@ -262,70 +347,85 @@ export function applyProverFailure({ namespace, spartanDir, durationSeconds, log
         logger
     });
 }
-export function applyProverKill({ namespace, spartanDir, logger }) {
+export function applyValidatorFailure({ namespace, spartanDir, logger, values, instanceName }) {
+    return installChaosMeshChart({
+        instanceName: instanceName ?? 'validator-failure',
+        targetNamespace: namespace,
+        valuesFile: 'validator-failure.yaml',
+        helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
+        values,
+        logger
+    });
+}
+export function applyProverKill({ namespace, spartanDir, logger, values }) {
     return installChaosMeshChart({
         instanceName: 'prover-kill',
         targetNamespace: namespace,
         valuesFile: 'prover-kill.yaml',
         helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
+        chaosMeshNamespace: namespace,
         clean: true,
-        logger
+        logger,
+        values
     });
 }
-export function applyProverBrokerKill({ namespace, spartanDir, logger }) {
+export function applyProverBrokerKill({ namespace, spartanDir, logger, values }) {
     return installChaosMeshChart({
         instanceName: 'prover-broker-kill',
         targetNamespace: namespace,
         valuesFile: 'prover-broker-kill.yaml',
         helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
         clean: true,
-        logger
+        logger,
+        values
     });
 }
-export function applyBootNodeFailure({ namespace, spartanDir, durationSeconds, logger }) {
+export function applyBootNodeFailure({ instanceName = 'boot-node-failure', namespace, spartanDir, durationSeconds, logger, values }) {
     return installChaosMeshChart({
-        instanceName: 'boot-node-failure',
+        instanceName,
         targetNamespace: namespace,
         valuesFile: 'boot-node-failure.yaml',
         helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
         values: {
-            'bootNodeFailure.duration': `${durationSeconds}s`
+            'bootNodeFailure.duration': `${durationSeconds}s`,
+            ...values ?? {}
         },
         logger
     });
 }
-export function applyValidatorKill({ namespace, spartanDir, logger, values }) {
+export function applyValidatorKill({ instanceName = 'validator-kill', namespace, spartanDir, logger, values, clean = true }) {
     return installChaosMeshChart({
-        instanceName: 'validator-kill',
+        instanceName: instanceName ?? 'validator-kill',
         targetNamespace: namespace,
         valuesFile: 'validator-kill.yaml',
         helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
+        clean,
         logger,
         values
     });
 }
-export function applyNetworkShaping({ valuesFile, namespace, spartanDir, logger }) {
+export function applyNetworkShaping({ instanceName = 'network-shaping', valuesFile, namespace, spartanDir, logger }) {
     return installChaosMeshChart({
-        instanceName: 'network-shaping',
+        instanceName,
         targetNamespace: namespace,
         valuesFile,
         helmChartDir: getChartDir(spartanDir, 'aztec-chaos-scenarios'),
         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) {
@@ -369,7 +469,12 @@ export async function restartBot(namespace, logger) {
         // Provide L1 execution RPC for bridging fee juice
         'bot.node.env.ETHEREUM_HOSTS': `http://${namespace}-eth-execution.${namespace}.svc.cluster.local:8545`,
         // Provide L1 mnemonic for bridging (falls back to labs mnemonic)
-        'bot.node.env.BOT_L1_MNEMONIC': mnemonic
+        'bot.node.env.BOT_L1_MNEMONIC': mnemonic,
+        // The bot does not need Kubernetes API access. Disable RBAC + ServiceAccount creation so the chart
+        // can be installed by users without cluster-scoped RBAC permissions.
+        'bot.rbac.create': false,
+        'bot.serviceAccount.create': false,
+        'bot.serviceAccount.name': 'default'
     };
     // Ensure we derive a funded L1 key (index 0 is funded on anvil default mnemonic)
     if (mnemonicStartIndex === undefined) {
@@ -392,7 +497,7 @@ export async function restartBot(namespace, logger) {
     let tag = tagFromEnv;
     if (!repository || !tag) {
         try {
-            const { stdout } = await execAsync(`kubectl get pods -l app.kubernetes.io/component=validator -n ${namespace} -o jsonpath='{.items[0].spec.containers[?(@.name=="aztec")].image}' | cat`);
+            const { stdout } = await execAsync(`kubectl get pods -l app.kubernetes.io/name=validator -n ${namespace} -o jsonpath='{.items[0].spec.containers[?(@.name=="aztec")].image}' | cat`);
             const image = stdout.trim().replace(/^'|'$/g, '');
             if (image && image.includes(':')) {
                 const lastColon = image.lastIndexOf(':');
@@ -410,6 +515,22 @@ export async function restartBot(namespace, logger) {
     if (mnemonicStartIndex !== undefined) {
         values['bot.mnemonicStartIndex'] = typeof mnemonicStartIndex === 'string' ? mnemonicStartIndex : Number(mnemonicStartIndex);
     }
+    // If a previous install attempt left the release in a non-deployed state (e.g. FAILED),
+    // `helm upgrade --install` can error with "has no deployed releases".
+    // In that case, clear the release record and do a clean install.
+    const existingStatus = await getHelmReleaseStatus(instanceName, namespace);
+    if (existingStatus && existingStatus.toLowerCase() !== 'deployed') {
+        logger.warn(`Transfer bot release ${instanceName} is in status '${existingStatus}'. Reinstalling cleanly.`);
+        await execAsync(`helm uninstall ${instanceName} --namespace ${namespace} --wait --ignore-not-found`).catch(()=>undefined);
+        // If helm left the release in `uninstalling`, force-delete the record so we can reinstall.
+        const afterUninstallStatus = await getHelmReleaseStatus(instanceName, namespace);
+        if (afterUninstallStatus?.toLowerCase() === 'uninstalling') {
+            await forceDeleteHelmReleaseRecord(instanceName, namespace, logger);
+        }
+    }
+    // `--reuse-values` fails if the release has never successfully deployed (e.g. first install, or a previous failed install).
+    // Only reuse values when we have a deployed release to reuse from.
+    const effectiveReuseValues = reuseValues && await hasDeployedHelmRelease(instanceName, namespace);
     await execHelmCommand({
         instanceName,
         helmChartDir,
@@ -417,7 +538,7 @@ export async function restartBot(namespace, logger) {
         valuesFile: undefined,
         timeout,
         values: values,
-        reuseValues
+        reuseValues: effectiveReuseValues
     });
     if (replicas > 0) {
         await waitForResourceByLabel({
@@ -449,8 +570,9 @@ export async function restartBot(namespace, logger) {
     const drop = enabled ? 'true' : 'false';
     const prob = String(probability);
     const selectors = [
-        'app=validator',
-        'app.kubernetes.io/component=validator'
+        'app.kubernetes.io/name=validator',
+        'app.kubernetes.io/component=validator',
+        'app=validator'
     ];
     let updated = false;
     for (const selector of selectors){
@@ -477,8 +599,9 @@ export async function restartBot(namespace, logger) {
 }
 export async function restartValidators(namespace, logger) {
     const selectors = [
-        'app=validator',
-        'app.kubernetes.io/component=validator'
+        'app.kubernetes.io/name=validator',
+        'app.kubernetes.io/component=validator',
+        'app=validator'
     ];
     let any = false;
     for (const selector of selectors){
@@ -532,11 +655,27 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
     logger.info(`Validator dynamic boot node enabled`);
 }
 export async function getSequencers(namespace) {
-    const command = `kubectl get pods -l app.kubernetes.io/component=validator -n ${namespace} -o jsonpath='{.items[*].metadata.name}'`;
-    const { stdout } = await execAsync(command);
-    const sequencers = stdout.split(' ');
-    logger.verbose(`Found sequencer pods ${sequencers.join(', ')}`);
-    return sequencers;
+    const selectors = [
+        'app.kubernetes.io/name=validator',
+        'app.kubernetes.io/component=validator',
+        'app.kubernetes.io/component=sequencer-node',
+        'app=validator'
+    ];
+    for (const selector of selectors){
+        try {
+            const command = `kubectl get pods -l ${selector} -n ${namespace} -o jsonpath='{.items[*].metadata.name}'`;
+            const { stdout } = await execAsync(command);
+            const sequencers = stdout.split(' ').map((s)=>s.trim()).filter(Boolean);
+            if (sequencers.length > 0) {
+                logger.verbose(`Found sequencer pods ${sequencers.join(', ')} (selector=${selector})`);
+                return sequencers;
+            }
+        } catch  {
+        // try next selector
+        }
+    }
+    // Fail fast instead of returning [''] which leads to attempts to port-forward `pod/`.
+    throw new Error(`No sequencer/validator pods found in namespace ${namespace}. Tried selectors: ${selectors.join(', ')}`);
 }
 export function updateSequencersConfig(env, config) {
     return withSequencersAdmin(env, async (client)=>{
@@ -586,7 +725,9 @@ export async function withSequencersAdmin(env, fn) {
         const url = `http://127.0.0.1:${port}`;
         const client = createPublicClient({
             transport: fallback([
-                http(url)
+                http(url, {
+                    batch: false
+                })
             ])
         });
         if (processes) {
@@ -604,7 +745,9 @@ export async function withSequencersAdmin(env, fn) {
         }
         const client = createPublicClient({
             transport: fallback([
-                http(L1_RPC_URLS_JSON)
+                http(L1_RPC_URLS_JSON, {
+                    batch: false
+                })
             ])
         });
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.9593d84",
+  "version": "0.0.1-commit.96bb3f7",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -8,8 +8,8 @@
     "./package.local.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsgo -b",
-    "build:dev": "tsgo -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,43 +25,43 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.9593d84",
-    "@aztec/archiver": "0.0.1-commit.9593d84",
-    "@aztec/aztec": "0.0.1-commit.9593d84",
-    "@aztec/aztec-node": "0.0.1-commit.9593d84",
-    "@aztec/aztec.js": "0.0.1-commit.9593d84",
-    "@aztec/bb-prover": "0.0.1-commit.9593d84",
-    "@aztec/bb.js": "0.0.1-commit.9593d84",
-    "@aztec/blob-lib": "0.0.1-commit.9593d84",
-    "@aztec/blob-sink": "0.0.1-commit.9593d84",
-    "@aztec/bot": "0.0.1-commit.9593d84",
-    "@aztec/cli": "0.0.1-commit.9593d84",
-    "@aztec/constants": "0.0.1-commit.9593d84",
-    "@aztec/entrypoints": "0.0.1-commit.9593d84",
-    "@aztec/epoch-cache": "0.0.1-commit.9593d84",
-    "@aztec/ethereum": "0.0.1-commit.9593d84",
-    "@aztec/foundation": "0.0.1-commit.9593d84",
-    "@aztec/kv-store": "0.0.1-commit.9593d84",
-    "@aztec/l1-artifacts": "0.0.1-commit.9593d84",
-    "@aztec/merkle-tree": "0.0.1-commit.9593d84",
-    "@aztec/node-keystore": "0.0.1-commit.9593d84",
-    "@aztec/noir-contracts.js": "0.0.1-commit.9593d84",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.9593d84",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9593d84",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.9593d84",
-    "@aztec/p2p": "0.0.1-commit.9593d84",
-    "@aztec/protocol-contracts": "0.0.1-commit.9593d84",
-    "@aztec/prover-client": "0.0.1-commit.9593d84",
-    "@aztec/prover-node": "0.0.1-commit.9593d84",
-    "@aztec/pxe": "0.0.1-commit.9593d84",
-    "@aztec/sequencer-client": "0.0.1-commit.9593d84",
-    "@aztec/simulator": "0.0.1-commit.9593d84",
-    "@aztec/slasher": "0.0.1-commit.9593d84",
-    "@aztec/stdlib": "0.0.1-commit.9593d84",
-    "@aztec/telemetry-client": "0.0.1-commit.9593d84",
-    "@aztec/test-wallet": "0.0.1-commit.9593d84",
-    "@aztec/validator-client": "0.0.1-commit.9593d84",
-    "@aztec/world-state": "0.0.1-commit.9593d84",
+    "@aztec/accounts": "0.0.1-commit.96bb3f7",
+    "@aztec/archiver": "0.0.1-commit.96bb3f7",
+    "@aztec/aztec": "0.0.1-commit.96bb3f7",
+    "@aztec/aztec-node": "0.0.1-commit.96bb3f7",
+    "@aztec/aztec.js": "0.0.1-commit.96bb3f7",
+    "@aztec/bb-prover": "0.0.1-commit.96bb3f7",
+    "@aztec/bb.js": "0.0.1-commit.96bb3f7",
+    "@aztec/blob-client": "0.0.1-commit.96bb3f7",
+    "@aztec/blob-lib": "0.0.1-commit.96bb3f7",
+    "@aztec/bot": "0.0.1-commit.96bb3f7",
+    "@aztec/cli": "0.0.1-commit.96bb3f7",
+    "@aztec/constants": "0.0.1-commit.96bb3f7",
+    "@aztec/entrypoints": "0.0.1-commit.96bb3f7",
+    "@aztec/epoch-cache": "0.0.1-commit.96bb3f7",
+    "@aztec/ethereum": "0.0.1-commit.96bb3f7",
+    "@aztec/foundation": "0.0.1-commit.96bb3f7",
+    "@aztec/kv-store": "0.0.1-commit.96bb3f7",
+    "@aztec/l1-artifacts": "0.0.1-commit.96bb3f7",
+    "@aztec/merkle-tree": "0.0.1-commit.96bb3f7",
+    "@aztec/node-keystore": "0.0.1-commit.96bb3f7",
+    "@aztec/noir-contracts.js": "0.0.1-commit.96bb3f7",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.96bb3f7",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.96bb3f7",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.96bb3f7",
+    "@aztec/p2p": "0.0.1-commit.96bb3f7",
+    "@aztec/protocol-contracts": "0.0.1-commit.96bb3f7",
+    "@aztec/prover-client": "0.0.1-commit.96bb3f7",
+    "@aztec/prover-node": "0.0.1-commit.96bb3f7",
+    "@aztec/pxe": "0.0.1-commit.96bb3f7",
+    "@aztec/sequencer-client": "0.0.1-commit.96bb3f7",
+    "@aztec/simulator": "0.0.1-commit.96bb3f7",
+    "@aztec/slasher": "0.0.1-commit.96bb3f7",
+    "@aztec/stdlib": "0.0.1-commit.96bb3f7",
+    "@aztec/telemetry-client": "0.0.1-commit.96bb3f7",
+    "@aztec/test-wallet": "0.0.1-commit.96bb3f7",
+    "@aztec/validator-client": "0.0.1-commit.96bb3f7",
+    "@aztec/world-state": "0.0.1-commit.96bb3f7",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -5,11 +5,14 @@ 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 { DeployAztecL1ContractsArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 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';
@@ -123,7 +126,7 @@ export class ClientFlowsBenchmark {
 
   private proxyLogger: ProxyLogger;
 
-  constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployL1ContractsArgs> = {}) {
+  constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {}) {
     this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
     this.snapshotManager = createSnapshotManager(
       `bench_client_flows${testName ? `/${testName}` : ''}`,
@@ -436,7 +439,7 @@ export class ClientFlowsBenchmark {
   public async getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress) {
     // The private fee paying method assembled on the app side requires knowledge of the maximum
     // fee the user is willing to pay
-    const maxFeesPerGas = (await this.aztecNode.getCurrentBaseFees()).mul(1.5);
+    const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1.5);
     const gasSettings = GasSettings.default({ maxFeesPerGas });
     return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
   }

package/src/bench/client_flows/data_extractor.ts

@@ -22,7 +22,7 @@ async function main() {
   logger.info(`Flows in ${ivcFolder}: \n${flows.map(flowName => `\t- ${flowName}`).join('\n')}`);
   const simulator = new WASMSimulator();
   const log = proxyLogger.createLogger('bb:prover');
-  const prover = new BBBundlePrivateKernelProver(simulator, log);
+  const prover = new BBBundlePrivateKernelProver(simulator, { logger: log });
 
   const userLog = createLogger('chonk_flows:data_processor');