@aztec/aztec.js 0.33.0 → 0.35.0

package/src/fee/fee_payment_method.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
+import { type GasSettings } from '@aztec/circuits.js';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
-import { type Fr } from '@aztec/foundation/fields';
 
 /**
  * Holds information about how the fee for a transaction is to be paid.
@@ -17,9 +17,8 @@ export interface FeePaymentMethod {
 
   /**
    * Creates a function call to pay the fee in the given asset.
-   * TODO(fees) replace maxFee with gas limits
-   * @param maxFee - The maximum fee to be paid in the given asset.
+   * @param gasSettings - The gas limits and max fees.
    * @returns The function call to pay the fee.
    */
-  getFunctionCalls(maxFee: Fr): Promise<FunctionCall[]>;
+  getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]>;
 }

package/src/fee/native_fee_payment_method.ts

@@ -1,7 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
-import { type AztecAddress, FunctionData } from '@aztec/circuits.js';
+import { type AztecAddress, FunctionData, type GasSettings } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
-import { type Fr } from '@aztec/foundation/fields';
 import { getCanonicalGasTokenAddress } from '@aztec/protocol-contracts/gas-token';
 
 import { type Wallet } from '../account/wallet.js';
@@ -47,16 +46,16 @@ export class NativeFeePaymentMethod implements FeePaymentMethod {
   }
 
   /**
-   * Creates a function call to pay the fee in gas token..
-   * @param feeLimit - The maximum fee to be paid in gas token.
+   * Creates a function call to pay the fee in gas token.
+   * @param gasSettings - The gas settings.
    * @returns A function call
    */
-  getFunctionCalls(feeLimit: Fr): Promise<FunctionCall[]> {
+  getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     return Promise.resolve([
       {
         to: this.#gasTokenAddress,
         functionData: new FunctionData(FunctionSelector.fromSignature('pay_fee(Field)'), false),
-        args: [feeLimit],
+        args: [gasSettings.getFeeLimit()],
       },
     ]);
   }

package/src/fee/private_fee_payment_method.ts

@@ -1,5 +1,5 @@
 import { type FunctionCall } from '@aztec/circuit-types';
-import { FunctionData } from '@aztec/circuits.js';
+import { FunctionData, type GasSettings } from '@aztec/circuits.js';
 import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
@@ -53,11 +53,12 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
 
   /**
    * Creates a function call to pay the fee in the given asset.
-   * @param maxFee - The maximum fee to be paid in the given asset.
+   * @param gasSettings - The gas settings.
    * @returns The function call to pay the fee.
    */
-  async getFunctionCalls(maxFee: Fr): Promise<FunctionCall[]> {
+  async getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     const nonce = Fr.random();
+    const maxFee = gasSettings.getFeeLimit();
     const messageHash = computeAuthWitMessageHash(
       this.paymentContract,
       this.wallet.getChainId(),

package/src/fee/public_fee_payment_method.ts

@@ -1,5 +1,5 @@
 import { type FunctionCall } from '@aztec/circuit-types';
-import { FunctionData } from '@aztec/circuits.js';
+import { FunctionData, type GasSettings } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -46,12 +46,12 @@ export class PublicFeePaymentMethod implements FeePaymentMethod {
 
   /**
    * Creates a function call to pay the fee in the given asset.
-   * @param maxFee - The maximum fee to be paid in the given asset.
+   * @param gasSettings - The gas settings.
    * @returns The function call to pay the fee.
    */
-  getFunctionCalls(maxFee: Fr): Promise<FunctionCall[]> {
+  getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]> {
     const nonce = Fr.random();
-
+    const maxFee = gasSettings.getFeeLimit();
     const messageHash = computeAuthWitMessageHash(
       this.paymentContract,
       this.wallet.getChainId(),

package/src/index.ts

@@ -85,7 +85,7 @@ export {
   Body,
   CompleteAddress,
   ExtendedNote,
-  FunctionCall,
+  type FunctionCall,
   GrumpkinPrivateKey,
   L1ToL2Message,
   L1Actor,
@@ -100,7 +100,7 @@ export {
   MerkleTreeId,
   Note,
   PXE,
-  PackedArguments,
+  PackedValues,
   PartialAddress,
   PublicKey,
   SyncStatus,

package/src/utils/authwit.ts

@@ -1,4 +1,4 @@
-import { type FunctionCall, PackedArguments } from '@aztec/circuit-types';
+import { type FunctionCall, PackedValues } from '@aztec/circuit-types';
 import { type AztecAddress, type Fr, GeneratorIndex } from '@aztec/circuits.js';
 import { pedersenHash } from '@aztec/foundation/crypto';
 
@@ -25,7 +25,7 @@ export const computeAuthWitMessageHash = (caller: AztecAddress, chainId: Fr, ver
     computeInnerAuthWitHash([
       caller.toField(),
       action.functionData.selector.toField(),
-      PackedArguments.fromArgs(action.args).hash,
+      PackedValues.fromValues(action.args).hash,
     ]),
   );
 };

package/src/utils/cheat_codes.ts

@@ -1,7 +1,7 @@
 import { type Note, type PXE } from '@aztec/circuit-types';
 import { type AztecAddress, type EthAddress, Fr } from '@aztec/circuits.js';
 import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
-import { keccak, pedersenHash } from '@aztec/foundation/crypto';
+import { keccak256, pedersenHash } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import fs from 'fs';
@@ -90,7 +90,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error mining: ${res.error.message}`);
     }
-    this.logger(`Mined ${numberOfBlocks} blocks`);
+    this.logger.info(`Mined ${numberOfBlocks} blocks`);
   }
 
   /**
@@ -102,7 +102,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error setting next block timestamp: ${res.error.message}`);
     }
-    this.logger(`Set next block timestamp to ${timestamp}`);
+    this.logger.info(`Set next block timestamp to ${timestamp}`);
   }
 
   /**
@@ -116,7 +116,7 @@ export class EthCheatCodes {
     }
     const jsonContent = JSON.stringify(res.result);
     fs.writeFileSync(`${fileName}.json`, jsonContent, 'utf8');
-    this.logger(`Dumped state to ${fileName}`);
+    this.logger.info(`Dumped state to ${fileName}`);
   }
 
   /**
@@ -129,7 +129,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error loading state: ${res.error.message}`);
     }
-    this.logger(`Loaded state from ${fileName}`);
+    this.logger.info(`Loaded state from ${fileName}`);
   }
 
   /**
@@ -155,7 +155,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error setting storage for contract ${contract} at ${slot}: ${res.error.message}`);
     }
-    this.logger(`Set storage for contract ${contract} at ${slot} to ${value}`);
+    this.logger.info(`Set storage for contract ${contract} at ${slot} to ${value}`);
   }
 
   /**
@@ -167,7 +167,7 @@ export class EthCheatCodes {
   public keccak256(baseSlot: bigint, key: bigint): bigint {
     // abi encode (removing the 0x) - concat key and baseSlot (both padded to 32 bytes)
     const abiEncoded = toHex(key, true).substring(2) + toHex(baseSlot, true).substring(2);
-    return toBigIntBE(keccak(Buffer.from(abiEncoded, 'hex')));
+    return toBigIntBE(keccak256(Buffer.from(abiEncoded, 'hex')));
   }
 
   /**
@@ -179,7 +179,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error impersonating ${who}: ${res.error.message}`);
     }
-    this.logger(`Impersonating ${who}`);
+    this.logger.info(`Impersonating ${who}`);
   }
 
   /**
@@ -191,7 +191,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error when stopping the impersonation of ${who}: ${res.error.message}`);
     }
-    this.logger(`Stopped impersonating ${who}`);
+    this.logger.info(`Stopped impersonating ${who}`);
   }
 
   /**
@@ -204,7 +204,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error setting bytecode for ${contract}: ${res.error.message}`);
     }
-    this.logger(`Set bytecode for ${contract} to ${bytecode}`);
+    this.logger.info(`Set bytecode for ${contract} to ${bytecode}`);
   }
 
   /**

package/src/utils/pxe.ts

@@ -5,11 +5,11 @@ import { retryUntil } from '@aztec/foundation/retry';
 export const waitForPXE = async (pxe: PXE, logger?: DebugLogger) => {
   await retryUntil(async () => {
     try {
-      logger?.('Attempting to contact PXE...');
+      logger?.debug('Attempting to contact PXE...');
       await pxe.getNodeInfo();
       return true;
     } catch (error) {
-      logger?.('Failed to contact PXE!');
+      logger?.verbose('Failed to contact PXE');
     }
     return undefined;
   }, 'RPC Get Node Info');

package/src/wallet/account_wallet.ts

@@ -4,7 +4,7 @@ import { type ABIParameterVisibility, type FunctionAbi, FunctionType } from '@az
 
 import { type AccountInterface } from '../account/interface.js';
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { type FeeOptions } from '../entrypoint/entrypoint.js';
+import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
 import { computeAuthWitMessageHash } from '../utils/authwit.js';
 import { BaseWallet } from './base_wallet.js';
 
@@ -16,8 +16,8 @@ export class AccountWallet extends BaseWallet {
     super(pxe);
   }
 
-  createTxExecutionRequest(execs: FunctionCall[], fee?: FeeOptions): Promise<TxExecutionRequest> {
-    return this.account.createTxExecutionRequest(execs, fee);
+  createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
+    return this.account.createTxExecutionRequest(exec);
   }
 
   getChainId(): Fr {

package/src/wallet/base_wallet.ts

@@ -28,7 +28,7 @@ import { type NodeInfo } from '@aztec/types/interfaces';
 
 import { type Wallet } from '../account/wallet.js';
 import { type ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { type FeeOptions } from '../entrypoint/entrypoint.js';
+import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
 
 /**
  * A base class for Wallet implementations
@@ -42,7 +42,7 @@ export abstract class BaseWallet implements Wallet {
 
   abstract getVersion(): Fr;
 
-  abstract createTxExecutionRequest(execs: FunctionCall[], fee?: FeeOptions): Promise<TxExecutionRequest>;
+  abstract createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest>;
 
   abstract createAuthWit(
     messageHashOrIntent:

package/src/wallet/signerless_wallet.ts

@@ -1,8 +1,8 @@
-import { type AuthWitness, type FunctionCall, type PXE, type TxExecutionRequest } from '@aztec/circuit-types';
+import { type AuthWitness, type PXE, type TxExecutionRequest } from '@aztec/circuit-types';
 import { type CompleteAddress, type Fr } from '@aztec/circuits.js';
 
 import { DefaultEntrypoint } from '../entrypoint/default_entrypoint.js';
-import { type EntrypointInterface } from '../entrypoint/entrypoint.js';
+import { type EntrypointInterface, type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
 import { BaseWallet } from './base_wallet.js';
 
 /**
@@ -13,14 +13,14 @@ export class SignerlessWallet extends BaseWallet {
     super(pxe);
   }
 
-  async createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
+  async createTxExecutionRequest(execution: ExecutionRequestInit): Promise<TxExecutionRequest> {
     let entrypoint = this.entrypoint;
     if (!entrypoint) {
       const { chainId, protocolVersion } = await this.pxe.getNodeInfo();
       entrypoint = new DefaultEntrypoint(chainId, protocolVersion);
     }
 
-    return entrypoint.createTxExecutionRequest(executions);
+    return entrypoint.createTxExecutionRequest(execution);
   }
 
   getChainId(): Fr {