@aztec/end-to-end 3.0.0-rc.5 → 4.0.0-nightly.20260107

package/dest/spartan/utils.js

@@ -18,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) {
@@ -185,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 '';
@@ -203,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);
 }
@@ -224,6 +252,30 @@ 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}`);
@@ -295,51 +347,66 @@ 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'),
@@ -402,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) {
@@ -425,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(':');
@@ -443,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,
@@ -450,7 +538,7 @@ export async function restartBot(namespace, logger) {
         valuesFile: undefined,
         timeout,
         values: values,
-        reuseValues
+        reuseValues: effectiveReuseValues
     });
     if (replicas > 0) {
         await waitForResourceByLabel({
@@ -482,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){
@@ -510,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){
@@ -565,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)=>{
@@ -619,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) {
@@ -637,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": "3.0.0-rc.5",
+  "version": "4.0.0-nightly.20260107",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,43 +25,43 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-rc.5",
-    "@aztec/archiver": "3.0.0-rc.5",
-    "@aztec/aztec": "3.0.0-rc.5",
-    "@aztec/aztec-node": "3.0.0-rc.5",
-    "@aztec/aztec.js": "3.0.0-rc.5",
-    "@aztec/bb-prover": "3.0.0-rc.5",
-    "@aztec/bb.js": "3.0.0-rc.5",
-    "@aztec/blob-lib": "3.0.0-rc.5",
-    "@aztec/blob-sink": "3.0.0-rc.5",
-    "@aztec/bot": "3.0.0-rc.5",
-    "@aztec/cli": "3.0.0-rc.5",
-    "@aztec/constants": "3.0.0-rc.5",
-    "@aztec/entrypoints": "3.0.0-rc.5",
-    "@aztec/epoch-cache": "3.0.0-rc.5",
-    "@aztec/ethereum": "3.0.0-rc.5",
-    "@aztec/foundation": "3.0.0-rc.5",
-    "@aztec/kv-store": "3.0.0-rc.5",
-    "@aztec/l1-artifacts": "3.0.0-rc.5",
-    "@aztec/merkle-tree": "3.0.0-rc.5",
-    "@aztec/node-keystore": "3.0.0-rc.5",
-    "@aztec/noir-contracts.js": "3.0.0-rc.5",
-    "@aztec/noir-noirc_abi": "3.0.0-rc.5",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-rc.5",
-    "@aztec/noir-test-contracts.js": "3.0.0-rc.5",
-    "@aztec/p2p": "3.0.0-rc.5",
-    "@aztec/protocol-contracts": "3.0.0-rc.5",
-    "@aztec/prover-client": "3.0.0-rc.5",
-    "@aztec/prover-node": "3.0.0-rc.5",
-    "@aztec/pxe": "3.0.0-rc.5",
-    "@aztec/sequencer-client": "3.0.0-rc.5",
-    "@aztec/simulator": "3.0.0-rc.5",
-    "@aztec/slasher": "3.0.0-rc.5",
-    "@aztec/stdlib": "3.0.0-rc.5",
-    "@aztec/telemetry-client": "3.0.0-rc.5",
-    "@aztec/test-wallet": "3.0.0-rc.5",
-    "@aztec/validator-client": "3.0.0-rc.5",
-    "@aztec/world-state": "3.0.0-rc.5",
+    "@aztec/accounts": "4.0.0-nightly.20260107",
+    "@aztec/archiver": "4.0.0-nightly.20260107",
+    "@aztec/aztec": "4.0.0-nightly.20260107",
+    "@aztec/aztec-node": "4.0.0-nightly.20260107",
+    "@aztec/aztec.js": "4.0.0-nightly.20260107",
+    "@aztec/bb-prover": "4.0.0-nightly.20260107",
+    "@aztec/bb.js": "4.0.0-nightly.20260107",
+    "@aztec/blob-client": "4.0.0-nightly.20260107",
+    "@aztec/blob-lib": "4.0.0-nightly.20260107",
+    "@aztec/bot": "4.0.0-nightly.20260107",
+    "@aztec/cli": "4.0.0-nightly.20260107",
+    "@aztec/constants": "4.0.0-nightly.20260107",
+    "@aztec/entrypoints": "4.0.0-nightly.20260107",
+    "@aztec/epoch-cache": "4.0.0-nightly.20260107",
+    "@aztec/ethereum": "4.0.0-nightly.20260107",
+    "@aztec/foundation": "4.0.0-nightly.20260107",
+    "@aztec/kv-store": "4.0.0-nightly.20260107",
+    "@aztec/l1-artifacts": "4.0.0-nightly.20260107",
+    "@aztec/merkle-tree": "4.0.0-nightly.20260107",
+    "@aztec/node-keystore": "4.0.0-nightly.20260107",
+    "@aztec/noir-contracts.js": "4.0.0-nightly.20260107",
+    "@aztec/noir-noirc_abi": "4.0.0-nightly.20260107",
+    "@aztec/noir-protocol-circuits-types": "4.0.0-nightly.20260107",
+    "@aztec/noir-test-contracts.js": "4.0.0-nightly.20260107",
+    "@aztec/p2p": "4.0.0-nightly.20260107",
+    "@aztec/protocol-contracts": "4.0.0-nightly.20260107",
+    "@aztec/prover-client": "4.0.0-nightly.20260107",
+    "@aztec/prover-node": "4.0.0-nightly.20260107",
+    "@aztec/pxe": "4.0.0-nightly.20260107",
+    "@aztec/sequencer-client": "4.0.0-nightly.20260107",
+    "@aztec/simulator": "4.0.0-nightly.20260107",
+    "@aztec/slasher": "4.0.0-nightly.20260107",
+    "@aztec/stdlib": "4.0.0-nightly.20260107",
+    "@aztec/telemetry-client": "4.0.0-nightly.20260107",
+    "@aztec/test-wallet": "4.0.0-nightly.20260107",
+    "@aztec/validator-client": "4.0.0-nightly.20260107",
+    "@aztec/world-state": "4.0.0-nightly.20260107",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

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');
 

package/src/bench/utils.ts

@@ -1,4 +1,5 @@
 import type { AztecNodeService } from '@aztec/aztec-node';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js/contracts';
 import { mean, stdDev, times } from '@aztec/foundation/collection';
 import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
@@ -103,19 +104,22 @@ function getMetricValues(points: BenchmarkDataPoint[]) {
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns A BatchCall instance.
  */
-function makeCall(
+async function makeCall(
   index: number,
   context: EndToEndContext,
   contract: BenchmarkingContract,
   heavyPublicCompute: boolean,
 ) {
-  const [owner] = context.accounts;
   if (heavyPublicCompute) {
     return new BatchCall(context.wallet, [contract.methods.sha256_hash_1024(randomBytesAsBigInts(1024))]);
   } else {
+    // We use random address for the new note owner because we can emit at most UNFINALIZED_TAGGING_INDEXES_WINDOW_LEN
+    // logs for a given sender-recipient-contract tuple.
+    const ownerOfNewNote = await AztecAddress.random();
+    const [ownerOfBalance] = context.accounts;
     return new BatchCall(context.wallet, [
-      contract.methods.create_note(owner, index + 1),
-      contract.methods.increment_balance(owner, index + 1),
+      contract.methods.create_note(ownerOfNewNote, index + 1),
+      contract.methods.increment_balance(ownerOfBalance, index + 1),
     ]);
   }
 }
@@ -129,13 +133,13 @@ function makeCall(
  * @param heavyPublicCompute - Whether the transactions include heavy public compute (like a big sha256).
  * @returns Array of sent txs.
  */
-export function sendTxs(
+export async function sendTxs(
   txCount: number,
   context: EndToEndContext,
   contract: BenchmarkingContract,
   heavyPublicCompute: boolean = false,
-): SentTx[] {
-  const calls = times(txCount, index => makeCall(index, context, contract, heavyPublicCompute));
+): Promise<SentTx[]> {
+  const calls = await Promise.all(times(txCount, index => makeCall(index, context, contract, heavyPublicCompute)));
   context.logger.info(`Creating ${txCount} txs`);
   const [from] = context.accounts;
   context.logger.info(`Sending ${txCount} txs`);

package/src/e2e_epochs/epochs_test.ts

@@ -97,12 +97,24 @@ export class EpochsTestContext {
     const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
     const aztecEpochDuration = opts.aztecEpochDuration ?? 6;
     const aztecProofSubmissionEpochs = opts.aztecProofSubmissionEpochs ?? 1;
-    return { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionEpochs };
+    const l1PublishingTime = opts.l1PublishingTime ?? 1;
+    return {
+      l1PublishingTime,
+      ethereumSlotDuration,
+      aztecSlotDuration,
+      aztecEpochDuration,
+      aztecProofSubmissionEpochs,
+    };
   }
 
   public async setup(opts: EpochsTestOpts = {}) {
-    const { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionEpochs } =
-      EpochsTestContext.getSlotDurations(opts);
+    const {
+      ethereumSlotDuration,
+      aztecSlotDuration,
+      aztecEpochDuration,
+      aztecProofSubmissionEpochs,
+      l1PublishingTime,
+    } = EpochsTestContext.getSlotDurations(opts);
 
     this.L1_BLOCK_TIME_IN_S = ethereumSlotDuration;
     this.L2_SLOT_DURATION_IN_S = aztecSlotDuration;
@@ -130,6 +142,7 @@ export class EpochsTestContext {
       worldStateBlockHistory: WORLD_STATE_BLOCK_HISTORY,
       exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
       slasherFlavor: 'none',
+      l1PublishingTime,
       ...opts,
     });
 
@@ -292,7 +305,7 @@ export class EpochsTestContext {
   }
 
   /** Waits until the given checkpoint number is mined. */
-  public async waitUntilCheckpointNumber(target: CheckpointNumber, timeout = 60) {
+  public async waitUntilCheckpointNumber(target: CheckpointNumber, timeout = 120) {
     await retryUntil(
       () => Promise.resolve(target <= this.monitor.checkpointNumber),
       `Wait until checkpoint ${target}`,
@@ -302,7 +315,7 @@ export class EpochsTestContext {
   }
 
   /** Waits until the given checkpoint number is marked as proven. */
-  public async waitUntilProvenCheckpointNumber(target: CheckpointNumber, timeout = 60) {
+  public async waitUntilProvenCheckpointNumber(target: CheckpointNumber, timeout = 120) {
     await retryUntil(
       () => Promise.resolve(target <= this.monitor.provenCheckpointNumber),
       `Wait proven checkpoint ${target}`,
@@ -391,11 +404,11 @@ export class EpochsTestContext {
     const stateChanges: TrackedSequencerEvent[] = [];
     const failEvents: TrackedSequencerEvent[] = [];
 
-    // Note we do not include the 'tx-count-check-failed' event here, since it is fine if we dont build
+    // Note we do not include the 'block-tx-count-check-failed' event here, since it is fine if we dont build
     // due to lack of txs available.
     const failEventsKeys: (keyof SequencerEvents)[] = [
       'block-build-failed',
-      'block-publish-failed',
+      'checkpoint-publish-failed',
       'proposer-rollup-check-failed',
     ];
 

package/src/e2e_fees/fees_test.ts

@@ -19,6 +19,7 @@ import { CounterContract } from '@aztec/noir-test-contracts.js/Counter';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { GasSettings } from '@aztec/stdlib/gas';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { TestWallet } from '@aztec/test-wallet/server';
 
 import { getContract } from 'viem';
@@ -58,6 +59,7 @@ export class FeesTest {
 
   public logger: Logger;
   public aztecNode!: AztecNode;
+  public aztecNodeAdmin!: AztecNodeAdmin;
   public cheatCodes!: CheatCodes;
 
   public wallet!: TestWallet;
@@ -142,9 +144,7 @@ export class FeesTest {
     const blockReward = await this.rollupContract.getCheckpointReward();
     const rewardConfig = await this.rollupContract.getRewardConfig();
 
-    const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(
-      EthAddress.fromString(rewardConfig.rewardDistributor),
-    );
+    const balance = await this.feeJuiceBridgeTestHarness.getL1FeeJuiceBalance(rewardConfig.rewardDistributor);
 
     const toDistribute = balance > blockReward ? blockReward : balance;
     const sequencerBlockRewards = (toDistribute * BigInt(rewardConfig.sequencerBps)) / 10000n;
@@ -190,6 +190,7 @@ export class FeesTest {
       async ({ deployedAccounts }, { wallet, aztecNode, cheatCodes }) => {
         this.wallet = wallet;
         this.aztecNode = aztecNode;
+        this.aztecNodeAdmin = aztecNode;
         this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2) });
         this.cheatCodes = cheatCodes;
         this.accounts = deployedAccounts.map(a => a.address);
@@ -322,7 +323,7 @@ export class FeesTest {
           const { baseFee } = await this.rollupContract.getL1FeesAt(block!.header.globalVariables.timestamp);
           const proverCost =
             mulDiv(
-              mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, await this.rollupContract.getEpochDuration()),
+              mulDiv(L1_GAS_PER_EPOCH_VERIFIED, baseFee, BigInt(await this.rollupContract.getEpochDuration())),
               1n,
               await this.rollupContract.getManaTarget(),
             ) + (await this.rollupContract.getProvingCostPerMana());

package/src/e2e_p2p/p2p_network.ts

@@ -451,7 +451,7 @@ export class P2PNetworkTest {
     );
 
     const slasherContract = getContract({
-      address: getAddress(await rollup.getSlasherAddress()),
+      address: getAddress((await rollup.getSlasherAddress()).toString()),
       abi: SlasherAbi,
       client: this.ctx.deployL1ContractsValues.l1Client,
     });

package/src/e2e_p2p/shared.ts

@@ -13,6 +13,7 @@ import type {
 } from '@aztec/ethereum/contracts';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { timesAsync, unique } from '@aztec/foundation/collection';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { retryUntil } from '@aztec/foundation/retry';
 import { pluralize } from '@aztec/foundation/string';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
@@ -137,7 +138,7 @@ export async function awaitCommitteeExists({
   logger: Logger;
 }): Promise<readonly `0x${string}`[]> {
   logger.info(`Waiting for committee to be set`);
-  let committee: readonly `0x${string}`[] | undefined;
+  let committee: EthAddress[] | undefined;
   await retryUntil(
     async () => {
       committee = await rollup.getCurrentEpochCommittee();
@@ -146,7 +147,7 @@ export async function awaitCommitteeExists({
     'non-empty committee',
     60,
   );
-  return committee!;
+  return committee!.map(c => c.toString() as `0x${string}`);
 }
 
 export async function awaitOffenseDetected({
@@ -218,9 +219,9 @@ export async function awaitCommitteeKicked({
 
   if (slashingProposer.type === 'empire') {
     // Await for the slash payload to be created if empire (no payload is created on tally until execution time)
-    const targetEpoch = BigInt(await cheatCodes.getEpoch()) + (await rollup.getLagInEpochsForValidatorSet()) + 1n;
+    const targetEpoch = EpochNumber((await cheatCodes.getEpoch()) + (await rollup.getLagInEpochsForValidatorSet()) + 1);
     logger.info(`Advancing to epoch ${targetEpoch} so we start slashing`);
-    await cheatCodes.advanceToEpoch(EpochNumber.fromBigInt(targetEpoch));
+    await cheatCodes.advanceToEpoch(targetEpoch);
 
     const slashPayloadEvents = await retryUntil(
       async () => {
@@ -275,7 +276,7 @@ export async function awaitCommitteeKicked({
   logger.info(`Advancing to check current committee`);
   await cheatCodes.debugRollup();
   await cheatCodes.advanceToEpoch(
-    EpochNumber.fromBigInt(BigInt(await cheatCodes.getEpoch()) + (await rollup.getLagInEpochsForValidatorSet()) + 1n),
+    EpochNumber((await cheatCodes.getEpoch()) + (await rollup.getLagInEpochsForValidatorSet()) + 1),
   );
   await cheatCodes.debugRollup();