feat!: The Great Wallet Refactor (#16865)

Second part of the `Wallet` refactor that moves us closer to a fully
fledged `Wallet SDK` and PXEless apps. Focuses on completely unbinding
the `Wallet` interface from a particular `AztecAddress`. The former now
refers to the wallet *software*, which exposes a clear API to apps. This
API is not yet finalized!

`ContractFunctionInteraction` and friends have been put on a diet, and
most of their responsibilities are now the Wallet's

As a consequence of this PR, every single e2e test, the playground, the
cli-wallet and boxes have been altered. It's not pretty (yet), but it
will be, I promise.

Author: AztecBot

aztec-up/test/amm_flow.sh

@@ -52,7 +52,6 @@ aztec-wallet \
 
 aztec-wallet \
   register-contract $canonical_sponsored_fpc_address SponsoredFPC \
-  -f accounts:main \
   --salt 0
 
 aztec-wallet \

boxes/boxes/react/package.json

@@ -38,6 +38,7 @@
   "dependencies": {
     "@aztec/accounts": "latest",
     "@aztec/aztec.js": "latest",
+    "@aztec/test-wallet": "latest",
     "classnames": "^2.3.2",
     "formik": "^2.4.3",
     "react": "^18.2.0",

boxes/boxes/react/src/config.ts

@@ -1,23 +1,43 @@
-import { createPXEClient, PXE } from '@aztec/aztec.js';
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing/lazy';
+import { AztecAddress, createPXEClient, PXE, Wallet } from '@aztec/aztec.js';
+import { getDeployedTestAccounts } from '@aztec/accounts/testing/lazy';
+import { TestWallet } from '@aztec/test-wallet';
 
 export class PrivateEnv {
+  private wallet!: Wallet;
+  private defaultAccountAddress!: AztecAddress;
+
   private constructor(private pxe: PXE) {}
 
-  static async create(pxeURL: string) {
+  static create(pxeURL: string) {
     const pxe = createPXEClient(pxeURL);
     return new PrivateEnv(pxe);
   }
 
-  async getWallet() {
-    const wallet = (await getDeployedTestAccountsWallets(this.pxe))[0];
-    if (!wallet) {
+  async init() {
+    const wallet = new TestWallet(this.pxe);
+
+    const accountData = (await getDeployedTestAccounts(this.pxe))[0];
+    if (!accountData) {
       console.error(
-        'Wallet not found. Please connect the app to a testing environment with deployed and funded test accounts.',
+        'Account not found. Please connect the app to a testing environment with deployed and funded test accounts.',
       );
     }
-    return wallet;
+
+    await wallet.createSchnorrAccount(accountData.secret, accountData.salt, accountData.signingKey);
+    this.wallet = wallet;
+    this.defaultAccountAddress = accountData.address;
+  }
+
+  async getWallet() {
+    if (!this.wallet) {
+      await this.init();
+    }
+    return this.wallet;
+  }
+
+  getDefaultAccountAddress() {
+    return this.defaultAccountAddress;
   }
 }
 
-export const deployerEnv = await PrivateEnv.create(process.env.PXE_URL || 'http://localhost:8080');
+export const deployerEnv = PrivateEnv.create(process.env.PXE_URL || 'http://localhost:8080');

boxes/boxes/react/src/hooks/useContract.tsx

@@ -13,12 +13,13 @@ export function useContract() {
 
     setWait(true);
     const wallet = await deployerEnv.getWallet();
+    const defaultAccountAddress = deployerEnv.getDefaultAccountAddress();
     const salt = Fr.random();
 
     const { BoxReactContract } = await import('../../artifacts/BoxReact');
 
-    const tx = await BoxReactContract.deploy(wallet, Fr.random(), wallet.getCompleteAddress().address).send({
-      from: wallet.getAddress(),
+    const tx = await BoxReactContract.deploy(wallet, Fr.random(), defaultAccountAddress).send({
+      from: defaultAccountAddress,
       contractAddressSalt: salt,
     });
     const contract = await toast.promise(tx.deployed(), {

boxes/boxes/react/src/hooks/useNumber.tsx

@@ -10,10 +10,10 @@ export function useNumber({ contract }: { contract: Contract }) {
     e.preventDefault();
 
     setWait(true);
-    const deployerWallet = await deployerEnv.getWallet();
+    const defaultAccountAddress = deployerEnv.getDefaultAccountAddress();
     const viewTxReceipt = await contract!.methods
-      .getNumber(deployerWallet.getCompleteAddress().address)
-      .simulate({ from: deployerWallet.getAddress() });
+      .getNumber(defaultAccountAddress)
+      .simulate({ from: defaultAccountAddress });
     toast(`Number is: ${viewTxReceipt.value}`);
     setWait(false);
   };
@@ -26,13 +26,9 @@ export function useNumber({ contract }: { contract: Contract }) {
       setWait(true);
 
       const value = BigInt(el.value);
-      const deployerWallet = await deployerEnv.getWallet();
-
+      const defaultAccountAddress = deployerEnv.getDefaultAccountAddress();
       await toast.promise(
-        contract!.methods
-          .setNumber(value, deployerWallet.getCompleteAddress().address)
-          .send({ from: deployerWallet.getAddress() })
-          .wait(),
+        contract!.methods.setNumber(value, defaultAccountAddress).send({ from: defaultAccountAddress }).wait(),
         {
           pending: 'Setting number...',
           success: `Number set to: ${value}`,

boxes/boxes/react/tests/node.test.ts

@@ -1,38 +1,35 @@
-import { AccountWallet, CompleteAddress, Contract, Fr, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, Contract, Fr, Wallet, createLogger } from '@aztec/aztec.js';
 import { BoxReactContract } from '../artifacts/BoxReact.js';
 import { deployerEnv } from '../src/config.js';
 
 const logger = createLogger('aztec:http-pxe-client');
 
 describe('BoxReact Contract Tests', () => {
-  let wallet: AccountWallet;
+  let wallet: Wallet;
+  let defaultAccountAddress: AztecAddress;
   let contract: Contract;
   const numberToSet = Fr.random();
-  let accountCompleteAddress: CompleteAddress;
 
   beforeAll(async () => {
     wallet = await deployerEnv.getWallet();
-    accountCompleteAddress = wallet.getCompleteAddress();
+    defaultAccountAddress = deployerEnv.getDefaultAccountAddress();
     const salt = Fr.random();
 
-    contract = await BoxReactContract.deploy(wallet, Fr.random(), accountCompleteAddress.address)
-      .send({ from: wallet.getAddress(), contractAddressSalt: salt })
+    contract = await BoxReactContract.deploy(wallet, Fr.random(), defaultAccountAddress)
+      .send({ from: defaultAccountAddress, contractAddressSalt: salt })
       .deployed();
 
     logger.info(`L2 contract deployed at ${contract.address}`);
   }, 60000);
 
   test('Can set a number', async () => {
-    await contract.methods
-      .setNumber(numberToSet, accountCompleteAddress.address)
-      .send({ from: wallet.getAddress() })
-      .wait();
+    await contract.methods.setNumber(numberToSet, defaultAccountAddress).send({ from: defaultAccountAddress }).wait();
   }, 40000);
 
   test('Can read a number', async () => {
     const viewTxReceipt = await contract.methods
-      .getNumber(accountCompleteAddress.address)
-      .simulate({ from: wallet.getAddress() });
+      .getNumber(defaultAccountAddress)
+      .simulate({ from: defaultAccountAddress });
     expect(numberToSet.toBigInt()).toEqual(viewTxReceipt.value);
   }, 40000);
 });

boxes/boxes/react/webpack.config.js

@@ -49,6 +49,7 @@ export default (_, argv) => ({
       path: false,
       tty: false,
       url: false,
+      net: false,
       worker_threads: false,
       events: require.resolve('events/'),
       buffer: require.resolve('buffer/'),