@aztec/aztec.js 0.67.1 → 0.68.0

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

@@ -46,7 +46,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 {

package/src/wallet/base_wallet.ts

@@ -86,14 +86,14 @@ export abstract class BaseWallet implements Wallet {
   getRegisteredAccount(address: AztecAddress): Promise<CompleteAddress | undefined> {
     return this.pxe.getRegisteredAccount(address);
   }
-  registerContact(address: AztecAddress): Promise<AztecAddress> {
-    return this.pxe.registerContact(address);
+  registerSender(address: AztecAddress): Promise<AztecAddress> {
+    return this.pxe.registerSender(address);
   }
-  getContacts(): Promise<AztecAddress[]> {
-    return this.pxe.getContacts();
+  getSenders(): Promise<AztecAddress[]> {
+    return this.pxe.getSenders();
   }
-  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 +115,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/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"}

package/dest/api/aztec_address.js

@@ -1,2 +0,0 @@
-export { AztecAddress } from '@aztec/foundation/aztec-address';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfYWRkcmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvYXp0ZWNfYWRkcmVzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUNBQWlDLENBQUMifQ==