@aztec/aztec.js 0.41.0 → 0.42.0

package/src/entrypoint/payload.ts

@@ -1,5 +1,6 @@
-import { type FunctionCall, PackedValues, emptyFunctionCall } from '@aztec/circuit-types';
-import { Fr, type GasSettings, GeneratorIndex } from '@aztec/circuits.js';
+import { FunctionCall, PackedValues } from '@aztec/circuit-types';
+import { type AztecAddress, Fr, type GasSettings, GeneratorIndex } from '@aztec/circuits.js';
+import { FunctionType } from '@aztec/foundation/abi';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import { type Tuple } from '@aztec/foundation/serialize';
@@ -39,13 +40,13 @@ type EncodedFunctionCall = {
 /* eslint-enable camelcase */
 
 /** Assembles an entrypoint payload */
-export class EntrypointPayload {
+export abstract class EntrypointPayload {
   #packedArguments: PackedValues[] = [];
   #functionCalls: EncodedFunctionCall[] = [];
   #nonce = Fr.random();
   #generatorIndex: number;
 
-  private constructor(functionCalls: FunctionCall[], generatorIndex: number) {
+  protected constructor(functionCalls: FunctionCall[], generatorIndex: number) {
     for (const call of functionCalls) {
       this.#packedArguments.push(PackedValues.fromValues(call.args));
     }
@@ -53,9 +54,9 @@ export class EntrypointPayload {
     /* eslint-disable camelcase */
     this.#functionCalls = functionCalls.map((call, index) => ({
       args_hash: this.#packedArguments[index].hash,
-      function_selector: call.functionData.selector.toField(),
+      function_selector: call.selector.toField(),
       target_address: call.to.toField(),
-      is_public: !call.functionData.isPrivate,
+      is_public: call.type == FunctionType.PUBLIC,
       is_static: call.isStatic,
     }));
     /* eslint-enable camelcase */
@@ -92,18 +93,7 @@ export class EntrypointPayload {
    * Serializes the payload to an array of fields
    * @returns The fields of the payload
    */
-  toFields(): Fr[] {
-    return [
-      ...this.#functionCalls.flatMap(call => [
-        call.args_hash,
-        call.function_selector,
-        call.target_address,
-        new Fr(call.is_public),
-        new Fr(call.is_static),
-      ]),
-      this.#nonce,
-    ];
-  }
+  abstract toFields(): Fr[];
 
   /**
    * Hashes the payload
@@ -113,13 +103,24 @@ export class EntrypointPayload {
     return pedersenHash(this.toFields(), this.#generatorIndex);
   }
 
+  /** Serializes the function calls to an array of fields. */
+  protected functionCallsToFields() {
+    return this.#functionCalls.flatMap(call => [
+      call.args_hash,
+      call.function_selector,
+      call.target_address,
+      new Fr(call.is_public),
+      new Fr(call.is_static),
+    ]);
+  }
+
   /**
-   * Creates an execution payload from a set of function calls
+   * Creates an execution payload for a dapp from a set of function calls
    * @param functionCalls - The function calls to execute
    * @returns The execution payload
    */
   static fromFunctionCalls(functionCalls: FunctionCall[]) {
-    return new EntrypointPayload(functionCalls, 0);
+    return new AppEntrypointPayload(functionCalls, 0);
   }
 
   /**
@@ -131,18 +132,49 @@ export class EntrypointPayload {
     if (functionCalls.length > APP_MAX_CALLS) {
       throw new Error(`Expected at most ${APP_MAX_CALLS} function calls, got ${functionCalls.length}`);
     }
-    const paddedCalls = padArrayEnd(functionCalls, emptyFunctionCall(), APP_MAX_CALLS);
-    return new EntrypointPayload(paddedCalls, GeneratorIndex.SIGNATURE_PAYLOAD);
+    const paddedCalls = padArrayEnd(functionCalls, FunctionCall.empty(), APP_MAX_CALLS);
+    return new AppEntrypointPayload(paddedCalls, GeneratorIndex.SIGNATURE_PAYLOAD);
   }
 
   /**
    * Creates an execution payload to pay the fee for a transaction
+   * @param sender - The address sending this payload
    * @param feeOpts - The fee payment options
    * @returns The execution payload
    */
-  static async fromFeeOptions(feeOpts?: FeeOptions) {
-    const calls = feeOpts ? await feeOpts.paymentMethod.getFunctionCalls(feeOpts?.gasSettings) : [];
-    const paddedCalls = padArrayEnd(calls, emptyFunctionCall(), FEE_MAX_CALLS);
-    return new EntrypointPayload(paddedCalls, GeneratorIndex.FEE_PAYLOAD);
+  static async fromFeeOptions(sender: AztecAddress, feeOpts?: FeeOptions) {
+    const calls = (await feeOpts?.paymentMethod.getFunctionCalls(feeOpts?.gasSettings)) ?? [];
+    const feePayer = await feeOpts?.paymentMethod.getFeePayer(feeOpts?.gasSettings);
+    const isFeePayer = !!feePayer && feePayer.equals(sender);
+    const paddedCalls = padArrayEnd(calls, FunctionCall.empty(), FEE_MAX_CALLS);
+    return new FeeEntrypointPayload(paddedCalls, GeneratorIndex.FEE_PAYLOAD, isFeePayer);
+  }
+}
+
+/** Entrypoint payload for app phase execution. */
+class AppEntrypointPayload extends EntrypointPayload {
+  override toFields(): Fr[] {
+    return [...this.functionCallsToFields(), this.nonce];
+  }
+}
+
+/** Entrypoint payload for fee payment to be run during setup phase. */
+class FeeEntrypointPayload extends EntrypointPayload {
+  #isFeePayer: boolean;
+
+  constructor(functionCalls: FunctionCall[], generatorIndex: number, isFeePayer: boolean) {
+    super(functionCalls, generatorIndex);
+    this.#isFeePayer = isFeePayer;
+  }
+
+  override toFields(): Fr[] {
+    return [...this.functionCallsToFields(), this.nonce, new Fr(this.#isFeePayer)];
   }
+
+  /* eslint-disable camelcase */
+  /** Whether the sender should be appointed as fee payer. */
+  get is_fee_payer() {
+    return this.#isFeePayer;
+  }
+  /* eslint-enable camelcase */
 }

package/src/fee/fee_payment_method.ts

@@ -6,19 +6,17 @@ import { type AztecAddress } from '@aztec/foundation/aztec-address';
  * Holds information about how the fee for a transaction is to be paid.
  */
 export interface FeePaymentMethod {
-  /**
-   * The asset used to pay the fee.
-   */
+  /** The asset used to pay the fee. */
   getAsset(): AztecAddress;
-  /**
-   * Address which will hold the fee payment.
-   */
-  getPaymentContract(): AztecAddress;
-
   /**
    * Creates a function call to pay the fee in the given asset.
    * @param gasSettings - The gas limits and max fees.
    * @returns The function call to pay the fee.
    */
   getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]>;
+  /**
+   * The expected fee payer for this tx.
+   * @param gasSettings - The gas limits and max fees.
+   */
+  getFeePayer(gasSettings: GasSettings): Promise<AztecAddress>;
 }

package/src/fee/native_fee_payment_method.ts

@@ -1,63 +1,24 @@
 import { type FunctionCall } from '@aztec/circuit-types';
-import { type AztecAddress, FunctionData, type GasSettings } from '@aztec/circuits.js';
-import { FunctionSelector } from '@aztec/foundation/abi';
-import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
+import { type AztecAddress } from '@aztec/circuits.js';
+import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 
-import { type Wallet } from '../account/wallet.js';
 import { type FeePaymentMethod } from './fee_payment_method.js';
 
 /**
  * Pay fee directly in the native gas token.
  */
 export class NativeFeePaymentMethod implements FeePaymentMethod {
-  #gasTokenAddress: AztecAddress;
+  constructor(protected sender: AztecAddress) {}
 
-  private constructor(canonicalGasTokenAddress: AztecAddress) {
-    this.#gasTokenAddress = canonicalGasTokenAddress;
-  }
-
-  static async create(wallet: Wallet): Promise<NativeFeePaymentMethod> {
-    const nodeInfo = await wallet.getNodeInfo();
-    return new NativeFeePaymentMethod(getCanonicalGasTokenAddress(nodeInfo.l1ContractAddresses.gasPortalAddress));
-  }
-
-  /**
-   * Gets the native gas asset used to pay the fee.
-   * @returns The asset used to pay the fee.
-   */
   getAsset() {
-    return this.#gasTokenAddress;
-  }
-
-  /**
-   * The contract responsible for fee payment. This will be the same as the asset.
-   * @returns The contract address responsible for holding the fee payment.
-   */
-  getPaymentContract() {
-    return this.#gasTokenAddress;
+    return GasTokenAddress;
   }
 
-  /**
-   * Fee payments in the native gas token are always public.
-   * @returns false
-   */
-  isPrivateFeePayment(): boolean {
-    return false;
+  getFunctionCalls(): Promise<FunctionCall[]> {
+    return Promise.resolve([]);
   }
 
-  /**
-   * Creates a function call to pay the fee in gas token.
-   * @param gasSettings - The gas settings.
-   * @returns A function call
-   */
-  getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
-    return Promise.resolve([
-      {
-        to: this.#gasTokenAddress,
-        functionData: new FunctionData(FunctionSelector.fromSignature('pay_fee(Field)'), /*isPrivate=*/ false),
-        isStatic: false,
-        args: [gasSettings.getFeeLimit()],
-      },
-    ]);
+  getFeePayer(): Promise<AztecAddress> {
+    return Promise.resolve(this.sender);
   }
 }

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';
@@ -58,21 +59,21 @@ export { AuthWitnessProvider } from './account/index.js';
 export { AccountContract } from './account/index.js';
 export { AccountManager } 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,
+  EncryptedLogIncomingBody,
+  EncryptedLogOutgoingBody,
   ExtendedNote,
-  type FunctionCall,
+  FunctionCall,
   GrumpkinPrivateKey,
-  L1ToL2Message,
   L1Actor,
+  L1ToL2Message,
   L2Actor,
   L2Block,
   L2BlockL2Logs,
-  EncryptedL2BlockL2Logs,
-  UnencryptedL2BlockL2Logs,
+  EncryptedNoteL2BlockL2Logs,
   LogFilter,
   LogId,
   LogType,
@@ -110,41 +115,37 @@ export {
   PackedValues,
   PartialAddress,
   PublicKey,
+  SiblingPath,
   SyncStatus,
   Tx,
   TxExecutionRequest,
   TxHash,
   TxReceipt,
   TxStatus,
+  UnencryptedL2BlockL2Logs,
   UnencryptedL2Log,
   createAztecNodeClient,
-  emptyFunctionCall,
   merkleTreeIds,
   mockTx,
-  Comparator,
-  SiblingPath,
-  EncryptedLogHeader,
-  EncryptedLogIncomingBody,
-  EncryptedLogOutgoingBody,
 } 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 +157,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,7 +54,7 @@ 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,

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));
   }
 
   /**

package/src/wallet/base_wallet.ts

@@ -7,6 +7,7 @@ import {
   type LogFilter,
   type NoteFilter,
   type PXE,
+  type PXEInfo,
   type SimulatedTx,
   type SyncStatus,
   type Tx,
@@ -15,6 +16,7 @@ import {
   type TxHash,
   type TxReceipt,
 } from '@aztec/circuit-types';
+import { type NoteProcessorStats } from '@aztec/circuit-types/stats';
 import { type AztecAddress, type CompleteAddress, type Fq, type Fr, type PartialAddress } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts';
@@ -158,6 +160,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 +175,7 @@ export abstract class BaseWallet implements Wallet {
   isContractPubliclyDeployed(address: AztecAddress): Promise<boolean> {
     return this.pxe.isContractPubliclyDeployed(address);
   }
+  getPXEInfo(): Promise<PXEInfo> {
+    return this.pxe.getPXEInfo();
+  }
 }