@aztec/entrypoints 3.0.0-nightly.20251002 → 3.0.0-nightly.20251004

package/dest/account_entrypoint.d.ts

@@ -1,8 +1,49 @@
+import { Fr } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
 import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { AuthWitnessProvider, EntrypointInterface, TxExecutionOptions } from './interfaces.js';
+import type { AuthWitnessProvider, EntrypointInterface } from './interfaces.js';
 import { ExecutionPayload } from './payload.js';
+/**
+ * The mechanism via which an account contract will pay for a transaction in which it gets invoked.
+ */
+export declare enum AccountFeePaymentMethodOptions {
+    /**
+     * Signals that some other contract is in charge of paying the fee, nothing needs to be done.
+     */
+    EXTERNAL = 0,
+    /**
+     * Used to make the account contract publicly pay for the transaction with its own fee juice balance,
+     * **which it must already have prior to this transaction**.
+     *
+     * The contract will set itself as the fee payer and end the setup phase.
+     */
+    PREEXISTING_FEE_JUICE = 1,
+    /**
+     * Used to make the account contract publicly pay for the transaction with its own fee juice balance
+     * **which is being claimed in the same transaction**.
+     *
+     * The contract will set itself as the fee payer but not end setup phase - this is done by the Fee Juice
+     * contract after enqueuing a public call, which unlike most public calls is whitelisted by the nodes
+     * to be executable during the setup phase.
+     */
+    FEE_JUICE_WITH_CLAIM = 2
+}
+/**
+ * General options for the tx execution.
+ */
+export type DefaultAccountEntrypointOptions = {
+    /** Whether the transaction can be cancelled. */
+    cancellable?: boolean;
+    /**
+     * A nonce to inject into the app payload of the transaction. When used with cancellable=true, this nonce will be
+     * used to compute a nullifier that allows cancelling this transaction by submitting a new one with the same nonce
+     * but higher fee. The nullifier ensures only one transaction can succeed.
+     */
+    txNonce?: Fr;
+    /** Options that configure how the account contract behaves depending on the fee payment method of the tx */
+    feePaymentMethodOptions: AccountFeePaymentMethodOptions;
+};
 /**
  * Implementation for an entrypoint interface that follows the default entrypoint signature
  * for an account, which accepts an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
@@ -13,7 +54,7 @@ export declare class DefaultAccountEntrypoint implements EntrypointInterface {
     private chainId;
     private version;
     constructor(address: AztecAddress, auth: AuthWitnessProvider, chainId?: number, version?: number);
-    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: DefaultAccountEntrypointOptions): Promise<TxExecutionRequest>;
     private getEntrypointAbi;
 }
 //# sourceMappingURL=account_entrypoint.d.ts.map

package/dest/account_entrypoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account_entrypoint.d.ts","sourceRoot":"","sources":["../src/account_entrypoint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,mBAAmB;IAEhE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAHP,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,MAAyB,EAClC,OAAO,GAAE,MAAwB;IAGrC,wBAAwB,CAC5B,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,kBAAkB,CAAC;IAgC9B,OAAO,CAAC,gBAAgB;CA2DzB"}
+{"version":3,"file":"account_entrypoint.d.ts","sourceRoot":"","sources":["../src/account_entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD;;GAEG;AACH,oBAAY,8BAA8B;IACxC;;OAEG;IACH,QAAQ,IAAI;IACZ;;;;;OAKG;IACH,qBAAqB,IAAI;IACzB;;;;;;;OAOG;IACH,oBAAoB,IAAI;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gDAAgD;IAChD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,4GAA4G;IAC5G,uBAAuB,EAAE,8BAA8B,CAAC;CACzD,CAAC;AAEF;;;GAGG;AACH,qBAAa,wBAAyB,YAAW,mBAAmB;IAEhE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAHP,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,mBAAmB,EACzB,OAAO,GAAE,MAAyB,EAClC,OAAO,GAAE,MAAwB;IAGrC,wBAAwB,CAC5B,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,kBAAkB,CAAC;IAgC9B,OAAO,CAAC,gBAAgB;CA0DzB"}

package/dest/account_entrypoint.js

@@ -3,6 +3,28 @@ import { FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
 import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
 import { EncodedAppEntrypointCalls } from './encoding.js';
+/**
+ * The mechanism via which an account contract will pay for a transaction in which it gets invoked.
+ */ export var AccountFeePaymentMethodOptions = /*#__PURE__*/ function(AccountFeePaymentMethodOptions) {
+    /**
+   * Signals that some other contract is in charge of paying the fee, nothing needs to be done.
+   */ AccountFeePaymentMethodOptions[AccountFeePaymentMethodOptions["EXTERNAL"] = 0] = "EXTERNAL";
+    /**
+   * Used to make the account contract publicly pay for the transaction with its own fee juice balance,
+   * **which it must already have prior to this transaction**.
+   *
+   * The contract will set itself as the fee payer and end the setup phase.
+   */ AccountFeePaymentMethodOptions[AccountFeePaymentMethodOptions["PREEXISTING_FEE_JUICE"] = 1] = "PREEXISTING_FEE_JUICE";
+    /**
+   * Used to make the account contract publicly pay for the transaction with its own fee juice balance
+   * **which is being claimed in the same transaction**.
+   *
+   * The contract will set itself as the fee payer but not end setup phase - this is done by the Fee Juice
+   * contract after enqueuing a public call, which unlike most public calls is whitelisted by the nodes
+   * to be executable during the setup phase.
+   */ AccountFeePaymentMethodOptions[AccountFeePaymentMethodOptions["FEE_JUICE_WITH_CLAIM"] = 2] = "FEE_JUICE_WITH_CLAIM";
+    return AccountFeePaymentMethodOptions;
+}({});
 /**
  * Implementation for an entrypoint interface that follows the default entrypoint signature
  * for an account, which accepts an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
@@ -21,18 +43,17 @@ import { EncodedAppEntrypointCalls } from './encoding.js';
         // Initial request with calls, authWitnesses and capsules
         const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
         // Global tx options
-        const { cancellable, txNonce, isFeePayer, endSetup } = options;
+        const { cancellable, txNonce, feePaymentMethodOptions } = options;
         // Encode the calls for the app
         const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
-        // Obtain the entrypoint hashed args, built from the app and fee encoded calls
+        // Obtain the entrypoint hashed args, built from the app encoded calls and global options
         const abi = this.getEntrypointAbi();
         const entrypointHashedArgs = await HashedValues.fromArgs(encodeArguments(abi, [
             encodedCalls,
-            !!isFeePayer,
-            !!endSetup,
+            feePaymentMethodOptions,
             !!cancellable
         ]));
-        // Generate the combined payload auth witness, by signing the hash of the combined payload
+        // Generate the payload auth witness, by signing the hash of the payload
         const appPayloadAuthwitness = await this.auth.createAuthWit(await encodedCalls.hash());
         // Assemble the tx request
         const txRequest = TxExecutionRequest.from({
@@ -142,15 +163,11 @@ import { EncodedAppEntrypointCalls } from './encoding.js';
                     visibility: 'public'
                 },
                 {
-                    name: 'is_fee_payer',
+                    name: 'fee_payment_method',
                     type: {
-                        kind: 'boolean'
-                    }
-                },
-                {
-                    name: 'end_setup',
-                    type: {
-                        kind: 'boolean'
+                        kind: 'integer',
+                        sign: 'unsigned',
+                        width: 8
                     }
                 },
                 {

package/dest/default_entrypoint.d.ts

@@ -1,6 +1,6 @@
 import type { GasSettings } from '@aztec/stdlib/gas';
 import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { EntrypointInterface, TxExecutionOptions } from './interfaces.js';
+import type { EntrypointInterface } from './interfaces.js';
 import type { ExecutionPayload } from './payload.js';
 /**
  * Default implementation of the entrypoint interface. It calls a function on a contract directly
@@ -9,6 +9,6 @@ export declare class DefaultEntrypoint implements EntrypointInterface {
     private chainId;
     private rollupVersion;
     constructor(chainId: number, rollupVersion: number);
-    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings): Promise<TxExecutionRequest>;
 }
 //# sourceMappingURL=default_entrypoint.d.ts.map

package/dest/default_entrypoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default_entrypoint.d.ts","sourceRoot":"","sources":["../src/default_entrypoint.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IAEzD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa;gBADb,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM;IAGzB,wBAAwB,CAC5B,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,kBAAkB,CAAC;CA+B/B"}
+{"version":3,"file":"default_entrypoint.d.ts","sourceRoot":"","sources":["../src/default_entrypoint.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IAEzD,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,aAAa;gBADb,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM;IAGzB,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA4B9G"}

package/dest/default_entrypoint.js

@@ -9,10 +9,7 @@ import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
         this.chainId = chainId;
         this.rollupVersion = rollupVersion;
     }
-    async createTxExecutionRequest(exec, gasSettings, options) {
-        if (options.txNonce || options.cancellable !== undefined || options.isFeePayer || options.endSetup) {
-            throw new Error('TxExecutionOptions are not supported in DefaultEntrypoint');
-        }
+    async createTxExecutionRequest(exec, gasSettings) {
         // Initial request with calls, authWitnesses and capsules
         const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
         if (calls.length > 1) {

package/dest/interfaces.d.ts

@@ -4,28 +4,14 @@ import type { GasSettings } from '@aztec/stdlib/gas';
 import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 import type { ExecutionPayload } from './payload.js';
 /**
- * General options for the tx execution.
+ * Information on the connected chain. Used by wallets when constructing transactions to protect against replay
+ * attacks.
  */
-export type TxExecutionOptions = {
-    /** Whether the transaction can be cancelled. */
-    cancellable?: boolean;
-    /**
-     * A nonce to inject into the app payload of the transaction. When used with cancellable=true, this nonce will be
-     * used to compute a nullifier that allows cancelling this transaction by submitting a new one with the same nonce
-     * but higher fee. The nullifier ensures only one transaction can succeed.
-     */
-    txNonce?: Fr;
-    /**
-     * Account contracts usually support paying transaction fees using their own fee juice balance, which is configured
-     * by setting this flag to true.
-     */
-    isFeePayer: boolean;
-    /**
-     * When paying transactions with fee juice, the account contract itself usually has to signal the end of the setup phase since
-     * no other contract will do it. This is configurable independently of the previous flag because in the case of using
-     * FeeJuiceWithClaim the account contract is the fee payer, but the end of the setup is handled by the FeeJuice contract.
-     */
-    endSetup: boolean;
+export type ChainInfo = {
+    /** The L1 chain id */
+    chainId: Fr;
+    /** The version of the rollup  */
+    version: Fr;
 };
 /**
  * Creates transaction execution requests out of a set of function calls, a fee payment method and
@@ -36,10 +22,10 @@ export interface EntrypointInterface {
      * Generates an execution request out of set of function calls.
      * @param exec - The execution intents to be run.
      * @param gasSettings - The gas settings for the transaction.
-     * @param options - Miscellaneous tx options that enable/disable features of the account contract
+     * @param options - Miscellaneous tx options that enable/disable features of the entrypoint
      * @returns The authenticated transaction execution request.
      */
-    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options?: any): Promise<TxExecutionRequest>;
 }
 /** Creates authorization witnesses. */
 export interface AuthWitnessProvider {

package/dest/interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gDAAgD;IAChD,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,CAAC;IACb;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;OAMG;IACH,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAChC;AAED,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/D"}
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,sBAAsB;IACtB,OAAO,EAAE,EAAE,CAAC;IACZ,iCAAiC;IACjC,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;OAMG;IACH,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAChC;AAED,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/D"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aztec/entrypoints",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/entrypoints",
   "description": "Implementation of sample contract entrypoints for the Aztec Network",
-  "version": "3.0.0-nightly.20251002",
+  "version": "3.0.0-nightly.20251004",
   "type": "module",
   "exports": {
     "./account": "./dest/account_entrypoint.js",
@@ -67,10 +67,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "3.0.0-nightly.20251002",
-    "@aztec/foundation": "3.0.0-nightly.20251002",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251002",
-    "@aztec/stdlib": "3.0.0-nightly.20251002",
+    "@aztec/constants": "3.0.0-nightly.20251004",
+    "@aztec/foundation": "3.0.0-nightly.20251004",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251004",
+    "@aztec/stdlib": "3.0.0-nightly.20251004",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/account_entrypoint.ts

@@ -6,9 +6,51 @@ import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
 import { EncodedAppEntrypointCalls } from './encoding.js';
-import type { AuthWitnessProvider, EntrypointInterface, TxExecutionOptions } from './interfaces.js';
+import type { AuthWitnessProvider, EntrypointInterface } from './interfaces.js';
 import { ExecutionPayload } from './payload.js';
 
+/**
+ * The mechanism via which an account contract will pay for a transaction in which it gets invoked.
+ */
+export enum AccountFeePaymentMethodOptions {
+  /**
+   * Signals that some other contract is in charge of paying the fee, nothing needs to be done.
+   */
+  EXTERNAL = 0,
+  /**
+   * Used to make the account contract publicly pay for the transaction with its own fee juice balance,
+   * **which it must already have prior to this transaction**.
+   *
+   * The contract will set itself as the fee payer and end the setup phase.
+   */
+  PREEXISTING_FEE_JUICE = 1,
+  /**
+   * Used to make the account contract publicly pay for the transaction with its own fee juice balance
+   * **which is being claimed in the same transaction**.
+   *
+   * The contract will set itself as the fee payer but not end setup phase - this is done by the Fee Juice
+   * contract after enqueuing a public call, which unlike most public calls is whitelisted by the nodes
+   * to be executable during the setup phase.
+   */
+  FEE_JUICE_WITH_CLAIM = 2,
+}
+
+/**
+ * General options for the tx execution.
+ */
+export type DefaultAccountEntrypointOptions = {
+  /** Whether the transaction can be cancelled. */
+  cancellable?: boolean;
+  /**
+   * A nonce to inject into the app payload of the transaction. When used with cancellable=true, this nonce will be
+   * used to compute a nullifier that allows cancelling this transaction by submitting a new one with the same nonce
+   * but higher fee. The nullifier ensures only one transaction can succeed.
+   */
+  txNonce?: Fr;
+  /** Options that configure how the account contract behaves depending on the fee payment method of the tx */
+  feePaymentMethodOptions: AccountFeePaymentMethodOptions;
+};
+
 /**
  * Implementation for an entrypoint interface that follows the default entrypoint signature
  * for an account, which accepts an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
@@ -24,22 +66,22 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
   async createTxExecutionRequest(
     exec: ExecutionPayload,
     gasSettings: GasSettings,
-    options: TxExecutionOptions,
+    options: DefaultAccountEntrypointOptions,
   ): Promise<TxExecutionRequest> {
     // Initial request with calls, authWitnesses and capsules
     const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
     // Global tx options
-    const { cancellable, txNonce, isFeePayer, endSetup } = options;
+    const { cancellable, txNonce, feePaymentMethodOptions } = options;
     // Encode the calls for the app
     const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
 
-    // Obtain the entrypoint hashed args, built from the app and fee encoded calls
+    // Obtain the entrypoint hashed args, built from the app encoded calls and global options
     const abi = this.getEntrypointAbi();
     const entrypointHashedArgs = await HashedValues.fromArgs(
-      encodeArguments(abi, [encodedCalls, !!isFeePayer, !!endSetup, !!cancellable]),
+      encodeArguments(abi, [encodedCalls, feePaymentMethodOptions, !!cancellable]),
     );
 
-    // Generate the combined payload auth witness, by signing the hash of the combined payload
+    // Generate the payload auth witness, by signing the hash of the payload
     const appPayloadAuthwitness = await this.auth.createAuthWit(await encodedCalls.hash());
 
     // Assemble the tx request
@@ -108,8 +150,7 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
           },
           visibility: 'public',
         },
-        { name: 'is_fee_payer', type: { kind: 'boolean' } },
-        { name: 'end_setup', type: { kind: 'boolean' } },
+        { name: 'fee_payment_method', type: { kind: 'integer', sign: 'unsigned', width: 8 } },
         { name: 'cancellable', type: { kind: 'boolean' } },
       ],
       returnTypes: [],

package/src/default_entrypoint.ts

@@ -2,7 +2,7 @@ import { FunctionType } from '@aztec/stdlib/abi';
 import type { GasSettings } from '@aztec/stdlib/gas';
 import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import type { EntrypointInterface, TxExecutionOptions } from './interfaces.js';
+import type { EntrypointInterface } from './interfaces.js';
 import type { ExecutionPayload } from './payload.js';
 
 /**
@@ -14,14 +14,7 @@ export class DefaultEntrypoint implements EntrypointInterface {
     private rollupVersion: number,
   ) {}
 
-  async createTxExecutionRequest(
-    exec: ExecutionPayload,
-    gasSettings: GasSettings,
-    options: TxExecutionOptions,
-  ): Promise<TxExecutionRequest> {
-    if (options.txNonce || options.cancellable !== undefined || options.isFeePayer || options.endSetup) {
-      throw new Error('TxExecutionOptions are not supported in DefaultEntrypoint');
-    }
+  async createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings): Promise<TxExecutionRequest> {
     // Initial request with calls, authWitnesses and capsules
     const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
 

package/src/interfaces.ts

@@ -6,28 +6,14 @@ import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 import type { ExecutionPayload } from './payload.js';
 
 /**
- * General options for the tx execution.
+ * Information on the connected chain. Used by wallets when constructing transactions to protect against replay
+ * attacks.
  */
-export type TxExecutionOptions = {
-  /** Whether the transaction can be cancelled. */
-  cancellable?: boolean;
-  /**
-   * A nonce to inject into the app payload of the transaction. When used with cancellable=true, this nonce will be
-   * used to compute a nullifier that allows cancelling this transaction by submitting a new one with the same nonce
-   * but higher fee. The nullifier ensures only one transaction can succeed.
-   */
-  txNonce?: Fr;
-  /**
-   * Account contracts usually support paying transaction fees using their own fee juice balance, which is configured
-   * by setting this flag to true.
-   */
-  isFeePayer: boolean;
-  /**
-   * When paying transactions with fee juice, the account contract itself usually has to signal the end of the setup phase since
-   * no other contract will do it. This is configurable independently of the previous flag because in the case of using
-   * FeeJuiceWithClaim the account contract is the fee payer, but the end of the setup is handled by the FeeJuice contract.
-   */
-  endSetup: boolean;
+export type ChainInfo = {
+  /** The L1 chain id */
+  chainId: Fr;
+  /** The version of the rollup  */
+  version: Fr;
 };
 
 /**
@@ -39,13 +25,13 @@ export interface EntrypointInterface {
    * Generates an execution request out of set of function calls.
    * @param exec - The execution intents to be run.
    * @param gasSettings - The gas settings for the transaction.
-   * @param options - Miscellaneous tx options that enable/disable features of the account contract
+   * @param options - Miscellaneous tx options that enable/disable features of the entrypoint
    * @returns The authenticated transaction execution request.
    */
   createTxExecutionRequest(
     exec: ExecutionPayload,
     gasSettings: GasSettings,
-    options: TxExecutionOptions,
+    options?: any,
   ): Promise<TxExecutionRequest>;
 }