@aztec/aztec.js 0.41.0 → 0.43.0

package/src/fee/native_fee_payment_method_with_claim.ts

@@ -0,0 +1,33 @@
+import { type FunctionCall } from '@aztec/circuit-types';
+import { type AztecAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
+import { FunctionType } from '@aztec/foundation/abi';
+import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+
+import { NativeFeePaymentMethod } from './native_fee_payment_method.js';
+
+/**
+ * Pay fee directly with native gas token claimed on the same tx.
+ */
+export class NativeFeePaymentMethodWithClaim extends NativeFeePaymentMethod {
+  constructor(sender: AztecAddress, private claimAmount: bigint | Fr, private claimSecret: Fr) {
+    super(sender);
+  }
+
+  /**
+   * Creates a function call to pay the fee in gas token.
+   * @returns A function call
+   */
+  override getFunctionCalls(): Promise<FunctionCall[]> {
+    return Promise.resolve([
+      {
+        to: GasTokenAddress,
+        name: 'claim',
+        selector: FunctionSelector.fromSignature('claim((Field),Field,Field)'),
+        isStatic: false,
+        args: [this.sender, new Fr(this.claimAmount), this.claimSecret],
+        returnTypes: [],
+        type: FunctionType.PRIVATE,
+      },
+    ]);
+  }
+}

package/src/fee/no_fee_payment_method.ts

@@ -0,0 +1,23 @@
+import { type FunctionCall } from '@aztec/circuit-types';
+import { AztecAddress } from '@aztec/circuits.js';
+
+import { type FeePaymentMethod } from './fee_payment_method.js';
+
+/**
+ * Does not pay fees. Will work until we enforce fee payment for all txs.
+ */
+export class NoFeePaymentMethod implements FeePaymentMethod {
+  constructor() {}
+
+  getAsset() {
+    return AztecAddress.ZERO;
+  }
+
+  getFunctionCalls(): Promise<FunctionCall[]> {
+    return Promise.resolve([]);
+  }
+
+  getFeePayer(): Promise<AztecAddress> {
+    return Promise.resolve(AztecAddress.ZERO);
+  }
+}

package/src/fee/private_fee_payment_method.ts

@@ -1,7 +1,7 @@
 import { type FunctionCall } from '@aztec/circuit-types';
-import { FunctionData, type GasSettings } from '@aztec/circuits.js';
+import { type GasSettings } from '@aztec/circuits.js';
 import { computeSecretHash } from '@aztec/circuits.js/hash';
-import { FunctionSelector } from '@aztec/foundation/abi';
+import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -43,12 +43,8 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
     return this.asset;
   }
 
-  /**
-   * The address which will facilitate the fee payment.
-   * @returns The contract address responsible for holding the fee payment.
-   */
-  getPaymentContract() {
-    return this.paymentContract;
+  getFeePayer(): Promise<AztecAddress> {
+    return Promise.resolve(this.paymentContract);
   }
 
   /**
@@ -64,13 +60,13 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
       this.wallet.getChainId(),
       this.wallet.getVersion(),
       {
+        name: 'unshield',
         args: [this.wallet.getCompleteAddress().address, this.paymentContract, maxFee, nonce],
-        functionData: new FunctionData(
-          FunctionSelector.fromSignature('unshield((Field),(Field),Field,Field)'),
-          /*isPrivate=*/ true,
-        ),
+        selector: FunctionSelector.fromSignature('unshield((Field),(Field),Field,Field)'),
+        type: FunctionType.PRIVATE,
         isStatic: false,
         to: this.asset,
+        returnTypes: [],
       },
     );
     await this.wallet.createAuthWit(messageHash);
@@ -79,13 +75,13 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
 
     return [
       {
-        to: this.getPaymentContract(),
-        functionData: new FunctionData(
-          FunctionSelector.fromSignature('fee_entrypoint_private(Field,(Field),Field,Field)'),
-          /*isPrivate=*/ true,
-        ),
+        name: 'fee_entrypoint_private',
+        to: this.paymentContract,
+        selector: FunctionSelector.fromSignature('fee_entrypoint_private(Field,(Field),Field,Field)'),
+        type: FunctionType.PRIVATE,
         isStatic: false,
         args: [maxFee, this.asset, secretHashForRebate, nonce],
+        returnTypes: [],
       },
     ];
   }

package/src/fee/public_fee_payment_method.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
-import { FunctionData, type GasSettings } from '@aztec/circuits.js';
-import { FunctionSelector } from '@aztec/foundation/abi';
+import { type GasSettings } from '@aztec/circuits.js';
+import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
@@ -21,7 +21,6 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
      * Address which will hold the fee payment.
      */
     protected paymentContract: AztecAddress,
-
     /**
      * An auth witness provider to authorize fee payments
      */
@@ -36,12 +35,8 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
     return this.asset;
   }
 
-  /**
-   * The address which will facilitate the fee payment.
-   * @returns The contract address responsible for holding the fee payment.
-   */
-  getPaymentContract() {
-    return this.paymentContract;
+  getFeePayer(): Promise<AztecAddress> {
+    return Promise.resolve(this.paymentContract);
   }
 
   /**
@@ -57,26 +52,26 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
       this.wallet.getChainId(),
       this.wallet.getVersion(),
       {
+        name: 'transfer_public',
         args: [this.wallet.getAddress(), this.paymentContract, maxFee, nonce],
-        functionData: new FunctionData(
-          FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
-          /*isPrivate=*/ false,
-        ),
+        selector: FunctionSelector.fromSignature('transfer_public((Field),(Field),Field,Field)'),
+        type: FunctionType.PUBLIC,
         isStatic: false,
         to: this.asset,
+        returnTypes: [],
       },
     );
 
     return Promise.resolve([
       this.wallet.setPublicAuthWit(messageHash, true).request(),
       {
-        to: this.getPaymentContract(),
-        functionData: new FunctionData(
-          FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
-          /*isPrivate=*/ true,
-        ),
+        name: 'fee_entrypoint_public',
+        to: this.paymentContract,
+        selector: FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
+        type: FunctionType.PRIVATE,
         isStatic: false,
         args: [maxFee, this.asset, nonce],
+        returnTypes: [],
       },
     ]);
   }

package/src/index.ts

@@ -20,35 +20,36 @@
  * TODO: Ultimately reimplement this mega exporter by mega exporting a granular api (then deprecate it).
  */
 export {
-  WaitOpts,
-  ContractFunctionInteraction,
+  BatchCall,
   Contract,
   ContractBase,
-  ContractMethod,
-  ContractStorageLayout,
-  ContractNotes,
-  SentTx,
-  BatchCall,
+  ContractFunctionInteraction,
+  type ContractMethod,
+  type ContractNotes,
+  type ContractStorageLayout,
   DeployMethod,
   DeploySentTx,
+  type SendMethodOptions,
+  SentTx,
+  type WaitOpts,
 } from './contract/index.js';
 
 export { ContractDeployer } from './deployment/index.js';
 
 export {
-  generatePublicKey,
-  FieldLike,
-  EthAddressLike,
-  CheatCodes,
   AztecAddressLike,
+  CheatCodes,
+  EthAddressLike,
+  EthCheatCodes,
+  FieldLike,
   FunctionSelectorLike,
   WrappedFieldLike,
-  EthCheatCodes,
   computeAuthWitMessageHash,
   computeInnerAuthWitHash,
   computeOuterAuthWitHash,
-  waitForPXE,
+  generatePublicKey,
   waitForAccountSynch,
+  waitForPXE,
 } from './utils/index.js';
 
 export { createPXEClient } from './rpc_clients/index.js';
@@ -56,23 +57,23 @@ export { createPXEClient } from './rpc_clients/index.js';
 export { AuthWitnessProvider } from './account/index.js';
 
 export { AccountContract } from './account/index.js';
-export { AccountManager } from './account_manager/index.js';
+export { AccountManager, DeployAccountOptions } from './account_manager/index.js';
 
-export { AccountWalletWithSecretKey, AccountWallet, Wallet, SignerlessWallet } from './wallet/index.js';
+export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet, Wallet } from './wallet/index.js';
 
 // // TODO https://github.com/AztecProtocol/aztec-packages/issues/2632 --> FunctionSelector might not need to be exposed
 // // here once the issue is resolved.
 export {
   AztecAddress,
   EthAddress,
-  Fr,
   Fq,
+  Fr,
   GlobalVariables,
   GrumpkinScalar,
+  INITIAL_L2_BLOCK_NUM,
   Point,
-  getContractInstanceFromDeployParams, // TODO(@spalladino) This method should be used from within the DeployMethod but not exposed in aztec.js
   getContractClassFromArtifact,
-  INITIAL_L2_BLOCK_NUM,
+  getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
 
 export { computeSecretHash } from '@aztec/circuits.js/hash';
@@ -90,17 +91,21 @@ export {
   AuthWitness,
   AztecNode,
   Body,
+  Comparator,
   CompleteAddress,
+  EncryptedL2BlockL2Logs,
+  EncryptedLogHeader,
+  EncryptedNoteLogIncomingBody,
+  EncryptedLogOutgoingBody,
   ExtendedNote,
-  type FunctionCall,
+  FunctionCall,
   GrumpkinPrivateKey,
-  L1ToL2Message,
   L1Actor,
+  L1ToL2Message,
   L2Actor,
   L2Block,
   L2BlockL2Logs,
-  EncryptedL2BlockL2Logs,
-  UnencryptedL2BlockL2Logs,
+  EncryptedNoteL2BlockL2Logs,
   LogFilter,
   LogId,
   LogType,
@@ -110,41 +115,40 @@ export {
   PackedValues,
   PartialAddress,
   PublicKey,
+  SiblingPath,
   SyncStatus,
   Tx,
   TxExecutionRequest,
   TxHash,
   TxReceipt,
   TxStatus,
+  UnencryptedL2BlockL2Logs,
   UnencryptedL2Log,
   createAztecNodeClient,
-  emptyFunctionCall,
   merkleTreeIds,
   mockTx,
-  Comparator,
-  SiblingPath,
-  EncryptedLogHeader,
-  EncryptedLogIncomingBody,
-  EncryptedLogOutgoingBody,
+  TaggedLog,
+  L1NotePayload,
+  L1EventPayload,
 } from '@aztec/circuit-types';
 export { NodeInfo } from '@aztec/types/interfaces';
 
-export { ContractInstanceWithAddress, ContractClassWithId } from '@aztec/types/contracts';
+export { ContractClassWithId, ContractInstanceWithAddress } from '@aztec/types/contracts';
 
 // TODO: These kinds of things have no place on our public api.
 // External devs will almost certainly have their own methods of doing these things.
 // If we want to use them in our own "aztec.js consuming code", import them from foundation as needed.
 export { encodeArguments } from '@aztec/foundation/abi';
+export { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 export { sha256 } from '@aztec/foundation/crypto';
+export { makeFetch } from '@aztec/foundation/json-rpc/client';
 export { DebugLogger, createDebugLogger, onLog } from '@aztec/foundation/log';
 export { retry, retryUntil } from '@aztec/foundation/retry';
+export { to2Fields, toBigInt } from '@aztec/foundation/serialize';
 export { sleep } from '@aztec/foundation/sleep';
 export { elapsed } from '@aztec/foundation/timer';
-export { fileURLToPath } from '@aztec/foundation/url';
-export { to2Fields, toBigInt } from '@aztec/foundation/serialize';
-export { toBigIntBE } from '@aztec/foundation/bigint-buffer';
-export { makeFetch } from '@aztec/foundation/json-rpc/client';
 export { FieldsOf } from '@aztec/foundation/types';
+export { fileURLToPath } from '@aztec/foundation/url';
 
 export {
   DeployL1Contracts,
@@ -156,6 +160,6 @@ export {
 // Start of section that exports public api via granular api.
 // Here you *can* do `export *` as the granular api defacto exports things explicitly.
 // This entire index file will be deprecated at some point after we're satisfied.
-export * from './api/init.js';
 export * from './api/abi.js';
 export * from './api/fee.js';
+export * from './api/init.js';

package/src/rpc_clients/pxe_client.ts

@@ -1,6 +1,6 @@
 import {
   AuthWitness,
-  EncryptedL2BlockL2Logs,
+  EncryptedNoteL2BlockL2Logs,
   ExtendedNote,
   ExtendedUnencryptedL2Log,
   L2Block,
@@ -54,8 +54,8 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       TxExecutionRequest,
       TxHash,
     },
-    { Tx, SimulatedTx, TxReceipt, EncryptedL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
+    { Tx, SimulatedTx, TxReceipt, EncryptedNoteL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
     false,
     'pxe',
     fetch,
-  );
+  ) as PXE;

package/src/utils/account.ts

@@ -14,11 +14,11 @@ export async function waitForAccountSynch(
   address: CompleteAddress,
   { interval, timeout }: WaitOpts = DefaultWaitOpts,
 ): Promise<void> {
-  const publicKey = address.publicKeys.masterIncomingViewingPublicKey.toString();
+  const accountAddress = address.address.toString();
   await retryUntil(
     async () => {
       const status = await pxe.getSyncStatus();
-      const accountSynchedToBlock = status.notes[publicKey];
+      const accountSynchedToBlock = status.notes[accountAddress];
       if (typeof accountSynchedToBlock === 'undefined') {
         return false;
       } else {

package/src/utils/authwit.ts

@@ -22,11 +22,7 @@ export const computeAuthWitMessageHash = (caller: AztecAddress, chainId: Fr, ver
     action.to.toField(),
     chainId,
     version,
-    computeInnerAuthWitHash([
-      caller.toField(),
-      action.functionData.selector.toField(),
-      PackedValues.fromValues(action.args).hash,
-    ]),
+    computeInnerAuthWitHash([caller.toField(), action.selector.toField(), PackedValues.fromValues(action.args).hash]),
   );
 };
 // docs:end:authwit_computeAuthWitMessageHash

package/src/utils/cheat_codes.ts

@@ -265,11 +265,11 @@ export class AztecCheatCodes {
   public async warp(to: number): Promise<void> {
     const rollupContract = (await this.pxe.getNodeInfo()).l1ContractAddresses.rollupAddress;
     await this.eth.setNextBlockTimestamp(to);
-    // also store this time on the rollup contract (slot 1 tracks `lastBlockTs`).
+    // also store this time on the rollup contract (slot 2 tracks `lastBlockTs`).
     // This is because when the sequencer executes public functions, it uses the timestamp stored in the rollup contract.
-    await this.eth.store(rollupContract, 1n, BigInt(to));
-    // also store this on slot 2 of the rollup contract (`lastWarpedBlockTs`) which tracks the last time warp was used.
     await this.eth.store(rollupContract, 2n, BigInt(to));
+    // also store this on slot 3 of the rollup contract (`lastWarpedBlockTs`) which tracks the last time warp was used.
+    await this.eth.store(rollupContract, 3n, BigInt(to));
   }
 
   /**
@@ -291,7 +291,11 @@ export class AztecCheatCodes {
    * @returns The notes stored at the given slot
    */
   public async loadPrivate(owner: AztecAddress, contract: AztecAddress, slot: Fr | bigint): Promise<Note[]> {
-    const extendedNotes = await this.pxe.getNotes({ owner, contractAddress: contract, storageSlot: new Fr(slot) });
+    const extendedNotes = await this.pxe.getIncomingNotes({
+      owner,
+      contractAddress: contract,
+      storageSlot: new Fr(slot),
+    });
     return extendedNotes.map(extendedNote => extendedNote.note);
   }
 }

package/src/wallet/account_wallet.ts

@@ -1,6 +1,7 @@
 import { type AuthWitness, type FunctionCall, type PXE, type TxExecutionRequest } from '@aztec/circuit-types';
 import { AztecAddress, CANONICAL_KEY_REGISTRY_ADDRESS, Fq, Fr, derivePublicKeyFromSecretKey } from '@aztec/circuits.js';
 import { type ABIParameterVisibility, type FunctionAbi, FunctionType } from '@aztec/foundation/abi';
+import { AuthRegistryAddress } from '@aztec/protocol-contracts/auth-registry';
 
 import { type AccountInterface } from '../account/interface.js';
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
@@ -80,11 +81,33 @@ export class AccountWallet extends BaseWallet {
     authorized: boolean,
   ): ContractFunctionInteraction {
     const message = this.getMessageHash(messageHashOrIntent);
-    if (authorized) {
-      return new ContractFunctionInteraction(this, this.getAddress(), this.getApprovePublicAuthwitAbi(), [message]);
-    } else {
-      return this.cancelAuthWit(message);
-    }
+    return new ContractFunctionInteraction(this, AuthRegistryAddress, this.getSetAuthorizedAbi(), [
+      message,
+      authorized,
+    ]);
+  }
+
+  /**
+   * Returns a function interaction to cancel a message hash as authorized or revoked.
+   * @param messageHashOrIntent - The message or the caller and action to revoke
+   * @returns - A function interaction.
+   */
+  public cancelPublicAuthWit(
+    messageHashOrIntent:
+      | Fr
+      | Buffer
+      | {
+          /** The caller to approve  */
+          caller: AztecAddress;
+          /** The action to approve */
+          action: ContractFunctionInteraction | FunctionCall;
+          /** The chain id to approve */
+          chainId?: Fr;
+          /** The version to approve  */
+          version?: Fr;
+        },
+  ): ContractFunctionInteraction {
+    return this.setPublicAuthWit(messageHashOrIntent, false);
   }
 
   /**
@@ -152,17 +175,25 @@ export class AccountWallet extends BaseWallet {
     isValidInPublic: boolean;
   }> {
     const messageHash = this.getMessageHash(messageHashOrIntent);
+    const results = { isValidInPrivate: false, isValidInPublic: false };
+
+    // Check private
     const witness = await this.getAuthWitness(messageHash);
-    const blockNumber = await this.getBlockNumber();
-    const interaction = new ContractFunctionInteraction(this, target, this.getLookupValidityAbi(), [
-      target,
-      blockNumber,
-      witness != undefined,
-      messageHash,
-    ]);
+    if (witness !== undefined) {
+      results.isValidInPrivate = (await new ContractFunctionInteraction(this, target, this.getLookupValidityAbi(), [
+        messageHash,
+      ]).simulate()) as boolean;
+    }
 
-    const [isValidInPrivate, isValidInPublic] = (await interaction.simulate()) as [boolean, boolean];
-    return { isValidInPrivate, isValidInPublic };
+    // check public
+    results.isValidInPublic = (await new ContractFunctionInteraction(
+      this,
+      AuthRegistryAddress,
+      this.getIsConsumableAbi(),
+      [target, messageHash],
+    ).simulate()) as boolean;
+
+    return results;
   }
 
   /**
@@ -224,9 +255,9 @@ export class AccountWallet extends BaseWallet {
     return this.getCompleteAddress().address;
   }
 
-  private getApprovePublicAuthwitAbi(): FunctionAbi {
+  private getSetAuthorizedAbi(): FunctionAbi {
     return {
-      name: 'approve_public_authwit',
+      name: 'set_authorized',
       isInitializer: false,
       functionType: FunctionType.PUBLIC,
       isInternal: true,
@@ -237,6 +268,11 @@ export class AccountWallet extends BaseWallet {
           type: { kind: 'field' },
           visibility: 'private' as ABIParameterVisibility,
         },
+        {
+          name: 'authorize',
+          type: { kind: 'boolean' },
+          visibility: 'private' as ABIParameterVisibility,
+        },
       ],
       returnTypes: [],
     };
@@ -267,29 +303,31 @@ export class AccountWallet extends BaseWallet {
       functionType: FunctionType.UNCONSTRAINED,
       isInternal: false,
       isStatic: false,
+      parameters: [{ name: 'message_hash', type: { kind: 'field' }, visibility: 'private' as ABIParameterVisibility }],
+      returnTypes: [{ kind: 'boolean' }],
+    };
+  }
+
+  private getIsConsumableAbi(): FunctionAbi {
+    return {
+      name: 'unconstrained_is_consumable',
+      isInitializer: false,
+      functionType: FunctionType.UNCONSTRAINED,
+      isInternal: false,
+      isStatic: false,
       parameters: [
         {
-          name: 'myself',
+          name: 'address',
           type: {
+            fields: [{ name: 'inner', type: { kind: 'field' } }],
             kind: 'struct',
             path: 'authwit::aztec::protocol_types::address::aztec_address::AztecAddress',
-            fields: [{ name: 'inner', type: { kind: 'field' } }],
           },
           visibility: 'private' as ABIParameterVisibility,
         },
-        {
-          name: 'block_number',
-          type: { kind: 'integer', sign: 'unsigned', width: 32 },
-          visibility: 'private' as ABIParameterVisibility,
-        },
-        {
-          name: 'check_private',
-          type: { kind: 'boolean' },
-          visibility: 'private' as ABIParameterVisibility,
-        },
         { name: 'message_hash', type: { kind: 'field' }, visibility: 'private' as ABIParameterVisibility },
       ],
-      returnTypes: [{ kind: 'array', length: 2, type: { kind: 'boolean' } }],
+      returnTypes: [{ kind: 'boolean' }],
     };
   }
 

package/src/wallet/base_wallet.ts

@@ -1,12 +1,15 @@
 import {
   type AuthWitness,
+  type EventMetadata,
   type ExtendedNote,
   type FunctionCall,
   type GetUnencryptedLogsResponse,
+  type IncomingNotesFilter,
   type L2Block,
   type LogFilter,
-  type NoteFilter,
+  type OutgoingNotesFilter,
   type PXE,
+  type PXEInfo,
   type SimulatedTx,
   type SyncStatus,
   type Tx,
@@ -15,7 +18,15 @@ import {
   type TxHash,
   type TxReceipt,
 } from '@aztec/circuit-types';
-import { type AztecAddress, type CompleteAddress, type Fq, type Fr, type PartialAddress } from '@aztec/circuits.js';
+import { type NoteProcessorStats } from '@aztec/circuit-types/stats';
+import {
+  type AztecAddress,
+  type CompleteAddress,
+  type Fq,
+  type Fr,
+  type PartialAddress,
+  type Point,
+} from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { type NodeInfo } from '@aztec/types/interfaces';
@@ -65,6 +76,9 @@ export abstract class BaseWallet implements Wallet {
   getContractClass(id: Fr): Promise<ContractClassWithId | undefined> {
     return this.pxe.getContractClass(id);
   }
+  getContractArtifact(id: Fr): Promise<ContractArtifact | undefined> {
+    return this.pxe.getContractArtifact(id);
+  }
   addCapsule(capsule: Fr[]): Promise<void> {
     return this.pxe.addCapsule(capsule);
   }
@@ -116,8 +130,11 @@ export abstract class BaseWallet implements Wallet {
   getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
     return this.pxe.getTxReceipt(txHash);
   }
-  getNotes(filter: NoteFilter): Promise<ExtendedNote[]> {
-    return this.pxe.getNotes(filter);
+  getIncomingNotes(filter: IncomingNotesFilter): Promise<ExtendedNote[]> {
+    return this.pxe.getIncomingNotes(filter);
+  }
+  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<ExtendedNote[]> {
+    return this.pxe.getOutgoingNotes(filter);
   }
   // TODO(#4956): Un-expose this
   getNoteNonces(note: ExtendedNote): Promise<Fr[]> {
@@ -129,6 +146,9 @@ export abstract class BaseWallet implements Wallet {
   addNote(note: ExtendedNote): Promise<void> {
     return this.pxe.addNote(note);
   }
+  addNullifiedNote(note: ExtendedNote): Promise<void> {
+    return this.pxe.addNullifiedNote(note);
+  }
   getBlock(number: number): Promise<L2Block | undefined> {
     return this.pxe.getBlock(number);
   }
@@ -158,6 +178,9 @@ export abstract class BaseWallet implements Wallet {
   getSyncStatus(): Promise<SyncStatus> {
     return this.pxe.getSyncStatus();
   }
+  getSyncStats(): Promise<{ [key: string]: NoteProcessorStats }> {
+    return this.pxe.getSyncStats();
+  }
   addAuthWitness(authWitness: AuthWitness) {
     return this.pxe.addAuthWitness(authWitness);
   }
@@ -170,4 +193,15 @@ export abstract class BaseWallet implements Wallet {
   isContractPubliclyDeployed(address: AztecAddress): Promise<boolean> {
     return this.pxe.isContractPubliclyDeployed(address);
   }
+  getPXEInfo(): Promise<PXEInfo> {
+    return this.pxe.getPXEInfo();
+  }
+  getEvents<T>(
+    from: number,
+    limit: number,
+    eventMetadata: EventMetadata<T>,
+    ivpk: Point = this.getCompleteAddress().publicKeys.masterIncomingViewingPublicKey,
+  ): Promise<T[]> {
+    return this.pxe.getEvents(from, limit, eventMetadata, ivpk);
+  }
 }