@aztec/entrypoints 2.1.0-rc.9 → 3.0.0-devnet.2

package/dest/interfaces.d.ts

@@ -1,22 +1,17 @@
 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';
 /**
- * General options for the tx execution.
+ * Information on the connected chain. Used by wallets when constructing transactions to protect against replay
+ * attacks.
  */
-export type TxExecutionOptions = {
-    /** Whether the transaction can be cancelled. */
-    cancellable?: boolean;
-    /**
-     * A nonce to inject into the app payload of the transaction. When used with cancellable=true, this nonce will be
-     * used to compute a nullifier that allows cancelling this transaction by submitting a new one with the same nonce
-     * but higher fee. The nullifier ensures only one transaction can succeed.
-     */
-    txNonce?: Fr;
+export type ChainInfo = {
+    /** The L1 chain id */
+    chainId: Fr;
+    /** The version of the rollup  */
+    version: Fr;
 };
 /**
  * Creates transaction execution requests out of a set of function calls, a fee payment method and
@@ -26,11 +21,11 @@ export interface EntrypointInterface {
     /**
      * Generates an execution request out of set of function calls.
      * @param exec - The execution intents to be run.
-     * @param fee - 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 entrypoint
      * @returns The authenticated transaction execution request.
      */
-    createTxExecutionRequest(exec: ExecutionPayload, fee: FeeOptions, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options?: any): Promise<TxExecutionRequest>;
 }
 /** Creates authorization witnesses. */
 export interface AuthWitnessProvider {
@@ -41,45 +36,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.
-     * @param gasSettings - The gas limits and max fees.
-     */
-    getFeePayer(gasSettings: GasSettings): 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>>;
-    /** Percentage to pad the base fee by, if empty, defaults to 0.5 */
-    baseFeePadding?: number;
-    /** Whether to run an initial simulation of the tx 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,GAAG,EAAE,UAAU,EACf,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;;;OAGG;IACH,WAAW,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;CAC9D;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,oCAAoC;IACpC,aAAa,EAAE,gBAAgB,CAAC;IAChC,uBAAuB;IACvB,WAAW,EAAE,WAAW,CAAC;CAC1B,CAAC;AAGF,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;IAC7C,mEAAmE;IACnE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4GAA4G;IAC5G,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;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,sBAAsB;IACtB,OAAO,EAAE,EAAE,CAAC;IACZ,iCAAiC;IACjC,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;OAMG;IACH,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAChC;AAED,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/D"}

package/dest/interfaces.js

@@ -1,2 +1 @@
-// docs:start:user_fee_options
-/** Fee options as set by a user. */ export { }; // docs:end:user_fee_options
+/** 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": "2.1.0-rc.9",
+  "version": "3.0.0-devnet.2",
   "type": "module",
   "exports": {
     "./account": "./dest/account_entrypoint.js",
@@ -67,10 +67,10 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "2.1.0-rc.9",
-    "@aztec/foundation": "2.1.0-rc.9",
-    "@aztec/protocol-contracts": "2.1.0-rc.9",
-    "@aztec/stdlib": "2.1.0-rc.9",
+    "@aztec/constants": "3.0.0-devnet.2",
+    "@aztec/foundation": "3.0.0-devnet.2",
+    "@aztec/protocol-contracts": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/account_entrypoint.ts

@@ -1,13 +1,56 @@
 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 } from './interfaces.js';
 import { ExecutionPayload } from './payload.js';
 
+/**
+ * The mechanism via which an account contract will pay for a transaction in which it gets invoked.
+ */
+export enum AccountFeePaymentMethodOptions {
+  /**
+   * Signals that some other contract is in charge of paying the fee, nothing needs to be done.
+   */
+  EXTERNAL = 0,
+  /**
+   * Used to make the account contract publicly pay for the transaction with its own fee juice balance,
+   * **which it must already have prior to this transaction**.
+   *
+   * The contract will set itself as the fee payer and end the setup phase.
+   */
+  PREEXISTING_FEE_JUICE = 1,
+  /**
+   * Used to make the account contract publicly pay for the transaction with its own fee juice balance
+   * **which is being claimed in the same transaction**.
+   *
+   * The contract will set itself as the fee payer but not end setup phase - this is done by the Fee Juice
+   * contract after enqueuing a public call, which unlike most public calls is whitelisted by the nodes
+   * to be executable during the setup phase.
+   */
+  FEE_JUICE_WITH_CLAIM = 2,
+}
+
+/**
+ * General options for the tx execution.
+ */
+export type DefaultAccountEntrypointOptions = {
+  /** Whether the transaction can be cancelled. */
+  cancellable?: boolean;
+  /**
+   * A nonce to inject into the app payload of the transaction. When used with cancellable=true, this nonce will be
+   * used to compute a nullifier that allows cancelling this transaction by submitting a new one with the same nonce
+   * but higher fee. The nullifier ensures only one transaction can succeed.
+   */
+  txNonce?: Fr;
+  /** Options that configure how the account contract behaves depending on the fee payment method of the tx */
+  feePaymentMethodOptions: AccountFeePaymentMethodOptions;
+};
+
 /**
  * Implementation for an entrypoint interface that follows the default entrypoint signature
  * for an account, which accepts an AppPayload and a FeePayload as defined in noir-libs/aztec-noir/src/entrypoint module
@@ -22,48 +65,33 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
 
   async createTxExecutionRequest(
     exec: ExecutionPayload,
-    fee: FeeOptions,
-    options: TxExecutionOptions,
+    gasSettings: GasSettings,
+    options: DefaultAccountEntrypointOptions,
   ): 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, 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);
+    const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
 
-    // Obtain the entrypoint hashed args, built from the app and fee encoded calls
+    // Obtain the entrypoint hashed args, built from the app encoded calls and global options
     const abi = this.getEntrypointAbi();
     const entrypointHashedArgs = await HashedValues.fromArgs(
-      encodeArguments(abi, [appEncodedCalls, feeEncodedCalls, !!cancellable]),
+      encodeArguments(abi, [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),
-      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 +117,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',
@@ -155,17 +140,18 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
                         },
                       },
                       { name: 'is_public', type: { kind: 'boolean' } },
+                      { name: 'hide_msg_sender', type: { kind: 'boolean' } },
                       { name: 'is_static', type: { kind: 'boolean' } },
                     ],
                   },
                 },
               },
               { name: 'tx_nonce', 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: { 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 } from './interfaces.js';
 import type { ExecutionPayload } from './payload.js';
 
 /**
@@ -13,14 +14,7 @@ export class DefaultEntrypoint implements EntrypointInterface {
     private rollupVersion: number,
   ) {}
 
-  async createTxExecutionRequest(
-    exec: ExecutionPayload,
-    fee: FeeOptions,
-    options: TxExecutionOptions,
-  ): Promise<TxExecutionRequest> {
-    if (options.txNonce || options.cancellable !== undefined) {
-      throw new Error('TxExecutionOptions are not supported in DefaultEntrypoint');
-    }
+  async createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings): Promise<TxExecutionRequest> {
     // Initial request with calls, authWitnesses and capsules
     const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
 
@@ -42,7 +36,7 @@ export class DefaultEntrypoint implements EntrypointInterface {
       call.to,
       call.selector,
       hashedArguments[0].hash,
-      new TxContext(this.chainId, this.rollupVersion, fee.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, fee: 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 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();
@@ -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, fee.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',
@@ -93,6 +86,7 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
                         },
                       },
                       { name: 'is_public', type: { kind: 'boolean' } },
+                      { name: 'hide_msg_sender', type: { kind: 'boolean' } },
                       { name: 'is_static', type: { kind: 'boolean' } },
                     ],
                   },

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 = {
@@ -23,6 +21,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;
 };
@@ -40,7 +40,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 +71,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
@@ -88,20 +90,11 @@ export abstract class EncodedCallsForEntrypoint implements EncodedCalls {
       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: 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 +102,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 +118,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 */
@@ -224,6 +137,7 @@ export async function encode(calls: FunctionCall[]): Promise<EncodedCalls> {
     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,
   }));