@aztec/aztec.js 0.0.0-test.1 → 0.0.1-commit.023c3e5

package/dest/ethereum/portal_manager.js

@@ -0,0 +1,345 @@
+import { extractEvent } from '@aztec/ethereum/utils';
+import { sha256ToField } from '@aztec/foundation/crypto/sha256';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { EthAddress } from '@aztec/foundation/eth-address';
+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';
+import { TokenPortalAbi } from '@aztec/l1-artifacts/TokenPortalAbi';
+import { computeL2ToL1MessageHash, computeSecretHash } from '@aztec/stdlib/hash';
+import { getL2ToL1MessageLeafId } from '@aztec/stdlib/messaging';
+import { getContract, toFunctionSelector } from 'viem';
+/** Stringifies an eth address for logging. */ function stringifyEthAddress(address, name) {
+    return name ? `${name} (${address.toString()})` : address.toString();
+}
+/** Generates a pair secret and secret hash */ export async function generateClaimSecret(logger) {
+    const secret = Fr.random();
+    const secretHash = await computeSecretHash(secret);
+    logger?.verbose(`Generated claim secret=${secret.toString()} hash=${secretHash.toString()}`);
+    return [
+        secret,
+        secretHash
+    ];
+}
+/** Helper for managing an ERC20 on L1. */ export class L1TokenManager {
+    tokenAddress;
+    handlerAddress;
+    extendedClient;
+    logger;
+    contract;
+    handler;
+    constructor(/** Address of the ERC20 contract. */ tokenAddress, /** Address of the handler/faucet contract. */ handlerAddress, extendedClient, logger){
+        this.tokenAddress = tokenAddress;
+        this.handlerAddress = handlerAddress;
+        this.extendedClient = extendedClient;
+        this.logger = logger;
+        this.contract = getContract({
+            address: this.tokenAddress.toString(),
+            abi: TestERC20Abi,
+            client: this.extendedClient
+        });
+        if (this.handlerAddress) {
+            this.handler = getContract({
+                address: this.handlerAddress.toString(),
+                abi: FeeAssetHandlerAbi,
+                client: this.extendedClient
+            });
+        }
+    }
+    /** 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.
+   * @param address - Address to get the balance of.
+   */ async getL1TokenBalance(address) {
+        return await this.contract.read.balanceOf([
+            address
+        ]);
+    }
+    /**
+   * 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(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.
+   * @param amount - Amount to approve.
+   * @param address - Address to approve the tokens for.
+   * @param addressName - Optional name of the address for logging.
+   */ async approve(amount, address, addressName = '') {
+        this.logger.info(`Approving ${amount} tokens for ${stringifyEthAddress(address, addressName)}`);
+        await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.contract.write.approve([
+                address,
+                amount
+            ])
+        });
+    }
+}
+/** Helper for interacting with the FeeJuicePortal on L1. */ export class L1FeeJuicePortalManager {
+    extendedClient;
+    logger;
+    tokenManager;
+    contract;
+    constructor(portalAddress, tokenAddress, handlerAddress, extendedClient, logger){
+        this.extendedClient = extendedClient;
+        this.logger = logger;
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
+        this.contract = getContract({
+            address: portalAddress.toString(),
+            abi: FeeJuicePortalAbi,
+            client: extendedClient
+        });
+    }
+    /** Returns the associated token manager for the L1 ERC20. */ getTokenManager() {
+        return this.tokenManager;
+    }
+    /**
+   * Bridges fee juice from L1 to L2 publicly. Handles L1 ERC20 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 bridgeTokensPublic(to, amount, mint = false) {
+        const [claimSecret, claimSecretHash] = await generateClaimSecret();
+        const amountToBridge = amount ?? await this.tokenManager.getMintAmount();
+        if (mint) {
+            const mintableAmount = await this.tokenManager.getMintAmount();
+            if (amountToBridge !== mintableAmount) {
+                throw new Error(`Minting amount must be ${mintableAmount}`);
+            }
+            await this.tokenManager.mint(this.extendedClient.account.address);
+        }
+        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(),
+            amountToBridge,
+            claimSecretHash.toString()
+        ];
+        await this.contract.simulate.depositToAztecPublic(args);
+        const txReceipt = await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.contract.write.depositToAztecPublic(args)
+        });
+        this.logger.info('Deposited to Aztec public successfully', {
+            txReceipt
+        });
+        const log = extractEvent(txReceipt.logs, this.contract.address, this.contract.abi, 'DepositToAztecPublic', (log)=>{
+            // Normalize hex strings for comparison (case-insensitive, handle different formats)
+            const normalizeHex = (val)=>{
+                const hexStr = typeof val === 'string' ? val : `0x${val.toString(16).padStart(64, '0')}`;
+                return hexStr.toLowerCase();
+            };
+            const secretHashMatch = normalizeHex(log.args.secretHash) === normalizeHex(claimSecretHash.toString());
+            const amountMatch = log.args.amount === amountToBridge;
+            const toMatch = normalizeHex(log.args.to) === normalizeHex(to.toString());
+            this.logger.debug(`Event filter matching: secretHash=${secretHashMatch} (${log.args.secretHash} vs ${claimSecretHash.toString()}), ` + `amount=${amountMatch} (${log.args.amount} vs ${amountToBridge}), ` + `to=${toMatch} (${log.args.to} vs ${to.toString()})`);
+            return secretHashMatch && amountMatch && toMatch;
+        }, this.logger);
+        return {
+            claimAmount: amountToBridge,
+            claimSecret,
+            claimSecretHash,
+            messageHash: log.args.key,
+            messageLeafIndex: log.args.index
+        };
+    }
+    /**
+   * Creates a new instance
+   * @param node - Aztec node client used for retrieving the L1 contract addresses.
+   * @param extendedClient - Wallet client, extended with public actions.
+   * @param logger - Logger.
+   */ static async new(node, extendedClient, logger) {
+        const { l1ContractAddresses: { feeJuiceAddress, feeJuicePortalAddress, feeAssetHandlerAddress } } = await node.getNodeInfo();
+        if (feeJuiceAddress.isZero() || feeJuicePortalAddress.isZero()) {
+            throw new Error('Portal or token not deployed on L1');
+        }
+        // Handler is optional - it's only needed for minting tokens during testing
+        const handlerAddress = feeAssetHandlerAddress && !feeAssetHandlerAddress.isZero() ? feeAssetHandlerAddress : undefined;
+        return new L1FeeJuicePortalManager(feeJuicePortalAddress, feeJuiceAddress, handlerAddress, extendedClient, logger);
+    }
+}
+/** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */ export class L1ToL2TokenPortalManager {
+    extendedClient;
+    logger;
+    portal;
+    tokenManager;
+    constructor(portalAddress, tokenAddress, handlerAddress, extendedClient, logger){
+        this.extendedClient = extendedClient;
+        this.logger = logger;
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
+        this.portal = getContract({
+            address: portalAddress.toString(),
+            abi: TokenPortalAbi,
+            client: extendedClient
+        });
+    }
+    /** Returns the token manager for the underlying L1 token. */ getTokenManager() {
+        return this.tokenManager;
+    }
+    /**
+   * Bridges tokens from L1 to L2. 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 bridgeTokensPublic(to, amount, mint = false) {
+        const [claimSecret, claimSecretHash] = await this.bridgeSetup(amount, mint);
+        this.logger.info('Sending L1 tokens to L2 to be claimed publicly');
+        const { request } = await this.portal.simulate.depositToAztecPublic([
+            to.toString(),
+            amount,
+            claimSecretHash.toString()
+        ]);
+        const txReceipt = await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.extendedClient.writeContract(request)
+        });
+        const log = extractEvent(txReceipt.logs, this.portal.address, this.portal.abi, 'DepositToAztecPublic', (log)=>{
+            // Normalize hex strings for comparison (case-insensitive, handle different formats)
+            const normalizeHex = (val)=>{
+                const hexStr = typeof val === 'string' ? val : `0x${val.toString(16).padStart(64, '0')}`;
+                return hexStr.toLowerCase();
+            };
+            return normalizeHex(log.args.secretHash) === normalizeHex(claimSecretHash.toString()) && log.args.amount === amount && normalizeHex(log.args.to) === normalizeHex(to.toString());
+        }, this.logger);
+        return {
+            claimAmount: amount,
+            claimSecret,
+            claimSecretHash,
+            messageHash: log.args.key,
+            messageLeafIndex: log.args.index
+        };
+    }
+    /**
+   * 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) {
+        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([
+            amount,
+            claimSecretHash.toString()
+        ]);
+        const txReceipt = await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.extendedClient.writeContract(request)
+        });
+        const log = extractEvent(txReceipt.logs, this.portal.address, this.portal.abi, 'DepositToAztecPrivate', (log)=>{
+            // Normalize hex strings for comparison (case-insensitive, handle different formats)
+            const normalizeHex = (val)=>{
+                const hexStr = typeof val === 'string' ? val : `0x${val.toString(16).padStart(64, '0')}`;
+                return hexStr.toLowerCase();
+            };
+            return log.args.amount === amount && normalizeHex(log.args.secretHashForL2MessageConsumption) === normalizeHex(claimSecretHash.toString());
+        }, this.logger);
+        this.logger.info(`Claim message secret: ${claimSecret.toString()}, claim message secret hash: ${claimSecretHash.toString()}`);
+        return {
+            claimAmount: amount,
+            claimSecret,
+            claimSecretHash,
+            recipient: to,
+            messageHash: log.args.key,
+            messageLeafIndex: log.args.index
+        };
+    }
+    async bridgeSetup(amount, mint) {
+        if (mint) {
+            const mintableAmount = await this.tokenManager.getMintAmount();
+            if (amount !== mintableAmount) {
+                throw new Error(`Minting amount must be ${mintableAmount} for testing`);
+            }
+            await this.tokenManager.mint(this.extendedClient.account.address);
+        }
+        await this.tokenManager.approve(amount, this.portal.address, 'TokenPortal');
+        return generateClaimSecret();
+    }
+}
+/** 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, handlerAddress, outboxAddress, extendedClient, logger){
+        super(portalAddress, tokenAddress, handlerAddress, extendedClient, logger);
+        this.outbox = getContract({
+            address: outboxAddress.toString(),
+            abi: OutboxAbi,
+            client: extendedClient
+        });
+    }
+    /**
+   * Withdraws funds from the portal by consuming an L2 to L1 message. Returns once the tx is mined on L1.
+   * @param amount - Amount to withdraw.
+   * @param recipient - Who will receive the funds.
+   * @param epochNumber - Epoch number of the message.
+   * @param messageIndex - Index of the message.
+   * @param siblingPath - Sibling path of the message.
+   */ async withdrawFunds(amount, recipient, epochNumber, messageIndex, siblingPath) {
+        this.logger.info(`Sending L1 tx to consume message at epoch ${epochNumber} index ${messageIndex} to withdraw ${amount}`);
+        const messageLeafId = getL2ToL1MessageLeafId({
+            leafIndex: messageIndex,
+            siblingPath
+        });
+        const isConsumedBefore = await this.outbox.read.hasMessageBeenConsumedAtEpoch([
+            BigInt(epochNumber),
+            messageLeafId
+        ]);
+        if (isConsumedBefore) {
+            throw new Error(`L2 to L1 message at epoch ${epochNumber} index ${messageIndex} height ${siblingPath.pathSize} has already been consumed`);
+        }
+        // Call function on L1 contract to consume the message
+        const { request: withdrawRequest } = await this.portal.simulate.withdraw([
+            recipient.toString(),
+            amount,
+            false,
+            BigInt(epochNumber),
+            messageIndex,
+            siblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
+        ]);
+        await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.extendedClient.writeContract(withdrawRequest)
+        });
+        const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtEpoch([
+            BigInt(epochNumber),
+            messageLeafId
+        ]);
+        if (!isConsumedAfter) {
+            throw new Error(`L2 to L1 message at epoch ${epochNumber} index ${messageIndex} height ${siblingPath.pathSize} not consumed after withdrawal`);
+        }
+    }
+    /**
+   * Computes the L2 to L1 message leaf for the given parameters.
+   * @param amount - Amount to bridge.
+   * @param recipient - Recipient on L1.
+   * @param l2Bridge - Address of the L2 bridge.
+   * @param callerOnL1 - Caller address on L1.
+   */ async getL2ToL1MessageLeaf(amount, recipient, l2Bridge, callerOnL1 = EthAddress.ZERO) {
+        const version = await this.outbox.read.VERSION();
+        const content = sha256ToField([
+            Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
+            recipient.toBuffer32(),
+            new Fr(amount).toBuffer(),
+            callerOnL1.toBuffer32()
+        ]);
+        return computeL2ToL1MessageHash({
+            l2Sender: l2Bridge,
+            l1Recipient: EthAddress.fromString(this.portal.address),
+            content,
+            rollupVersion: new Fr(version),
+            chainId: new Fr(this.extendedClient.chain.id)
+        });
+    }
+}

package/dest/fee/fee_juice_payment_method_with_claim.d.ts

@@ -1,18 +1,23 @@
-import type { FunctionCall } from '@aztec/stdlib/abi';
-import type { L2AmountClaim } from '../api/ethereum/portal_manager.js';
-import type { Wallet } from '../wallet/index.js';
-import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
+import type { L2AmountClaim } from '../ethereum/portal_manager.js';
+import type { FeePaymentMethod } from './fee_payment_method.js';
 /**
- * Pay fee directly with Fee Juice claimed on the same tx.
+ * Pay fee directly with Fee Juice claimed in the same tx. Claiming consumes an L1 to L2 message that "contains"
+ * the fee juice bridged from L1.
  */
-export declare class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
-    private senderWallet;
+export declare class FeeJuicePaymentMethodWithClaim implements FeePaymentMethod {
+    private sender;
     private claim;
-    constructor(senderWallet: Wallet, claim: Pick<L2AmountClaim, 'claimAmount' | 'claimSecret' | 'messageLeafIndex'>);
+    constructor(sender: AztecAddress, 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_and_end_setup` function call.
      */
-    getFunctionCalls(): Promise<FunctionCall[]>;
+    getExecutionPayload(): Promise<ExecutionPayload>;
+    getAsset(): Promise<AztecAddress>;
+    getFeePayer(): Promise<AztecAddress>;
+    getGasSettings(): GasSettings | undefined;
 }
-//# sourceMappingURL=fee_juice_payment_method_with_claim.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX2p1aWNlX3BheW1lbnRfbWV0aG9kX3dpdGhfY2xhaW0uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mZWUvZmVlX2p1aWNlX3BheW1lbnRfbWV0aG9kX3dpdGhfY2xhaW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRTs7O0dBR0c7QUFDSCxxQkFBYSw4QkFBK0IsWUFBVyxnQkFBZ0I7SUFFbkUsT0FBTyxDQUFDLE1BQU07SUFDZCxPQUFPLENBQUMsS0FBSztJQUZmLFlBQ1UsTUFBTSxFQUFFLFlBQVksRUFDcEIsS0FBSyxFQUFFLElBQUksQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLGFBQWEsR0FBRyxrQkFBa0IsQ0FBQyxFQUNwRjtJQUVKOzs7T0FHRztJQUNHLG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQTBCckQ7SUFFRCxRQUFRLDBCQUVQO0lBRUQsV0FBVyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FFbkM7SUFFRCxjQUFjLElBQUksV0FBVyxHQUFHLFNBQVMsQ0FFeEM7Q0FDRiJ9

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;AAGtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAEvE,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":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;;GAGG;AACH,qBAAa,8BAA+B,YAAW,gBAAgB;IAEnE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IAFf,YACU,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC,EACpF;IAEJ;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CA0BrD;IAED,QAAQ,0BAEP;IAED,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAEnC;IAED,cAAc,IAAI,WAAW,GAAG,SAAS,CAExC;CACF"}

package/dest/fee/fee_juice_payment_method_with_claim.js

@@ -1,30 +1,31 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
-import { getFeeJuice } from '../contract/protocol_contracts.js';
-import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
 /**
- * Pay fee directly with Fee Juice claimed on the same tx.
- */ export class FeeJuicePaymentMethodWithClaim extends FeeJuicePaymentMethod {
-    senderWallet;
+ * Pay fee directly with Fee Juice claimed in the same tx. Claiming consumes an L1 to L2 message that "contains"
+ * the fee juice bridged from L1.
+ */ export class FeeJuicePaymentMethodWithClaim {
+    sender;
     claim;
-    constructor(senderWallet, claim){
-        super(senderWallet.getAddress()), this.senderWallet = senderWallet, this.claim = claim;
+    constructor(sender, claim){
+        this.sender = sender;
+        this.claim = claim;
     }
     /**
-   * Creates a function call to pay the fee in Fee Juice.
-   * @returns A function call
-   */ async getFunctionCalls() {
-        const canonicalFeeJuice = await getFeeJuice(this.senderWallet);
-        const selector = await FunctionSelector.fromNameAndParameters(canonicalFeeJuice.artifact.functions.find((f)=>f.name === 'claim'));
-        return Promise.resolve([
+   * Creates an execution payload to pay the fee in Fee Juice.
+   * @returns An execution payload that just contains the `claim_and_end_setup` function call.
+   */ async getExecutionPayload() {
+        const selector = await FunctionSelector.fromSignature('claim_and_end_setup((Field),u128,Field,Field)');
+        return new ExecutionPayload([
             {
                 to: ProtocolContractAddress.FeeJuice,
-                name: 'claim',
+                name: 'claim_and_end_setup',
                 selector,
+                hideMsgSender: false,
                 isStatic: false,
                 args: [
-                    this.senderWallet.getAddress().toField(),
+                    this.sender.toField(),
                     new Fr(this.claim.claimAmount),
                     this.claim.claimSecret,
                     new Fr(this.claim.messageLeafIndex)
@@ -32,6 +33,15 @@ import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
                 returnTypes: [],
                 type: FunctionType.PRIVATE
             }
-        ]);
+        ], [], [], [], this.sender);
+    }
+    getAsset() {
+        return Promise.resolve(ProtocolContractAddress.FeeJuice);
+    }
+    getFeePayer() {
+        return Promise.resolve(this.sender);
+    }
+    getGasSettings() {
+        return;
     }
 }

package/dest/fee/fee_payment_method.d.ts

@@ -1,6 +1,6 @@
-import type { FunctionCall } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
+import type { ExecutionPayload } from '@aztec/stdlib/tx';
 /**
  * Holds information about how the fee for a transaction is to be paid.
  */
@@ -8,15 +8,19 @@ export interface FeePaymentMethod {
     /** The asset used to pay the fee. */
     getAsset(): Promise<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.
+     * Returns the data to be added to the final execution request
+     * to pay the fee in the given asset
+     * @returns The function calls to pay the fee.
      */
-    getFunctionCalls(gasSettings: GasSettings): Promise<FunctionCall[]>;
+    getExecutionPayload(): Promise<ExecutionPayload>;
     /**
      * The expected fee payer for this tx.
-     * @param gasSettings - The gas limits and max fees.
      */
-    getFeePayer(gasSettings: GasSettings): Promise<AztecAddress>;
+    getFeePayer(): Promise<AztecAddress>;
+    /**
+     * The gas settings (if any) used to compute the
+     * execution payload of the payment method
+     */
+    getGasSettings(): GasSettings | undefined;
 }
-//# sourceMappingURL=fee_payment_method.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3BheW1lbnRfbWV0aG9kLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmVlL2ZlZV9wYXltZW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNyRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXpEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixxQ0FBcUM7SUFDckMsUUFBUSxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUNsQzs7OztPQUlHO0lBQ0gsbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7SUFDakQ7O09BRUc7SUFDSCxXQUFXLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ3JDOzs7T0FHRztJQUNILGNBQWMsSUFBSSxXQUFXLEdBQUcsU0FBUyxDQUFDO0NBQzNDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC;;;;OAIG;IACH,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IACpE;;;OAGG;IACH,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC9D"}
+{"version":3,"file":"fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC;;;;OAIG;IACH,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjD;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IACrC;;;OAGG;IACH,cAAc,IAAI,WAAW,GAAG,SAAS,CAAC;CAC3C"}

package/dest/fee/private_fee_payment_method.d.ts

@@ -1,7 +1,7 @@
-import { type FunctionCall } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
-import type { Wallet } from '../account/wallet.js';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
+import type { Wallet } from '../wallet/wallet.js';
 import type { FeePaymentMethod } from './fee_payment_method.js';
 /**
  * Holds information about how the fee for a transaction is to be paid.
@@ -12,9 +12,17 @@ export declare class PrivateFeePaymentMethod implements FeePaymentMethod {
      */
     private paymentContract;
     /**
-     * An auth witness provider to authorize fee payments
+     * Address of the account that will pay the fee
+     */
+    private sender;
+    /**
+     * A wallet to perform the simulation to get the accepted asset
      */
     private wallet;
+    /**
+     * Gas settings used to compute the maximum fee the user is willing to pay
+     */
+    protected gasSettings: GasSettings;
     /**
      * If true, the max fee will be set to 1.
      * TODO(#7694): Remove this param once the lacking feature in TXE is implemented.
@@ -27,9 +35,17 @@ export declare class PrivateFeePaymentMethod implements FeePaymentMethod {
      */
     paymentContract: AztecAddress, 
     /**
-     * An auth witness provider to authorize fee payments
+     * Address of the account that will pay the fee
+     */
+    sender: AztecAddress, 
+    /**
+     * A wallet to perform the simulation to get the accepted asset
      */
     wallet: Wallet, 
+    /**
+     * Gas settings used to compute the maximum fee the user is willing to pay
+     */
+    gasSettings: GasSettings, 
     /**
      * If true, the max fee will be set to 1.
      * TODO(#7694): Remove this param once the lacking feature in TXE is implemented.
@@ -42,10 +58,11 @@ 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(): Promise<ExecutionPayload>;
+    getGasSettings(): GasSettings | undefined;
 }
-//# sourceMappingURL=private_fee_payment_method.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9mZWVfcGF5bWVudF9tZXRob2QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mZWUvcHJpdmF0ZV9mZWVfcGF5bWVudF9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBR3BELE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEU7O0dBRUc7QUFDSCxxQkFBYSx1QkFBd0IsWUFBVyxnQkFBZ0I7SUFJNUQ7O09BRUc7SUFDSCxPQUFPLENBQUMsZUFBZTtJQUV2Qjs7T0FFRztJQUNILE9BQU8sQ0FBQyxNQUFNO0lBRWQ7O09BRUc7SUFDSCxPQUFPLENBQUMsTUFBTTtJQUNkOztPQUVHO0lBQ0gsU0FBUyxDQUFDLFdBQVcsRUFBRSxXQUFXO0lBQ2xDOzs7T0FHRztJQUNILE9BQU8sQ0FBQyxjQUFjO0lBekJ4QixPQUFPLENBQUMsWUFBWSxDQUFzQztJQUUxRDtJQUNFOztPQUVHO0lBQ0ssZUFBZSxFQUFFLFlBQVk7SUFFckM7O09BRUc7SUFDSyxNQUFNLEVBQUUsWUFBWTtJQUU1Qjs7T0FFRztJQUNLLE1BQU0sRUFBRSxNQUFNO0lBQ3RCOztPQUVHO0lBQ08sV0FBVyxFQUFFLFdBQVc7SUFDbEM7OztPQUdHO0lBQ0ssY0FBYyxVQUFRLEVBQzVCO0lBRUo7OztPQUdHO0lBQ0csUUFBUSxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0F1Q3RDO0lBRUQsV0FBVyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FFbkM7SUFFRDs7OztPQUlHO0lBQ0csbUJBQW1CLElBQUksT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBc0NyRDtJQUVELGNBQWMsSUFBSSxXQUFXLEdBQUcsU0FBUyxDQUV4QztDQUNGIn0=

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":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,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;;OAEG;IACH,OAAO,CAAC,MAAM;IACd;;OAEG;IACH,SAAS,CAAC,WAAW,EAAE,WAAW;IAClC;;;OAGG;IACH,OAAO,CAAC,cAAc;IAzBxB,OAAO,CAAC,YAAY,CAAsC;IAE1D;IACE;;OAEG;IACK,eAAe,EAAE,YAAY;IAErC;;OAEG;IACK,MAAM,EAAE,YAAY;IAE5B;;OAEG;IACK,MAAM,EAAE,MAAM;IACtB;;OAEG;IACO,WAAW,EAAE,WAAW;IAClC;;;OAGG;IACK,cAAc,UAAQ,EAC5B;IAEJ;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAuCtC;IAED,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAEnC;IAED;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAsCrD;IAED,cAAc,IAAI,WAAW,GAAG,SAAS,CAExC;CACF"}