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

package/dest/{api/ethereum → ethereum}/portal_manager.d.ts

@@ -1,12 +1,12 @@
-import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import type { ExtendedViemWalletClient, ViemContract } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import type { Logger } from '@aztec/foundation/log';
 import type { SiblingPath } from '@aztec/foundation/trees';
-import { TokenPortalAbi } from '@aztec/l1-artifacts';
+import { TokenPortalAbi } from '@aztec/l1-artifacts/TokenPortalAbi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-import { type GetContractReturnType, type Hex } from 'viem';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import { type Hex } from 'viem';
 /** L1 to L2 message info to claim it on L2. */
 export type L2Claim = {
     /** Secret for claiming. */
@@ -31,26 +31,33 @@ export declare function generateClaimSecret(logger?: Logger): Promise<[Fr, Fr]>;
 /** Helper for managing an ERC20 on L1. */
 export declare class L1TokenManager {
     /** Address of the ERC20 contract. */
-    readonly address: EthAddress;
-    private publicClient;
-    private walletClient;
+    readonly tokenAddress: EthAddress;
+    /** Address of the handler/faucet contract. */
+    readonly handlerAddress: EthAddress | undefined;
+    private readonly extendedClient;
     private logger;
     private contract;
+    private handler;
     constructor(
     /** Address of the ERC20 contract. */
-    address: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    tokenAddress: EthAddress, 
+    /** Address of the handler/faucet contract. */
+    handlerAddress: EthAddress | undefined, extendedClient: ExtendedViemWalletClient, logger: Logger);
+    /** Returns the amount of tokens available to mint via the handler.
+     * @throws if the handler is not provided.
+     */
+    getMintAmount(): Promise<bigint>;
     /**
      * Returns the balance of the given address.
      * @param address - Address to get the balance of.
      */
     getL1TokenBalance(address: Hex): Promise<bigint>;
     /**
-     * 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.
      */
-    mint(amount: bigint, address: Hex, addressName?: string): Promise<void>;
+    mint(address: Hex, addressName?: string): Promise<void>;
     /**
      * Approves tokens for the given address. Returns once the tx has been mined.
      * @param amount - Amount to approve.
@@ -61,12 +68,11 @@ export declare class L1TokenManager {
 }
 /** Helper for interacting with the FeeJuicePortal on L1. */
 export declare class L1FeeJuicePortalManager {
-    private readonly publicClient;
-    private readonly walletClient;
+    private readonly extendedClient;
     private readonly logger;
     private readonly tokenManager;
     private readonly contract;
-    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress, extendedClient: ExtendedViemWalletClient, logger: Logger);
     /** Returns the associated token manager for the L1 ERC20. */
     getTokenManager(): L1TokenManager;
     /**
@@ -75,24 +81,22 @@ export declare class L1FeeJuicePortalManager {
      * @param amount - Amount of tokens to send.
      * @param mint - Whether to mint the tokens before sending (only during testing).
      */
-    bridgeTokensPublic(to: AztecAddress, amount: bigint, mint?: boolean): Promise<L2AmountClaim>;
+    bridgeTokensPublic(to: AztecAddress, amount: bigint | undefined, mint?: boolean): Promise<L2AmountClaim>;
     /**
      * Creates a new instance
-     * @param pxe - PXE client used for retrieving the L1 contract addresses.
-     * @param publicClient - L1 public client.
-     * @param walletClient - L1 wallet client.
+     * @param node - Aztec node client used for retrieving the L1 contract addresses.
+     * @param extendedClient - Wallet client, extended with public actions.
      * @param logger - Logger.
      */
-    static new(pxe: PXE, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger): Promise<L1FeeJuicePortalManager>;
+    static new(node: AztecNode, extendedClient: ExtendedViemWalletClient, logger: Logger): Promise<L1FeeJuicePortalManager>;
 }
 /** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */
 export declare class L1ToL2TokenPortalManager {
-    protected publicClient: ViemPublicClient;
-    protected walletClient: ViemWalletClient;
+    protected extendedClient: ExtendedViemWalletClient;
     protected logger: Logger;
-    protected readonly portal: GetContractReturnType<typeof TokenPortalAbi, ViemWalletClient>;
+    protected readonly portal: ViemContract<typeof TokenPortalAbi>;
     protected readonly tokenManager: L1TokenManager;
-    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress | undefined, extendedClient: ExtendedViemWalletClient, logger: Logger);
     /** Returns the token manager for the underlying L1 token. */
     getTokenManager(): L1TokenManager;
     /**
@@ -114,7 +118,7 @@ export declare class L1ToL2TokenPortalManager {
 /** Helper for interacting with a test TokenPortal on L1 for both withdrawing from and bridging to L2. */
 export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
     private readonly outbox;
-    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, outboxAddress: EthAddress, publicClient: ViemPublicClient, walletClient: ViemWalletClient, logger: Logger);
+    constructor(portalAddress: EthAddress, tokenAddress: EthAddress, handlerAddress: EthAddress | undefined, outboxAddress: EthAddress, extendedClient: ExtendedViemWalletClient, logger: Logger);
     /**
      * 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.
@@ -131,6 +135,6 @@ export declare class L1TokenPortalManager extends L1ToL2TokenPortalManager {
      * @param l2Bridge - Address of the L2 bridge.
      * @param callerOnL1 - Caller address on L1.
      */
-    getL2ToL1MessageLeaf(amount: bigint, recipient: EthAddress, l2Bridge: AztecAddress, callerOnL1?: EthAddress): Fr;
+    getL2ToL1MessageLeaf(amount: bigint, recipient: EthAddress, l2Bridge: AztecAddress, callerOnL1?: EthAddress): Promise<Fr>;
 }
 //# sourceMappingURL=portal_manager.d.ts.map

package/dest/ethereum/portal_manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"portal_manager.d.ts","sourceRoot":"","sources":["../../src/ethereum/portal_manager.ts"],"names":[],"mappings":"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"}

package/dest/{api/ethereum → ethereum}/portal_manager.js

@@ -2,8 +2,13 @@ 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 { FeeJuicePortalAbi, OutboxAbi, TestERC20Abi, TokenPortalAbi } from '@aztec/l1-artifacts';
-import { computeSecretHash } from '@aztec/stdlib/hash';
+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();
@@ -18,21 +23,37 @@ import { getContract, toFunctionSelector } from 'viem';
     ];
 }
 /** Helper for managing an ERC20 on L1. */ export class L1TokenManager {
-    address;
-    publicClient;
-    walletClient;
+    tokenAddress;
+    handlerAddress;
+    extendedClient;
     logger;
     contract;
-    constructor(/** Address of the ERC20 contract. */ address, publicClient, walletClient, logger){
-        this.address = address;
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+    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.address.toString(),
+            address: this.tokenAddress.toString(),
             abi: TestERC20Abi,
-            client: this.walletClient
+            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.
@@ -43,18 +64,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.
@@ -63,7 +85,7 @@ import { getContract, toFunctionSelector } from 'viem';
    * @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.publicClient.waitForTransactionReceipt({
+        await this.extendedClient.waitForTransactionReceipt({
             hash: await this.contract.write.approve([
                 address,
                 amount
@@ -72,20 +94,18 @@ import { getContract, toFunctionSelector } from 'viem';
     }
 }
 /** Helper for interacting with the FeeJuicePortal on L1. */ export class L1FeeJuicePortalManager {
-    publicClient;
-    walletClient;
+    extendedClient;
     logger;
     tokenManager;
     contract;
-    constructor(portalAddress, tokenAddress, publicClient, walletClient, logger){
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+    constructor(portalAddress, tokenAddress, handlerAddress, extendedClient, logger){
+        this.extendedClient = extendedClient;
         this.logger = logger;
-        this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
         this.contract = getContract({
             address: portalAddress.toString(),
             abi: FeeJuicePortalAbi,
-            client: this.walletClient
+            client: extendedClient
         });
     }
     /** Returns the associated token manager for the L1 ERC20. */ getTokenManager() {
@@ -98,24 +118,29 @@ 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.extendedClient.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);
-        const txReceipt = await this.publicClient.waitForTransactionReceipt({
+        const txReceipt = await this.extendedClient.waitForTransactionReceipt({
             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,
@@ -124,33 +149,33 @@ import { getContract, toFunctionSelector } from 'viem';
     }
     /**
    * Creates a new instance
-   * @param pxe - PXE client used for retrieving the L1 contract addresses.
-   * @param publicClient - L1 public client.
-   * @param walletClient - L1 wallet client.
+   * @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(pxe, publicClient, walletClient, logger) {
-        const { l1ContractAddresses: { feeJuiceAddress, feeJuicePortalAddress } } = await pxe.getNodeInfo();
+   */ 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');
         }
-        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, extendedClient, logger);
     }
 }
 /** Helper for interacting with a test TokenPortal on L1 for sending tokens to L2. */ export class L1ToL2TokenPortalManager {
-    publicClient;
-    walletClient;
+    extendedClient;
     logger;
     portal;
     tokenManager;
-    constructor(portalAddress, tokenAddress, publicClient, walletClient, logger){
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+    constructor(portalAddress, tokenAddress, handlerAddress, extendedClient, logger){
+        this.extendedClient = extendedClient;
         this.logger = logger;
-        this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
+        this.tokenManager = new L1TokenManager(tokenAddress, handlerAddress, extendedClient, logger);
         this.portal = getContract({
             address: portalAddress.toString(),
             abi: TokenPortalAbi,
-            client: this.walletClient
+            client: extendedClient
         });
     }
     /** Returns the token manager for the underlying L1 token. */ getTokenManager() {
@@ -169,8 +194,8 @@ import { getContract, toFunctionSelector } from 'viem';
             amount,
             claimSecretHash.toString()
         ]);
-        const txReceipt = await this.publicClient.waitForTransactionReceipt({
-            hash: await this.walletClient.writeContract(request)
+        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)=>log.args.secretHash === claimSecretHash.toString() && log.args.amount === amount && log.args.to === to.toString(), this.logger);
         return {
@@ -193,8 +218,8 @@ import { getContract, toFunctionSelector } from 'viem';
             amount,
             claimSecretHash.toString()
         ]);
-        const txReceipt = await this.publicClient.waitForTransactionReceipt({
-            hash: await this.walletClient.writeContract(request)
+        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)=>log.args.amount === amount && log.args.secretHashForL2MessageConsumption === claimSecretHash.toString(), this.logger);
         this.logger.info(`Claim message secret: ${claimSecret.toString()}, claim message secret hash: ${claimSecretHash.toString()}`);
@@ -209,7 +234,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.extendedClient.account.address);
         }
         await this.tokenManager.approve(amount, this.portal.address, 'TokenPortal');
         return generateClaimSecret();
@@ -217,12 +246,12 @@ 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, extendedClient, logger){
+        super(portalAddress, tokenAddress, handlerAddress, extendedClient, logger);
         this.outbox = getContract({
             address: outboxAddress.toString(),
             abi: OutboxAbi,
-            client: walletClient
+            client: extendedClient
         });
     }
     /**
@@ -234,12 +263,16 @@ import { getContract, toFunctionSelector } from 'viem';
    * @param siblingPath - Sibling path of the message.
    */ async withdrawFunds(amount, recipient, blockNumber, messageIndex, siblingPath) {
         this.logger.info(`Sending L1 tx to consume message at block ${blockNumber} index ${messageIndex} to withdraw ${amount}`);
-        const isConsumedBefore = await this.outbox.read.hasMessageBeenConsumedAtBlockAndIndex([
+        const messageLeafId = getL2ToL1MessageLeafId({
+            leafIndex: messageIndex,
+            siblingPath
+        });
+        const isConsumedBefore = await this.outbox.read.hasMessageBeenConsumedAtBlock([
             blockNumber,
-            messageIndex
+            messageLeafId
         ]);
         if (isConsumedBefore) {
-            throw new Error(`L1 to L2 message at block ${blockNumber} index ${messageIndex} has already been consumed`);
+            throw new Error(`L1 to L2 message at block ${blockNumber} 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([
@@ -250,15 +283,15 @@ import { getContract, toFunctionSelector } from 'viem';
             messageIndex,
             siblingPath.toBufferArray().map((buf)=>`0x${buf.toString('hex')}`)
         ]);
-        await this.publicClient.waitForTransactionReceipt({
-            hash: await this.walletClient.writeContract(withdrawRequest)
+        await this.extendedClient.waitForTransactionReceipt({
+            hash: await this.extendedClient.writeContract(withdrawRequest)
         });
-        const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtBlockAndIndex([
+        const isConsumedAfter = await this.outbox.read.hasMessageBeenConsumedAtBlock([
             blockNumber,
-            messageIndex
+            messageLeafId
         ]);
         if (!isConsumedAfter) {
-            throw new Error(`L1 to L2 message at block ${blockNumber} index ${messageIndex} not consumed after withdrawal`);
+            throw new Error(`L1 to L2 message at block ${blockNumber} index ${messageIndex} height ${siblingPath.pathSize} not consumed after withdrawal`);
         }
     }
     /**
@@ -267,20 +300,20 @@ import { getContract, toFunctionSelector } from 'viem';
    * @param recipient - Recipient on L1.
    * @param l2Bridge - Address of the L2 bridge.
    * @param callerOnL1 - Caller address on L1.
-   */ getL2ToL1MessageLeaf(amount, recipient, l2Bridge, callerOnL1 = EthAddress.ZERO) {
+   */ 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()
         ]);
-        const leaf = sha256ToField([
-            l2Bridge.toBuffer(),
-            new Fr(1).toBuffer(),
-            EthAddress.fromString(this.portal.address).toBuffer32() ?? Buffer.alloc(32, 0),
-            new Fr(this.publicClient.chain.id).toBuffer(),
-            content.toBuffer()
-        ]);
-        return leaf;
+        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 { ExecutionPayload } from '@aztec/entrypoints/payload';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
+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

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":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,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;gBADL,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAGxF;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA0BtD,QAAQ;IAIR,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;IAIpC,cAAc,IAAI,WAAW,GAAG,SAAS;CAG1C"}

package/dest/fee/fee_juice_payment_method_with_claim.js

@@ -1,30 +1,31 @@
+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';
-import { getFeeJuice } from '../contract/protocol_contracts.js';
-import { FeeJuicePaymentMethod } from './fee_juice_payment_method.js';
 /**
- * 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
             }
-        ]);
+        ], [], []);
+    }
+    getAsset() {
+        return Promise.resolve(ProtocolContractAddress.FeeJuice);
+    }
+    getFeePayer() {
+        return Promise.resolve(this.sender);
+    }
+    getGasSettings() {
+        return;
     }
 }

package/dest/fee/fee_payment_method.d.ts

@@ -1,4 +1,4 @@
-import type { FunctionCall } from '@aztec/stdlib/abi';
+import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
 /**
@@ -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

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,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,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,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"}