refactor!: nuking remaining Aztec Node proxy methods from PXE

Continuation of the work from the PR down the sack and nuking the remaining Aztec Node proxy methods from PXE. These are the changes:
1. Dropepd `getCurrentBaseFee`,
2. moved `getTxReceipt` on `Wallet`,
3. drop `sendTx` and moved the implementation to `BaseWallet`,
4. dropped `getNodeInfo` (this was super ugly because we had essentially a copy of implementation from AztecNode in PXE).

The cluttering of wallet inputs is only temporary because PXE is supposed to be a lib used by the wallet and hence the wallet itself should "set it up".

This makes me realize that the PXEService naming is stale as it's transforming to not be a service. Will rename that once I nuke the PXE JSON RPC server.

Author: benesjan

boxes/boxes/react/src/config.ts

@@ -22,7 +22,7 @@ export class PrivateEnv {
       l1Contracts,
     } as PXEServiceConfig;
     const pxe = await createPXEService(aztecNode, configWithContracts);
-    const wallet = new TestWallet(pxe);
+    const wallet = new TestWallet(pxe, aztecNode);
 
     const [accountData] = await getInitialTestAccountsData();
     if (!accountData) {

boxes/boxes/vanilla/app/embedded-wallet.ts

@@ -43,10 +43,9 @@ export class EmbeddedWallet extends BaseWallet {
   ): Promise<Account> {
     let account: Account | undefined;
     if (address.equals(AztecAddress.ZERO)) {
-      const { l1ChainId: chainId, rollupVersion } =
-        await this.pxe.getNodeInfo();
+      const {chainId, version} = await this.getChainInfo();
       account = new SignerlessAccount(
-        new DefaultMultiCallEntrypoint(chainId, rollupVersion)
+        new DefaultMultiCallEntrypoint(chainId.toNumber(), version.toNumber())
       );
     } else {
       account = this.accounts.get(address?.toString() ?? '');
@@ -70,7 +69,7 @@ export class EmbeddedWallet extends BaseWallet {
 
   static async initialize(nodeUrl: string) {
     // Create Aztec Node Client
-    const aztecNode = await createAztecNodeClient(nodeUrl);
+    const aztecNode = createAztecNodeClient(nodeUrl);
 
     // Create PXE Service
     const config = getPXEServiceConfig();
@@ -84,9 +83,9 @@ export class EmbeddedWallet extends BaseWallet {
     await pxe.registerContract(await EmbeddedWallet.#getSponsoredPFCContract());
 
     // Log the Node Info
-    const nodeInfo = await pxe.getNodeInfo();
+    const nodeInfo = await aztecNode.getNodeInfo();
     logger.info('PXE Connected to node', nodeInfo);
-    return new EmbeddedWallet(pxe);
+    return new EmbeddedWallet(pxe, aztecNode);
   }
 
   // Internal method to use the Sponsored FPC Contract for fee payment
@@ -229,7 +228,7 @@ export class EmbeddedWallet extends BaseWallet {
   }
 
   private async getFakeAccountDataFor(address: AztecAddress) {
-    const nodeInfo = await this.pxe.getNodeInfo();
+    const chainInfo = await this.getChainInfo();
     const originalAccount = await this.getAccountFromAddress(address);
     const originalAddress = await originalAccount.getCompleteAddress();
     const { contractInstance } = await this.pxe.getContractMetadata(
@@ -240,7 +239,7 @@ export class EmbeddedWallet extends BaseWallet {
         `No contract instance found for address: ${originalAddress.address}`
       );
     }
-    const stubAccount = createStubAccount(originalAddress, nodeInfo);
+    const stubAccount = createStubAccount(originalAddress, chainInfo);
     const StubAccountContractArtifact = await getStubAccountContractArtifact();
     const instance = await getContractInstanceFromInstantiationParams(
       StubAccountContractArtifact,

boxes/boxes/vanilla/scripts/deploy.ts

@@ -7,10 +7,10 @@ import {
   Fr,
   getContractInstanceFromInstantiationParams,
   PublicKeys,
-  type PXE,
   SponsoredFeePaymentMethod,
   type Wallet,
 } from '@aztec/aztec.js';
+import { type AztecNode } from '@aztec/aztec.js/interfaces';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { createStore } from '@aztec/kv-store/lmdb';
 import { getDefaultInitializer } from '@aztec/stdlib/abi';
@@ -26,9 +26,7 @@ const WRITE_ENV_FILE = process.env.WRITE_ENV_FILE === 'false' ? false : true;
 
 const PXE_STORE_DIR = path.join(import.meta.dirname, '.store');
 
-async function setupPXE() {
-  const aztecNode = createAztecNodeClient(AZTEC_NODE_URL);
-
+async function setupPXE(aztecNode: AztecNode) {
   fs.rmSync(PXE_STORE_DIR, { recursive: true, force: true });
 
   const store = await createStore('pxe', {
@@ -159,8 +157,9 @@ async function writeEnvFile(deploymentInfo) {
 }
 
 async function createAccountAndDeployContract() {
-  const pxe = await setupPXE();
-  const wallet = new TestWallet(pxe);
+  const aztecNode = createAztecNodeClient(AZTEC_NODE_URL);
+  const pxe = await setupPXE(aztecNode);
+  const wallet = new TestWallet(pxe, aztecNode);
 
   // Register the SponsoredFPC contract (for sponsored fee payments)
   await wallet.registerContract(

boxes/boxes/vite/src/config.ts

@@ -26,7 +26,7 @@ export class PrivateEnv {
       l1Contracts,
     } as PXEServiceConfig;
     const pxe = await createPXEService(aztecNode, configWithContracts);
-    const wallet = new TestWallet(pxe);
+    const wallet = new TestWallet(pxe, aztecNode);
 
     const [accountData] = await getInitialTestAccountsData();
     if (!accountData) {

playground/src/wallet/embedded_wallet.ts

@@ -12,6 +12,7 @@ import {
   type PXE,
   createAztecNodeClient,
   type Aliased,
+  type AztecNode,
 } from '@aztec/aztec.js';
 import { getPXEServiceConfig, type PXEServiceConfig } from '@aztec/pxe/config';
 import { createPXEService } from '@aztec/pxe/client/lazy';
@@ -48,13 +49,14 @@ export interface AccountData {
 export class EmbeddedWallet extends BaseWallet {
   constructor(
     pxe: PXE,
+    aztecNode: AztecNode,
     private walletDB: WalletDB,
   ) {
-    super(pxe);
+    super(pxe, aztecNode);
   }
 
   static async create(nodeURL: string) {
-    const aztecNode = await createAztecNodeClient(nodeURL);
+    const aztecNode = createAztecNodeClient(nodeURL);
 
     const l1Contracts = await aztecNode.getL1ContractAddresses();
     const rollupAddress = l1Contracts.rollupAddress;
@@ -83,13 +85,13 @@ export class EmbeddedWallet extends BaseWallet {
       walletLogger,
     );
     const db = WalletDB.init(walletDBStore, walletLogger.info);
-    return new EmbeddedWallet(pxe, db);
+    return new EmbeddedWallet(pxe, aztecNode, db);
   }
 
   protected async getAccountFromAddress(address: AztecAddress): Promise<Account> {
     let account: Account | undefined;
     if (address.equals(AztecAddress.ZERO)) {
-      const { l1ChainId: chainId, rollupVersion } = await this.pxe.getNodeInfo();
+      const { l1ChainId: chainId, rollupVersion } = await this.aztecNode.getNodeInfo();
       account = new SignerlessAccount(new DefaultMultiCallEntrypoint(chainId, rollupVersion));
     } else {
       const { secretKey, salt, signingKey, type } = await this.walletDB.retrieveAccount(address);
@@ -205,14 +207,14 @@ export class EmbeddedWallet extends BaseWallet {
   }
 
   private async getFakeAccountDataFor(address: AztecAddress) {
-    const nodeInfo = await this.pxe.getNodeInfo();
+    const chainInfo = await this.getChainInfo();
     const originalAccount = await this.getAccountFromAddress(address);
     const originalAddress = await originalAccount.getCompleteAddress();
     const { contractInstance } = await this.pxe.getContractMetadata(originalAddress.address);
     if (!contractInstance) {
       throw new Error(`No contract instance found for address: ${originalAddress.address}`);
     }
-    const stubAccount = createStubAccount(originalAddress, nodeInfo);
+    const stubAccount = createStubAccount(originalAddress, chainInfo);
     const StubAccountContractArtifact = await getStubAccountContractArtifact();
     const instance = await getContractInstanceFromInstantiationParams(StubAccountContractArtifact, {
       salt: Fr.random(),

yarn-project/accounts/src/defaults/account_contract.ts

@@ -1,6 +1,7 @@
 import type { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
+import type { ChainInfo } from '@aztec/aztec.js/wallet';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';
+import type { CompleteAddress } from '@aztec/stdlib/contract';
 
 import { DefaultAccountInterface } from '../defaults/account_interface.js';
 
@@ -23,7 +24,7 @@ export abstract class DefaultAccountContract implements AccountContract {
 
   constructor() {}
 
-  getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface {
-    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, nodeInfo);
+  getInterface(address: CompleteAddress, chainInfo: ChainInfo): AccountInterface {
+    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, chainInfo);
   }
 }

yarn-project/accounts/src/defaults/account_interface.ts

@@ -1,12 +1,12 @@
 import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
+import type { ChainInfo } from '@aztec/aztec.js/wallet';
 import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import type { EntrypointInterface, FeeOptions, TxExecutionOptions } from '@aztec/entrypoints/interfaces';
 import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { CompleteAddress } from '@aztec/stdlib/contract';
-import type { NodeInfo } from '@aztec/stdlib/contract';
 import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 
 /**
@@ -22,16 +22,16 @@ export class DefaultAccountInterface implements AccountInterface {
   constructor(
     private authWitnessProvider: AuthWitnessProvider,
     private address: CompleteAddress,
-    nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'rollupVersion'>,
+    chainInfo: ChainInfo,
   ) {
     this.entrypoint = new DefaultAccountEntrypoint(
       address.address,
       authWitnessProvider,
-      nodeInfo.l1ChainId,
-      nodeInfo.rollupVersion,
+      chainInfo.chainId.toNumber(),
+      chainInfo.version.toNumber(),
     );
-    this.chainId = new Fr(nodeInfo.l1ChainId);
-    this.version = new Fr(nodeInfo.rollupVersion);
+    this.chainId = chainInfo.chainId;
+    this.version = chainInfo.version;
   }
 
   createTxExecutionRequest(

yarn-project/accounts/src/stub/index.ts

@@ -1,4 +1,4 @@
-import { BaseAccount, type CompleteAddress, type NodeInfo } from '@aztec/aztec.js';
+import { BaseAccount, type ChainInfo, type CompleteAddress } from '@aztec/aztec.js';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
@@ -26,15 +26,12 @@ export class StubAccountContract extends StubBaseAccountContract {
 /**
  *
  */
-export function createStubAccount(
-  originalAddress: CompleteAddress,
-  nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'rollupVersion'>,
-) {
+export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
   const accountContract = new StubAccountContract();
   const accountInterface = new DefaultAccountInterface(
     accountContract.getAuthWitnessProvider(originalAddress),
     originalAddress,
-    nodeInfo,
+    chainInfo,
   );
   return new BaseAccount(accountInterface);
 }

yarn-project/accounts/src/stub/lazy.ts

@@ -1,4 +1,4 @@
-import { BaseAccount, type CompleteAddress, type NodeInfo } from '@aztec/aztec.js';
+import { BaseAccount, type ChainInfo, type CompleteAddress } from '@aztec/aztec.js';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
 
@@ -37,15 +37,12 @@ export class StubAccountContract extends StubBaseAccountContract {
 /**
  *
  */
-export function createStubAccount(
-  originalAddress: CompleteAddress,
-  nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'rollupVersion'>,
-) {
+export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
   const accountContract = new StubAccountContract();
   const accountInterface = new DefaultAccountInterface(
     accountContract.getAuthWitnessProvider(originalAddress),
     originalAddress,
-    nodeInfo,
+    chainInfo,
   );
   return new BaseAccount(accountInterface);
 }

yarn-project/aztec.js/src/account/account_contract.ts

@@ -1,10 +1,11 @@
 import type { AuthWitnessProvider } from '@aztec/entrypoints/interfaces';
 import { Fr } from '@aztec/foundation/fields';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';
+import type { CompleteAddress } from '@aztec/stdlib/contract';
 import { getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import { deriveKeys } from '@aztec/stdlib/keys';
 
+import type { ChainInfo } from '../wallet/index.js';
 import type { AccountInterface } from './interface.js';
 
 // docs:start:account-contract-interface
@@ -36,10 +37,10 @@ export interface AccountContract {
    * The account interface is responsible for assembling tx requests given requested function calls, and
    * for creating signed auth witnesses given action identifiers (message hashes).
    * @param address - Address of this account contract.
-   * @param nodeInfo - Info on the chain where it is initialized / published.
+   * @param chainInfo - Chain id and version of the rollup where the account contract is initialized / published.
    * @returns An account interface instance for creating tx requests and authorizing actions.
    */
-  getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface;
+  getInterface(address: CompleteAddress, chainInfo: ChainInfo): AccountInterface;
 
   /**
    * Returns the auth witness provider for the given address.