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

package/dest/account_entrypoint.d.ts

@@ -1,6 +1,7 @@
 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, FeeOptions, TxExecutionOptions } from './interfaces.js';
+import type { AuthWitnessProvider, EntrypointInterface, TxExecutionOptions } from './interfaces.js';
 import { ExecutionPayload } from './payload.js';
 /**
  * Implementation for an entrypoint interface that follows the default entrypoint signature
@@ -12,7 +13,7 @@ export declare class DefaultAccountEntrypoint implements EntrypointInterface {
     private chainId;
     private version;
     constructor(address: AztecAddress, auth: AuthWitnessProvider, chainId?: number, version?: number);
-    createTxExecutionRequest(exec: ExecutionPayload, feeOptions: FeeOptions, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: TxExecutionOptions): 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,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAChH,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,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,kBAAkB,CAAC;IA+C9B,OAAO,CAAC,gBAAgB;CAqGzB"}
+{"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"}

package/dest/account_entrypoint.js

@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields';
 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 { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encoding.js';
+import { EncodedAppEntrypointCalls } from './encoding.js';
 /**
  * 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
@@ -17,44 +17,37 @@ import { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encodin
         this.chainId = chainId;
         this.version = version;
     }
-    async createTxExecutionRequest(exec, feeOptions, options) {
+    async createTxExecutionRequest(exec, gasSettings, options) {
         // Initial request with calls, authWitnesses and capsules
         const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
         // Global tx options
-        const { cancellable, txNonce } = options;
+        const { cancellable, txNonce, isFeePayer, endSetup } = options;
         // Encode the calls for the app
-        const appEncodedCalls = await EncodedCallsForEntrypoint.fromAppExecution(calls, txNonce);
-        // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
-        const { calls: feeCalls, authWitnesses: feeAuthwitnesses } = await feeOptions.paymentMethod.getExecutionPayload(feeOptions.gasSettings);
-        // Encode the calls for the fee
-        const feePayer = await feeOptions.paymentMethod.getFeePayer();
-        const isFeePayer = feePayer.equals(this.address);
-        const feeEncodedCalls = await EncodedCallsForEntrypoint.fromFeeCalls(feeCalls, isFeePayer);
+        const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
         // Obtain the entrypoint hashed args, built from the app and fee encoded calls
         const abi = this.getEntrypointAbi();
         const entrypointHashedArgs = await HashedValues.fromArgs(encodeArguments(abi, [
-            appEncodedCalls,
-            feeEncodedCalls,
+            encodedCalls,
+            !!isFeePayer,
+            !!endSetup,
             !!cancellable
         ]));
         // Generate the combined payload auth witness, by signing the hash of the combined payload
-        const combinedPayloadAuthWitness = await this.auth.createAuthWit(await computeCombinedPayloadHash(appEncodedCalls, feeEncodedCalls));
+        const appPayloadAuthwitness = await this.auth.createAuthWit(await encodedCalls.hash());
         // Assemble the tx request
         const txRequest = TxExecutionRequest.from({
             firstCallArgsHash: entrypointHashedArgs.hash,
             origin: this.address,
             functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-            txContext: new TxContext(this.chainId, this.version, feeOptions.gasSettings),
+            txContext: new TxContext(this.chainId, this.version, gasSettings),
             argsOfCalls: [
-                ...appEncodedCalls.hashedArguments,
-                ...feeEncodedCalls.hashedArguments,
+                ...encodedCalls.hashedArguments,
                 entrypointHashedArgs,
                 ...extraHashedArgs
             ],
             authWitnesses: [
                 ...authWitnesses,
-                ...feeAuthwitnesses,
-                combinedPayloadAuthWitness
+                appPayloadAuthwitness
             ],
             capsules,
             salt: Fr.random()
@@ -79,7 +72,7 @@ import { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encodin
                                 name: 'function_calls',
                                 type: {
                                     kind: 'array',
-                                    length: 4,
+                                    length: 5,
                                     type: {
                                         kind: 'struct',
                                         path: 'authwit::entrypoint::function_call::FunctionCall',
@@ -149,89 +142,16 @@ import { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encodin
                     visibility: 'public'
                 },
                 {
-                    name: 'fee_payload',
+                    name: 'is_fee_payer',
                     type: {
-                        kind: 'struct',
-                        path: 'authwit::entrypoint::fee::FeePayload',
-                        fields: [
-                            {
-                                name: 'function_calls',
-                                type: {
-                                    kind: 'array',
-                                    length: 2,
-                                    type: {
-                                        kind: 'struct',
-                                        path: 'authwit::entrypoint::function_call::FunctionCall',
-                                        fields: [
-                                            {
-                                                name: 'args_hash',
-                                                type: {
-                                                    kind: 'field'
-                                                }
-                                            },
-                                            {
-                                                name: 'function_selector',
-                                                type: {
-                                                    kind: 'struct',
-                                                    path: 'authwit::aztec::protocol_types::abis::function_selector::FunctionSelector',
-                                                    fields: [
-                                                        {
-                                                            name: 'inner',
-                                                            type: {
-                                                                kind: 'integer',
-                                                                sign: 'unsigned',
-                                                                width: 32
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            },
-                                            {
-                                                name: 'target_address',
-                                                type: {
-                                                    kind: 'struct',
-                                                    path: 'authwit::aztec::protocol_types::address::AztecAddress',
-                                                    fields: [
-                                                        {
-                                                            name: 'inner',
-                                                            type: {
-                                                                kind: 'field'
-                                                            }
-                                                        }
-                                                    ]
-                                                }
-                                            },
-                                            {
-                                                name: 'is_public',
-                                                type: {
-                                                    kind: 'boolean'
-                                                }
-                                            },
-                                            {
-                                                name: 'is_static',
-                                                type: {
-                                                    kind: 'boolean'
-                                                }
-                                            }
-                                        ]
-                                    }
-                                }
-                            },
-                            {
-                                name: 'tx_nonce',
-                                type: {
-                                    kind: 'field'
-                                }
-                            },
-                            {
-                                name: 'is_fee_payer',
-                                type: {
-                                    kind: 'boolean'
-                                }
-                            }
-                        ]
-                    },
-                    visibility: 'public'
+                        kind: 'boolean'
+                    }
+                },
+                {
+                    name: 'end_setup',
+                    type: {
+                        kind: 'boolean'
+                    }
                 },
                 {
                     name: 'cancellable',

package/dest/default_entrypoint.d.ts

@@ -1,5 +1,6 @@
+import type { GasSettings } from '@aztec/stdlib/gas';
 import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { EntrypointInterface, FeeOptions, TxExecutionOptions } from './interfaces.js';
+import type { EntrypointInterface, TxExecutionOptions } from './interfaces.js';
 import type { ExecutionPayload } from './payload.js';
 /**
  * Default implementation of the entrypoint interface. It calls a function on a contract directly
@@ -8,6 +9,6 @@ export declare class DefaultEntrypoint implements EntrypointInterface {
     private chainId;
     private rollupVersion;
     constructor(chainId: number, rollupVersion: number);
-    createTxExecutionRequest(exec: ExecutionPayload, feeOptions: FeeOptions, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: TxExecutionOptions): 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,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC3F,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,UAAU,EAAE,UAAU,EACtB,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,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"}

package/dest/default_entrypoint.js

@@ -9,8 +9,8 @@ import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
         this.chainId = chainId;
         this.rollupVersion = rollupVersion;
     }
-    async createTxExecutionRequest(exec, feeOptions, options) {
-        if (options.txNonce || options.cancellable !== undefined) {
+    async createTxExecutionRequest(exec, gasSettings, options) {
+        if (options.txNonce || options.cancellable !== undefined || options.isFeePayer || options.endSetup) {
             throw new Error('TxExecutionOptions are not supported in DefaultEntrypoint');
         }
         // Initial request with calls, authWitnesses and capsules
@@ -27,7 +27,7 @@ import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
             throw new Error('Public entrypoints are not allowed');
         }
         // Assemble the tx request
-        return new TxExecutionRequest(call.to, call.selector, hashedArguments[0].hash, new TxContext(this.chainId, this.rollupVersion, feeOptions.gasSettings), [
+        return new TxExecutionRequest(call.to, call.selector, hashedArguments[0].hash, new TxContext(this.chainId, this.rollupVersion, gasSettings), [
             ...hashedArguments,
             ...extraHashedArgs
         ], authWitnesses, capsules);

package/dest/default_multi_call_entrypoint.d.ts

@@ -1,6 +1,7 @@
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
 import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { EntrypointInterface, FeeOptions } from './interfaces.js';
+import type { EntrypointInterface } from './interfaces.js';
 import type { ExecutionPayload } from './payload.js';
 /**
  * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
@@ -10,7 +11,7 @@ export declare class DefaultMultiCallEntrypoint implements EntrypointInterface {
     private version;
     private address;
     constructor(chainId: number, version: number, address?: AztecAddress);
-    createTxExecutionRequest(exec: ExecutionPayload, feeOptions: FeeOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings): Promise<TxExecutionRequest>;
     private getEntrypointAbi;
 }
 //# sourceMappingURL=default_multi_call_entrypoint.d.ts.map

package/dest/default_multi_call_entrypoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default_multi_call_entrypoint.d.ts","sourceRoot":"","sources":["../src/default_multi_call_entrypoint.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAG/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;GAEG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAElE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAA0D;IAGvE,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkC3G,OAAO,CAAC,gBAAgB;CAwDzB"}
+{"version":3,"file":"default_multi_call_entrypoint.d.ts","sourceRoot":"","sources":["../src/default_multi_call_entrypoint.ts"],"names":[],"mappings":"AAGA,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;AAG/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;GAEG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAElE,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;gBAFP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,YAA0D;IAGvE,wBAAwB,CAAC,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0B7G,OAAO,CAAC,gBAAgB;CAwDzB"}

package/dest/default_multi_call_entrypoint.js

@@ -2,7 +2,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
 import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
-import { EncodedCallsForEntrypoint } from './encoding.js';
+import { EncodedAppEntrypointCalls } from './encoding.js';
 /**
  * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
  */ export class DefaultMultiCallEntrypoint {
@@ -14,14 +14,11 @@ import { EncodedCallsForEntrypoint } from './encoding.js';
         this.version = version;
         this.address = address;
     }
-    async createTxExecutionRequest(exec, feeOptions) {
+    async createTxExecutionRequest(exec, gasSettings) {
         // Initial request with calls, authWitnesses and capsules
         const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
-        // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
-        const { calls: feeCalls, authWitnesses: feeAuthwitnesses, extraHashedArgs: feeExtraHashedArgs } = await feeOptions.paymentMethod.getExecutionPayload(feeOptions.gasSettings);
-        // Encode the calls, including the fee calls
-        // (since this entrypoint does not distinguish between app and fee calls)
-        const encodedCalls = await EncodedCallsForEntrypoint.fromAppExecution(calls.concat(feeCalls));
+        // Encode the calls for the app
+        const encodedCalls = await EncodedAppEntrypointCalls.create(calls);
         // Obtain the entrypoint hashed args, built from the encoded calls
         const abi = this.getEntrypointAbi();
         const entrypointHashedArgs = await HashedValues.fromArgs(encodeArguments(abi, [
@@ -32,17 +29,13 @@ import { EncodedCallsForEntrypoint } from './encoding.js';
             firstCallArgsHash: entrypointHashedArgs.hash,
             origin: this.address,
             functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-            txContext: new TxContext(this.chainId, this.version, feeOptions.gasSettings),
+            txContext: new TxContext(this.chainId, this.version, gasSettings),
             argsOfCalls: [
                 ...encodedCalls.hashedArguments,
                 entrypointHashedArgs,
-                ...extraHashedArgs,
-                ...feeExtraHashedArgs
-            ],
-            authWitnesses: [
-                ...feeAuthwitnesses,
-                ...authWitnesses
+                ...extraHashedArgs
             ],
+            authWitnesses,
             capsules,
             salt: Fr.random()
         });
@@ -66,7 +59,7 @@ import { EncodedCallsForEntrypoint } from './encoding.js';
                                 name: 'function_calls',
                                 type: {
                                     kind: 'array',
-                                    length: 4,
+                                    length: 5,
                                     type: {
                                         kind: 'struct',
                                         path: 'authwit::entrypoint::function_call::FunctionCall',

package/dest/encoding.d.ts

@@ -2,8 +2,7 @@ import { Fr } from '@aztec/foundation/fields';
 import type { Tuple } from '@aztec/foundation/serialize';
 import { FunctionCall } from '@aztec/stdlib/abi';
 import { HashedValues } from '@aztec/stdlib/tx';
-declare const APP_MAX_CALLS = 4;
-declare const FEE_MAX_CALLS = 2;
+declare const APP_MAX_CALLS = 5;
 /** Encoded function call for an Aztec entrypoint */
 export type EncodedFunctionCall = {
     /** Arguments hash for the call. */
@@ -30,7 +29,7 @@ export type EncodedCalls = {
  * This utility class helps in creating the payload for the entrypoint by taking into
  * account how the calls are encoded and hashed.
  * */
-export declare abstract class EncodedCallsForEntrypoint implements EncodedCalls {
+export declare class EncodedAppEntrypointCalls implements EncodedCalls {
     /** Function calls in the expected format (Noir's convention) */
     encodedFunctionCalls: EncodedFunctionCall[];
     /** The hashed args for the call, ready to be injected in the execution cache */
@@ -65,7 +64,7 @@ export declare abstract class EncodedCallsForEntrypoint implements EncodedCalls
      * Serializes the payload to an array of fields
      * @returns The fields of the payload
      */
-    abstract toFields(): Fr[];
+    toFields(): Fr[];
     /**
      * Hashes the payload
      * @returns The hash of the payload
@@ -73,12 +72,6 @@ export declare abstract class EncodedCallsForEntrypoint implements EncodedCalls
     hash(): Promise<Fr>;
     /** Serializes the function calls to an array of fields. */
     protected functionCallsToFields(): Fr[];
-    /**
-     * Encodes a set of function calls for a dapp entrypoint
-     * @param functionCalls - The function calls to execute
-     * @returns The encoded calls
-     */
-    static fromFunctionCalls(functionCalls: FunctionCall[]): Promise<EncodedAppEntrypointCalls>;
     /**
      * Encodes the functions for the app-portion of a transaction from a set of function calls and a nonce
      * @param functionCalls - The function calls to execute
@@ -86,35 +79,8 @@ export declare abstract class EncodedCallsForEntrypoint implements EncodedCalls
      * nonce can be replaced by submitting a new one with a higher fee.
      * @returns The encoded calls
      */
-    static fromAppExecution(functionCalls: FunctionCall[] | Tuple<FunctionCall, typeof APP_MAX_CALLS>, txNonce?: Fr): Promise<EncodedAppEntrypointCalls>;
-    /**
-     * Creates an encoded set of functions to pay the fee for a transaction
-     * @param functionCalls - The calls generated by the payment method
-     * @param isFeePayer - Whether the sender should be appointed as fee payer
-     * @returns The encoded calls
-     */
-    static fromFeeCalls(functionCalls: FunctionCall[] | Tuple<FunctionCall, typeof FEE_MAX_CALLS>, isFeePayer: boolean): Promise<EncodedFeeEntrypointCalls>;
-}
-/** Encoded calls for app phase execution. */
-export declare class EncodedAppEntrypointCalls extends EncodedCallsForEntrypoint {
-    constructor(encodedFunctionCalls: EncodedFunctionCall[], hashedArguments: HashedValues[], generatorIndex: number, txNonce: Fr);
-    toFields(): Fr[];
+    static create(functionCalls: FunctionCall[] | Tuple<FunctionCall, typeof APP_MAX_CALLS>, txNonce?: Fr): Promise<EncodedAppEntrypointCalls>;
 }
-/** Encoded calls for fee payment */
-export declare class EncodedFeeEntrypointCalls extends EncodedCallsForEntrypoint {
-    #private;
-    constructor(encodedFunctionCalls: EncodedFunctionCall[], hashedArguments: HashedValues[], generatorIndex: number, txNonce: Fr, isFeePayer: boolean);
-    toFields(): Fr[];
-    /** Whether the sender should be appointed as fee payer. */
-    get is_fee_payer(): boolean;
-}
-/**
- * Computes a hash of a combined set of app and fee calls.
- * @param appCalls - A set of app calls.
- * @param feeCalls - A set of calls used to pay fees.
- * @returns A hash of a combined call set.
- */
-export declare function computeCombinedPayloadHash(appPayload: EncodedAppEntrypointCalls, feePayload: EncodedFeeEntrypointCalls): Promise<Fr>;
 /** Encodes FunctionCalls for execution, following Noir's convention */
 export declare function encode(calls: FunctionCall[]): Promise<EncodedCalls>;
 export {};

package/dest/encoding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,QAAA,MAAM,aAAa,IAAI,CAAC;AAExB,QAAA,MAAM,aAAa,IAAI,CAAC;AAExB,oDAAoD;AACpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,mCAAmC;IACnC,oGAAoG;IACpG,SAAS,EAAE,EAAE,CAAC;IACd,uCAAuC;IACvC,iBAAiB,EAAE,EAAE,CAAC;IACtB,sCAAsC;IACtC,cAAc,EAAE,EAAE,CAAC;IACnB,gDAAgD;IAChD,SAAS,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,sFAAsF;AACtF,MAAM,MAAM,YAAY,GAAG;IACzB,gEAAgE;IAChE,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,gFAAgF;IAChF,eAAe,EAAE,YAAY,EAAE,CAAC;CACjC,CAAC;AAEF;;;;KAIK;AACL,8BAAsB,yBAA0B,YAAW,YAAY;IAEnE,gEAAgE;IACzD,oBAAoB,EAAE,mBAAmB,EAAE;IAClD,gFAAgF;IACzE,eAAe,EAAE,YAAY,EAAE;IACtC,oDAAoD;IAC7C,cAAc,EAAE,MAAM;IAC7B;;;;OAIG;IAEI,QAAQ,EAAE,EAAE;;IAZnB,gEAAgE;IACzD,oBAAoB,EAAE,mBAAmB,EAAE;IAClD,gFAAgF;IACzE,eAAe,EAAE,YAAY,EAAE;IACtC,oDAAoD;IAC7C,cAAc,EAAE,MAAM;IAC7B;;;;OAIG;IAEI,QAAQ,EAAE,EAAE;IAIrB;;;OAGG;IACH,IAAI,cAAc,0BAEjB;IAGD;;;OAGG;IACH,QAAQ,CAAC,QAAQ,IAAI,EAAE,EAAE;IAEzB;;;OAGG;IACH,IAAI;IAIJ,2DAA2D;IAC3D,SAAS,CAAC,qBAAqB;IAU/B;;;;OAIG;WACU,iBAAiB,CAAC,aAAa,EAAE,YAAY,EAAE;IAK5D;;;;;;OAMG;WACU,gBAAgB,CAC3B,aAAa,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,OAAO,aAAa,CAAC,EACzE,OAAO,KAAc;IAevB;;;;;OAKG;WACU,YAAY,CACvB,aAAa,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,OAAO,aAAa,CAAC,EACzE,UAAU,EAAE,OAAO;CAYtB;AAED,6CAA6C;AAC7C,qBAAa,yBAA0B,SAAQ,yBAAyB;gBAEpE,oBAAoB,EAAE,mBAAmB,EAAE,EAC3C,eAAe,EAAE,YAAY,EAAE,EAC/B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,EAAE;IAKJ,QAAQ,IAAI,EAAE,EAAE;CAG1B;AAED,oCAAoC;AACpC,qBAAa,yBAA0B,SAAQ,yBAAyB;;gBAIpE,oBAAoB,EAAE,mBAAmB,EAAE,EAC3C,eAAe,EAAE,YAAY,EAAE,EAC/B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,EAAE,EACX,UAAU,EAAE,OAAO;IAMZ,QAAQ,IAAI,EAAE,EAAE;IAKzB,2DAA2D;IAC3D,IAAI,YAAY,YAEf;CAEF;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,yBAAyB,EACrC,UAAU,EAAE,yBAAyB,GACpC,OAAO,CAAC,EAAE,CAAC,CAKb;AAED,uEAAuE;AACvE,wBAAsB,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBzE"}
+{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,QAAA,MAAM,aAAa,IAAI,CAAC;AAExB,oDAAoD;AACpD,MAAM,MAAM,mBAAmB,GAAG;IAChC,mCAAmC;IACnC,oGAAoG;IACpG,SAAS,EAAE,EAAE,CAAC;IACd,uCAAuC;IACvC,iBAAiB,EAAE,EAAE,CAAC;IACtB,sCAAsC;IACtC,cAAc,EAAE,EAAE,CAAC;IACnB,gDAAgD;IAChD,SAAS,EAAE,OAAO,CAAC;IACnB,2CAA2C;IAC3C,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,sFAAsF;AACtF,MAAM,MAAM,YAAY,GAAG;IACzB,gEAAgE;IAChE,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,gFAAgF;IAChF,eAAe,EAAE,YAAY,EAAE,CAAC;CACjC,CAAC;AAEF;;;;KAIK;AACL,qBAAa,yBAA0B,YAAW,YAAY;IAE1D,gEAAgE;IACzD,oBAAoB,EAAE,mBAAmB,EAAE;IAClD,gFAAgF;IACzE,eAAe,EAAE,YAAY,EAAE;IACtC,oDAAoD;IAC7C,cAAc,EAAE,MAAM;IAC7B;;;;OAIG;IAEI,QAAQ,EAAE,EAAE;;IAZnB,gEAAgE;IACzD,oBAAoB,EAAE,mBAAmB,EAAE;IAClD,gFAAgF;IACzE,eAAe,EAAE,YAAY,EAAE;IACtC,oDAAoD;IAC7C,cAAc,EAAE,MAAM;IAC7B;;;;OAIG;IAEI,QAAQ,EAAE,EAAE;IAIrB;;;OAGG;IACH,IAAI,cAAc,0BAEjB;IAGD;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE;IAIhB;;;OAGG;IACH,IAAI;IAIJ,2DAA2D;IAC3D,SAAS,CAAC,qBAAqB;IAU/B;;;;;;OAMG;WACU,MAAM,CACjB,aAAa,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,OAAO,aAAa,CAAC,EACzE,OAAO,KAAc;CAcxB;AAED,uEAAuE;AACvE,wBAAsB,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBzE"}

package/dest/encoding.js

@@ -6,14 +6,12 @@ import { FunctionCall, FunctionType } from '@aztec/stdlib/abi';
 import { HashedValues } from '@aztec/stdlib/tx';
 // These must match the values defined in:
 // - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
-const APP_MAX_CALLS = 4;
-// - and noir-projects/aztec-nr/aztec/src/entrypoint/fee.nr
-const FEE_MAX_CALLS = 2;
+const APP_MAX_CALLS = 5;
 /**
  * Entrypoints derive their arguments from the calls that they'll ultimate make.
  * This utility class helps in creating the payload for the entrypoint by taking into
  * account how the calls are encoded and hashed.
- * */ export class EncodedCallsForEntrypoint {
+ * */ export class EncodedAppEntrypointCalls {
     encodedFunctionCalls;
     hashedArguments;
     generatorIndex;
@@ -35,6 +33,15 @@ const FEE_MAX_CALLS = 2;
    */ get function_calls() {
         return this.encodedFunctionCalls;
     }
+    /* eslint-enable camelcase */ /**
+   * Serializes the payload to an array of fields
+   * @returns The fields of the payload
+   */ toFields() {
+        return [
+            ...this.functionCallsToFields(),
+            this.tx_nonce
+        ];
+    }
     /**
    * Hashes the payload
    * @returns The hash of the payload
@@ -51,20 +58,12 @@ const FEE_MAX_CALLS = 2;
             ]);
     }
     /**
-   * Encodes a set of function calls for a dapp entrypoint
-   * @param functionCalls - The function calls to execute
-   * @returns The encoded calls
-   */ static async fromFunctionCalls(functionCalls) {
-        const encoded = await encode(functionCalls);
-        return new EncodedAppEntrypointCalls(encoded.encodedFunctionCalls, encoded.hashedArguments, 0, Fr.random());
-    }
-    /**
    * Encodes the functions for the app-portion of a transaction from a set of function calls and a nonce
    * @param functionCalls - The function calls to execute
    * @param txNonce - A nonce used to enable transaction cancellation when cancellable=true. Transactions with the same
    * nonce can be replaced by submitting a new one with a higher fee.
    * @returns The encoded calls
-   */ static async fromAppExecution(functionCalls, txNonce = Fr.random()) {
+   */ static async create(functionCalls, txNonce = Fr.random()) {
         if (functionCalls.length > APP_MAX_CALLS) {
             throw new Error(`Expected at most ${APP_MAX_CALLS} function calls, got ${functionCalls.length}`);
         }
@@ -72,55 +71,6 @@ const FEE_MAX_CALLS = 2;
         const encoded = await encode(paddedCalls);
         return new EncodedAppEntrypointCalls(encoded.encodedFunctionCalls, encoded.hashedArguments, GeneratorIndex.SIGNATURE_PAYLOAD, txNonce);
     }
-    /**
-   * Creates an encoded set of functions to pay the fee for a transaction
-   * @param functionCalls - The calls generated by the payment method
-   * @param isFeePayer - Whether the sender should be appointed as fee payer
-   * @returns The encoded calls
-   */ static async fromFeeCalls(functionCalls, isFeePayer) {
-        const paddedCalls = padArrayEnd(functionCalls, FunctionCall.empty(), FEE_MAX_CALLS);
-        const encoded = await encode(paddedCalls);
-        return new EncodedFeeEntrypointCalls(encoded.encodedFunctionCalls, encoded.hashedArguments, GeneratorIndex.FEE_PAYLOAD, Fr.random(), isFeePayer);
-    }
-}
-/** Encoded calls for app phase execution. */ export class EncodedAppEntrypointCalls extends EncodedCallsForEntrypoint {
-    constructor(encodedFunctionCalls, hashedArguments, generatorIndex, txNonce){
-        super(encodedFunctionCalls, hashedArguments, generatorIndex, txNonce);
-    }
-    toFields() {
-        return [
-            ...this.functionCallsToFields(),
-            this.tx_nonce
-        ];
-    }
-}
-/** Encoded calls for fee payment */ export class EncodedFeeEntrypointCalls extends EncodedCallsForEntrypoint {
-    #isFeePayer;
-    constructor(encodedFunctionCalls, hashedArguments, generatorIndex, txNonce, isFeePayer){
-        super(encodedFunctionCalls, hashedArguments, generatorIndex, txNonce);
-        this.#isFeePayer = isFeePayer;
-    }
-    toFields() {
-        return [
-            ...this.functionCallsToFields(),
-            this.tx_nonce,
-            new Fr(this.#isFeePayer)
-        ];
-    }
-    /* eslint-disable camelcase */ /** Whether the sender should be appointed as fee payer. */ get is_fee_payer() {
-        return this.#isFeePayer;
-    }
-}
-/**
- * Computes a hash of a combined set of app and fee calls.
- * @param appCalls - A set of app calls.
- * @param feeCalls - A set of calls used to pay fees.
- * @returns A hash of a combined call set.
- */ export async function computeCombinedPayloadHash(appPayload, feePayload) {
-    return poseidon2HashWithSeparator([
-        await appPayload.hash(),
-        await feePayload.hash()
-    ], GeneratorIndex.COMBINED_PAYLOAD);
 }
 /** Encodes FunctionCalls for execution, following Noir's convention */ export async function encode(calls) {
     const hashedArguments = [];

package/dest/interfaces.d.ts

@@ -1,7 +1,5 @@
 import type { Fr } from '@aztec/foundation/fields';
-import type { FieldsOf } from '@aztec/foundation/types';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
 import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 import type { ExecutionPayload } from './payload.js';
@@ -17,6 +15,17 @@ export type TxExecutionOptions = {
      * 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;
 };
 /**
  * Creates transaction execution requests out of a set of function calls, a fee payment method and
@@ -26,11 +35,11 @@ export interface EntrypointInterface {
     /**
      * Generates an execution request out of set of function calls.
      * @param exec - The execution intents to be run.
-     * @param feeOptions - The fee options for the transaction.
-     * @param options - Transaction nonce and whether the transaction is cancellable.
+     * @param gasSettings - The gas settings for the transaction.
+     * @param options - Miscellaneous tx options that enable/disable features of the account contract
      * @returns The authenticated transaction execution request.
      */
-    createTxExecutionRequest(exec: ExecutionPayload, feeOptions: FeeOptions, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options: TxExecutionOptions): Promise<TxExecutionRequest>;
 }
 /** Creates authorization witnesses. */
 export interface AuthWitnessProvider {
@@ -41,45 +50,4 @@ export interface AuthWitnessProvider {
      */
     createAuthWit(messageHash: Fr | Buffer): Promise<AuthWitness>;
 }
-/**
- * Holds information about how the fee for a transaction is to be paid.
- */
-export interface FeePaymentMethod {
-    /** The asset used to pay the fee. */
-    getAsset(): Promise<AztecAddress>;
-    /**
-     * Returns the data to be added to the final execution request
-     * to pay the fee in the given asset
-     * @param gasSettings - The gas limits and max fees.
-     * @returns The function calls to pay the fee.
-     */
-    getExecutionPayload(gasSettings: GasSettings): Promise<ExecutionPayload>;
-    /**
-     * The expected fee payer for this tx.
-     */
-    getFeePayer(): Promise<AztecAddress>;
-}
-/**
- * Fee payment options for a transaction.
- */
-export type FeeOptions = {
-    /** The fee payment method to use */
-    paymentMethod: FeePaymentMethod;
-    /** The gas settings */
-    gasSettings: GasSettings;
-};
-/** Fee options as set by a user. */
-export type UserFeeOptions = {
-    /** The fee payment method to use */
-    paymentMethod?: FeePaymentMethod;
-    /** The gas settings */
-    gasSettings?: Partial<FieldsOf<GasSettings>>;
-};
-/**  Fee options that can be set for simulation *only* */
-export type SimulationUserFeeOptions = UserFeeOptions & {
-    /** Whether to modify the fee settings of the simulation with high gas limit to figure out actual gas settings. */
-    estimateGas?: boolean;
-    /** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */
-    estimatedGasPadding?: number;
-};
 //# sourceMappingURL=interfaces.d.ts.map

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,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,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;CACd,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;OAMG;IACH,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,UAAU,EACtB,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;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,qCAAqC;IACrC,QAAQ,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAClC;;;;;OAKG;IACH,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACzE;;OAEG;IACH,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,oCAAoC;IACpC,aAAa,EAAE,gBAAgB,CAAC;IAChC,uBAAuB;IACvB,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAEF,oCAAoC;AACpC,MAAM,MAAM,cAAc,GAAG;IAC3B,oCAAoC;IACpC,aAAa,CAAC,EAAE,gBAAgB,CAAC;IACjC,uBAAuB;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;CAC9C,CAAC;AAEF,yDAAyD;AACzD,MAAM,MAAM,wBAAwB,GAAG,cAAc,GAAG;IACtD,kHAAkH;IAClH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,qHAAqH;IACrH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC"}
+{"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"}

package/dest/interfaces.js

@@ -1 +1 @@
-/**  Fee options that can be set for simulation *only* */ export { };
+/** Creates authorization witnesses. */ export { };

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.20251001",
+  "version": "3.0.0-nightly.20251002",
   "type": "module",
   "exports": {
     "./account": "./dest/account_entrypoint.js",
@@ -67,10 +67,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "3.0.0-nightly.20251001",
-    "@aztec/foundation": "3.0.0-nightly.20251001",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251001",
-    "@aztec/stdlib": "3.0.0-nightly.20251001",
+    "@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",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/account_entrypoint.ts

@@ -1,11 +1,12 @@
 import { Fr } from '@aztec/foundation/fields';
 import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
 import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
-import { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encoding.js';
-import type { AuthWitnessProvider, EntrypointInterface, FeeOptions, TxExecutionOptions } from './interfaces.js';
+import { EncodedAppEntrypointCalls } from './encoding.js';
+import type { AuthWitnessProvider, EntrypointInterface, TxExecutionOptions } from './interfaces.js';
 import { ExecutionPayload } from './payload.js';
 
 /**
@@ -22,48 +23,33 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
 
   async createTxExecutionRequest(
     exec: ExecutionPayload,
-    feeOptions: FeeOptions,
+    gasSettings: GasSettings,
     options: TxExecutionOptions,
   ): Promise<TxExecutionRequest> {
     // Initial request with calls, authWitnesses and capsules
     const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
     // Global tx options
-    const { cancellable, txNonce } = options;
+    const { cancellable, txNonce, isFeePayer, endSetup } = options;
     // Encode the calls for the app
-    const appEncodedCalls = await EncodedCallsForEntrypoint.fromAppExecution(calls, txNonce);
-    // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
-    const { calls: feeCalls, authWitnesses: feeAuthwitnesses } = await feeOptions.paymentMethod.getExecutionPayload(
-      feeOptions.gasSettings,
-    );
-    // Encode the calls for the fee
-    const feePayer = await feeOptions.paymentMethod.getFeePayer();
-    const isFeePayer = feePayer.equals(this.address);
-    const feeEncodedCalls = await EncodedCallsForEntrypoint.fromFeeCalls(feeCalls, isFeePayer);
+    const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
 
     // Obtain the entrypoint hashed args, built from the app and fee encoded calls
     const abi = this.getEntrypointAbi();
     const entrypointHashedArgs = await HashedValues.fromArgs(
-      encodeArguments(abi, [appEncodedCalls, feeEncodedCalls, !!cancellable]),
+      encodeArguments(abi, [encodedCalls, !!isFeePayer, !!endSetup, !!cancellable]),
     );
 
     // Generate the combined payload auth witness, by signing the hash of the combined payload
-    const combinedPayloadAuthWitness = await this.auth.createAuthWit(
-      await computeCombinedPayloadHash(appEncodedCalls, feeEncodedCalls),
-    );
+    const appPayloadAuthwitness = await this.auth.createAuthWit(await encodedCalls.hash());
 
     // Assemble the tx request
     const txRequest = TxExecutionRequest.from({
       firstCallArgsHash: entrypointHashedArgs.hash,
       origin: this.address,
       functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-      txContext: new TxContext(this.chainId, this.version, feeOptions.gasSettings),
-      argsOfCalls: [
-        ...appEncodedCalls.hashedArguments,
-        ...feeEncodedCalls.hashedArguments,
-        entrypointHashedArgs,
-        ...extraHashedArgs,
-      ],
-      authWitnesses: [...authWitnesses, ...feeAuthwitnesses, combinedPayloadAuthWitness],
+      txContext: new TxContext(this.chainId, this.version, gasSettings),
+      argsOfCalls: [...encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs],
+      authWitnesses: [...authWitnesses, appPayloadAuthwitness],
       capsules,
       salt: Fr.random(),
     });
@@ -89,50 +75,7 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
                 name: 'function_calls',
                 type: {
                   kind: 'array',
-                  length: 4,
-                  type: {
-                    kind: 'struct',
-                    path: 'authwit::entrypoint::function_call::FunctionCall',
-                    fields: [
-                      { name: 'args_hash', type: { kind: 'field' } },
-                      {
-                        name: 'function_selector',
-                        type: {
-                          kind: 'struct',
-                          path: 'authwit::aztec::protocol_types::abis::function_selector::FunctionSelector',
-                          fields: [{ name: 'inner', type: { kind: 'integer', sign: 'unsigned', width: 32 } }],
-                        },
-                      },
-                      {
-                        name: 'target_address',
-                        type: {
-                          kind: 'struct',
-                          path: 'authwit::aztec::protocol_types::address::AztecAddress',
-                          fields: [{ name: 'inner', type: { kind: 'field' } }],
-                        },
-                      },
-                      { name: 'is_public', type: { kind: 'boolean' } },
-                      { name: 'is_static', type: { kind: 'boolean' } },
-                    ],
-                  },
-                },
-              },
-              { name: 'tx_nonce', type: { kind: 'field' } },
-            ],
-          },
-          visibility: 'public',
-        },
-        {
-          name: 'fee_payload',
-          type: {
-            kind: 'struct',
-            path: 'authwit::entrypoint::fee::FeePayload',
-            fields: [
-              {
-                name: 'function_calls',
-                type: {
-                  kind: 'array',
-                  length: 2,
+                  length: 5,
                   type: {
                     kind: 'struct',
                     path: 'authwit::entrypoint::function_call::FunctionCall',
@@ -161,11 +104,12 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
                 },
               },
               { name: 'tx_nonce', type: { kind: 'field' } },
-              { name: 'is_fee_payer', type: { kind: 'boolean' } },
             ],
           },
           visibility: 'public',
         },
+        { name: 'is_fee_payer', type: { kind: 'boolean' } },
+        { name: 'end_setup', type: { kind: 'boolean' } },
         { name: 'cancellable', type: { kind: 'boolean' } },
       ],
       returnTypes: [],

package/src/default_entrypoint.ts

@@ -1,7 +1,8 @@
 import { FunctionType } from '@aztec/stdlib/abi';
+import type { GasSettings } from '@aztec/stdlib/gas';
 import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import type { EntrypointInterface, FeeOptions, TxExecutionOptions } from './interfaces.js';
+import type { EntrypointInterface, TxExecutionOptions } from './interfaces.js';
 import type { ExecutionPayload } from './payload.js';
 
 /**
@@ -15,10 +16,10 @@ export class DefaultEntrypoint implements EntrypointInterface {
 
   async createTxExecutionRequest(
     exec: ExecutionPayload,
-    feeOptions: FeeOptions,
+    gasSettings: GasSettings,
     options: TxExecutionOptions,
   ): Promise<TxExecutionRequest> {
-    if (options.txNonce || options.cancellable !== undefined) {
+    if (options.txNonce || options.cancellable !== undefined || options.isFeePayer || options.endSetup) {
       throw new Error('TxExecutionOptions are not supported in DefaultEntrypoint');
     }
     // Initial request with calls, authWitnesses and capsules
@@ -42,7 +43,7 @@ export class DefaultEntrypoint implements EntrypointInterface {
       call.to,
       call.selector,
       hashedArguments[0].hash,
-      new TxContext(this.chainId, this.rollupVersion, feeOptions.gasSettings),
+      new TxContext(this.chainId, this.rollupVersion, gasSettings),
       [...hashedArguments, ...extraHashedArgs],
       authWitnesses,
       capsules,

package/src/default_multi_call_entrypoint.ts

@@ -2,10 +2,11 @@ import { Fr } from '@aztec/foundation/fields';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
 import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import { EncodedCallsForEntrypoint } from './encoding.js';
-import type { EntrypointInterface, FeeOptions } from './interfaces.js';
+import { EncodedAppEntrypointCalls } from './encoding.js';
+import type { EntrypointInterface } from './interfaces.js';
 import type { ExecutionPayload } from './payload.js';
 
 /**
@@ -18,20 +19,12 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
     private address: AztecAddress = ProtocolContractAddress.MultiCallEntrypoint,
   ) {}
 
-  async createTxExecutionRequest(exec: ExecutionPayload, feeOptions: FeeOptions): Promise<TxExecutionRequest> {
+  async createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings): Promise<TxExecutionRequest> {
     // Initial request with calls, authWitnesses and capsules
     const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
 
-    // Get the execution payload for the fee, it includes the calls and potentially authWitnesses
-    const {
-      calls: feeCalls,
-      authWitnesses: feeAuthwitnesses,
-      extraHashedArgs: feeExtraHashedArgs,
-    } = await feeOptions.paymentMethod.getExecutionPayload(feeOptions.gasSettings);
-
-    // Encode the calls, including the fee calls
-    // (since this entrypoint does not distinguish between app and fee calls)
-    const encodedCalls = await EncodedCallsForEntrypoint.fromAppExecution(calls.concat(feeCalls));
+    // Encode the calls for the app
+    const encodedCalls = await EncodedAppEntrypointCalls.create(calls);
 
     // Obtain the entrypoint hashed args, built from the encoded calls
     const abi = this.getEntrypointAbi();
@@ -42,9 +35,9 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
       firstCallArgsHash: entrypointHashedArgs.hash,
       origin: this.address,
       functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-      txContext: new TxContext(this.chainId, this.version, feeOptions.gasSettings),
-      argsOfCalls: [...encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs, ...feeExtraHashedArgs],
-      authWitnesses: [...feeAuthwitnesses, ...authWitnesses],
+      txContext: new TxContext(this.chainId, this.version, gasSettings),
+      argsOfCalls: [...encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs],
+      authWitnesses,
       capsules,
       salt: Fr.random(),
     });
@@ -70,7 +63,7 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
                 name: 'function_calls',
                 type: {
                   kind: 'array',
-                  length: 4,
+                  length: 5,
                   type: {
                     kind: 'struct',
                     path: 'authwit::entrypoint::function_call::FunctionCall',

package/src/encoding.ts

@@ -8,9 +8,7 @@ import { HashedValues } from '@aztec/stdlib/tx';
 
 // These must match the values defined in:
 // - noir-projects/aztec-nr/aztec/src/entrypoint/app.nr
-const APP_MAX_CALLS = 4;
-// - and noir-projects/aztec-nr/aztec/src/entrypoint/fee.nr
-const FEE_MAX_CALLS = 2;
+const APP_MAX_CALLS = 5;
 
 /** Encoded function call for an Aztec entrypoint */
 export type EncodedFunctionCall = {
@@ -40,7 +38,7 @@ export type EncodedCalls = {
  * This utility class helps in creating the payload for the entrypoint by taking into
  * account how the calls are encoded and hashed.
  * */
-export abstract class EncodedCallsForEntrypoint implements EncodedCalls {
+export class EncodedAppEntrypointCalls implements EncodedCalls {
   constructor(
     /** Function calls in the expected format (Noir's convention) */
     public encodedFunctionCalls: EncodedFunctionCall[],
@@ -71,7 +69,9 @@ export abstract class EncodedCallsForEntrypoint implements EncodedCalls {
    * Serializes the payload to an array of fields
    * @returns The fields of the payload
    */
-  abstract toFields(): Fr[];
+  toFields(): Fr[] {
+    return [...this.functionCallsToFields(), this.tx_nonce];
+  }
 
   /**
    * Hashes the payload
@@ -92,16 +92,6 @@ export abstract class EncodedCallsForEntrypoint implements EncodedCalls {
     ]);
   }
 
-  /**
-   * Encodes a set of function calls for a dapp entrypoint
-   * @param functionCalls - The function calls to execute
-   * @returns The encoded calls
-   */
-  static async fromFunctionCalls(functionCalls: FunctionCall[]) {
-    const encoded = await encode(functionCalls);
-    return new EncodedAppEntrypointCalls(encoded.encodedFunctionCalls, encoded.hashedArguments, 0, Fr.random());
-  }
-
   /**
    * Encodes the functions for the app-portion of a transaction from a set of function calls and a nonce
    * @param functionCalls - The function calls to execute
@@ -109,7 +99,7 @@ export abstract class EncodedCallsForEntrypoint implements EncodedCalls {
    * nonce can be replaced by submitting a new one with a higher fee.
    * @returns The encoded calls
    */
-  static async fromAppExecution(
+  static async create(
     functionCalls: FunctionCall[] | Tuple<FunctionCall, typeof APP_MAX_CALLS>,
     txNonce = Fr.random(),
   ) {
@@ -125,86 +115,6 @@ export abstract class EncodedCallsForEntrypoint implements EncodedCalls {
       txNonce,
     );
   }
-
-  /**
-   * Creates an encoded set of functions to pay the fee for a transaction
-   * @param functionCalls - The calls generated by the payment method
-   * @param isFeePayer - Whether the sender should be appointed as fee payer
-   * @returns The encoded calls
-   */
-  static async fromFeeCalls(
-    functionCalls: FunctionCall[] | Tuple<FunctionCall, typeof FEE_MAX_CALLS>,
-    isFeePayer: boolean,
-  ) {
-    const paddedCalls = padArrayEnd(functionCalls, FunctionCall.empty(), FEE_MAX_CALLS);
-    const encoded = await encode(paddedCalls);
-    return new EncodedFeeEntrypointCalls(
-      encoded.encodedFunctionCalls,
-      encoded.hashedArguments,
-      GeneratorIndex.FEE_PAYLOAD,
-      Fr.random(),
-      isFeePayer,
-    );
-  }
-}
-
-/** Encoded calls for app phase execution. */
-export class EncodedAppEntrypointCalls extends EncodedCallsForEntrypoint {
-  constructor(
-    encodedFunctionCalls: EncodedFunctionCall[],
-    hashedArguments: HashedValues[],
-    generatorIndex: number,
-    txNonce: Fr,
-  ) {
-    super(encodedFunctionCalls, hashedArguments, generatorIndex, txNonce);
-  }
-
-  override toFields(): Fr[] {
-    return [...this.functionCallsToFields(), this.tx_nonce];
-  }
-}
-
-/** Encoded calls for fee payment */
-export class EncodedFeeEntrypointCalls extends EncodedCallsForEntrypoint {
-  #isFeePayer: boolean;
-
-  constructor(
-    encodedFunctionCalls: EncodedFunctionCall[],
-    hashedArguments: HashedValues[],
-    generatorIndex: number,
-    txNonce: Fr,
-    isFeePayer: boolean,
-  ) {
-    super(encodedFunctionCalls, hashedArguments, generatorIndex, txNonce);
-    this.#isFeePayer = isFeePayer;
-  }
-
-  override toFields(): Fr[] {
-    return [...this.functionCallsToFields(), this.tx_nonce, new Fr(this.#isFeePayer)];
-  }
-
-  /* eslint-disable camelcase */
-  /** Whether the sender should be appointed as fee payer. */
-  get is_fee_payer() {
-    return this.#isFeePayer;
-  }
-  /* eslint-enable camelcase */
-}
-
-/**
- * Computes a hash of a combined set of app and fee calls.
- * @param appCalls - A set of app calls.
- * @param feeCalls - A set of calls used to pay fees.
- * @returns A hash of a combined call set.
- */
-export async function computeCombinedPayloadHash(
-  appPayload: EncodedAppEntrypointCalls,
-  feePayload: EncodedFeeEntrypointCalls,
-): Promise<Fr> {
-  return poseidon2HashWithSeparator(
-    [await appPayload.hash(), await feePayload.hash()],
-    GeneratorIndex.COMBINED_PAYLOAD,
-  );
 }
 
 /** Encodes FunctionCalls for execution, following Noir's convention */

package/src/interfaces.ts

@@ -1,7 +1,5 @@
 import type { Fr } from '@aztec/foundation/fields';
-import type { FieldsOf } from '@aztec/foundation/types';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
 import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 
@@ -19,6 +17,17 @@ export type TxExecutionOptions = {
    * 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;
 };
 
 /**
@@ -29,13 +38,13 @@ export interface EntrypointInterface {
   /**
    * Generates an execution request out of set of function calls.
    * @param exec - The execution intents to be run.
-   * @param feeOptions - The fee options for the transaction.
-   * @param options - Transaction nonce and whether the transaction is cancellable.
+   * @param gasSettings - The gas settings for the transaction.
+   * @param options - Miscellaneous tx options that enable/disable features of the account contract
    * @returns The authenticated transaction execution request.
    */
   createTxExecutionRequest(
     exec: ExecutionPayload,
-    feeOptions: FeeOptions,
+    gasSettings: GasSettings,
     options: TxExecutionOptions,
   ): Promise<TxExecutionRequest>;
 }
@@ -49,48 +58,3 @@ export interface AuthWitnessProvider {
    */
   createAuthWit(messageHash: Fr | Buffer): Promise<AuthWitness>;
 }
-
-/**
- * Holds information about how the fee for a transaction is to be paid.
- */
-export interface FeePaymentMethod {
-  /** The asset used to pay the fee. */
-  getAsset(): Promise<AztecAddress>;
-  /**
-   * Returns the data to be added to the final execution request
-   * to pay the fee in the given asset
-   * @param gasSettings - The gas limits and max fees.
-   * @returns The function calls to pay the fee.
-   */
-  getExecutionPayload(gasSettings: GasSettings): Promise<ExecutionPayload>;
-  /**
-   * The expected fee payer for this tx.
-   */
-  getFeePayer(): Promise<AztecAddress>;
-}
-
-/**
- * Fee payment options for a transaction.
- */
-export type FeeOptions = {
-  /** The fee payment method to use */
-  paymentMethod: FeePaymentMethod;
-  /** The gas settings */
-  gasSettings: GasSettings;
-};
-
-/** Fee options as set by a user. */
-export type UserFeeOptions = {
-  /** The fee payment method to use */
-  paymentMethod?: FeePaymentMethod;
-  /** The gas settings */
-  gasSettings?: Partial<FieldsOf<GasSettings>>;
-};
-
-/**  Fee options that can be set for simulation *only* */
-export type SimulationUserFeeOptions = UserFeeOptions & {
-  /** Whether to modify the fee settings of the simulation with high gas limit to figure out actual gas settings. */
-  estimateGas?: boolean;
-  /** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */
-  estimatedGasPadding?: number;
-};