@aztec/end-to-end 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.77.0-testnet-ignition.17

package/src/e2e_p2p/p2p_network.ts

@@ -1,14 +1,18 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { type AztecNodeConfig, type AztecNodeService } from '@aztec/aztec-node';
-import { type AccountWalletWithSecretKey } from '@aztec/aztec.js';
+import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
+import type { InitialAccountData } from '@aztec/accounts/testing';
+import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+import type { AccountWalletWithSecretKey } from '@aztec/aztec.js';
 import { ChainMonitor } from '@aztec/aztec.js/ethereum';
-import { L1TxUtilsWithBlobs, RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { EthCheatCodesWithState } from '@aztec/ethereum/test';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { SpamContract } from '@aztec/noir-contracts.js/Spam';
-import { type BootstrapNode } from '@aztec/p2p';
-import { createBootstrapNodeFromPrivateKey } from '@aztec/p2p/mocks';
+import type { BootstrapNode } from '@aztec/p2p/bootstrap';
+import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
+import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { getGenesisValues } from '@aztec/world-state/testing';
 
 import getPort from 'get-port';
 import { getContract } from 'viem';
@@ -23,8 +27,8 @@ import {
 import {
   type ISnapshotManager,
   type SubsystemsContext,
-  addAccounts,
   createSnapshotManager,
+  deployAccounts,
 } from '../fixtures/snapshot_manager.js';
 import { getPrivateKeyFromIndex } from '../fixtures/utils.js';
 import { getEndToEndTestTelemetryClient } from '../fixtures/with_telemetry_utils.js';
@@ -34,6 +38,11 @@ const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f2067060
 const l1ContractsConfig = getL1ContractsConfigEnvVars();
 export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
 
+export const SHORTENED_BLOCK_TIME_CONFIG = {
+  aztecSlotDuration: 12,
+  ethereumSlotDuration: 4,
+};
+
 export class P2PNetworkTest {
   private snapshotManager: ISnapshotManager;
   private baseAccount;
@@ -47,25 +56,26 @@ export class P2PNetworkTest {
   public proposerPrivateKeys: `0x${string}`[] = [];
   public peerIdPrivateKeys: string[] = [];
 
-  public bootstrapNodeEnr: string = '';
-
+  public deployedAccounts: InitialAccountData[] = [];
+  public prefilledPublicData: PublicDataTreeLeaf[] = [];
   // The re-execution test needs a wallet and a spam contract
   public wallet?: AccountWalletWithSecretKey;
   public spamContract?: SpamContract;
 
+  public bootstrapNode?: BootstrapNode;
+
   private cleanupInterval: NodeJS.Timeout | undefined = undefined;
 
   private gasUtils: L1TxUtilsWithBlobs | undefined = undefined;
 
   constructor(
     testName: string,
-    public bootstrapNode: BootstrapNode,
+    public bootstrapNodeEnr: string,
     public bootNodePort: number,
     private numberOfNodes: number,
     initialValidatorConfig: AztecNodeConfig,
     // If set enable metrics collection
-    metricsPort?: number,
-    assumeProvenThrough?: number,
+    private metricsPort?: number,
   ) {
     this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
 
@@ -75,23 +85,26 @@ export class P2PNetworkTest {
     this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
     this.attesterPublicKeys = this.attesterPrivateKeys.map(privateKey => privateKeyToAccount(privateKey).address);
 
-    this.bootstrapNodeEnr = bootstrapNode.getENR().encodeTxt();
-
     this.snapshotManager = createSnapshotManager(
       `e2e_p2p_network/${testName}`,
       process.env.E2E_DATA_PATH,
       {
         ...initialValidatorConfig,
-        ethereumSlotDuration: l1ContractsConfig.ethereumSlotDuration,
+        ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
+        aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
+        aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
+        aztecProofSubmissionWindow:
+          initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
         salt: 420,
         metricsPort: metricsPort,
+        numberOfInitialFundedAccounts: 1,
       },
       {
         aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
-        aztecEpochProofClaimWindowInL2Slots:
-          initialValidatorConfig.aztecEpochProofClaimWindowInL2Slots ??
-          l1ContractsConfig.aztecEpochProofClaimWindowInL2Slots,
-        assumeProvenThrough: assumeProvenThrough ?? Number.MAX_SAFE_INTEGER,
+        ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
+        aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
+        aztecProofSubmissionWindow:
+          initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
         initialValidators: [],
       },
     );
@@ -103,35 +116,31 @@ export class P2PNetworkTest {
     basePort,
     metricsPort,
     initialConfig,
-    assumeProvenThrough,
   }: {
     testName: string;
     numberOfNodes: number;
     basePort?: number;
     metricsPort?: number;
     initialConfig?: Partial<AztecNodeConfig>;
-    assumeProvenThrough?: number;
   }) {
     const port = basePort || (await getPort());
 
-    const telemetry = getEndToEndTestTelemetryClient(metricsPort);
-    const bootstrapNode = await createBootstrapNodeFromPrivateKey(BOOTSTRAP_NODE_PRIVATE_KEY, port, telemetry);
-    const bootstrapNodeEnr = bootstrapNode.getENR().encodeTxt();
+    const bootstrapNodeENR = await getBootstrapNodeEnr(BOOTSTRAP_NODE_PRIVATE_KEY, port);
+    const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
 
     const initialValidatorConfig = await createValidatorConfig(
       (initialConfig ?? {}) as AztecNodeConfig,
       bootstrapNodeEnr,
     );
 
-    return new P2PNetworkTest(
-      testName,
-      bootstrapNode,
-      port,
-      numberOfNodes,
-      initialValidatorConfig,
-      metricsPort,
-      assumeProvenThrough,
-    );
+    return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfNodes, initialValidatorConfig, metricsPort);
+  }
+
+  get fundedAccount() {
+    if (!this.deployedAccounts[0]) {
+      throw new Error('Call snapshot t.setupAccount to create a funded account.');
+    }
+    return this.deployedAccounts[0];
   }
 
   /**
@@ -161,6 +170,18 @@ export class P2PNetworkTest {
   }
 
   async applyBaseSnapshots() {
+    await this.snapshotManager.snapshot('add-bootstrap-node', async ({ aztecNodeConfig }) => {
+      const telemetry = getEndToEndTestTelemetryClient(this.metricsPort);
+      this.bootstrapNode = await createBootstrapNodeFromPrivateKey(
+        BOOTSTRAP_NODE_PRIVATE_KEY,
+        this.bootNodePort,
+        telemetry,
+        aztecNodeConfig,
+      );
+      // Overwrite enr with updated info
+      this.bootstrapNodeEnr = this.bootstrapNode.getENR().encodeTxt();
+    });
+
     await this.snapshotManager.snapshot(
       'add-validators',
       async ({ deployL1ContractsValues, aztecNodeConfig, dateProvider }) => {
@@ -219,7 +240,7 @@ export class P2PNetworkTest {
 
         const slotsInEpoch = await rollup.read.getEpochDuration();
         const timestamp = await rollup.read.getTimestampForSlot([slotsInEpoch]);
-        const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrl);
+        const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
         try {
           await cheatCodes.warp(Number(timestamp));
         } catch (err) {
@@ -245,16 +266,11 @@ export class P2PNetworkTest {
   async setupAccount() {
     await this.snapshotManager.snapshot(
       'setup-account',
-      addAccounts(1, this.logger, false),
-      async ({ accountKeys }, ctx) => {
-        const wallets = await Promise.all(
-          accountKeys.map(async ak => {
-            const account = await getSchnorrAccount(ctx.pxe, ak[0], ak[1], 1);
-            return account.getWallet();
-          }),
-        );
-
-        this.wallet = wallets[0];
+      deployAccounts(1, this.logger, false),
+      async ({ deployedAccounts }, { pxe }) => {
+        this.deployedAccounts = deployedAccounts;
+        const [account] = deployedAccounts;
+        this.wallet = await getSchnorrWalletWithSecretKey(pxe, account.secret, account.signingKey, account.salt);
       },
     );
   }
@@ -303,6 +319,11 @@ export class P2PNetworkTest {
 
   async setup() {
     this.ctx = await this.snapshotManager.setup();
+
+    this.prefilledPublicData = (
+      await getGenesisValues(this.ctx.initialFundedAccounts.map(a => a.address))
+    ).prefilledPublicData;
+
     this.startSyncMockSystemTimeInterval();
 
     this.gasUtils = new L1TxUtilsWithBlobs(
@@ -319,8 +340,7 @@ export class P2PNetworkTest {
       },
     );
 
-    this.monitor = new ChainMonitor(RollupContract.getFromL1ContractsValues(this.ctx.deployL1ContractsValues));
-    this.monitor.start();
+    this.monitor = new ChainMonitor(RollupContract.getFromL1ContractsValues(this.ctx.deployL1ContractsValues)).start();
   }
 
   async stopNodes(nodes: AztecNodeService[]) {
@@ -338,7 +358,7 @@ export class P2PNetworkTest {
 
   async teardown() {
     this.monitor.stop();
-    await this.bootstrapNode.stop();
+    await this.bootstrapNode?.stop();
     await this.snapshotManager.teardown();
     if (this.cleanupInterval) {
       clearInterval(this.cleanupInterval);

package/src/e2e_p2p/shared.ts

@@ -1,10 +1,11 @@
-import { type AztecNodeService } from '@aztec/aztec-node';
-import { CompleteAddress, type Logger, type SentTx, TxStatus } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
-import { type SpamContract } from '@aztec/noir-contracts.js/Spam';
+import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import type { InitialAccountData } from '@aztec/accounts/testing';
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { type Logger, type SentTx, TxStatus } from '@aztec/aztec.js';
+import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
 import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe';
 
-import { type NodeContext } from '../fixtures/setup_p2p_test.js';
+import type { NodeContext } from '../fixtures/setup_p2p_test.js';
 import { submitTxsTo } from '../shared/submit-transactions.js';
 
 // submits a set of transactions to the provided Private eXecution Environment (PXE)
@@ -43,18 +44,23 @@ export const createPXEServiceAndSubmitTransactions = async (
   logger: Logger,
   node: AztecNodeService,
   numTxs: number,
+  fundedAccount: InitialAccountData,
 ): Promise<NodeContext> => {
   const rpcConfig = getRpcConfig();
   const pxeService = await createPXEService(node, rpcConfig, true);
 
-  const secretKey = Fr.random();
-  const completeAddress = await CompleteAddress.fromSecretKeyAndPartialAddress(secretKey, Fr.random());
-  await pxeService.registerAccount(secretKey, completeAddress.partialAddress);
+  const account = await getSchnorrAccount(
+    pxeService,
+    fundedAccount.secret,
+    fundedAccount.signingKey,
+    fundedAccount.salt,
+  );
+  await account.register();
+  const wallet = await account.getWallet();
 
-  const txs = await submitTxsTo(pxeService, numTxs, logger);
+  const txs = await submitTxsTo(pxeService, numTxs, wallet, logger);
   return {
     txs,
-    account: completeAddress.address,
     pxeService,
     node,
   };

package/src/e2e_prover/e2e_prover_test.ts

@@ -1,14 +1,17 @@
-import { SchnorrAccountContractArtifact, getSchnorrAccount } from '@aztec/accounts/schnorr';
+import {
+  SchnorrAccountContractArtifact,
+  getSchnorrAccount,
+  getSchnorrWalletWithSecretKey,
+} from '@aztec/accounts/schnorr';
+import type { InitialAccountData } from '@aztec/accounts/testing';
 import { type Archiver, createArchiver } from '@aztec/archiver';
 import {
   type AccountWalletWithSecretKey,
   type AztecNode,
   type CheatCodes,
   type CompleteAddress,
-  type DeployL1Contracts,
+  type DeployL1ContractsReturnType,
   EthAddress,
-  type Fq,
-  Fr,
   type Logger,
   type PXE,
   createLogger,
@@ -16,12 +19,13 @@ import {
 } from '@aztec/aztec.js';
 import { BBCircuitVerifier, type ClientProtocolCircuitVerifier, TestCircuitVerifier } from '@aztec/bb-prover';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
-import { type BlobSinkServer } from '@aztec/blob-sink/server';
+import type { BlobSinkServer } from '@aztec/blob-sink/server';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { HonkVerifierAbi, HonkVerifierBytecode, RollupAbi, TestERC20Abi } 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';
+import type { PXEService } from '@aztec/pxe';
+import { getGenesisValues } from '@aztec/world-state/testing';
 
 import { type Hex, getContract } from 'viem';
 import { privateKeyToAddress } from 'viem/accounts';
@@ -31,8 +35,8 @@ import { getBBConfig } from '../fixtures/get_bb_config.js';
 import {
   type ISnapshotManager,
   type SubsystemsContext,
-  addAccounts,
   createSnapshotManager,
+  deployAccounts,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
 import { getPrivateKeyFromIndex, setupPXEService } from '../fixtures/utils.js';
@@ -40,8 +44,6 @@ import { TokenSimulator } from '../simulators/token_simulator.js';
 
 const { E2E_DATA_PATH: dataPath } = process.env;
 
-const SALT = 1;
-
 type ProvenSetup = {
   pxe: PXE;
   teardown: () => Promise<void>;
@@ -60,7 +62,7 @@ export class FullProverTest {
   static TOKEN_DECIMALS = 18n;
   private snapshotManager: ISnapshotManager;
   logger: Logger;
-  keys: Array<[Fr, Fq]> = [];
+  deployedAccounts: InitialAccountData[] = [];
   wallets: AccountWalletWithSecretKey[] = [];
   accounts: CompleteAddress[] = [];
   fakeProofsAsset!: TokenContract;
@@ -77,7 +79,7 @@ export class FullProverTest {
   private context!: SubsystemsContext;
   private proverNode!: ProverNode;
   private simulatedProverNode!: ProverNode;
-  public l1Contracts!: DeployL1Contracts;
+  public l1Contracts!: DeployL1ContractsReturnType;
   public proverAddress!: EthAddress;
 
   constructor(
@@ -91,7 +93,7 @@ export class FullProverTest {
       `full_prover_integration/${testName}`,
       dataPath,
       { startProverNode: true, fundRewardDistributor: true, coinbase },
-      { assumeProvenThrough: undefined },
+      {},
     );
   }
 
@@ -101,17 +103,18 @@ export class FullProverTest {
    * 2. Publicly deploy accounts, deploy token contract
    */
   async applyBaseSnapshots() {
-    await this.snapshotManager.snapshot('2_accounts', addAccounts(2, this.logger), async ({ accountKeys }, { pxe }) => {
-      this.keys = accountKeys;
-      this.wallets = await Promise.all(
-        accountKeys.map(async ak => {
-          const account = await getSchnorrAccount(pxe, ak[0], ak[1], SALT);
-          return account.getWallet();
-        }),
-      );
-      this.accounts = this.wallets.map(w => w.getCompleteAddress());
-      this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-    });
+    await this.snapshotManager.snapshot(
+      '2_accounts',
+      deployAccounts(2, this.logger),
+      async ({ deployedAccounts }, { pxe }) => {
+        this.deployedAccounts = deployedAccounts;
+        this.wallets = await Promise.all(
+          deployedAccounts.map(a => getSchnorrWalletWithSecretKey(pxe, a.secret, a.signingKey, a.salt)),
+        );
+        this.accounts = this.wallets.map(w => w.getCompleteAddress());
+        this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
+      },
+    );
 
     await this.snapshotManager.snapshot(
       'client_prover_integration',
@@ -154,6 +157,10 @@ export class FullProverTest {
 
   async setup() {
     this.context = await this.snapshotManager.setup();
+
+    // We don't wish to mark as proven automatically, so we set the flag to false
+    this.context.watcher.setIsMarkingAsProven(false);
+
     this.simulatedProverNode = this.context.proverNode!;
     ({
       pxe: this.pxe,
@@ -218,11 +225,22 @@ export class FullProverTest {
       await result.pxe.registerContract(this.fakeProofsAsset);
 
       for (let i = 0; i < 2; i++) {
-        await result.pxe.registerAccount(this.keys[i][0], this.wallets[i].getCompleteAddress().partialAddress);
-        await this.pxe.registerAccount(this.keys[i][0], this.wallets[i].getCompleteAddress().partialAddress);
+        await result.pxe.registerAccount(
+          this.deployedAccounts[i].secret,
+          this.wallets[i].getCompleteAddress().partialAddress,
+        );
+        await this.pxe.registerAccount(
+          this.deployedAccounts[i].secret,
+          this.wallets[i].getCompleteAddress().partialAddress,
+        );
       }
 
-      const account = await getSchnorrAccount(result.pxe, this.keys[0][0], this.keys[0][1], SALT);
+      const account = await getSchnorrAccount(
+        result.pxe,
+        this.deployedAccounts[0].secret,
+        this.deployedAccounts[0].signingKey,
+        this.deployedAccounts[0].salt,
+      );
 
       await result.pxe.registerContract({
         instance: account.getInstance(),
@@ -264,27 +282,28 @@ export class FullProverTest {
       ...this.context.aztecNodeConfig,
       proverCoordinationNodeUrl: undefined,
       dataDirectory: undefined,
-      proverId: new Fr(81),
+      proverId: this.proverAddress.toField(),
       realProofs: this.realProofs,
       proverAgentCount: 2,
       publisherPrivateKey: `0x${proverNodePrivateKey!.toString('hex')}`,
       proverNodeMaxPendingJobs: 100,
       proverNodeMaxParallelBlocksPerEpoch: 32,
       proverNodePollingIntervalMs: 100,
-      quoteProviderBasisPointFee: 100,
-      quoteProviderBondAmount: 1000n,
-      proverMinimumEscrowAmount: 3000n,
-      proverTargetEscrowAmount: 6000n,
       txGatheringTimeoutMs: 60000,
       txGatheringIntervalMs: 1000,
       txGatheringMaxParallelRequests: 100,
     };
-    this.proverNode = await createProverNode(proverConfig, {
-      aztecNodeTxProvider: this.aztecNode,
-      archiver: archiver as Archiver,
-      blobSinkClient,
-    });
-    await this.proverNode.start();
+    const { prefilledPublicData } = await getGenesisValues(this.context.initialFundedAccounts.map(a => a.address));
+    this.proverNode = await createProverNode(
+      proverConfig,
+      {
+        aztecNodeTxProvider: this.aztecNode,
+        archiver: archiver as Archiver,
+        blobSinkClient,
+      },
+      { prefilledPublicData },
+    );
+    this.proverNode.start();
 
     this.logger.warn(`Proofs are now enabled`);
     return this;

package/src/e2e_token_contract/token_contract_test.ts

@@ -1,4 +1,4 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { type AccountWallet, type CompleteAddress, type Logger, createLogger } from '@aztec/aztec.js';
 import { DocsExampleContract } from '@aztec/noir-contracts.js/DocsExample';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
@@ -8,8 +8,8 @@ import { jest } from '@jest/globals';
 import {
   type ISnapshotManager,
   type SubsystemsContext,
-  addAccounts,
   createSnapshotManager,
+  deployAccounts,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
@@ -45,15 +45,14 @@ export class TokenContractTest {
     // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
     jest.setTimeout(120_000);
 
-    await this.snapshotManager.snapshot('3_accounts', addAccounts(3, this.logger), async ({ accountKeys }, { pxe }) => {
-      this.wallets = await Promise.all(
-        accountKeys.map(async ak => {
-          const account = await getSchnorrAccount(pxe, ak[0], ak[1], 1);
-          return account.getWallet();
-        }),
-      );
-      this.accounts = this.wallets.map(w => w.getCompleteAddress());
-    });
+    await this.snapshotManager.snapshot(
+      '3_accounts',
+      deployAccounts(3, this.logger),
+      async ({ deployedAccounts }, { pxe }) => {
+        this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
+        this.accounts = this.wallets.map(w => w.getCompleteAddress());
+      },
+    );
 
     await this.snapshotManager.snapshot(
       'e2e_token_contract',

package/src/fixtures/fixtures.ts

@@ -14,8 +14,8 @@ export const privateKey = Buffer.from('ac0974bec39a17e36ba4a6b4d238ff944bacb478c
 export const privateKey2 = Buffer.from('59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d', 'hex');
 
 /// Common errors
-export const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with underflow 'hi == high'";
-export const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'hi == high'";
+export const U128_UNDERFLOW_ERROR = "Assertion failed: attempt to subtract with overflow 'self - other'";
+export const U128_OVERFLOW_ERROR = "Assertion failed: attempt to add with overflow 'self + other'";
 export const BITSIZE_TOO_BIG_ERROR = "Assertion failed: call to assert_max_bit_size 'self.__assert_max_bit_size'";
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): Make these a fixed error after transition.
 export const DUPLICATE_NULLIFIER_ERROR = /dropped|duplicate nullifier|reverted|Nullifier collision/;

package/src/fixtures/get_acvm_config.ts

@@ -1,4 +1,4 @@
-import { type Logger } from '@aztec/aztec.js';
+import type { Logger } from '@aztec/aztec.js';
 import { parseBooleanEnv } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
 
@@ -38,8 +38,12 @@ export async function getACVMConfig(logger: Logger): Promise<
 
     const cleanup = async () => {
       if (directoryToCleanup) {
-        // logger(`Cleaning up ACVM temp directory ${directoryToCleanup}`);
-        await fs.rm(directoryToCleanup, { recursive: true, force: true });
+        try {
+          logger.info(`Cleaning up ACVM temp directory ${directoryToCleanup}`);
+          await fs.rm(directoryToCleanup, { recursive: true, force: true, maxRetries: 3 });
+        } catch (err) {
+          logger.warn(`Failed to delete ACVM temp directory at ${directoryToCleanup}: ${err}`);
+        }
       }
     };
 

package/src/fixtures/get_bb_config.ts

@@ -1,5 +1,5 @@
 import { type Logger, fileURLToPath } from '@aztec/aztec.js';
-import { type BBConfig } from '@aztec/bb-prover';
+import type { BBConfig } from '@aztec/bb-prover';
 
 import fs from 'node:fs/promises';
 import { tmpdir } from 'node:os';
@@ -38,7 +38,11 @@ export const getBBConfig = async (
 
     const cleanup = async () => {
       if (directoryToCleanup && !bbSkipCleanup) {
-        await fs.rm(directoryToCleanup, { recursive: true, force: true });
+        try {
+          await fs.rm(directoryToCleanup, { recursive: true, force: true, maxRetries: 3 });
+        } catch (err) {
+          logger.warn(`Failed to delete bb working directory at ${directoryToCleanup}: ${err}`);
+        }
       }
     };
 

package/src/fixtures/l1_to_l2_messaging.ts

@@ -1,23 +1,16 @@
-import { type AztecAddress, Fr } from '@aztec/circuits.js';
-import { type L1ContractAddresses } from '@aztec/ethereum';
+import type { L1ContractAddresses, ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import { Fr } from '@aztec/foundation/fields';
 import { InboxAbi } from '@aztec/l1-artifacts';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 
 import { expect } from '@jest/globals';
-import {
-  type Account,
-  type Chain,
-  type HttpTransport,
-  type PublicClient,
-  type WalletClient,
-  decodeEventLog,
-  getContract,
-} from 'viem';
+import { decodeEventLog, getContract } from 'viem';
 
 export async function sendL1ToL2Message(
   message: { recipient: AztecAddress; content: Fr; secretHash: Fr },
   ctx: {
-    walletClient: WalletClient<HttpTransport, Chain, Account>;
-    publicClient: PublicClient<HttpTransport, Chain>;
+    walletClient: ViemWalletClient;
+    publicClient: ViemPublicClient;
     l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress'>;
   },
 ) {

package/src/fixtures/setup_l1_contracts.ts

@@ -1,9 +1,9 @@
 import { type Logger, deployL1Contracts } from '@aztec/aztec.js';
-import { type DeployL1ContractsArgs, type L1ContractsConfig } from '@aztec/ethereum';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vks';
+import type { DeployL1ContractsArgs, L1ContractsConfig } from '@aztec/ethereum';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
 
-import { type HDAccount, type PrivateKeyAccount } from 'viem';
+import type { HDAccount, PrivateKeyAccount } from 'viem';
 import { foundry } from 'viem/chains';
 
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
@@ -12,11 +12,12 @@ export const setupL1Contracts = async (
   l1RpcUrl: string,
   account: HDAccount | PrivateKeyAccount,
   logger: Logger,
-  args: Pick<DeployL1ContractsArgs, 'assumeProvenThrough' | 'initialValidators'> & L1ContractsConfig,
+  args: Pick<DeployL1ContractsArgs, 'genesisArchiveRoot' | 'genesisBlockHash' | 'initialValidators'> &
+    L1ContractsConfig,
 ) => {
-  const l1Data = await deployL1Contracts(l1RpcUrl, account, foundry, logger, {
-    l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice,
-    vkTreeRoot: await getVKTreeRoot(),
+  const l1Data = await deployL1Contracts([l1RpcUrl], account, foundry, logger, {
+    l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
+    vkTreeRoot: getVKTreeRoot(),
     protocolContractTreeRoot,
     salt: undefined,
     ...args,