@aztec/entrypoints 3.0.0-canary.a9708bd → 3.0.0-devnet.2

package/dest/account_entrypoint.d.ts

@@ -1,7 +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, FeeOptions, 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
@@ -12,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, fee: FeeOptions, 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,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,GAAG,EAAE,UAAU,EACf,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":"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;CA2DzB"}

package/dest/account_entrypoint.js

@@ -2,7 +2,29 @@ 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';
+/**
+ * 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
@@ -17,44 +39,36 @@ import { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encodin
         this.chainId = chainId;
         this.version = version;
     }
-    async createTxExecutionRequest(exec, fee, 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, feePaymentMethodOptions } = 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 fee.paymentMethod.getExecutionPayload(fee.gasSettings);
-        // Encode the calls for the fee
-        const feePayer = await fee.paymentMethod.getFeePayer(fee.gasSettings);
-        const isFeePayer = feePayer.equals(this.address);
-        const feeEncodedCalls = await EncodedCallsForEntrypoint.fromFeeCalls(feeCalls, isFeePayer);
-        // Obtain the entrypoint hashed args, built from the app and fee encoded calls
+        const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
+        // 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, [
-            appEncodedCalls,
-            feeEncodedCalls,
+            encodedCalls,
+            feePaymentMethodOptions,
             !!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));
+        // 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({
             firstCallArgsHash: entrypointHashedArgs.hash,
             origin: this.address,
             functionSelector: await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters),
-            txContext: new TxContext(this.chainId, this.version, fee.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 +93,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',
@@ -129,80 +143,7 @@ import { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encodin
                                                 }
                                             },
                                             {
-                                                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,
-                                    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',
+                                                name: 'hide_msg_sender',
                                                 type: {
                                                     kind: 'boolean'
                                                 }
@@ -222,17 +163,19 @@ import { EncodedCallsForEntrypoint, computeCombinedPayloadHash } from './encodin
                                 type: {
                                     kind: 'field'
                                 }
-                            },
-                            {
-                                name: 'is_fee_payer',
-                                type: {
-                                    kind: 'boolean'
-                                }
                             }
                         ]
                     },
                     visibility: 'public'
                 },
+                {
+                    name: 'fee_payment_method',
+                    type: {
+                        kind: 'integer',
+                        sign: 'unsigned',
+                        width: 8
+                    }
+                },
                 {
                     name: 'cancellable',
                     type: {

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 } 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, fee: FeeOptions, 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,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,GAAG,EAAE,UAAU,EACf,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, fee, options) {
-        if (options.txNonce || options.cancellable !== undefined) {
-            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) {
@@ -27,7 +24,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, fee.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, fee: 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,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAkCpG,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;CAyDzB"}

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, fee) {
+    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 fee.paymentMethod.getExecutionPayload(fee.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, fee.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',
@@ -115,6 +108,12 @@ import { EncodedCallsForEntrypoint } from './encoding.js';
                                                     kind: 'boolean'
                                                 }
                                             },
+                                            {
+                                                name: 'hide_msg_sender',
+                                                type: {
+                                                    kind: 'boolean'
+                                                }
+                                            },
                                             {
                                                 name: 'is_static',
                                                 type: {

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. */
@@ -15,6 +14,8 @@ export type EncodedFunctionCall = {
     target_address: Fr;
     /** Whether the function is public or private */
     is_public: boolean;
+    /** Only applicable for enqueued public function calls. Whether the msg_sender will be set to "null". */
+    hide_msg_sender: boolean;
     /** Whether the function can alter state */
     is_static: boolean;
 };
@@ -30,7 +31,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 +66,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 +74,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 +81,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,wGAAwG;IACxG,eAAe,EAAE,OAAO,CAAC;IACzB,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;IAW/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,CAwBzE"}

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
@@ -47,24 +54,17 @@ const FEE_MAX_CALLS = 2;
                 call.function_selector,
                 call.target_address,
                 new Fr(call.is_public),
+                new Fr(call.hide_msg_sender),
                 new Fr(call.is_static)
             ]);
     }
     /**
-   * 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 +72,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 = [];
@@ -136,6 +87,7 @@ const FEE_MAX_CALLS = 2;
             function_selector: call.selector.toField(),
             target_address: call.to.toField(),
             is_public: call.type == FunctionType.PUBLIC,
+            hide_msg_sender: call.hideMsgSender,
             is_static: call.isStatic
         }));
     return {