@aztec/end-to-end 3.0.0-nightly.20250923 → 3.0.0-nightly.20250925

package/src/fixtures/utils.ts

@@ -1,5 +1,5 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
-import { type InitialAccountData, generateSchnorrAccounts, getDeployedTestAccounts } from '@aztec/accounts/testing';
+import { type InitialAccountData, generateSchnorrAccounts, getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { type Archiver, createArchiver } from '@aztec/archiver';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import {
@@ -11,10 +11,8 @@ import {
   type Wallet,
   createAztecNodeClient,
   createLogger,
-  createPXEClient,
-  makeFetch,
   sleep,
-  waitForPXE,
+  waitForNode,
 } from '@aztec/aztec.js';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
@@ -56,11 +54,9 @@ import type { P2PClientDeps } from '@aztec/p2p';
 import { MockGossipSubNetwork, getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
 import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { type ProverNode, type ProverNodeConfig, type ProverNodeDeps, createProverNode } from '@aztec/prover-node';
-import { type PXEServiceConfig, createPXEServiceWithSimulator, getPXEServiceConfig } from '@aztec/pxe/server';
+import { type PXEServiceConfig, getPXEServiceConfig } from '@aztec/pxe/server';
 import type { SequencerClient } from '@aztec/sequencer-client';
 import type { TestSequencerClient } from '@aztec/sequencer-client/test';
-import { MemoryCircuitRecorder, SimulatorRecorderWrapper, WASMSimulator } from '@aztec/simulator/client';
-import { FileCircuitRecorder } from '@aztec/simulator/testing';
 import {
   type ContractInstanceWithAddress,
   getContractClassFromArtifact,
@@ -77,7 +73,7 @@ import {
   initTelemetryClient,
 } from '@aztec/telemetry-client';
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
 import type { Anvil } from '@viem/anvil';
@@ -97,8 +93,8 @@ import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
 export { deployAndInitializeTokenAndBridgeContracts } from '../shared/cross_chain_test_harness.js';
 export { startAnvil };
 
-const { PXE_URL = '' } = process.env;
-const getAztecUrl = () => PXE_URL;
+const { AZTEC_NODE_URL = '' } = process.env;
+const getAztecUrl = () => AZTEC_NODE_URL;
 
 let telemetry: TelemetryClient | undefined = undefined;
 function getTelemetryClient(partialConfig: Partial<TelemetryClientConfig> & { benchmark?: boolean } = {}) {
@@ -178,18 +174,11 @@ export async function setupPXEServiceAndGetWallet(
     pxeServiceConfig.dataDirectory = path.join(tmpdir(), randomBytes(8).toString('hex'));
   }
 
-  const simulator = new WASMSimulator();
-  const recorder = process.env.CIRCUIT_RECORD_DIR
-    ? new FileCircuitRecorder(process.env.CIRCUIT_RECORD_DIR)
-    : new MemoryCircuitRecorder();
-  const simulatorWithRecorder = new SimulatorRecorderWrapper(simulator, recorder);
-  const pxe = await createPXEServiceWithSimulator(aztecNode, simulatorWithRecorder, pxeServiceConfig, {
-    useLogSuffix,
-  });
-
   const teardown = configuredDataDirectory ? () => Promise.resolve() : () => tryRmDir(pxeServiceConfig.dataDirectory!);
 
-  const wallet = new TestWallet(pxe, aztecNode);
+  const wallet = await TestWallet.create(aztecNode, pxeServiceConfig, {
+    useLogSuffix,
+  });
 
   return {
     wallet,
@@ -217,11 +206,9 @@ async function setupWithRemoteEnvironment(
   const aztecNodeUrl = getAztecUrl();
   logger.verbose(`Creating Aztec Node client to remote host ${aztecNodeUrl}`);
   const aztecNode = createAztecNodeClient(aztecNodeUrl);
-  logger.verbose(`Creating PXE client to remote host ${PXE_URL}`);
-  const pxeClient = createPXEClient(PXE_URL, {}, makeFetch([1, 2, 3], true));
-  await waitForPXE(pxeClient, logger);
-  logger.verbose('JSON RPC client connected to PXE');
-  logger.verbose(`Retrieving contract addresses from ${PXE_URL}`);
+  await waitForNode(aztecNode, logger);
+  logger.verbose('JSON RPC client connected to Aztec Node');
+  logger.verbose(`Retrieving contract addresses from ${aztecNodeUrl}`);
   const { l1ContractAddresses, rollupVersion } = await aztecNode.getNodeInfo();
 
   const l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
@@ -231,13 +218,13 @@ async function setupWithRemoteEnvironment(
     l1Client,
     rollupVersion,
   };
-  const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls);
-  const wallet = new TestWallet(pxeClient, aztecNode);
-  const cheatCodes = await CheatCodes.create(config.l1RpcUrls, wallet, aztecNode);
+  const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls, new DateProvider());
+  const wallet = await TestWallet.create(aztecNode);
+  const cheatCodes = await CheatCodes.create(config.l1RpcUrls, wallet, aztecNode, new DateProvider());
   const teardown = () => Promise.resolve();
 
   logger.verbose('Populating wallet from already registered accounts...');
-  const initialFundedAccounts = await getDeployedTestAccounts(wallet);
+  const initialFundedAccounts = await getInitialTestAccountsData();
 
   if (initialFundedAccounts.length < numberOfAccounts) {
     throw new Error(`Required ${numberOfAccounts} accounts. Found ${initialFundedAccounts.length}.`);
@@ -404,9 +391,9 @@ export async function setup(
       if (!isAnvilTestChain(chain.id)) {
         throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
       }
-      if (PXE_URL) {
+      if (AZTEC_NODE_URL) {
         throw new Error(
-          `PXE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`,
+          `AZTEC_NODE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`,
         );
       }
 
@@ -426,7 +413,8 @@ export async function setup(
       setupMetricsLogger(filename);
     }
 
-    const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls);
+    const dateProvider = new TestDateProvider();
+    const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls, dateProvider);
 
     if (opts.stateLoad) {
       await ethCheatCodes.loadChainState(opts.stateLoad);
@@ -458,7 +446,7 @@ export async function setup(
 
     config.coinbase = EthAddress.fromString(publisherHdAccount.address);
 
-    if (PXE_URL) {
+    if (AZTEC_NODE_URL) {
       // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
       return await setupWithRemoteEnvironment(publisherHdAccount!, config, logger, numberOfAccounts);
     }
@@ -527,6 +515,7 @@ export async function setup(
     if (enableAutomine) {
       await ethCheatCodes.setAutomine(false);
       await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);
+      dateProvider.setTime((await ethCheatCodes.timestamp()) * 1000);
     }
 
     if (opts.l2StartTime) {
@@ -535,11 +524,8 @@ export async function setup(
       await ethCheatCodes.warp(opts.l2StartTime, { resetBlockInterval: true });
     }
 
-    const dateProvider = new TestDateProvider();
-    dateProvider.setTime((await ethCheatCodes.timestamp()) * 1000);
-
     const watcher = new AnvilTestWatcher(
-      new EthCheatCodesWithState(config.l1RpcUrls),
+      new EthCheatCodesWithState(config.l1RpcUrls, dateProvider),
       deployL1ContractsValues.l1ContractAddresses.rollupAddress,
       deployL1ContractsValues.l1Client,
       dateProvider,
@@ -650,16 +636,14 @@ export async function setup(
     logger.verbose('Creating a pxe...');
     const { wallet, teardown: pxeTeardown } = await setupPXEServiceAndGetWallet(aztecNode!, pxeOpts, logger);
 
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, wallet, aztecNode);
+    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, wallet, aztecNode, dateProvider);
 
     if (
       (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0) ||
       (opts.initialValidators && opts.initialValidators.length > 0)
     ) {
       // We need to advance such that the committee is set up.
-      await cheatCodes.rollup.advanceToEpoch((await cheatCodes.rollup.getEpoch()) + BigInt(config.lagInEpochs + 1), {
-        updateDateProvider: dateProvider,
-      });
+      await cheatCodes.rollup.advanceToEpoch((await cheatCodes.rollup.getEpoch()) + BigInt(config.lagInEpochs + 1));
       await cheatCodes.rollup.setupEpoch();
       await cheatCodes.rollup.debugRollup();
     }
@@ -780,20 +764,6 @@ export async function ensureAccountContractsPublished(wallet: Wallet, accountsTo
 }
 // docs:end:public_deploy_accounts
 
-/**
- * Sets the timestamp of the next block.
- * @param rpcUrl - rpc url of the blockchain instance to connect to
- * @param timestamp - the timestamp for the next block
- */
-export async function setNextBlockTimestamp(rpcUrl: string, timestamp: number) {
-  const params = `[${timestamp}]`;
-  await fetch(rpcUrl, {
-    body: `{"jsonrpc":"2.0", "method": "evm_setNextBlockTimestamp", "params": ${params}, "id": 1}`,
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-  });
-}
-
 /** Returns the job name for the current test. */
 function getJobName() {
   return process.env.JOB_NAME ?? expect.getState().currentTestName?.split(' ')[0].replaceAll('/', '_') ?? 'unknown';

package/src/shared/submit-transactions.ts

@@ -1,6 +1,6 @@
 import { AztecAddress, Fr, GrumpkinScalar, type Logger, type SentTx, TxStatus } from '@aztec/aztec.js';
 import { times } from '@aztec/foundation/collection';
-import type { TestWallet } from '@aztec/test-wallet';
+import type { TestWallet } from '@aztec/test-wallet/server';
 
 // submits a set of transactions to the provided Wallet
 export const submitTxsTo = async (

package/src/shared/uniswap_l1_l2.ts

@@ -20,7 +20,7 @@ import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-art
 import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
 import { computeL2ToL1MessageHash } from '@aztec/stdlib/hash';
 import { computeL2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
-import type { TestWallet } from '@aztec/test-wallet';
+import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { jest } from '@jest/globals';
 import { type GetContractReturnType, getContract, parseEther, toFunctionSelector } from 'viem';

package/src/spartan/setup_test_wallets.ts

@@ -1,4 +1,4 @@
-import { generateSchnorrAccounts, getDeployedTestAccounts } from '@aztec/accounts/testing';
+import { generateSchnorrAccounts } from '@aztec/accounts/testing';
 import {
   type AztecAddress,
   type AztecNode,
@@ -9,15 +9,14 @@ import {
   SponsoredFeePaymentMethod,
   type Wallet,
   createAztecNodeClient,
-  createCompatibleClient,
   retryUntil,
 } from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { createPXEService } from '@aztec/pxe/server';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import { TestWallet } from '@aztec/test-wallet';
+import { registerInitialSandboxAccountsInWallet } from '@aztec/test-wallet';
+import { TestWallet } from '@aztec/test-wallet/server';
 
 import { getACVMConfig } from '../fixtures/get_acvm_config.js';
 import { getBBConfig } from '../fixtures/get_bb_config.js';
@@ -39,39 +38,33 @@ const TOKEN_SYMBOL = 'USD';
 const TOKEN_DECIMALS = 18n;
 
 export async function setupTestAccountsWithTokens(
-  pxeUrl: string,
   nodeUrl: string,
   mintAmount: bigint,
   logger: Logger,
 ): Promise<TestAccounts> {
   const ACCOUNT_COUNT = 1; // TODO fix this to allow for 16 wallets again
 
-  const pxe = await createCompatibleClient(pxeUrl, logger);
   const aztecNode = createAztecNodeClient(nodeUrl);
-  const wallet = new TestWallet(pxe, aztecNode);
+  const wallet = await TestWallet.create(aztecNode);
 
-  const [recipientAccount, ...accounts] = (await getDeployedTestAccounts(wallet)).slice(0, ACCOUNT_COUNT + 1);
+  const [recipientAccount, ...accounts] = (await registerInitialSandboxAccountsInWallet(wallet)).slice(
+    0,
+    ACCOUNT_COUNT + 1,
+  );
 
   const tokenAdmin = accounts[0];
-  const tokenAddress = await deployTokenAndMint(
-    wallet,
-    accounts.map(acc => acc.address),
-    tokenAdmin.address,
-    mintAmount,
-    undefined,
-    logger,
-  );
+  const tokenAddress = await deployTokenAndMint(wallet, accounts, tokenAdmin, mintAmount, undefined, logger);
   const tokenContract = await TokenContract.at(tokenAddress, wallet);
 
   return {
     aztecNode,
-    accounts: accounts.map(acc => acc.address),
+    accounts,
     wallet,
-    tokenAdminAddress: tokenAdmin.address,
+    tokenAdminAddress: tokenAdmin,
     tokenName: TOKEN_NAME,
     tokenAddress,
     tokenContract,
-    recipientAddress: recipientAccount.address,
+    recipientAddress: recipientAccount,
   };
 }
 
@@ -88,10 +81,11 @@ export async function deploySponsoredTestAccounts(
 
   await registerSponsoredFPC(wallet);
 
+  const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
+  await recipientAccount.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 });
   await Promise.all(
     fundedAccounts.map(async a => {
-      const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
-      await recipientAccount.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 }); // increase timeout on purpose in order to account for two empty epochs
+      await a.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 }); // increase timeout on purpose in order to account for two empty epochs
       logger.info(`Account deployed at ${a.getAddress()}`);
     }),
   );
@@ -120,7 +114,6 @@ export async function deploySponsoredTestAccounts(
 }
 
 export async function deployTestAccountsWithTokens(
-  pxeUrl: string,
   nodeUrl: string,
   l1RpcUrls: string[],
   mnemonicOrPrivateKey: string,
@@ -128,9 +121,8 @@ export async function deployTestAccountsWithTokens(
   logger: Logger,
   numberOfFundedWallets = 1,
 ): Promise<TestAccounts> {
-  const pxe = await createCompatibleClient(pxeUrl, logger);
   const aztecNode = createAztecNodeClient(nodeUrl);
-  const wallet = new TestWallet(pxe, aztecNode);
+  const wallet = await TestWallet.create(aztecNode);
 
   const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
   const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
@@ -293,20 +285,20 @@ export async function createWalletAndAztecNodeClient(
 ): Promise<{ wallet: TestWallet; aztecNode: AztecNode; cleanup: () => Promise<void> }> {
   const aztecNode = createAztecNodeClient(nodeUrl);
   const [bbConfig, acvmConfig] = await Promise.all([getBBConfig(logger), getACVMConfig(logger)]);
-  const pxe = await createPXEService(aztecNode, {
+  const pxeConfig = {
     dataDirectory: undefined,
     dataStoreMapSizeKB: 1024 * 1024,
     ...bbConfig,
     ...acvmConfig,
     proverEnabled,
-  });
-  const wallet = new TestWallet(pxe, aztecNode);
+  };
+  const wallet = await TestWallet.create(aztecNode, pxeConfig);
 
   return {
     wallet,
     aztecNode,
     async cleanup() {
-      await pxe.stop();
+      await wallet.stop();
       await bbConfig?.cleanup();
       await acvmConfig?.cleanup();
     },