@aztec/entrypoints 0.0.1-fake-ceab37513c → 0.0.6-commit.a2d1860fe9

package/dest/account_entrypoint.d.ts

@@ -1,18 +1,59 @@
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { AuthWitnessProvider, EntrypointInterface, FeeOptions, TxExecutionOptions } from './interfaces.js';
-import { ExecutionPayload } from './payload.js';
+import type { GasSettings } from '@aztec/stdlib/gas';
+import { ExecutionPayload, TxExecutionRequest } from '@aztec/stdlib/tx';
+import type { AuthWitnessProvider, ChainInfo, EntrypointInterface } from './interfaces.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
  */
 export declare class DefaultAccountEntrypoint implements EntrypointInterface {
+    #private;
     private address;
     private auth;
-    private chainId;
-    private version;
-    constructor(address: AztecAddress, auth: AuthWitnessProvider, chainId?: number, version?: number);
-    createTxExecutionRequest(exec: ExecutionPayload, fee: FeeOptions, options: TxExecutionOptions): Promise<TxExecutionRequest>;
+    constructor(address: AztecAddress, auth: AuthWitnessProvider);
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, chainInfo: ChainInfo, options: DefaultAccountEntrypointOptions): Promise<TxExecutionRequest>;
+    wrapExecutionPayload(exec: ExecutionPayload, options: DefaultAccountEntrypointOptions): Promise<ExecutionPayload>;
     private getEntrypointAbi;
 }
-//# sourceMappingURL=account_entrypoint.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWNjb3VudF9lbnRyeXBvaW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvYWNjb3VudF9lbnRyeXBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNoRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQTJCLGtCQUFrQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHakcsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsU0FBUyxFQUFFLG1CQUFtQixFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFM0Y7O0dBRUc7QUFDSCxvQkFBWSw4QkFBOEI7SUFDeEM7O09BRUc7SUFDSCxRQUFRLElBQUk7SUFDWjs7Ozs7T0FLRztJQUNILHFCQUFxQixJQUFJO0lBQ3pCOzs7Ozs7O09BT0c7SUFDSCxvQkFBb0IsSUFBSTtDQUN6QjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxNQUFNLCtCQUErQixHQUFHO0lBQzVDLGdEQUFnRDtJQUNoRCxXQUFXLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDdEI7Ozs7T0FJRztJQUNILE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUNiLDRHQUE0RztJQUM1Ryx1QkFBdUIsRUFBRSw4QkFBOEIsQ0FBQztDQUN6RCxDQUFDO0FBRUY7OztHQUdHO0FBQ0gscUJBQWEsd0JBQXlCLFlBQVcsbUJBQW1COztJQUVoRSxPQUFPLENBQUMsT0FBTztJQUNmLE9BQU8sQ0FBQyxJQUFJO0lBRmQsWUFDVSxPQUFPLEVBQUUsWUFBWSxFQUNyQixJQUFJLEVBQUUsbUJBQW1CLEVBQy9CO0lBRUUsd0JBQXdCLENBQzVCLElBQUksRUFBRSxnQkFBZ0IsRUFDdEIsV0FBVyxFQUFFLFdBQVcsRUFDeEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsT0FBTyxFQUFFLCtCQUErQixHQUN2QyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FnQjdCO0lBRUssb0JBQW9CLENBQ3hCLElBQUksRUFBRSxnQkFBZ0IsRUFDdEIsT0FBTyxFQUFFLCtCQUErQixHQUN2QyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0F1QjNCO0lBZ0NELE9BQU8sQ0FBQyxnQkFBZ0I7Q0EyRHpCIn0=

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,gCAAgC,CAAC;AAEpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGjG,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3F;;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;IAFd,YACU,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,mBAAmB,EAC/B;IAEE,wBAAwB,CAC5B,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,kBAAkB,CAAC,CAgB7B;IAEK,oBAAoB,CACxB,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,+BAA+B,GACvC,OAAO,CAAC,gBAAgB,CAAC,CAuB3B;IAgCD,OAAO,CAAC,gBAAgB;CA2DzB"}

package/dest/account_entrypoint.js

@@ -1,72 +1,119 @@
-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 { Fr } from '@aztec/foundation/curves/bn254';
+import { FunctionCall, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
+import { ExecutionPayload, HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
+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
  */ export class DefaultAccountEntrypoint {
     address;
     auth;
-    chainId;
-    version;
-    constructor(address, auth, chainId = DEFAULT_CHAIN_ID, version = DEFAULT_VERSION){
+    constructor(address, auth){
         this.address = address;
         this.auth = auth;
-        this.chainId = chainId;
-        this.version = version;
     }
-    async createTxExecutionRequest(exec, fee, options) {
-        // Initial request with calls, authWitnesses and capsules
-        const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
-        // Global tx options
-        const { cancellable, txNonce } = 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 abi = this.getEntrypointAbi();
-        const entrypointHashedArgs = await HashedValues.fromArgs(encodeArguments(abi, [
-            appEncodedCalls,
-            feeEncodedCalls,
-            !!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));
-        // Assemble the tx request
+    async createTxExecutionRequest(exec, gasSettings, chainInfo, options) {
+        const { authWitnesses, capsules, extraHashedArgs } = exec;
+        const callData = await this.#buildEntrypointCallData(exec, options);
+        const entrypointHashedArgs = await HashedValues.fromArgs(callData.encodedArgs);
         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),
+            functionSelector: callData.functionSelector,
+            txContext: new TxContext(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings),
             argsOfCalls: [
-                ...appEncodedCalls.hashedArguments,
-                ...feeEncodedCalls.hashedArguments,
+                ...callData.encodedCalls.hashedArguments,
                 entrypointHashedArgs,
                 ...extraHashedArgs
             ],
             authWitnesses: [
                 ...authWitnesses,
-                ...feeAuthwitnesses,
-                combinedPayloadAuthWitness
+                callData.payloadAuthWitness
             ],
             capsules,
             salt: Fr.random()
         });
         return txRequest;
     }
+    async wrapExecutionPayload(exec, options) {
+        const { authWitnesses, capsules, extraHashedArgs, feePayer } = exec;
+        const callData = await this.#buildEntrypointCallData(exec, options);
+        // Build the entrypoint function call
+        const entrypointCall = FunctionCall.from({
+            name: callData.abi.name,
+            to: this.address,
+            selector: callData.functionSelector,
+            type: callData.abi.functionType,
+            hideMsgSender: false,
+            isStatic: callData.abi.isStatic,
+            args: callData.encodedArgs,
+            returnTypes: callData.abi.returnTypes
+        });
+        return new ExecutionPayload([
+            entrypointCall
+        ], [
+            callData.payloadAuthWitness,
+            ...authWitnesses
+        ], capsules, [
+            ...callData.encodedCalls.hashedArguments,
+            ...extraHashedArgs
+        ], feePayer ?? this.address);
+    }
+    /**
+   * Builds the shared data needed for both creating a tx execution request and wrapping an execution payload.
+   * This includes encoding calls, building entrypoint arguments, and creating the authwitness.
+   * @param exec - The execution payload containing calls to encode
+   * @param options - Account entrypoint options including tx nonce and fee payment method
+   * @returns Encoded call data, ABI, function selector, and auth witness
+   */ async #buildEntrypointCallData(exec, options) {
+        const { calls } = exec;
+        const { cancellable, txNonce, feePaymentMethodOptions } = options;
+        const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
+        const abi = this.getEntrypointAbi();
+        const args = [
+            encodedCalls,
+            feePaymentMethodOptions,
+            !!cancellable
+        ];
+        const encodedArgs = encodeArguments(abi, args);
+        const functionSelector = await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters);
+        const payloadAuthWitness = await this.auth.createAuthWit(await encodedCalls.hash());
+        return {
+            encodedCalls,
+            abi,
+            encodedArgs,
+            functionSelector,
+            payloadAuthWitness
+        };
+    }
     getEntrypointAbi() {
         return {
             name: 'entrypoint',
             isInitializer: false,
             functionType: 'private',
-            isInternal: false,
+            isOnlySelf: false,
             isStatic: false,
             parameters: [
                 {
@@ -79,7 +126,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 +176,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 +196,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/constants.d.ts

@@ -2,4 +2,4 @@
 export declare const DEFAULT_CHAIN_ID = 31337;
 /** Default protocol version to use. */
 export declare const DEFAULT_VERSION = 1;
-//# sourceMappingURL=constants.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uc3RhbnRzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDhGQUE4RjtBQUM5RixlQUFPLE1BQU0sZ0JBQWdCLFFBQVEsQ0FBQztBQUN0Qyx1Q0FBdUM7QUFDdkMsZUFBTyxNQUFNLGVBQWUsSUFBSSxDQUFDIn0=

package/dest/default_entrypoint.d.ts

@@ -1,13 +1,11 @@
-import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { EntrypointInterface, FeeOptions, TxExecutionOptions } from './interfaces.js';
-import type { ExecutionPayload } from './payload.js';
+import type { GasSettings } from '@aztec/stdlib/gas';
+import { ExecutionPayload, TxExecutionRequest } from '@aztec/stdlib/tx';
+import type { ChainInfo, EntrypointInterface } from './interfaces.js';
 /**
  * Default implementation of the entrypoint interface. It calls a function on a contract directly
  */
 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, chainInfo: ChainInfo): Promise<TxExecutionRequest>;
+    wrapExecutionPayload(exec: ExecutionPayload, _options?: any): Promise<ExecutionPayload>;
 }
-//# sourceMappingURL=default_entrypoint.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdF9lbnRyeXBvaW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGVmYXVsdF9lbnRyeXBvaW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sRUFBRSxnQkFBZ0IsRUFBMkIsa0JBQWtCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVqRyxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUV0RTs7R0FFRztBQUNILHFCQUFhLGlCQUFrQixZQUFXLG1CQUFtQjtJQUNyRCx3QkFBd0IsQ0FDNUIsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixXQUFXLEVBQUUsV0FBVyxFQUN4QixTQUFTLEVBQUUsU0FBUyxHQUNuQixPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0EyQjdCO0lBRUssb0JBQW9CLENBQUMsSUFBSSxFQUFFLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxFQUFFLEdBQUcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FnQjVGO0NBQ0YifQ==

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,EAAE,gBAAgB,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEjG,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtE;;GAEG;AACH,qBAAa,iBAAkB,YAAW,mBAAmB;IACrD,wBAAwB,CAC5B,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,kBAAkB,CAAC,CA2B7B;IAEK,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAgB5F;CACF"}

package/dest/default_entrypoint.js

@@ -1,18 +1,9 @@
 import { FunctionType } from '@aztec/stdlib/abi';
-import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
+import { ExecutionPayload, HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 /**
  * Default implementation of the entrypoint interface. It calls a function on a contract directly
  */ export class DefaultEntrypoint {
-    chainId;
-    rollupVersion;
-    constructor(chainId, rollupVersion){
-        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, chainInfo) {
         // Initial request with calls, authWitnesses and capsules
         const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
         if (calls.length > 1) {
@@ -27,9 +18,22 @@ 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(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings), [
             ...hashedArguments,
             ...extraHashedArgs
         ], authWitnesses, capsules);
     }
+    async wrapExecutionPayload(exec, _options) {
+        if (exec.calls.length !== 1) {
+            throw new Error(`DefaultEntrypoint can only wrap a single call, got ${exec.calls.length}`);
+        }
+        const call = exec.calls[0];
+        const hashedArguments = await HashedValues.fromArgs(call.args);
+        return new ExecutionPayload([
+            call
+        ], exec.authWitnesses, exec.capsules, [
+            hashedArguments,
+            ...exec.extraHashedArgs
+        ], exec.feePayer);
+    }
 }

package/dest/default_multi_call_entrypoint.d.ts

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

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,EAAE,gBAAgB,EAA2B,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGjG,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtE;;GAEG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;;IACxD,OAAO,CAAC,OAAO;IAA3B,YAAoB,OAAO,GAAE,YAA0D,EAAI;IAErF,wBAAwB,CAC5B,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,kBAAkB,CAAC,CAiB7B;IAEK,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAqB5F;IA0BD,OAAO,CAAC,gBAAgB;CAyDzB"}

package/dest/default_multi_call_entrypoint.js

@@ -1,59 +1,81 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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 { FunctionCall, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
+import { ExecutionPayload, HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
+import { EncodedAppEntrypointCalls } from './encoding.js';
 /**
  * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
  */ export class DefaultMultiCallEntrypoint {
-    chainId;
-    version;
     address;
-    constructor(chainId, version, address = ProtocolContractAddress.MultiCallEntrypoint){
-        this.chainId = chainId;
-        this.version = version;
+    constructor(address = ProtocolContractAddress.MultiCallEntrypoint){
         this.address = address;
     }
-    async createTxExecutionRequest(exec, fee) {
-        // 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));
-        // Obtain the entrypoint hashed args, built from the encoded calls
-        const abi = this.getEntrypointAbi();
-        const entrypointHashedArgs = await HashedValues.fromArgs(encodeArguments(abi, [
-            encodedCalls
-        ]));
-        // Assemble the tx request
+    async createTxExecutionRequest(exec, gasSettings, chainInfo) {
+        const { authWitnesses, capsules, extraHashedArgs } = exec;
+        const callData = await this.#buildEntrypointCallData(exec);
+        const entrypointHashedArgs = await HashedValues.fromArgs(callData.encodedArgs);
         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),
+            functionSelector: callData.functionSelector,
+            txContext: new TxContext(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings),
             argsOfCalls: [
-                ...encodedCalls.hashedArguments,
+                ...callData.encodedCalls.hashedArguments,
                 entrypointHashedArgs,
-                ...extraHashedArgs,
-                ...feeExtraHashedArgs
-            ],
-            authWitnesses: [
-                ...feeAuthwitnesses,
-                ...authWitnesses
+                ...extraHashedArgs
             ],
+            authWitnesses,
             capsules,
             salt: Fr.random()
         });
         return Promise.resolve(txRequest);
     }
+    async wrapExecutionPayload(exec, _options) {
+        const { authWitnesses, capsules, extraHashedArgs } = exec;
+        const callData = await this.#buildEntrypointCallData(exec);
+        const entrypointCall = FunctionCall.from({
+            name: callData.abi.name,
+            to: this.address,
+            selector: callData.functionSelector,
+            type: callData.abi.functionType,
+            hideMsgSender: false,
+            isStatic: callData.abi.isStatic,
+            args: callData.encodedArgs,
+            returnTypes: callData.abi.returnTypes
+        });
+        return new ExecutionPayload([
+            entrypointCall
+        ], authWitnesses, capsules, [
+            ...callData.encodedCalls.hashedArguments,
+            ...extraHashedArgs
+        ], exec.feePayer);
+    }
+    /**
+   * Builds the shared data needed for both creating a tx execution request and wrapping an execution payload.
+   * This includes encoding calls and building entrypoint arguments.
+   * @param exec - The execution payload containing calls to encode
+   * @returns Encoded call data, ABI, encoded arguments, and function selector
+   */ async #buildEntrypointCallData(exec) {
+        const { calls } = exec;
+        const encodedCalls = await EncodedAppEntrypointCalls.create(calls);
+        const abi = this.getEntrypointAbi();
+        const encodedArgs = encodeArguments(abi, [
+            encodedCalls
+        ]);
+        const functionSelector = await FunctionSelector.fromNameAndParameters(abi.name, abi.parameters);
+        return {
+            encodedCalls,
+            abi,
+            encodedArgs,
+            functionSelector
+        };
+    }
     getEntrypointAbi() {
         return {
             name: 'entrypoint',
             isInitializer: false,
             functionType: 'private',
-            isInternal: false,
+            isOnlySelf: false,
             isStatic: false,
             parameters: [
                 {
@@ -66,7 +88,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 +137,12 @@ import { EncodedCallsForEntrypoint } from './encoding.js';
                                                     kind: 'boolean'
                                                 }
                                             },
+                                            {
+                                                name: 'hide_msg_sender',
+                                                type: {
+                                                    kind: 'boolean'
+                                                }
+                                            },
                                             {
                                                 name: 'is_static',
                                                 type: {