@aztec/end-to-end 0.0.1-fake-c83136db25 → 0.0.1-fake-ceab37513c

package/src/spartan/setup_test_wallets.ts

@@ -1,29 +1,36 @@
-import { generateSchnorrAccounts } from '@aztec/accounts/testing';
-import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { L1FeeJuicePortalManager } from '@aztec/aztec.js/ethereum';
-import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
-import { type FeePaymentMethod, SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
-import { Fr } from '@aztec/aztec.js/fields';
-import { type AztecNode, createAztecNodeClient } from '@aztec/aztec.js/node';
-import type { Wallet } from '@aztec/aztec.js/wallet';
+import { getSchnorrAccount, getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
+import { generateSchnorrAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
+import {
+  type AccountWalletWithSecretKey,
+  type AztecAddress,
+  type AztecNode,
+  FeeJuicePaymentMethodWithClaim,
+  type FeePaymentMethod,
+  Fr,
+  L1FeeJuicePortalManager,
+  type PXE,
+  SponsoredFeePaymentMethod,
+  createAztecNodeClient,
+  createCompatibleClient,
+  retryUntil,
+} from '@aztec/aztec.js';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { Logger } from '@aztec/foundation/log';
-import { retryUntil } from '@aztec/foundation/retry';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import { createPXEService } from '@aztec/pxe/server';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import { TestWallet, proveInteraction, registerInitialSandboxAccountsInWallet } from '@aztec/test-wallet/server';
 
 import { getACVMConfig } from '../fixtures/get_acvm_config.js';
 import { getBBConfig } from '../fixtures/get_bb_config.js';
 import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.js';
 
-export interface TestAccounts {
-  aztecNode: AztecNode;
-  wallet: TestWallet;
-  accounts: AztecAddress[];
-  tokenContract: TokenContract;
+export interface TestWallets {
+  pxe: PXE;
+  wallets: AccountWalletWithSecretKey[];
+  tokenAdminWallet: TokenContract;
   tokenAdminAddress: AztecAddress;
   tokenName: string;
+  recipientWallet: AccountWalletWithSecretKey;
   recipientAddress: AztecAddress;
   tokenAddress: AztecAddress;
 }
@@ -32,165 +39,164 @@ const TOKEN_NAME = 'USDC';
 const TOKEN_SYMBOL = 'USD';
 const TOKEN_DECIMALS = 18n;
 
-export async function setupTestAccountsWithTokens(
-  nodeUrl: string,
+export async function setupTestWalletsWithTokens(
+  pxeUrl: string,
   mintAmount: bigint,
   logger: Logger,
-): Promise<TestAccounts> {
-  const ACCOUNT_COUNT = 1; // TODO fix this to allow for 16 wallets again
+): Promise<TestWallets> {
+  const WALLET_COUNT = 1; // TODO fix this to allow for 16 wallets again
 
-  const aztecNode = createAztecNodeClient(nodeUrl);
-  const wallet = await TestWallet.create(aztecNode);
+  const pxe = await createCompatibleClient(pxeUrl, logger);
 
-  const [recipientAccount, ...accounts] = (await registerInitialSandboxAccountsInWallet(wallet)).slice(
-    0,
-    ACCOUNT_COUNT + 1,
-  );
+  const [recipientWallet, ...wallets] = (await getDeployedTestAccountsWallets(pxe)).slice(0, WALLET_COUNT + 1);
 
-  const tokenAdmin = accounts[0];
-  const tokenAddress = await deployTokenAndMint(wallet, accounts, tokenAdmin, mintAmount, undefined, logger);
-  const tokenContract = await TokenContract.at(tokenAddress, wallet);
+  const tokenAdmin = wallets[0];
+  const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, undefined, logger);
+  const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
 
   return {
-    aztecNode,
-    accounts,
-    wallet,
-    tokenAdminAddress: tokenAdmin,
+    pxe,
+    wallets,
+    tokenAdminWallet,
+    tokenAdminAddress: tokenAdmin.getAddress(),
     tokenName: TOKEN_NAME,
     tokenAddress,
-    tokenContract,
-    recipientAddress: recipientAccount,
+    recipientAddress: recipientWallet.getAddress(),
+    recipientWallet,
   };
 }
 
-export async function deploySponsoredTestAccounts(
-  wallet: TestWallet,
-  aztecNode: AztecNode,
+export async function deploySponsoredTestWallets(
+  pxe: PXE,
   mintAmount: bigint,
   logger: Logger,
   numberOfFundedWallets = 1,
-): Promise<TestAccounts> {
+): Promise<TestWallets> {
   const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
-  const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
-  const fundedAccounts = await Promise.all(funded.map(a => wallet.createSchnorrAccount(a.secret, a.salt)));
+  const recipientWallet = await getSchnorrWalletWithSecretKey(
+    pxe,
+    recipient.secret,
+    recipient.signingKey,
+    recipient.salt,
+  );
+  const fundedAccounts = await Promise.all(funded.map(a => getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
 
-  await registerSponsoredFPC(wallet);
+  await registerSponsoredFPC(pxe);
 
-  const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
-  const recipientDeployMethod = await recipientAccount.getDeployMethod();
-  await recipientDeployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait({ timeout: 2400 });
-  await Promise.all(
+  const wallets = await Promise.all(
     fundedAccounts.map(async a => {
-      const deployMethod = await a.getDeployMethod();
-      await deployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait({ timeout: 2400 }); // increase timeout on purpose in order to account for two empty epochs
-      logger.info(`Account deployed at ${a.address}`);
+      const wallet = await a.getWallet();
+      const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
+      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()}`);
+      return wallet;
     }),
   );
 
-  const tokenAdmin = fundedAccounts[0];
+  const tokenAdmin = wallets[0];
   const tokenAddress = await deployTokenAndMint(
-    wallet,
-    fundedAccounts.map(acc => acc.address),
-    tokenAdmin.address,
+    wallets,
+    tokenAdmin.getAddress(),
     mintAmount,
     new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()),
     logger,
   );
-  const tokenContract = await TokenContract.at(tokenAddress, wallet);
+  const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
 
   return {
-    aztecNode,
-    wallet,
-    accounts: fundedAccounts.map(acc => acc.address),
-    tokenAdminAddress: tokenAdmin.address,
+    pxe,
+    wallets,
+    tokenAdminAddress: tokenAdmin.getAddress(),
+    tokenAdminWallet,
     tokenName: TOKEN_NAME,
     tokenAddress,
-    tokenContract,
-    recipientAddress: recipientAccount.address,
+    recipientWallet,
+    recipientAddress: recipientWallet.getAddress(),
   };
 }
 
-export async function deployTestAccountsWithTokens(
+export async function deployTestWalletWithTokens(
+  pxeUrl: string,
   nodeUrl: string,
   l1RpcUrls: string[],
   mnemonicOrPrivateKey: string,
   mintAmount: bigint,
   logger: Logger,
   numberOfFundedWallets = 1,
-): Promise<TestAccounts> {
-  const aztecNode = createAztecNodeClient(nodeUrl);
-  const wallet = await TestWallet.create(aztecNode);
+): Promise<TestWallets> {
+  const pxe = await createCompatibleClient(pxeUrl, logger);
+  const node = createAztecNodeClient(nodeUrl);
 
   const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
-  const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
-  const fundedAccounts = await Promise.all(funded.map(a => wallet.createSchnorrAccount(a.secret, a.salt)));
+  const recipientWallet = await getSchnorrWalletWithSecretKey(
+    pxe,
+    recipient.secret,
+    recipient.signingKey,
+    recipient.salt,
+  );
+  const fundedAccounts = await Promise.all(funded.map(a => getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
 
   const claims = await Promise.all(
-    fundedAccounts.map(a => bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, aztecNode, a.address, undefined, logger)),
+    fundedAccounts.map(a => bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), undefined, logger)),
   );
 
   // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
-  await advanceL2Block(aztecNode);
-  await advanceL2Block(aztecNode);
-  await advanceL2Block(aztecNode);
+  await advanceL2Block(node);
+  await advanceL2Block(node);
+  await advanceL2Block(node);
 
-  await Promise.all(
+  const wallets = await Promise.all(
     fundedAccounts.map(async (a, i) => {
-      const paymentMethod = new FeeJuicePaymentMethodWithClaim(a.address, claims[i]);
-      const deployMethod = await a.getDeployMethod();
-      await deployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait();
-      logger.info(`Account deployed at ${a.address}`);
+      const wallet = await a.getWallet();
+      const paymentMethod = new FeeJuicePaymentMethodWithClaim(wallet, claims[i]);
+      await a.deploy({ fee: { paymentMethod } }).wait();
+      logger.info(`Account deployed at ${a.getAddress()}`);
+      return wallet;
     }),
   );
 
-  const tokenAdmin = fundedAccounts[0];
-  const tokenAddress = await deployTokenAndMint(
-    wallet,
-    fundedAccounts.map(acc => acc.address),
-    tokenAdmin.address,
-    mintAmount,
-    undefined,
-    logger,
-  );
-  const tokenContract = await TokenContract.at(tokenAddress, wallet);
+  const tokenAdmin = wallets[0];
+  const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, undefined, logger);
+  const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
 
   return {
-    aztecNode,
-    wallet,
-    accounts: fundedAccounts.map(acc => acc.address),
-    tokenAdminAddress: tokenAdmin.address,
+    pxe,
+    wallets,
+    tokenAdminAddress: tokenAdmin.getAddress(),
+    tokenAdminWallet,
     tokenName: TOKEN_NAME,
     tokenAddress,
-    tokenContract,
-    recipientAddress: recipientAccount.address,
+    recipientWallet,
+    recipientAddress: recipientWallet.getAddress(),
   };
 }
 
 async function bridgeL1FeeJuice(
   l1RpcUrls: string[],
   mnemonicOrPrivateKey: string,
-  aztecNode: AztecNode,
+  pxe: PXE,
   recipient: AztecAddress,
   amount: bigint | undefined,
   log: Logger,
 ) {
-  const { l1ChainId } = await aztecNode.getNodeInfo();
+  const { l1ChainId } = await pxe.getNodeInfo();
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
-  const portal = await L1FeeJuicePortalManager.new(aztecNode, l1Client, log);
+  // docs:start:bridge_fee_juice
+  const portal = await L1FeeJuicePortalManager.new(pxe, l1Client, log);
   const claim = await portal.bridgeTokensPublic(recipient, amount, true /* mint */);
+  // docs:end:bridge_fee_juice
 
-  const isSynced = async () =>
-    (await aztecNode.getL1ToL2MessageBlock(Fr.fromHexString(claim.messageHash))) !== undefined;
+  const isSynced = async () => await pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
   await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 0.5);
 
   log.info(`Created a claim for ${amount} L1 fee juice to ${recipient}.`, claim);
   return claim;
 }
 
-async function advanceL2Block(aztecNode: AztecNode, nodeAdmin?: AztecNodeAdmin) {
-  const initialBlockNumber = await aztecNode.getBlockNumber();
+async function advanceL2Block(node: AztecNode, nodeAdmin?: AztecNodeAdmin) {
+  const initialBlockNumber = await node.getBlockNumber();
 
   let minTxsPerBlock = undefined;
   if (nodeAdmin) {
@@ -198,7 +204,7 @@ async function advanceL2Block(aztecNode: AztecNode, nodeAdmin?: AztecNodeAdmin)
     await nodeAdmin.setConfig({ minTxsPerBlock: 0 }); // Set to 0 to ensure we can advance the block
   }
 
-  await retryUntil(async () => (await aztecNode.getBlockNumber()) >= initialBlockNumber + 1);
+  await retryUntil(async () => (await node.getBlockNumber()) >= initialBlockNumber + 1);
 
   if (nodeAdmin && minTxsPerBlock !== undefined) {
     await nodeAdmin.setConfig({ minTxsPerBlock });
@@ -206,15 +212,14 @@ async function advanceL2Block(aztecNode: AztecNode, nodeAdmin?: AztecNodeAdmin)
 }
 
 async function deployTokenAndMint(
-  wallet: Wallet,
-  accounts: AztecAddress[],
+  wallets: AccountWalletWithSecretKey[],
   admin: AztecAddress,
   mintAmount: bigint,
   paymentMethod: FeePaymentMethod | undefined,
   logger: Logger,
 ) {
   logger.verbose(`Deploying TokenContract...`);
-  const tokenContract = await TokenContract.deploy(wallet, admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS)
+  const tokenContract = await TokenContract.deploy(wallets[0], admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS)
     .send({
       from: admin,
       fee: {
@@ -225,12 +230,12 @@ async function deployTokenAndMint(
 
   const tokenAddress = tokenContract.address;
 
-  logger.verbose(`Minting ${mintAmount} public assets to the ${accounts.length} accounts...`);
+  logger.verbose(`Minting ${mintAmount} public assets to the ${wallets.length} wallets...`);
 
   await Promise.all(
-    accounts.map(async acc =>
-      (await TokenContract.at(tokenAddress, wallet)).methods
-        .mint_to_public(acc, mintAmount)
+    wallets.map(async w =>
+      (await TokenContract.at(tokenAddress, w)).methods
+        .mint_to_public(w.getAddress(), mintAmount)
         .send({ from: admin, fee: { paymentMethod } })
         .wait({ timeout: 600 }),
     ),
@@ -242,33 +247,23 @@ async function deployTokenAndMint(
 }
 
 export async function performTransfers({
-  wallet,
-  testAccounts,
+  testWallets,
   rounds,
   transferAmount,
   logger,
-  feePaymentMethod,
 }: {
-  wallet: TestWallet;
-  testAccounts: TestAccounts;
+  testWallets: TestWallets;
   rounds: number;
   transferAmount: bigint;
   logger: Logger;
-  feePaymentMethod?: FeePaymentMethod;
 }) {
-  const recipient = testAccounts.recipientAddress;
-  // Default to sponsored fee payment if no fee method is provided
-  const defaultFeePaymentMethod = feePaymentMethod || new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
+  const recipient = testWallets.recipientWallet.getAddress();
   for (let i = 0; i < rounds; i++) {
-    const txs = testAccounts.accounts.map(async acc => {
-      const token = await TokenContract.at(testAccounts.tokenAddress, testAccounts.wallet);
-      return proveInteraction(wallet, token.methods.transfer_in_public(acc, recipient, transferAmount, 0), {
-        from: acc,
-        fee: {
-          paymentMethod: defaultFeePaymentMethod,
-        },
-      });
-    });
+    const txs = testWallets.wallets.map(async w =>
+      (await TokenContract.at(testWallets.tokenAddress, w)).methods
+        .transfer_in_public(w.getAddress(), recipient, transferAmount, 0)
+        .prove({ from: w.getAddress() }),
+    );
 
     const provenTxs = await Promise.all(txs);
 
@@ -278,27 +273,25 @@ export async function performTransfers({
   }
 }
 
-export async function createWalletAndAztecNodeClient(
+export async function startCompatiblePXE(
   nodeUrl: string,
   proverEnabled: boolean,
   logger: Logger,
-): Promise<{ wallet: TestWallet; aztecNode: AztecNode; cleanup: () => Promise<void> }> {
-  const aztecNode = createAztecNodeClient(nodeUrl);
+): Promise<{ pxe: PXE; cleanup: () => Promise<void> }> {
+  const node = createAztecNodeClient(nodeUrl);
   const [bbConfig, acvmConfig] = await Promise.all([getBBConfig(logger), getACVMConfig(logger)]);
-  const pxeConfig = {
+  const pxe = await createPXEService(node, {
     dataDirectory: undefined,
     dataStoreMapSizeKb: 1024 * 1024,
     ...bbConfig,
     ...acvmConfig,
     proverEnabled,
-  };
-  const wallet = await TestWallet.create(aztecNode, pxeConfig);
+  });
 
   return {
-    wallet,
-    aztecNode,
+    pxe,
     async cleanup() {
-      await wallet.stop();
+      await pxe.stop();
       await bbConfig?.cleanup();
       await acvmConfig?.cleanup();
     },