@aztec/aztec.js 0.67.1 → 0.68.1

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@aztec/aztec.js",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/aztec.js",
-  "version": "0.67.1",
+  "version": "0.68.1",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
     "./interfaces/pxe": "./dest/api/interfaces/pxe.js",
     "./abi": "./dest/api/abi.js",
     "./account": "./dest/api/account.js",
-    "./aztec_address": "./dest/api/aztec_address.js",
+    "./addresses": "./dest/api/addresses.js",
+    "./contracts": "./dest/contract/index.js",
     "./deployment": "./dest/api/deployment.js",
     "./entrypoint": "./dest/api/entrypoint.js",
     "./eth_address": "./dest/api/eth_address.js",
@@ -17,8 +18,10 @@
     "./fields": "./dest/api/fields.js",
     "./init": "./dest/api/init.js",
     "./log_id": "./dest/api/log_id.js",
+    "./rpc": "./dest/rpc_clients/index.js",
     "./tx_hash": "./dest/api/tx_hash.js",
-    "./wallet": "./dest/api/wallet.js"
+    "./wallet": "./dest/api/wallet.js",
+    "./utils": "./dest/utils/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -35,7 +38,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo ./src/account_contract/artifacts",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests"
+    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
     "../package.common.json",
@@ -68,9 +71,9 @@
     ],
     "reporters": [
       [
-        "default",
+        "jest-silent-reporter",
         {
-          "summaryThreshold": 9999
+          "useDots": true
         }
       ]
     ],
@@ -80,13 +83,13 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.67.1",
-    "@aztec/circuits.js": "0.67.1",
-    "@aztec/ethereum": "0.67.1",
-    "@aztec/foundation": "0.67.1",
-    "@aztec/l1-artifacts": "0.67.1",
-    "@aztec/protocol-contracts": "0.67.1",
-    "@aztec/types": "0.67.1",
+    "@aztec/circuit-types": "0.68.1",
+    "@aztec/circuits.js": "0.68.1",
+    "@aztec/ethereum": "0.68.1",
+    "@aztec/foundation": "0.68.1",
+    "@aztec/l1-artifacts": "0.68.1",
+    "@aztec/protocol-contracts": "0.68.1",
+    "@aztec/types": "0.68.1",
     "axios": "^1.7.2",
     "tslib": "^2.4.0",
     "viem": "^2.7.15"

package/{dest/api/aztec_address.d.ts → src/api/addresses.ts}

@@ -1,2 +1,2 @@
 export { AztecAddress } from '@aztec/foundation/aztec-address';
-//# sourceMappingURL=aztec_address.d.ts.map
+export { CompleteAddress } from '@aztec/circuits.js';

package/src/contract/base_contract_interaction.ts

@@ -91,7 +91,13 @@ export abstract class BaseContractInteraction {
     opts?: Omit<SendMethodOptions, 'estimateGas' | 'skipPublicSimulation'>,
   ): Promise<Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>> {
     const txRequest = await this.create({ ...opts, fee: { ...opts?.fee, estimateGas: false } });
-    const simulationResult = await this.wallet.simulateTx(txRequest, true);
+    const simulationResult = await this.wallet.simulateTx(
+      txRequest,
+      true /*simulatePublic*/,
+      undefined /* msgSender */,
+      undefined /* skipTxValidation */,
+      false /* enforceFeePayment */,
+    );
     const { totalGas: gasLimits, teardownGas: teardownGasLimits } = getGasLimits(
       simulationResult,
       opts?.fee?.estimatedGasPadding,
@@ -122,17 +128,24 @@ export abstract class BaseContractInteraction {
     const defaultFeeOptions = await this.getDefaultFeeOptions(request.fee);
     const paymentMethod = defaultFeeOptions.paymentMethod;
     const maxFeesPerGas = defaultFeeOptions.gasSettings.maxFeesPerGas;
+    const maxPriorityFeesPerGas = defaultFeeOptions.gasSettings.maxPriorityFeesPerGas;
 
     let gasSettings = defaultFeeOptions.gasSettings;
     if (request.fee?.estimateGas) {
       const feeForEstimation: FeeOptions = { paymentMethod, gasSettings };
       const txRequest = await this.wallet.createTxExecutionRequest({ ...request, fee: feeForEstimation });
-      const simulationResult = await this.wallet.simulateTx(txRequest, true);
+      const simulationResult = await this.wallet.simulateTx(
+        txRequest,
+        true /*simulatePublic*/,
+        undefined /* msgSender */,
+        undefined /* skipTxValidation */,
+        false /* enforceFeePayment */,
+      );
       const { totalGas: gasLimits, teardownGas: teardownGasLimits } = getGasLimits(
         simulationResult,
         request.fee?.estimatedGasPadding,
       );
-      gasSettings = GasSettings.from({ maxFeesPerGas, gasLimits, teardownGasLimits });
+      gasSettings = GasSettings.from({ maxFeesPerGas, maxPriorityFeesPerGas, gasLimits, teardownGasLimits });
       this.log.verbose(
         `Estimated gas limits for tx: DA=${gasLimits.daGas} L2=${gasLimits.l2Gas} teardownDA=${teardownGasLimits.daGas} teardownL2=${teardownGasLimits.l2Gas}`,
       );

package/src/contract/contract_function_interaction.ts

@@ -103,13 +103,20 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
     const txRequest = await this.create();
     const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation);
 
-    // As account entrypoints are private, for private functions we retrieve the return values from the first nested call
-    // since we're interested in the first set of values AFTER the account entrypoint
-    // For public functions we retrieve the first values directly from the public output.
-    const rawReturnValues =
-      this.functionDao.functionType == FunctionType.PRIVATE
-        ? simulatedTx.getPrivateReturnValues().nested?.[0].values
-        : simulatedTx.getPublicReturnValues()?.[0].values;
+    let rawReturnValues;
+    if (this.functionDao.functionType == FunctionType.PRIVATE) {
+      if (simulatedTx.getPrivateReturnValues().nested.length > 0) {
+        // The function invoked is private and it was called via an account contract
+        // TODO(#10631): There is a bug here: this branch might be triggered when there is no-account contract as well
+        rawReturnValues = simulatedTx.getPrivateReturnValues().nested[0].values;
+      } else {
+        // The function invoked is private and it was called directly (without account contract)
+        rawReturnValues = simulatedTx.getPrivateReturnValues().values;
+      }
+    } else {
+      // For public functions we retrieve the first values directly from the public output.
+      rawReturnValues = simulatedTx.getPublicReturnValues()?.[0].values;
+    }
 
     return rawReturnValues ? decodeFromAbi(this.functionDao.returnTypes, rawReturnValues) : [];
   }
@@ -126,7 +133,14 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
     }
 
     const txRequest = await this.create();
-    const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation, true);
+    const simulatedTx = await this.wallet.simulateTx(
+      txRequest,
+      true,
+      options?.from,
+      options?.skipTxValidation,
+      undefined,
+      true,
+    );
 
     const rawReturnValues =
       this.functionDao.functionType == FunctionType.PRIVATE

package/src/contract/get_gas_limits.ts

@@ -1,11 +1,24 @@
-import { type GasUsed, type TxSimulationResult } from '@aztec/circuit-types';
+import { type TxSimulationResult } from '@aztec/circuit-types';
+import { type Gas } from '@aztec/circuits.js';
 
 /**
  * Returns suggested total and teardown gas limits for a simulated tx.
  * Note that public gas usage is only accounted for if the publicOutput is present.
  * @param pad - Percentage to pad the suggested gas limits by, (as decimal, e.g., 0.10 for 10%).
  */
-export function getGasLimits(simulationResult: TxSimulationResult, pad = 0.1): GasUsed {
+export function getGasLimits(
+  simulationResult: TxSimulationResult,
+  pad = 0.1,
+): {
+  /**
+   * Total gas used across private and public
+   */
+  totalGas: Gas;
+  /**
+   * Teardown gas used
+   */
+  teardownGas: Gas;
+} {
   return {
     totalGas: simulationResult.gasUsed.totalGas.mul(1 + pad),
     teardownGas: simulationResult.gasUsed.teardownGas.mul(1 + pad),

package/src/contract/index.ts

@@ -35,10 +35,14 @@
  *
  * @packageDocumentation
  */
-export * from './contract.js';
-export * from './contract_function_interaction.js';
-export * from './sent_tx.js';
-export * from './contract_base.js';
-export * from './batch_call.js';
+export { Contract } from './contract.js';
+export {
+  ContractFunctionInteraction,
+  type ProfileResult,
+  type SendMethodOptions,
+} from './contract_function_interaction.js';
+export { DefaultWaitOpts, SentTx, type WaitOpts } from './sent_tx.js';
+export { ContractBase, type ContractMethod, type ContractNotes, type ContractStorageLayout } from './contract_base.js';
+export { BatchCall } from './batch_call.js';
 export { type DeployOptions, DeployMethod } from './deploy_method.js';
-export * from './deploy_sent_tx.js';
+export { DeploySentTx } from './deploy_sent_tx.js';

package/src/fee/fee_juice_payment_method.ts

@@ -11,7 +11,7 @@ export class FeeJuicePaymentMethod implements FeePaymentMethod {
   constructor(protected sender: AztecAddress) {}
 
   getAsset() {
-    return ProtocolContractAddress.FeeJuice;
+    return Promise.resolve(ProtocolContractAddress.FeeJuice);
   }
 
   getFunctionCalls(): Promise<FunctionCall[]> {

package/src/fee/fee_juice_payment_method_with_claim.ts

@@ -1,7 +1,8 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { type AztecAddress, Fr, FunctionSelector } from '@aztec/circuits.js';
 import { FunctionType } from '@aztec/foundation/abi';
-import { ProtocolContractAddress, ProtocolContractArtifact } from '@aztec/protocol-contracts';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 
 import { type L2AmountClaim } from '../utils/portal_manager.js';
 import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
@@ -23,7 +24,7 @@ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
    */
   override getFunctionCalls(): Promise<FunctionCall[]> {
     const selector = FunctionSelector.fromNameAndParameters(
-      ProtocolContractArtifact.FeeJuice.functions.find(f => f.name === 'claim')!,
+      getCanonicalFeeJuice().artifact.functions.find(f => f.name === 'claim')!,
     );
 
     return Promise.resolve([

package/src/fee/fee_payment_method.ts

@@ -7,7 +7,7 @@ import { type AztecAddress } from '@aztec/foundation/aztec-address';
  */
 export interface FeePaymentMethod {
   /** The asset used to pay the fee. */
-  getAsset(): AztecAddress;
+  getAsset(): Promise<AztecAddress>;
   /**
    * Creates a function call to pay the fee in the given asset.
    * @param gasSettings - The gas limits and max fees.

package/src/fee/no_fee_payment_method.ts

@@ -10,7 +10,7 @@ export class NoFeePaymentMethod implements FeePaymentMethod {
   constructor() {}
 
   getAsset() {
-    return AztecAddress.ZERO;
+    return Promise.resolve(AztecAddress.ZERO);
   }
 
   getFunctionCalls(): Promise<FunctionCall[]> {

package/src/fee/private_fee_payment_method.ts

@@ -5,17 +5,17 @@ import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
 import { type Wallet } from '../account/wallet.js';
+import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { SignerlessWallet } from '../wallet/signerless_wallet.js';
 import { type FeePaymentMethod } from './fee_payment_method.js';
 
 /**
  * Holds information about how the fee for a transaction is to be paid.
  */
 export class PrivateFeePaymentMethod implements FeePaymentMethod {
+  private assetPromise: Promise<AztecAddress> | null = null;
+
   constructor(
-    /**
-     * The asset used to pay the fee.
-     */
-    private asset: AztecAddress,
     /**
      * Address which will hold the fee payment.
      */
@@ -26,11 +26,6 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
      */
     private wallet: Wallet,
 
-    /**
-     * Address that the FPC sends notes it receives to.
-     */
-    private feeRecipient: AztecAddress,
-
     /**
      * If true, the max fee will be set to 1.
      * TODO(#7694): Remove this param once the lacking feature in TXE is implemented.
@@ -42,8 +37,43 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
    * The asset used to pay the fee.
    * @returns The asset used to pay the fee.
    */
-  getAsset() {
-    return this.asset;
+  getAsset(): Promise<AztecAddress> {
+    if (!this.assetPromise) {
+      // We use signer-less wallet because this function could be triggered before the associated account is deployed.
+      const signerlessWallet = new SignerlessWallet(this.wallet);
+
+      const interaction = new ContractFunctionInteraction(
+        signerlessWallet,
+        this.paymentContract,
+        {
+          name: 'get_accepted_asset',
+          functionType: FunctionType.PRIVATE,
+          isInternal: false,
+          isStatic: false,
+          parameters: [],
+          returnTypes: [
+            {
+              kind: 'struct',
+              path: 'authwit::aztec::protocol_types::address::aztec_address::AztecAddress',
+              fields: [
+                {
+                  name: 'inner',
+                  type: {
+                    kind: 'field',
+                  },
+                },
+              ],
+            },
+          ],
+          errorTypes: {},
+          isInitializer: false,
+        },
+        [],
+      );
+
+      this.assetPromise = interaction.simulate();
+    }
+    return this.assetPromise!;
   }
 
   getFeePayer(): Promise<AztecAddress> {
@@ -65,11 +95,11 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
       caller: this.paymentContract,
       action: {
         name: 'setup_refund',
-        args: [this.feeRecipient.toField(), this.wallet.getAddress().toField(), maxFee, nonce],
-        selector: FunctionSelector.fromSignature('setup_refund((Field),(Field),Field,Field)'),
+        args: [this.wallet.getAddress().toField(), maxFee, nonce],
+        selector: FunctionSelector.fromSignature('setup_refund((Field),Field,Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        to: this.asset,
+        to: await this.getAsset(),
         returnTypes: [],
       },
     });
@@ -78,10 +108,10 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
       {
         name: 'fee_entrypoint_private',
         to: this.paymentContract,
-        selector: FunctionSelector.fromSignature('fee_entrypoint_private(Field,(Field),Field)'),
+        selector: FunctionSelector.fromSignature('fee_entrypoint_private(Field,Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        args: [maxFee, this.asset.toField(), nonce],
+        args: [maxFee, nonce],
         returnTypes: [],
       },
     ];

package/src/fee/public_fee_payment_method.ts

@@ -4,18 +4,18 @@ import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 
+import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 import { type AccountWallet } from '../wallet/account_wallet.js';
+import { SignerlessWallet } from '../wallet/signerless_wallet.js';
 import { type FeePaymentMethod } from './fee_payment_method.js';
 
 /**
  * Holds information about how the fee for a transaction is to be paid.
  */
 export class PublicFeePaymentMethod implements FeePaymentMethod {
+  private assetPromise: Promise<AztecAddress> | null = null;
+
   constructor(
-    /**
-     * The asset used to pay the fee.
-     */
-    protected asset: AztecAddress,
     /**
      * Address which will hold the fee payment.
      */
@@ -30,8 +30,43 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
    * The asset used to pay the fee.
    * @returns The asset used to pay the fee.
    */
-  getAsset() {
-    return this.asset;
+  getAsset(): Promise<AztecAddress> {
+    if (!this.assetPromise) {
+      // We use signer-less wallet because this function could be triggered before the associated account is deployed.
+      const signerlessWallet = new SignerlessWallet(this.wallet);
+
+      const interaction = new ContractFunctionInteraction(
+        signerlessWallet,
+        this.paymentContract,
+        {
+          name: 'get_accepted_asset',
+          functionType: FunctionType.PRIVATE,
+          isInternal: false,
+          isStatic: false,
+          parameters: [],
+          returnTypes: [
+            {
+              kind: 'struct',
+              path: 'authwit::aztec::protocol_types::address::aztec_address::AztecAddress',
+              fields: [
+                {
+                  name: 'inner',
+                  type: {
+                    kind: 'field',
+                  },
+                },
+              ],
+            },
+          ],
+          errorTypes: {},
+          isInitializer: false,
+        },
+        [],
+      );
+
+      this.assetPromise = interaction.simulate();
+    }
+    return this.assetPromise!;
   }
 
   getFeePayer(): Promise<AztecAddress> {
@@ -43,7 +78,7 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
    * @param gasSettings - The gas settings.
    * @returns The function call to pay the fee.
    */
-  getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
+  async getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     const nonce = Fr.random();
     const maxFee = gasSettings.getFeeLimit();
 
@@ -58,7 +93,7 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
               selector: FunctionSelector.fromSignature('transfer_in_public((Field),(Field),Field,Field)'),
               type: FunctionType.PUBLIC,
               isStatic: false,
-              to: this.asset,
+              to: await this.getAsset(),
               returnTypes: [],
             },
           },
@@ -68,10 +103,10 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
       {
         name: 'fee_entrypoint_public',
         to: this.paymentContract,
-        selector: FunctionSelector.fromSignature('fee_entrypoint_public(Field,(Field),Field)'),
+        selector: FunctionSelector.fromSignature('fee_entrypoint_public(Field,Field)'),
         type: FunctionType.PRIVATE,
         isStatic: false,
-        args: [maxFee, this.asset.toField(), nonce],
+        args: [maxFee, nonce],
         returnTypes: [],
       },
     ]);

package/src/index.ts

@@ -13,29 +13,12 @@
  * ```typescript
  *   import { TxHash } from '@aztec.js/tx_hash'
  *   import { type ContractArtifact, type FunctionArtifact, FunctionSelector } from '@aztec/aztec.js/abi';
- *   import { AztecAddress } from '@aztec/aztec.js/aztec_address';
+ *   import { AztecAddress } from '@aztec/aztec.js/addresses';
  *   import { EthAddress } from '@aztec/aztec.js/eth_address';
  * ```
  *
  * TODO: Ultimately reimplement this mega exporter by mega exporting a granular api (then deprecate it).
  */
-export {
-  BatchCall,
-  Contract,
-  ContractBase,
-  ContractFunctionInteraction,
-  DefaultWaitOpts,
-  DeployMethod,
-  DeploySentTx,
-  SentTx,
-  type ContractMethod,
-  type ContractNotes,
-  type ContractStorageLayout,
-  type DeployOptions,
-  type ProfileResult,
-  type SendMethodOptions,
-  type WaitOpts,
-} from './contract/index.js';
 
 export { ContractDeployer } from './deployment/index.js';
 
@@ -79,7 +62,6 @@ export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet, type Walle
 // // TODO https://github.com/AztecProtocol/aztec-packages/issues/2632 --> FunctionSelector might not need to be exposed
 // // here once the issue is resolved.
 export {
-  AztecAddress,
   ContractClassWithId,
   ContractInstanceWithAddress,
   EthAddress,
@@ -110,7 +92,6 @@ export {
   AuthWitness,
   Body,
   Comparator,
-  CompleteAddress,
   ContractClass2BlockL2Logs,
   EncryptedLogPayload,
   EpochProofQuote,
@@ -174,3 +155,6 @@ export { EthCheatCodes, deployL1Contract, deployL1Contracts, type DeployL1Contra
 export * from './api/abi.js';
 export * from './api/fee.js';
 export * from './api/init.js';
+// Granular export, even if not in the api folder
+export * from './contract/index.js';
+export * from './api/addresses.js';

package/src/rpc_clients/pxe_client.ts

@@ -1,4 +1,4 @@
-import { type PXE, PXESchema } from '@aztec/circuit-types';
+import { type PXE, PXESchema } from '@aztec/circuit-types/interfaces';
 import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
 
 /**

package/src/utils/anvil_test_watcher.ts

@@ -1,6 +1,7 @@
 import { type EthCheatCodes, type Logger, createLogger } from '@aztec/aztec.js';
 import { type EthAddress } from '@aztec/circuits.js';
 import { RunningPromise } from '@aztec/foundation/running-promise';
+import { type TestDateProvider } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts';
 
 import { type GetContractReturnType, type HttpTransport, type PublicClient, getAddress, getContract } from 'viem';
@@ -24,6 +25,7 @@ export class AnvilTestWatcher {
     private cheatcodes: EthCheatCodes,
     rollupAddress: EthAddress,
     publicClient: PublicClient<HttpTransport, chains.Chain>,
+    private dateProvider?: TestDateProvider,
   ) {
     this.rollup = getContract({
       address: getAddress(rollupAddress.toString()),
@@ -46,7 +48,7 @@ export class AnvilTestWatcher {
     const isAutoMining = await this.cheatcodes.isAutoMining();
 
     if (isAutoMining) {
-      this.filledRunningPromise = new RunningPromise(() => this.mineIfSlotFilled(), 1000);
+      this.filledRunningPromise = new RunningPromise(() => this.mineIfSlotFilled(), this.logger, 1000);
       this.filledRunningPromise.start();
       this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
     } else {
@@ -69,6 +71,7 @@ export class AnvilTestWatcher {
         const timestamp = await this.rollup.read.getTimestampForSlot([currentSlot + 1n]);
         try {
           await this.cheatcodes.warp(Number(timestamp));
+          this.dateProvider?.setTime(Number(timestamp) * 1000);
         } catch (e) {
           this.logger.error(`Failed to warp to timestamp ${timestamp}: ${e}`);
         }

package/src/utils/cheat_codes.ts

@@ -108,8 +108,17 @@ export class RollupCheatCodes {
     const slotsUntilNextEpoch = epochDuration - (slot % epochDuration) + 1n;
     const timeToNextEpoch = slotsUntilNextEpoch * slotDuration;
     const l1Timestamp = BigInt((await this.client.getBlock()).timestamp);
-    await this.ethCheatCodes.warp(Number(l1Timestamp + timeToNextEpoch));
-    this.logger.verbose(`Advanced to next epoch`);
+    await this.ethCheatCodes.warp(Number(l1Timestamp + timeToNextEpoch), true);
+    this.logger.warn(`Advanced to next epoch`);
+  }
+
+  /** Warps time in L1 until the beginning of the next slot. */
+  public async advanceToNextSlot() {
+    const currentSlot = await this.getSlot();
+    const timestamp = await this.rollup.read.getTimestampForSlot([currentSlot + 1n]);
+    await this.ethCheatCodes.warp(Number(timestamp));
+    this.logger.warn(`Advanced to slot ${currentSlot + 1n}`);
+    return [timestamp, currentSlot + 1n];
   }
 
   /**
@@ -120,9 +129,9 @@ export class RollupCheatCodes {
     const l1Timestamp = (await this.client.getBlock()).timestamp;
     const slotDuration = await this.rollup.read.SLOT_DURATION();
     const timeToWarp = BigInt(howMany) * slotDuration;
-    await this.ethCheatCodes.warp(l1Timestamp + timeToWarp);
+    await this.ethCheatCodes.warp(l1Timestamp + timeToWarp, true);
     const [slot, epoch] = await Promise.all([this.getSlot(), this.getEpoch()]);
-    this.logger.verbose(`Advanced ${howMany} slots up to slot ${slot} in epoch ${epoch}`);
+    this.logger.warn(`Advanced ${howMany} slots up to slot ${slot} in epoch ${epoch}`);
   }
 
   /** Returns the current proof claim (if any) */
@@ -163,7 +172,7 @@ export class RollupCheatCodes {
 
     await this.asOwner(async account => {
       await this.rollup.write.setAssumeProvenThroughBlockNumber([blockNumber], { account, chain: this.client.chain });
-      this.logger.verbose(`Marked ${blockNumber} as proven`);
+      this.logger.warn(`Marked ${blockNumber} as proven`);
     });
   }
 

package/src/wallet/base_wallet.ts

@@ -83,17 +83,14 @@ export abstract class BaseWallet implements Wallet {
   getRegisteredAccounts(): Promise<CompleteAddress[]> {
     return this.pxe.getRegisteredAccounts();
   }
-  getRegisteredAccount(address: AztecAddress): Promise<CompleteAddress | undefined> {
-    return this.pxe.getRegisteredAccount(address);
+  registerSender(address: AztecAddress): Promise<AztecAddress> {
+    return this.pxe.registerSender(address);
   }
-  registerContact(address: AztecAddress): Promise<AztecAddress> {
-    return this.pxe.registerContact(address);
+  getSenders(): Promise<AztecAddress[]> {
+    return this.pxe.getSenders();
   }
-  getContacts(): Promise<AztecAddress[]> {
-    return this.pxe.getContacts();
-  }
-  async removeContact(address: AztecAddress): Promise<void> {
-    await this.pxe.removeContact(address);
+  async removeSender(address: AztecAddress): Promise<void> {
+    await this.pxe.removeSender(address);
   }
   registerContract(contract: {
     /** Instance */ instance: ContractInstanceWithAddress;
@@ -115,9 +112,18 @@ export abstract class BaseWallet implements Wallet {
     simulatePublic: boolean,
     msgSender?: AztecAddress,
     skipTxValidation?: boolean,
+    enforceFeePayment?: boolean,
     profile?: boolean,
   ): Promise<TxSimulationResult> {
-    return this.pxe.simulateTx(txRequest, simulatePublic, msgSender, skipTxValidation, profile, this.scopes);
+    return this.pxe.simulateTx(
+      txRequest,
+      simulatePublic,
+      msgSender,
+      skipTxValidation,
+      enforceFeePayment,
+      profile,
+      this.scopes,
+    );
   }
   sendTx(tx: Tx): Promise<TxHash> {
     return this.pxe.sendTx(tx);

package/src/wallet/index.ts

@@ -21,7 +21,9 @@ export async function getWallet(
   address: AztecAddress,
   accountContract: AccountContract,
 ): Promise<AccountWallet> {
-  const completeAddress = await pxe.getRegisteredAccount(address);
+  const completeAddress = (await pxe.getRegisteredAccounts()).find(completeAddress =>
+    completeAddress.address.equals(address),
+  );
   if (!completeAddress) {
     throw new Error(`Account ${address} not found`);
   }

package/dest/api/aztec_address.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"aztec_address.d.ts","sourceRoot":"","sources":["../../src/api/aztec_address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC"}