@aztec/end-to-end 2.0.0-nightly.20250902 → 2.0.0-rc.1

package/dest/spartan/utils.js

@@ -1,27 +1,23 @@
 import { createLogger, sleep } from '@aztec/aztec.js';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
-import { createAztecNodeAdminClient } from '@aztec/stdlib/interfaces/client';
+import { schemas } from '@aztec/foundation/schemas';
+import { createAztecNodeAdminClient, createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { exec, execSync, spawn } from 'child_process';
 import path from 'path';
 import { promisify } from 'util';
+import { createPublicClient, fallback, http } from 'viem';
 import { z } from 'zod';
-export const RPC_SERVICE_NAME = 'services/aztec-infra-rpc-aztec-node';
 const execAsync = promisify(exec);
 const logger = createLogger('e2e:k8s-utils');
 const testConfigSchema = z.object({
-    NAMESPACE: z.string().min(1, 'NAMESPACE env variable must be set'),
-    L1_ACCOUNT_MNEMONIC: z.string().default('test test test test test test test test test test test junk'),
-    K8S_CLUSTER: z.string().min(1, 'K8S_CLUSTER env variable must be set'),
-    REGION: z.string().optional(),
-    PROJECT_ID: z.string().optional(),
-    AZTEC_REAL_PROOFS: z.coerce.boolean().default(false)
+    NAMESPACE: z.string().default('scenario'),
+    REAL_VERIFIER: schemas.Boolean.optional().default(true),
+    CREATE_ETH_DEVNET: schemas.Boolean.optional().default(false),
+    L1_RPC_URLS_JSON: z.string().optional()
 });
 export function setupEnvironment(env) {
     const config = testConfigSchema.parse(env);
-    if (config.K8S_CLUSTER !== 'kind') {
-        const command = `gcloud container clusters get-credentials ${config.K8S_CLUSTER} --region=${config.REGION} --project=${config.PROJECT_ID}`;
-        execSync(command);
-    }
+    logger.warn(`Loaded env config`, config);
     return config;
 }
 /**
@@ -73,7 +69,7 @@ export function runProjectScript(script, args, logger, env) {
 }
 export async function startPortForward({ resource, namespace, containerPort, hostPort }) {
     const hostPortAsString = hostPort ? hostPort.toString() : '';
-    logger.info(`kubectl port-forward -n ${namespace} ${resource} ${hostPortAsString}:${containerPort}`);
+    logger.debug(`kubectl port-forward -n ${namespace} ${resource} ${hostPortAsString}:${containerPort}`);
     const process1 = spawn('kubectl', [
         'port-forward',
         '-n',
@@ -95,20 +91,20 @@ export async function startPortForward({ resource, namespace, containerPort, hos
             const str = data.toString();
             if (!isResolved && str.includes('Forwarding from')) {
                 isResolved = true;
-                logger.info(str);
+                logger.debug(`Port forward for ${resource}: ${str}`);
                 const port = str.search(/:\d+/);
                 if (port === -1) {
                     throw new Error('Port not found in port forward output');
                 }
                 const portNumber = parseInt(str.slice(port + 1));
-                logger.info(`Port forward connected: ${portNumber}`);
+                logger.verbose(`Port forwarded for ${resource} at ${portNumber}:${containerPort}`);
                 resolve(portNumber);
             } else {
                 logger.silent(str);
             }
         });
         process1.stderr?.on('data', (data)=>{
-            logger.info(data.toString());
+            logger.verbose(`Port forward for ${resource}: ${data.toString()}`);
             // It's a strange thing:
             // If we don't pipe stderr, then the port forwarding does not work.
             // Log to silent because this doesn't actually report errors,
@@ -118,16 +114,16 @@ export async function startPortForward({ resource, namespace, containerPort, hos
         process1.on('close', ()=>{
             if (!isResolved) {
                 isResolved = true;
-                logger.warn('Port forward closed before connection established');
+                logger.warn(`Port forward for ${resource} closed before connection established`);
                 resolve(0);
             }
         });
         process1.on('error', (error)=>{
-            logger.error(`Port forward error: ${error}`);
+            logger.error(`Port forward for ${resource} error: ${error}`);
             resolve(0);
         });
         process1.on('exit', (code)=>{
-            logger.info(`Port forward exited with code ${code}`);
+            logger.verbose(`Port forward for ${resource} exited with code ${code}`);
             resolve(0);
         });
     });
@@ -139,19 +135,26 @@ export async function startPortForward({ resource, namespace, containerPort, hos
 }
 export function startPortForwardForRPC(namespace) {
     return startPortForward({
-        resource: RPC_SERVICE_NAME,
+        resource: `services/${namespace}-rpc-aztec-node`,
         namespace,
         containerPort: 8080
     });
 }
+export function startPortForwardForEthereum(namespace) {
+    return startPortForward({
+        resource: `services/${namespace}-eth-execution`,
+        namespace,
+        containerPort: 8545
+    });
+}
 export async function deleteResourceByName({ resource, namespace, name, force = false }) {
     const command = `kubectl delete ${resource} ${name} -n ${namespace} --ignore-not-found=true --wait=true ${force ? '--force' : ''}`;
     logger.info(`command: ${command}`);
     const { stdout } = await execAsync(command);
     return stdout;
 }
-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}`;
+export async function deleteResourceByLabel({ resource, namespace, label, timeout = '5m', force = false }) {
+    const command = `kubectl delete ${resource} -l ${label} -n ${namespace} --ignore-not-found=true --wait=true --timeout=${timeout} ${force ? '--force' : ''}`;
     logger.info(`command: ${command}`);
     const { stdout } = await execAsync(command);
     return stdout;
@@ -204,13 +207,13 @@ async function execHelmCommand(args) {
         const deleteArgs = {
             resource: 'podchaos',
             namespace: chaosMeshNamespace,
-            name: `${targetNamespace}-${instanceName}`
+            label: `app.kubernetes.io/instance=${instanceName}`
         };
         logger.info(`Deleting podchaos resource`);
-        await deleteResourceByName(deleteArgs).catch((e)=>{
+        await deleteResourceByLabel(deleteArgs).catch((e)=>{
             logger.error(`Error deleting podchaos resource: ${e}`);
             logger.info(`Force deleting podchaos resource`);
-            return deleteResourceByName({
+            return deleteResourceByLabel({
                 ...deleteArgs,
                 force: true
             });
@@ -336,40 +339,108 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
     });
     logger.info(`Validator dynamic boot node enabled`);
 }
-export async function updateSequencerConfig(url, config) {
-    const node = createAztecNodeAdminClient(url);
-    // Retry incase the port forward is not ready yet
-    await retry(()=>node.setConfig(config), 'Update sequencer config', makeBackoff([
-        1,
-        3,
-        6
-    ]), logger);
-}
 export async function getSequencers(namespace) {
-    const command = `kubectl get pods -l app=validator -n ${namespace} -o jsonpath='{.items[*].metadata.name}'`;
+    const command = `kubectl get pods -l app.kubernetes.io/component=validator -n ${namespace} -o jsonpath='{.items[*].metadata.name}'`;
     const { stdout } = await execAsync(command);
-    return stdout.split(' ');
+    const sequencers = stdout.split(' ');
+    logger.verbose(`Found sequencer pods ${sequencers.join(', ')}`);
+    return sequencers;
 }
-async function updateK8sSequencersConfig(args) {
-    const { containerPort, namespace, config } = args;
+export function updateSequencersConfig(env, config) {
+    return withSequencersAdmin(env, async (client)=>{
+        await client.setConfig(config);
+        return client.getConfig();
+    });
+}
+export function getSequencersConfig(env) {
+    return withSequencersAdmin(env, (client)=>client.getConfig());
+}
+export async function withSequencersAdmin(env, fn) {
+    const adminContainerPort = 8880;
+    const namespace = env.NAMESPACE;
     const sequencers = await getSequencers(namespace);
+    const results = [];
     for (const sequencer of sequencers){
         const { process: process1, port } = await startPortForward({
             resource: `pod/${sequencer}`,
             namespace,
-            containerPort
+            containerPort: adminContainerPort
         });
         const url = `http://localhost:${port}`;
-        await updateSequencerConfig(url, config);
+        await retry(()=>fetch(`${url}/status`).then((res)=>res.status === 200), 'forward node admin port', makeBackoff([
+            1,
+            1,
+            2,
+            6
+        ]), logger, true);
+        const client = createAztecNodeAdminClient(url);
+        results.push(await fn(client));
         process1.kill();
     }
+    return results;
 }
-export async function updateSequencersConfig(env, config) {
-    await updateK8sSequencersConfig({
-        containerPort: 8880,
-        namespace: env.NAMESPACE,
-        config
-    });
+/**
+ * Returns a public viem client to the eth execution node. If it was part of a local eth devnet,
+ * it first port-forwards the service and points to it. Otherwise, just uses the external RPC url.
+ */ export async function getPublicViemClient(env, /** If set, will push the new process into it */ processes) {
+    const { NAMESPACE, CREATE_ETH_DEVNET, L1_RPC_URLS_JSON } = env;
+    if (CREATE_ETH_DEVNET) {
+        logger.info(`Creating port forward to eth execution node`);
+        const { process: process1, port } = await startPortForward({
+            resource: `svc/${NAMESPACE}-eth-execution`,
+            namespace: NAMESPACE,
+            containerPort: 8545
+        });
+        const url = `http://127.0.0.1:${port}`;
+        const client = createPublicClient({
+            transport: fallback([
+                http(url)
+            ])
+        });
+        if (processes) {
+            processes.push(process1);
+        }
+        return {
+            url,
+            client,
+            process: process1
+        };
+    } else {
+        logger.info(`Connecting to the eth execution node at ${L1_RPC_URLS_JSON}`);
+        if (!L1_RPC_URLS_JSON) {
+            throw new Error(`L1_RPC_URLS_JSON is not defined`);
+        }
+        const client = createPublicClient({
+            transport: fallback([
+                http(L1_RPC_URLS_JSON)
+            ])
+        });
+        return {
+            url: L1_RPC_URLS_JSON,
+            client
+        };
+    }
+}
+/** Queries an Aztec node for the L1 deployment addresses */ export async function getL1DeploymentAddresses(env) {
+    let forwardProcess;
+    try {
+        const [sequencer] = await getSequencers(env.NAMESPACE);
+        const { process: process1, port } = await startPortForward({
+            resource: `pod/${sequencer}`,
+            namespace: env.NAMESPACE,
+            containerPort: 8080
+        });
+        forwardProcess = process1;
+        const url = `http://127.0.0.1:${port}`;
+        const node = createAztecNodeClient(url);
+        return await retry(()=>node.getNodeInfo().then((i)=>i.l1ContractAddresses), 'get node info', makeBackoff([
+            1,
+            3,
+            6
+        ]), logger);
+    } finally{
+        forwardProcess?.kill();
+    }
 }
 /**
  * Rolls the Aztec pods in the given namespace.

package/package.json

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

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -16,7 +16,6 @@ import {
   createLogger,
 } from '@aztec/aztec.js';
 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';
 import { randomBytes } from '@aztec/foundation/crypto';
@@ -155,10 +154,13 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.teardown();
   }
 
-  async mintAndBridgeFeeJuice(address: AztecAddress, amount: bigint) {
-    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, address);
+  async mintAndBridgeFeeJuice(address: AztecAddress) {
+    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(address);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await this.feeJuiceContract.methods.claim(address, amount, secret, index).send({ from: this.adminAddress }).wait();
+    await this.feeJuiceContract.methods
+      .claim(address, claim.claimAmount, secret, index)
+      .send({ from: this.adminAddress })
+      .wait();
   }
 
   /** Admin mints bananaCoin tokens privately to the target address and redeems them. */
@@ -304,11 +306,7 @@ export class ClientFlowsBenchmark {
 
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(
-          FEE_FUNDING_FOR_TESTER_ACCOUNT,
-          bananaFPC.address,
-          this.adminAddress,
-        );
+        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
 
         return { bananaFPCAddress: bananaFPC.address };
       },
@@ -361,10 +359,7 @@ export class ClientFlowsBenchmark {
     const benchysAccountManager = await this.createBenchmarkingAccountManager(this.pxe, accountType);
     const benchysWallet = await benchysAccountManager.getWallet();
     const benchysAddress = benchysAccountManager.getAddress();
-    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(
-      FEE_FUNDING_FOR_TESTER_ACCOUNT,
-      benchysAddress,
-    );
+    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
     const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysWallet, claim);
     await benchysAccountManager.deploy({ fee: { paymentMethod } }).wait();
     // Register benchy on the user's PXE, where we're going to be interacting from
@@ -409,10 +404,7 @@ export class ClientFlowsBenchmark {
   }
 
   public async getBridgedFeeJuicePaymentMethodForWallet(wallet: Wallet) {
-    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(
-      FEE_FUNDING_FOR_TESTER_ACCOUNT,
-      wallet.getAddress(),
-    );
+    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(wallet.getAddress());
     return new FeeJuicePaymentMethodWithClaim(wallet, claim);
   }
 

package/src/e2e_epochs/epochs_test.ts

@@ -92,7 +92,7 @@ export class EpochsTestContext {
       : DEFAULT_L1_BLOCK_TIME;
     const ethereumSlotDuration = opts.ethereumSlotDuration ?? envEthereumSlotDuration;
     const aztecSlotDuration = opts.aztecSlotDuration ?? ethereumSlotDuration * 2;
-    const aztecEpochDuration = opts.aztecEpochDuration ?? 4;
+    const aztecEpochDuration = opts.aztecEpochDuration ?? 6;
     const aztecProofSubmissionEpochs = opts.aztecProofSubmissionEpochs ?? 1;
     return { ethereumSlotDuration, aztecSlotDuration, aztecEpochDuration, aztecProofSubmissionEpochs };
   }
@@ -278,7 +278,12 @@ export class EpochsTestContext {
   public async waitUntilEpochStarts(epoch: number) {
     const [start] = getTimestampRangeForEpoch(BigInt(epoch), this.constants);
     this.logger.info(`Waiting until L1 timestamp ${start} is reached as the start of epoch ${epoch}`);
-    await waitUntilL1Timestamp(this.l1Client, start - BigInt(this.L1_BLOCK_TIME_IN_S));
+    await waitUntilL1Timestamp(
+      this.l1Client,
+      start - BigInt(this.L1_BLOCK_TIME_IN_S),
+      undefined,
+      30 * this.epochDuration,
+    );
     return start;
   }
 

package/src/e2e_fees/bridging_race.notest.ts

@@ -1,6 +1,5 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { Fr, type Logger, type PXE, sleep } from '@aztec/aztec.js';
-import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
 import { Fq } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
@@ -64,11 +63,13 @@ describe('e2e_fees bridging_race', () => {
     // Waiting for the archiver to sync the message _before_ waiting for the mandatory 2 L2 blocks to pass fixed it
     // This was added everywhere we wait for two blocks, which is spread across three different places in the codebase
     // Yes, we need to REFACTOR it at some point
-    const amount = FEE_FUNDING_FOR_TESTER_ACCOUNT;
-    const claim = await t.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, bobsAddress);
+    const claim = await t.feeJuiceBridgeTestHarness.prepareTokensOnL1(bobsAddress);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await t.feeJuiceContract.methods.claim(bobsAddress, amount, secret, index).send({ from: bobsAddress }).wait();
+    await t.feeJuiceContract.methods
+      .claim(bobsAddress, claim.claimAmount, secret, index)
+      .send({ from: bobsAddress })
+      .wait();
     const [balance] = await t.getGasBalanceFn(bobsAddress);
-    expect(balance).toEqual(amount);
+    expect(balance).toEqual(claim.claimAmount);
   });
 });

package/src/e2e_fees/fees_test.ts

@@ -9,7 +9,6 @@ import {
   sleep,
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
-import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
 import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -158,10 +157,13 @@ export class FeesTest {
     return { sequencerBlockRewards, proverBlockRewards };
   }
 
-  async mintAndBridgeFeeJuice(minter: AztecAddress, recipient: AztecAddress, amount: bigint) {
-    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(amount, recipient);
+  async mintAndBridgeFeeJuice(minter: AztecAddress, recipient: AztecAddress) {
+    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(recipient);
     const { claimSecret: secret, messageLeafIndex: index } = claim;
-    await this.feeJuiceContract.methods.claim(recipient, amount, secret, index).send({ from: minter }).wait();
+    await this.feeJuiceContract.methods
+      .claim(recipient, claim.claimAmount, secret, index)
+      .send({ from: minter })
+      .wait();
   }
 
   /** Alice mints bananaCoin tokens privately to the target address and redeems them. */
@@ -287,11 +289,7 @@ export class FeesTest {
 
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
-        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(
-          FEE_FUNDING_FOR_TESTER_ACCOUNT,
-          bananaFPC.address,
-          this.aliceAddress,
-        );
+        await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.aliceAddress);
 
         return {
           bananaFPCAddress: bananaFPC.address,

package/src/fixtures/e2e_prover_test.ts

@@ -26,7 +26,7 @@ import type { BlobSinkServer } from '@aztec/blob-sink/server';
 import type { DeployL1ContractsReturnType } from '@aztec/ethereum';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { SecretValue } from '@aztec/foundation/config';
-import { TestERC20Abi } from '@aztec/l1-artifacts';
+import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { type ProverNode, type ProverNodeConfig, createProverNode } from '@aztec/prover-node';
 import type { PXEService } from '@aztec/pxe/server';
@@ -289,7 +289,7 @@ export class FullProverTest {
     this.proverAddress = EthAddress.fromString(proverNodeSenderAddress);
 
     this.logger.verbose(`Funding prover node at ${proverNodeSenderAddress}`);
-    await this.mintL1ERC20(proverNodeSenderAddress, 100_000_000n);
+    await this.mintFeeJuice(proverNodeSenderAddress);
 
     this.logger.verbose('Starting prover node');
     const proverConfig: ProverNodeConfig = {
@@ -328,11 +328,12 @@ export class FullProverTest {
     return this;
   }
 
-  private async mintL1ERC20(recipient: Hex, amount: bigint) {
-    const erc20Address = this.context.deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress;
+  private async mintFeeJuice(recipient: Hex) {
+    const handlerAddress = this.context.deployL1ContractsValues.l1ContractAddresses.feeAssetHandlerAddress!;
+    this.logger.verbose(`Minting fee juice to ${recipient} using handler at ${handlerAddress}`);
     const client = this.context.deployL1ContractsValues.l1Client;
-    const erc20 = getContract({ abi: TestERC20Abi, address: erc20Address.toString(), client });
-    const hash = await erc20.write.mint([recipient, amount]);
+    const handler = getContract({ abi: FeeAssetHandlerAbi, address: handlerAddress.toString(), client });
+    const hash = await handler.write.mint([recipient]);
     await this.context.deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash });
   }
 

package/src/fixtures/snapshot_manager.ts

@@ -21,8 +21,6 @@ import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/serv
 import {
   type DeployL1ContractsArgs,
   type DeployL1ContractsReturnType,
-  FeeAssetArtifact,
-  RollupContract,
   createExtendedL1Client,
   deployMulticall3,
   getL1ContractsConfigEnvVars,
@@ -49,7 +47,7 @@ import fs from 'fs/promises';
 import getPort from 'get-port';
 import { tmpdir } from 'os';
 import path, { join } from 'path';
-import { type Hex, getContract } from 'viem';
+import type { Hex } from 'viem';
 import { mnemonicToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 
@@ -383,31 +381,6 @@ async function setupFromFresh(
   aztecNodeConfig.rollupVersion = deployL1ContractsValues.rollupVersion;
   aztecNodeConfig.l1PublishRetryIntervalMS = 100;
 
-  if (opts.fundRewardDistributor) {
-    // Mints block rewards for 10000 blocks to the rewardDistributor contract
-
-    const rollup = new RollupContract(
-      deployL1ContractsValues.l1Client,
-      deployL1ContractsValues.l1ContractAddresses.rollupAddress,
-    );
-
-    const blockReward = await rollup.getBlockReward();
-    const mintAmount = 10_000n * (blockReward as bigint);
-
-    const feeJuice = getContract({
-      address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
-      abi: FeeAssetArtifact.contractAbi,
-      client: deployL1ContractsValues.l1Client,
-    });
-
-    const rewardDistributorMintTxHash = await feeJuice.write.mint(
-      [deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(), mintAmount],
-      {} as any,
-    );
-    await deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: rewardDistributorMintTxHash });
-    logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
-  }
-
   const dateProvider = new TestDateProvider();
 
   const watcher = new AnvilTestWatcher(

package/src/fixtures/utils.ts

@@ -382,9 +382,7 @@ export type EndToEndContext = {
  */
 export async function setup(
   numberOfAccounts = 1,
-  opts: SetupOptions = {
-    customForwarderContractAddress: EthAddress.ZERO,
-  },
+  opts: SetupOptions = {},
   pxeOpts: Partial<PXEServiceConfig> = {},
   chain: Chain = foundry,
 ): Promise<EndToEndContext> {

package/src/shared/gas_portal_test_harness.ts

@@ -12,17 +12,14 @@ import {
   retryUntil,
 } from '@aztec/aztec.js';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum';
-import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 
-import { getContract } from 'viem';
-
 export interface IGasBridgingTestHarness {
   getL1FeeJuiceBalance(address: EthAddress): Promise<bigint>;
-  prepareTokensOnL1(bridgeAmount: bigint, owner: AztecAddress): Promise<L2AmountClaim>;
-  bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress, claimer: AztecAddress): Promise<void>;
+  prepareTokensOnL1(owner: AztecAddress): Promise<L2AmountClaim>;
+  bridgeFromL1ToL2(owner: AztecAddress, claimer: AztecAddress): Promise<void>;
   feeJuice: FeeJuiceContract;
   l1FeeJuiceAddress: EthAddress;
 }
@@ -119,16 +116,9 @@ export class GasBridgingTestHarness implements IGasBridgingTestHarness {
     this.l1TokenManager = this.feeJuicePortalManager.getTokenManager();
   }
 
-  async mintTokensOnL1(amount: bigint, to: EthAddress = this.ethAccount) {
+  async mintTokensOnL1(to: EthAddress = this.ethAccount) {
     // const balanceBefore = await this.l1TokenManager.getL1TokenBalance(to.toString());
     await this.l1TokenManager.mint(to.toString());
-    const feeAssetL1 = getContract({
-      address: this.l1FeeJuiceAddress.toString(),
-      abi: TestERC20Abi,
-      client: this.l1Client,
-    });
-
-    await feeAssetL1.write.mint([to.toString(), amount]);
 
     // expect(await this.l1TokenManager.getL1TokenBalance(to.toString())).toEqual(balanceBefore + amount);
   }
@@ -156,8 +146,9 @@ export class GasBridgingTestHarness implements IGasBridgingTestHarness {
     expect(balance).toBe(expectedBalance);
   }
 
-  async prepareTokensOnL1(bridgeAmount: bigint, owner: AztecAddress) {
-    await this.mintTokensOnL1(bridgeAmount);
+  async prepareTokensOnL1(owner: AztecAddress) {
+    const bridgeAmount = await this.l1TokenManager.getMintAmount();
+    await this.mintTokensOnL1();
     const claim = await this.sendTokensToPortalPublic(bridgeAmount, owner);
 
     const isSynced = async () => await this.aztecNode.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
@@ -170,9 +161,9 @@ export class GasBridgingTestHarness implements IGasBridgingTestHarness {
     return claim;
   }
 
-  async bridgeFromL1ToL2(bridgeAmount: bigint, owner: AztecAddress, claimer: AztecAddress) {
+  async bridgeFromL1ToL2(owner: AztecAddress, claimer: AztecAddress) {
     // Prepare the tokens on the L1 side
-    const claim = await this.prepareTokensOnL1(bridgeAmount, owner);
+    const claim = await this.prepareTokensOnL1(owner);
 
     // Consume L1 -> L2 message and claim tokens privately on L2
     await this.consumeMessageOnAztecAndClaimPrivately(owner, claimer, claim);