@aztec/aztec.js 0.81.0 → 0.82.0

package/dest/ethereum/portal_manager.js

@@ -2,6 +2,7 @@ import { extractEvent } from '@aztec/ethereum/utils';
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
+import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts/FeeAssetHandlerAbi';
 import { FeeJuicePortalAbi } from '@aztec/l1-artifacts/FeeJuicePortalAbi';
 import { OutboxAbi } from '@aztec/l1-artifacts/OutboxAbi';
 import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
@@ -21,21 +22,39 @@ import { getContract, toFunctionSelector } from 'viem';
     ];
 }
 /** Helper for managing an ERC20 on L1. */ export class L1TokenManager {
-    address;
+    tokenAddress;
+    handlerAddress;
     publicClient;
     walletClient;
     logger;
     contract;
-    constructor(/** Address of the ERC20 contract. */ address, publicClient, walletClient, logger){
-        this.address = address;
+    handler;
+    constructor(/** Address of the ERC20 contract. */ tokenAddress, /** Address of the handler/faucet contract. */ handlerAddress, publicClient, walletClient, logger){
+        this.tokenAddress = tokenAddress;
+        this.handlerAddress = handlerAddress;
         this.publicClient = publicClient;
         this.walletClient = walletClient;
         this.logger = logger;
         this.contract = getContract({
-            address: this.address.toString(),
+            address: this.tokenAddress.toString(),
             abi: TestERC20Abi,
             client: this.walletClient
         });
+        if (this.handlerAddress) {
+            this.handler = getContract({
+                address: this.handlerAddress.toString(),
+                abi: FeeAssetHandlerAbi,
+                client: this.walletClient
+            });
+        }
+    }
+    /** Returns the amount of tokens available to mint via the handler.
+   * @throws if the handler is not provided.
+   */ async getMintAmount() {
+        if (!this.handler) {
+            throw new Error('Minting handler was not provided');
+        }
+        return await this.handler.read.mintAmount();
     }
     /**
    * Returns the balance of the given address.
@@ -46,18 +65,19 @@ import { getContract, toFunctionSelector } from 'viem';
         ]);
     }
     /**
-   * Mints tokens for the given address. Returns once the tx has been mined.
-   * @param amount - Amount to mint.
+   * Mints a fixed amount of tokens for the given address. Returns once the tx has been mined.
    * @param address - Address to mint the tokens for.
    * @param addressName - Optional name of the address for logging.
-   */ async mint(amount, address, addressName) {
-        this.logger.info(`Minting ${amount} tokens for ${stringifyEthAddress(address, addressName)}`);
-        await this.publicClient.waitForTransactionReceipt({
-            hash: await this.contract.write.mint([
-                address,
-                amount
-            ])
-        });
+   */ async mint(address, addressName) {
+        if (!this.handler) {
+            throw new Error('Minting handler was not provided');
+        }
+        const mintAmount = await this.getMintAmount();
+        this.logger.info(`Minting ${mintAmount} tokens for ${stringifyEthAddress(address, addressName)}`);
+        // NOTE: the handler mints a fixed amount.
+        await this.handler.write.mint([
+            address
+        ]);
     }
     /**
    * Approves tokens for the given address. Returns once the tx has been mined.
@@ -80,11 +100,11 @@ import { getContract, toFunctionSelector } from 'viem';
     logger;
     tokenManager;
     contract;
-    constructor(portalAddress, tokenAddress, publicClient, walletClient, logger){
+    constructor(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, logger){
         this.publicClient = publicClient;
         this.walletClient = walletClient;
         this.logger = logger;
-        this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, publicClient, walletClient, logger);
         this.contract = getContract({
             address: portalAddress.toString(),
             abi: FeeJuicePortalAbi,
@@ -101,14 +121,19 @@ import { getContract, toFunctionSelector } from 'viem';
    * @param mint - Whether to mint the tokens before sending (only during testing).
    */ async bridgeTokensPublic(to, amount, mint = false) {
         const [claimSecret, claimSecretHash] = await generateClaimSecret();
+        const mintableAmount = await this.tokenManager.getMintAmount();
+        const amountToBridge = amount ?? mintableAmount;
         if (mint) {
-            await this.tokenManager.mint(amount, this.walletClient.account.address);
+            if (amountToBridge !== mintableAmount) {
+                throw new Error(`Minting amount must be ${mintableAmount}`);
+            }
+            await this.tokenManager.mint(this.walletClient.account.address);
         }
-        await this.tokenManager.approve(amount, this.contract.address, 'FeeJuice Portal');
+        await this.tokenManager.approve(amountToBridge, this.contract.address, 'FeeJuice Portal');
         this.logger.info('Sending L1 Fee Juice to L2 to be claimed publicly');
         const args = [
             to.toString(),
-            amount,
+            amountToBridge,
             claimSecretHash.toString()
         ];
         await this.contract.simulate.depositToAztecPublic(args);
@@ -116,9 +141,9 @@ import { getContract, toFunctionSelector } from 'viem';
             hash: await this.contract.write.depositToAztecPublic(args)
         });
         this.logger.info('Deposited to Aztec public successfully');
-        const log = extractEvent(txReceipt.logs, this.contract.address, this.contract.abi, 'DepositToAztecPublic', (log)=>log.args.secretHash === claimSecretHash.toString() && log.args.amount === amount && log.args.to === to.toString(), this.logger);
+        const log = extractEvent(txReceipt.logs, this.contract.address, this.contract.abi, 'DepositToAztecPublic', (log)=>log.args.secretHash === claimSecretHash.toString() && log.args.amount === amountToBridge && log.args.to === to.toString(), this.logger);
         return {
-            claimAmount: amount,
+            claimAmount: amountToBridge,
             claimSecret,
             claimSecretHash,
             messageHash: log.args.key,
@@ -127,16 +152,19 @@ import { getContract, toFunctionSelector } from 'viem';
     }
     /**
    * Creates a new instance
-   * @param pxe - PXE client used for retrieving the L1 contract addresses.
+   * @param walletOrPxe - Wallet or PXE client used for retrieving the L1 contract addresses.
    * @param publicClient - L1 public client.
    * @param walletClient - L1 wallet client.
    * @param logger - Logger.
-   */ static async new(pxe, publicClient, walletClient, logger) {
-        const { l1ContractAddresses: { feeJuiceAddress, feeJuicePortalAddress } } = await pxe.getNodeInfo();
+   */ static async new(walletOrPxe, publicClient, walletClient, logger) {
+        const { l1ContractAddresses: { feeJuiceAddress, feeJuicePortalAddress, feeAssetHandlerAddress } } = await walletOrPxe.getNodeInfo();
         if (feeJuiceAddress.isZero() || feeJuicePortalAddress.isZero()) {
             throw new Error('Portal or token not deployed on L1');
         }
-        return new L1FeeJuicePortalManager(feeJuicePortalAddress, feeJuiceAddress, publicClient, walletClient, logger);
+        if (!feeAssetHandlerAddress || feeAssetHandlerAddress.isZero()) {
+            throw new Error('Handler not deployed on L1, or handler address is zero');
+        }
+        return new L1FeeJuicePortalManager(feeJuicePortalAddress, feeJuiceAddress, feeAssetHandlerAddress, publicClient, walletClient, logger);
     }
 }
 /** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */ export class L1ToL2TokenPortalManager {
@@ -145,11 +173,11 @@ import { getContract, toFunctionSelector } from 'viem';
     logger;
     portal;
     tokenManager;
-    constructor(portalAddress, tokenAddress, publicClient, walletClient, logger){
+    constructor(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, logger){
         this.publicClient = publicClient;
         this.walletClient = walletClient;
         this.logger = logger;
-        this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, publicClient, walletClient, logger);
         this.portal = getContract({
             address: portalAddress.toString(),
             abi: TokenPortalAbi,
@@ -184,12 +212,14 @@ import { getContract, toFunctionSelector } from 'viem';
             messageLeafIndex: log.args.index
         };
     }
+    // docs:start:bridge_tokens_private
     /**
    * Bridges tokens from L1 to L2 privately. Handles token approvals. Returns once the tx has been mined.
    * @param to - Address to send the tokens to on L2.
    * @param amount - Amount of tokens to send.
    * @param mint - Whether to mint the tokens before sending (only during testing).
    */ async bridgeTokensPrivate(to, amount, mint = false) {
+        // docs:end:bridge_tokens_private
         const [claimSecret, claimSecretHash] = await this.bridgeSetup(amount, mint);
         this.logger.info('Sending L1 tokens to L2 to be claimed privately');
         const { request } = await this.portal.simulate.depositToAztecPrivate([
@@ -212,7 +242,11 @@ import { getContract, toFunctionSelector } from 'viem';
     }
     async bridgeSetup(amount, mint) {
         if (mint) {
-            await this.tokenManager.mint(amount, this.walletClient.account.address);
+            const mintableAmount = await this.tokenManager.getMintAmount();
+            if (amount !== mintableAmount) {
+                throw new Error(`Minting amount must be ${mintableAmount} for testing`);
+            }
+            await this.tokenManager.mint(this.walletClient.account.address);
         }
         await this.tokenManager.approve(amount, this.portal.address, 'TokenPortal');
         return generateClaimSecret();
@@ -220,8 +254,8 @@ import { getContract, toFunctionSelector } from 'viem';
 }
 /** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
     outbox;
-    constructor(portalAddress, tokenAddress, outboxAddress, publicClient, walletClient, logger){
-        super(portalAddress, tokenAddress, publicClient, walletClient, logger);
+    constructor(portalAddress, tokenAddress, handlerAddress, outboxAddress, publicClient, walletClient, logger){
+        super(portalAddress, tokenAddress, handlerAddress, publicClient, walletClient, logger);
         this.outbox = getContract({
             address: outboxAddress.toString(),
             abi: OutboxAbi,

package/dest/fee/fee_juice_payment_method.d.ts

@@ -1,6 +1,6 @@
-import type { FunctionCall } from '@aztec/stdlib/abi';
+import type { FeePaymentMethod } from '@aztec/entrypoints/interfaces';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { FeePaymentMethod } from './fee_payment_method.js';
 /**
  * Pay fee directly in the Fee Juice.
  */
@@ -8,7 +8,7 @@ export declare class FeeJuicePaymentMethod implements FeePaymentMethod {
     protected sender: AztecAddress;
     constructor(sender: AztecAddress);
     getAsset(): Promise<AztecAddress>;
-    getFunctionCalls(): Promise<FunctionCall[]>;
+    getExecutionPayload(): Promise<ExecutionPayload>;
     getFeePayer(): Promise<AztecAddress>;
 }
 //# sourceMappingURL=fee_juice_payment_method.d.ts.map

package/dest/fee/fee_juice_payment_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee_juice_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/fee_juice_payment_method.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE;;GAEG;AACH,qBAAa,qBAAsB,YAAW,gBAAgB;IAEhD,SAAS,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAE1C,QAAQ;IAIR,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI3C,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;CAGrC"}
+{"version":3,"file":"fee_juice_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/fee_juice_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE;;GAEG;AACH,qBAAa,qBAAsB,YAAW,gBAAgB;IAEhD,SAAS,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAE1C,QAAQ;IAIR,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAIhD,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;CAGrC"}

package/dest/fee/fee_juice_payment_method.js

@@ -1,3 +1,4 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 // docs:start:fee_juice_method
 /**
@@ -11,8 +12,8 @@ import { ProtocolContractAddress } from '@aztec/protocol-contracts';
     getAsset() {
         return Promise.resolve(ProtocolContractAddress.FeeJuice);
     }
-    getFunctionCalls() {
-        return Promise.resolve([]);
+    getExecutionPayload() {
+        return Promise.resolve(ExecutionPayload.empty());
     }
     getFeePayer() {
         return Promise.resolve(this.sender);

package/dest/fee/fee_juice_payment_method_with_claim.d.ts

@@ -1,4 +1,4 @@
-import type { FunctionCall } from '@aztec/stdlib/abi';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { L2AmountClaim } from '../ethereum/portal_manager.js';
 import type { Wallet } from '../wallet/index.js';
 import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
@@ -10,9 +10,9 @@ export declare class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMetho
     private claim;
     constructor(senderWallet: Wallet, claim: Pick<L2AmountClaim, 'claimAmount' | 'claimSecret' | 'messageLeafIndex'>);
     /**
-     * Creates a function call to pay the fee in Fee Juice.
-     * @returns A function call
+     * Creates an execution payload to pay the fee in Fee Juice.
+     * @returns An execution payload that just contains the claim function call.
      */
-    getFunctionCalls(): Promise<FunctionCall[]>;
+    getExecutionPayload(): Promise<ExecutionPayload>;
 }
 //# sourceMappingURL=fee_juice_payment_method_with_claim.d.ts.map

package/dest/fee/fee_juice_payment_method_with_claim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fee_juice_payment_method_with_claim.d.ts","sourceRoot":"","sources":["../../src/fee/fee_juice_payment_method_with_claim.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,qBAAqB;IAErE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,KAAK;gBADL,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAKxF;;;OAGG;IACY,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAuB3D"}
+{"version":3,"file":"fee_juice_payment_method_with_claim.d.ts","sourceRoot":"","sources":["../../src/fee/fee_juice_payment_method_with_claim.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAM9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE;;GAEG;AACH,qBAAa,8BAA+B,SAAQ,qBAAqB;IAErE,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,KAAK;gBADL,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAKxF;;;OAGG;IACY,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;CA2BhE"}

package/dest/fee/fee_juice_payment_method_with_claim.js

@@ -1,3 +1,4 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
@@ -12,12 +13,12 @@ import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
         super(senderWallet.getAddress()), this.senderWallet = senderWallet, this.claim = claim;
     }
     /**
-   * Creates a function call to pay the fee in Fee Juice.
-   * @returns A function call
-   */ async getFunctionCalls() {
+   * Creates an execution payload to pay the fee in Fee Juice.
+   * @returns An execution payload that just contains the claim function call.
+   */ async getExecutionPayload() {
         const canonicalFeeJuice = await getFeeJuice(this.senderWallet);
         const selector = await FunctionSelector.fromNameAndParameters(canonicalFeeJuice.artifact.functions.find((f)=>f.name === 'claim'));
-        return Promise.resolve([
+        return new ExecutionPayload([
             {
                 to: ProtocolContractAddress.FeeJuice,
                 name: 'claim',
@@ -32,6 +33,6 @@ import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
                 returnTypes: [],
                 type: FunctionType.PRIVATE
             }
-        ]);
+        ], [], []);
     }
 }

package/dest/fee/private_fee_payment_method.d.ts

@@ -1,8 +1,8 @@
-import { type FunctionCall } from '@aztec/stdlib/abi';
+import type { FeePaymentMethod } from '@aztec/entrypoints/interfaces';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
-import type { Wallet } from '../account/wallet.js';
-import type { FeePaymentMethod } from './fee_payment_method.js';
+import type { Wallet } from '../wallet/wallet.js';
 /**
  * Holds information about how the fee for a transaction is to be paid.
  */
@@ -42,10 +42,10 @@ export declare class PrivateFeePaymentMethod implements FeePaymentMethod {
     getAsset(): Promise<AztecAddress>;
     getFeePayer(): Promise<AztecAddress>;
     /**
-     * Creates a function call to pay the fee in the given asset.
+     * Creates an execution payload to pay the fee using a private function through an FPC in the desired asset
      * @param gasSettings - The gas settings.
-     * @returns The function call to pay the fee.
+     * @returns An execution payload that contains the required function calls and auth witnesses.
      */
-    getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]>;
+    getExecutionPayload(gasSettings: GasSettings): Promise<ExecutionPayload>;
 }
 //# sourceMappingURL=private_fee_payment_method.d.ts.map

package/dest/fee/private_fee_payment_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"private_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/private_fee_payment_method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,YAAY,EAAkC,MAAM,mBAAmB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,qBAAa,uBAAwB,YAAW,gBAAgB;IAI5D;;OAEG;IACH,OAAO,CAAC,eAAe;IAEvB;;OAEG;IACH,OAAO,CAAC,MAAM;IAEd;;;OAGG;IACH,OAAO,CAAC,cAAc;IAjBxB,OAAO,CAAC,YAAY,CAAsC;;IAGxD;;OAEG;IACK,eAAe,EAAE,YAAY;IAErC;;OAEG;IACK,MAAM,EAAE,MAAM;IAEtB;;;OAGG;IACK,cAAc,UAAQ;IAGhC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAuCjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC;;;;OAIG;IACG,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CA+B1E"}
+{"version":3,"file":"private_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/private_fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD;;GAEG;AACH,qBAAa,uBAAwB,YAAW,gBAAgB;IAI5D;;OAEG;IACH,OAAO,CAAC,eAAe;IAEvB;;OAEG;IACH,OAAO,CAAC,MAAM;IAEd;;;OAGG;IACH,OAAO,CAAC,cAAc;IAjBxB,OAAO,CAAC,YAAY,CAAsC;;IAGxD;;OAEG;IACK,eAAe,EAAE,YAAY;IAErC;;OAEG;IACK,MAAM,EAAE,MAAM;IAEtB;;;OAGG;IACK,cAAc,UAAQ;IAGhC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAoCjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC;;;;OAIG;IACG,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAmC/E"}

package/dest/fee/private_fee_payment_method.js

@@ -1,7 +1,7 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
-import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { SignerlessWallet } from '../wallet/signerless_wallet.js';
+import { simulateWithoutSignature } from './utils.js';
 /**
  * Holds information about how the fee for a transaction is to be paid.
  */ export class PrivateFeePaymentMethod {
@@ -27,9 +27,9 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
    * @returns The asset used to pay the fee.
    */ getAsset() {
         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, {
+            // We use the utility method to avoid a signature because this function could be triggered
+            // before the associated account is deployed.
+            this.assetPromise = simulateWithoutSignature(this.wallet, this.paymentContract, {
                 name: 'get_accepted_asset',
                 functionType: FunctionType.PRIVATE,
                 isInternal: false,
@@ -52,7 +52,6 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
                 errorTypes: {},
                 isInitializer: false
             }, []);
-            this.assetPromise = interaction.simulate();
         }
         return this.assetPromise;
     }
@@ -60,15 +59,15 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
         return Promise.resolve(this.paymentContract);
     }
     /**
-   * Creates a function call to pay the fee in the given asset.
+   * Creates an execution payload to pay the fee using a private function through an FPC in the desired asset
    * @param gasSettings - The gas settings.
-   * @returns The function call to pay the fee.
-   */ async getFunctionCalls(gasSettings) {
+   * @returns An execution payload that contains the required function calls and auth witnesses.
+   */ async getExecutionPayload(gasSettings) {
         // We assume 1:1 exchange rate between fee juice and token. But in reality you would need to convert feeLimit
         // (maxFee) to be in token denomination.
         const maxFee = this.setMaxFeeToOne ? Fr.ONE : gasSettings.getFeeLimit();
         const nonce = Fr.random();
-        await this.wallet.createAuthWit({
+        const witness = await this.wallet.createAuthWit({
             caller: this.paymentContract,
             action: {
                 name: 'transfer_to_public',
@@ -85,7 +84,7 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
                 returnTypes: []
             }
         });
-        return [
+        return new ExecutionPayload([
             {
                 name: 'fee_entrypoint_private',
                 to: this.paymentContract,
@@ -98,6 +97,8 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
                 ],
                 returnTypes: []
             }
-        ];
+        ], [
+            witness
+        ], []);
     }
 }

package/dest/fee/public_fee_payment_method.d.ts

@@ -1,8 +1,8 @@
-import type { FunctionCall } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { GasSettings } from '@aztec/stdlib/gas';
+import type { FeePaymentMethod } from '@aztec/entrypoints/interfaces';
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { GasSettings } from '@aztec/stdlib/gas';
 import type { AccountWallet } from '../wallet/account_wallet.js';
-import type { FeePaymentMethod } from './fee_payment_method.js';
 /**
  * Holds information about how the fee for a transaction is to be paid.
  */
@@ -32,10 +32,10 @@ export declare class PublicFeePaymentMethod implements FeePaymentMethod {
     getAsset(): Promise<AztecAddress>;
     getFeePayer(): Promise<AztecAddress>;
     /**
-     * Creates a function call to pay the fee in the given asset.
+     * Creates an execution payload to pay the fee using a public function through an FPC in the desired asset
      * @param gasSettings - The gas settings.
-     * @returns The function call to pay the fee.
+     * @returns An execution payload that contains the required function calls.
      */
-    getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]>;
+    getExecutionPayload(gasSettings: GasSettings): Promise<ExecutionPayload>;
 }
 //# sourceMappingURL=public_fee_payment_method.d.ts.map

package/dest/fee/public_fee_payment_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/public_fee_payment_method.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,qBAAa,sBAAuB,YAAW,gBAAgB;IAI3D;;OAEG;IACH,SAAS,CAAC,eAAe,EAAE,YAAY;IACvC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa;IAVjC,OAAO,CAAC,YAAY,CAAsC;;IAGxD;;OAEG;IACO,eAAe,EAAE,YAAY;IACvC;;OAEG;IACO,MAAM,EAAE,aAAa;IAGjC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAuCjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC;;;;OAIG;IACG,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAiC1E"}
+{"version":3,"file":"public_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/public_fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGjE;;GAEG;AACH,qBAAa,sBAAuB,YAAW,gBAAgB;IAI3D;;OAEG;IACH,SAAS,CAAC,eAAe,EAAE,YAAY;IACvC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa;IAVjC,OAAO,CAAC,YAAY,CAAsC;;IAGxD;;OAEG;IACO,eAAe,EAAE,YAAY;IACvC;;OAEG;IACO,MAAM,EAAE,aAAa;IAGjC;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC;IAoCjC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC;;;;OAIG;IACG,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAqC/E"}

package/dest/fee/public_fee_payment_method.js

@@ -1,7 +1,7 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
-import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
-import { SignerlessWallet } from '../wallet/signerless_wallet.js';
+import { simulateWithoutSignature } from './utils.js';
 /**
  * Holds information about how the fee for a transaction is to be paid.
  */ export class PublicFeePaymentMethod {
@@ -22,9 +22,9 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
    * @returns The asset used to pay the fee.
    */ getAsset() {
         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, {
+            // We use the utility method to avoid a signature because this function could be triggered
+            // before the associated account is deployed.
+            this.assetPromise = simulateWithoutSignature(this.wallet, this.paymentContract, {
                 name: 'get_accepted_asset',
                 functionType: FunctionType.PRIVATE,
                 isInternal: false,
@@ -47,7 +47,6 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
                 errorTypes: {},
                 isInitializer: false
             }, []);
-            this.assetPromise = interaction.simulate();
         }
         return this.assetPromise;
     }
@@ -55,10 +54,10 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
         return Promise.resolve(this.paymentContract);
     }
     /**
-   * Creates a function call to pay the fee in the given asset.
+   * Creates an execution payload to pay the fee using a public function through an FPC in the desired asset
    * @param gasSettings - The gas settings.
-   * @returns The function call to pay the fee.
-   */ async getFunctionCalls(gasSettings) {
+   * @returns An execution payload that contains the required function calls.
+   */ async getExecutionPayload(gasSettings) {
         const nonce = Fr.random();
         const maxFee = gasSettings.getFeeLimit();
         const setPublicAuthWitInteraction = await this.wallet.setPublicAuthWit({
@@ -78,7 +77,7 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
                 returnTypes: []
             }
         }, true);
-        return [
+        return new ExecutionPayload([
             ...(await setPublicAuthWitInteraction.request()).calls,
             {
                 name: 'fee_entrypoint_public',
@@ -92,6 +91,6 @@ import { SignerlessWallet } from '../wallet/signerless_wallet.js';
                 ],
                 returnTypes: []
             }
-        ];
+        ], [], []);
     }
 }

package/dest/fee/utils.d.ts

@@ -0,0 +1,13 @@
+import { type FunctionAbi } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { Wallet } from '../wallet/wallet.js';
+/**
+ * Use a wallet to simulate a function avoiding the wallet's entrypoint, as a SignerlessWallet would do
+ * @param wallet - The wallet to use for the simulation.
+ * @param contractAddress - The address of the contract to call.
+ * @param abi - The ABI of the function to simulate.
+ * @param args - The arguments to pass to the function.
+ * @returns The return values of the function call.
+ */
+export declare function simulateWithoutSignature(wallet: Wallet, contractAddress: AztecAddress, abi: FunctionAbi, args: any[]): Promise<import("@aztec/stdlib/abi").AbiDecoded>;
+//# sourceMappingURL=utils.d.ts.map

package/dest/fee/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/fee/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAI3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,YAAY,EAC7B,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,GAAG,EAAE,mDAiBZ"}

package/dest/fee/utils.js

@@ -0,0 +1,32 @@
+import { DefaultEntrypoint } from '@aztec/entrypoints/default';
+import { decodeFromAbi } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { GasSettings } from '@aztec/stdlib/gas';
+import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
+/**
+ * Use a wallet to simulate a function avoiding the wallet's entrypoint, as a SignerlessWallet would do
+ * @param wallet - The wallet to use for the simulation.
+ * @param contractAddress - The address of the contract to call.
+ * @param abi - The ABI of the function to simulate.
+ * @param args - The arguments to pass to the function.
+ * @returns The return values of the function call.
+ */ export async function simulateWithoutSignature(wallet, contractAddress, abi, args) {
+    const interaction = new ContractFunctionInteraction(wallet, contractAddress, abi, args);
+    const request = await interaction.request();
+    const maxFeesPerGas = (await wallet.getCurrentBaseFees()).mul(1.5);
+    const paymentMethod = new FeeJuicePaymentMethod(AztecAddress.ZERO);
+    const gasSettings = GasSettings.default({
+        maxFeesPerGas
+    });
+    const fee = {
+        gasSettings,
+        paymentMethod
+    };
+    const { l1ChainId: chainId, protocolVersion } = await wallet.getNodeInfo();
+    const entrypoint = new DefaultEntrypoint(chainId, protocolVersion);
+    const signerlessTxExecutionRequest = await entrypoint.createTxExecutionRequest(request, fee, {});
+    const simulationResult = await wallet.simulateTx(signerlessTxExecutionRequest, false, undefined, undefined, true);
+    const rawReturnValues = simulationResult.getPrivateReturnValues().values;
+    return decodeFromAbi(abi.returnTypes, rawReturnValues);
+}

package/dest/utils/authwit.d.ts

@@ -47,14 +47,21 @@ export type IntentAction = {
  * @returns The message hash for the action
  */
 export declare const computeAuthWitMessageHash: (intent: IntentInnerHash | IntentAction, metadata: IntentMetadata) => Promise<Fr>;
-export declare const computeInnerAuthWitHashFromAction: (caller: AztecAddress, action: FunctionCall) => Promise<Fr>;
 /**
- * Compute the inner hash for an authentication witness.
- * This is the "intent" of the message, before siloed with the consumer.
- * It is used as part of the `computeAuthWitMessageHash` but can also be used
- * in case the message is not a "call" to a function, but arbitrary data.
- * @param args - The arguments to hash
- * @returns The inner hash for the witness
- */
-export declare const computeInnerAuthWitHash: (args: Fr[]) => Promise<Fr>;
+ * Computes the inner authwitness hash for a function call, for it to later be combined with the metadata
+ * required for the outer hash and eventually the full AuthWitness.
+ * @param caller - Who is going to be calling the function
+ * @param fnCall - The function call to compute the inner hash from
+ * @returns The inner hash for the function call
+ **/
+export declare const computeInnerAuthWitHashFromFunctionCall: (caller: AztecAddress, fnCall: FunctionCall) => Promise<Fr>;
+/**
+ * Computes the inner authwitness hash for an action, that can either be a ContractFunctionInteraction
+ * or an isolated FunctionCall. Since the former is just a wrapper around the latter, we can just extract
+ * the first (and only) call from the ContractFunctionInteraction and use it to compute the inner hash.
+ * @param caller - Who is going to be performing the action
+ * @param action - The ContractFunctionInteraction or FunctionCall to compute the inner hash for
+ * @returns The inner hash for the action
+ **/
+export declare const computeInnerAuthWitHashFromAction: (caller: AztecAddress, action: FunctionCall | ContractFunctionInteraction) => Promise<Fr>;
 //# sourceMappingURL=authwit.d.ts.map

package/dest/utils/authwit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAE3F,8BAA8B;AAC9B,MAAM,MAAM,cAAc,GAAG;IAC3B,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;IACZ,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,gCAAgC;AAChC,MAAM,MAAM,eAAe,GAAG;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,GAAG,EAAE,CAAC;CACxB,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GAAG;IACzB,6BAA6B;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,4BAA4B;IAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;CACpD,CAAC;AAGF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,yBAAyB,WAAkB,eAAe,GAAG,YAAY,YAAY,cAAc,gBAiB/G,CAAC;AAGF,eAAO,MAAM,iCAAiC,WAAkB,YAAY,UAAU,YAAY,gBAK9F,CAAC;AAEL;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,SAAU,EAAE,EAAE,gBAEjD,CAAC"}
+{"version":3,"file":"authwit.d.ts","sourceRoot":"","sources":["../../src/utils/authwit.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAE3F,8BAA8B;AAC9B,MAAM,MAAM,cAAc,GAAG;IAC3B,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;IACZ,8BAA8B;IAC9B,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF,gCAAgC;AAChC,MAAM,MAAM,eAAe,GAAG;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,GAAG,EAAE,CAAC;CACxB,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,YAAY,GAAG;IACzB,6BAA6B;IAC7B,MAAM,EAAE,YAAY,CAAC;IACrB,4BAA4B;IAC5B,MAAM,EAAE,2BAA2B,GAAG,YAAY,CAAC;CACpD,CAAC;AAGF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,yBAAyB,WAAkB,eAAe,GAAG,YAAY,YAAY,cAAc,gBAiB/G,CAAC;AAGF;;;;;;IAMI;AACJ,eAAO,MAAM,uCAAuC,WAAkB,YAAY,UAAU,YAAY,gBAMvG,CAAC;AAEF;;;;;;;IAOI;AACJ,eAAO,MAAM,iCAAiC,WACpC,YAAY,UACZ,YAAY,GAAG,2BAA2B,gBAQnD,CAAC"}