@aztec/entrypoints 0.0.1-commit.b655e406 → 0.0.1-commit.d1f2d6c

package/dest/account_entrypoint.d.ts

@@ -1,9 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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 } from './interfaces.js';
-import { ExecutionPayload } from './payload.js';
+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.
  */
@@ -49,12 +48,12 @@ export type DefaultAccountEntrypointOptions = {
  * 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, gasSettings: GasSettings, options: DefaultAccountEntrypointOptions): 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":"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"}
+{"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,7 +1,6 @@
-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 { 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.
@@ -31,56 +30,81 @@ import { EncodedAppEntrypointCalls } from './encoding.js';
  */ 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, gasSettings, options) {
-        // Initial request with calls, authWitnesses and capsules
-        const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
-        // Global tx options
-        const { cancellable, txNonce, feePaymentMethodOptions } = options;
-        // Encode the calls for the app
-        const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
-        // Obtain the entrypoint hashed args, built from the app encoded calls and global options
-        const abi = this.getEntrypointAbi();
-        const entrypointHashedArgs = await HashedValues.fromArgs(encodeArguments(abi, [
-            encodedCalls,
-            feePaymentMethodOptions,
-            !!cancellable
-        ]));
-        // 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
+    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, gasSettings),
+            functionSelector: callData.functionSelector,
+            txContext: new TxContext(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings),
             argsOfCalls: [
-                ...encodedCalls.hashedArguments,
+                ...callData.encodedCalls.hashedArguments,
                 entrypointHashedArgs,
                 ...extraHashedArgs
             ],
             authWitnesses: [
                 ...authWitnesses,
-                appPayloadAuthwitness
+                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 = new FunctionCall(callData.abi.name, this.address, callData.functionSelector, callData.abi.functionType, false, callData.abi.isStatic, callData.encodedArgs, 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: [
                 {

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,14 +1,11 @@
 import type { GasSettings } from '@aztec/stdlib/gas';
-import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { EntrypointInterface } from './interfaces.js';
-import type { ExecutionPayload } from './payload.js';
+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, gasSettings: GasSettings): 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,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"}
+{"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,15 +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, gasSettings) {
+    async createTxExecutionRequest(exec, gasSettings, chainInfo) {
         // Initial request with calls, authWitnesses and capsules
         const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
         if (calls.length > 1) {
@@ -24,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, 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,17 +1,16 @@
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { GasSettings } from '@aztec/stdlib/gas';
-import { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { EntrypointInterface } from './interfaces.js';
-import type { ExecutionPayload } from './payload.js';
+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, gasSettings: GasSettings): 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,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"}
+{"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,37 +1,26 @@
-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 { 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, gasSettings) {
-        // Initial request with calls, authWitnesses and capsules
-        const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
-        // 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, [
-            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, gasSettings),
+            functionSelector: callData.functionSelector,
+            txContext: new TxContext(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings),
             argsOfCalls: [
-                ...encodedCalls.hashedArguments,
+                ...callData.encodedCalls.hashedArguments,
                 entrypointHashedArgs,
                 ...extraHashedArgs
             ],
@@ -41,12 +30,43 @@ import { EncodedAppEntrypointCalls } from './encoding.js';
         });
         return Promise.resolve(txRequest);
     }
+    async wrapExecutionPayload(exec, _options) {
+        const { authWitnesses, capsules, extraHashedArgs } = exec;
+        const callData = await this.#buildEntrypointCallData(exec);
+        const entrypointCall = new FunctionCall(callData.abi.name, this.address, callData.functionSelector, callData.abi.functionType, false, callData.abi.isStatic, callData.encodedArgs, 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: [
                 {

package/dest/encoding.d.ts

@@ -1,8 +1,8 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Tuple } from '@aztec/foundation/serialize';
 import { FunctionCall } from '@aztec/stdlib/abi';
 import { HashedValues } from '@aztec/stdlib/tx';
-declare const APP_MAX_CALLS = 5;
+export declare const APP_MAX_CALLS = 5;
 /** Encoded function call for an Aztec entrypoint */
 export type EncodedFunctionCall = {
     /** Arguments hash for the call. */
@@ -85,5 +85,4 @@ export declare class EncodedAppEntrypointCalls implements EncodedCalls {
 }
 /** Encodes FunctionCalls for execution, following Noir's convention */
 export declare function encode(calls: FunctionCall[]): Promise<EncodedCalls>;
-export {};
-//# sourceMappingURL=encoding.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5jb2RpbmcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lbmNvZGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDekQsT0FBTyxFQUFFLFlBQVksRUFBZ0IsTUFBTSxtQkFBbUIsQ0FBQztBQUMvRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFJaEQsZUFBTyxNQUFNLGFBQWEsSUFBSSxDQUFDO0FBRS9CLG9EQUFvRDtBQUNwRCxNQUFNLE1BQU0sbUJBQW1CLEdBQUc7SUFDaEMsbUNBQW1DO0lBQ25DLG9HQUFvRztJQUNwRyxTQUFTLEVBQUUsRUFBRSxDQUFDO0lBQ2QsdUNBQXVDO0lBQ3ZDLGlCQUFpQixFQUFFLEVBQUUsQ0FBQztJQUN0QixzQ0FBc0M7SUFDdEMsY0FBYyxFQUFFLEVBQUUsQ0FBQztJQUNuQixnREFBZ0Q7SUFDaEQsU0FBUyxFQUFFLE9BQU8sQ0FBQztJQUNuQix3R0FBd0c7SUFDeEcsZUFBZSxFQUFFLE9BQU8sQ0FBQztJQUN6QiwyQ0FBMkM7SUFDM0MsU0FBUyxFQUFFLE9BQU8sQ0FBQztDQUNwQixDQUFDO0FBRUYsc0ZBQXNGO0FBQ3RGLE1BQU0sTUFBTSxZQUFZLEdBQUc7SUFDekIsZ0VBQWdFO0lBQ2hFLG9CQUFvQixFQUFFLG1CQUFtQixFQUFFLENBQUM7SUFDNUMsZ0ZBQWdGO0lBQ2hGLGVBQWUsRUFBRSxZQUFZLEVBQUUsQ0FBQztDQUNqQyxDQUFDO0FBRUY7Ozs7S0FJSztBQUNMLHFCQUFhLHlCQUEwQixZQUFXLFlBQVk7SUFFMUQsZ0VBQWdFO0lBQ3pELG9CQUFvQixFQUFFLG1CQUFtQixFQUFFO0lBQ2xELGdGQUFnRjtJQUN6RSxlQUFlLEVBQUUsWUFBWSxFQUFFO0lBQ3RDLG9EQUFvRDtJQUM3QyxjQUFjLEVBQUUsTUFBTTtJQUM3Qjs7OztPQUlHO0lBRUksUUFBUSxFQUFFLEVBQUU7SUFickI7SUFDRSxnRUFBZ0U7SUFDekQsb0JBQW9CLEVBQUUsbUJBQW1CLEVBQUU7SUFDbEQsZ0ZBQWdGO0lBQ3pFLGVBQWUsRUFBRSxZQUFZLEVBQUU7SUFDdEMsb0RBQW9EO0lBQzdDLGNBQWMsRUFBRSxNQUFNO0lBQzdCOzs7O09BSUc7SUFFSSxRQUFRLEVBQUUsRUFBRSxFQUNqQjtJQUdKOzs7T0FHRztJQUNILElBQUksY0FBYywwQkFFakI7SUFHRDs7O09BR0c7SUFDSCxRQUFRLElBQUksRUFBRSxFQUFFLENBRWY7SUFFRDs7O09BR0c7SUFDSCxJQUFJLGdCQUVIO0lBRUQsMkRBQTJEO0lBQzNELFNBQVMsQ0FBQyxxQkFBcUIsU0FTOUI7SUFFRDs7Ozs7O09BTUc7SUFDSCxPQUFhLE1BQU0sQ0FDakIsYUFBYSxFQUFFLFlBQVksRUFBRSxHQUFHLEtBQUssQ0FBQyxZQUFZLEVBQUUsT0FBTyxhQUFhLENBQUMsRUFDekUsT0FBTyxLQUFjLHNDQWF0QjtDQUNGO0FBRUQsdUVBQXVFO0FBQ3ZFLHdCQUFzQixNQUFNLENBQUMsS0FBSyxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0F3QnpFIn0=

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,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"}
+{"version":3,"file":"encoding.d.ts","sourceRoot":"","sources":["../src/encoding.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,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,eAAO,MAAM,aAAa,IAAI,CAAC;AAE/B,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;IAbrB;IACE,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,EACjB;IAGJ;;;OAGG;IACH,IAAI,cAAc,0BAEjB;IAGD;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED;;;OAGG;IACH,IAAI,gBAEH;IAED,2DAA2D;IAC3D,SAAS,CAAC,qBAAqB,SAS9B;IAED;;;;;;OAMG;IACH,OAAa,MAAM,CACjB,aAAa,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,OAAO,aAAa,CAAC,EACzE,OAAO,KAAc,sCAatB;CACF;AAED,uEAAuE;AACvE,wBAAsB,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAwBzE"}

package/dest/encoding.js

@@ -1,12 +1,12 @@
 import { GeneratorIndex } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 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 = 5;
+export 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

package/dest/index.d.ts

@@ -10,4 +10,4 @@ export * from './interfaces.js';
 export * from './default_entrypoint.js';
 export * from './encoding.js';
 export * from './default_multi_call_entrypoint.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLGVBQWUsQ0FBQztBQUM5QixjQUFjLG9DQUFvQyxDQUFDIn0=

package/dest/interfaces.d.ts

@@ -1,8 +1,8 @@
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { GasSettings } from '@aztec/stdlib/gas';
-import type { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { ExecutionPayload } from './payload.js';
+import type { ExecutionPayload, TxExecutionRequest } from '@aztec/stdlib/tx';
+import { z } from 'zod';
 /**
  * Information on the connected chain. Used by wallets when constructing transactions to protect against replay
  * attacks.
@@ -13,6 +13,19 @@ export type ChainInfo = {
     /** The version of the rollup  */
     version: Fr;
 };
+/**
+ * Zod schema for ChainInfo
+ */
+export declare const ChainInfoSchema: z.ZodObject<{
+    chainId: z.ZodType<Fr, any, string>;
+    version: z.ZodType<Fr, any, string>;
+}, "strip", z.ZodTypeAny, {
+    chainId: Fr;
+    version: Fr;
+}, {
+    chainId: string;
+    version: string;
+}>;
 /**
  * Creates transaction execution requests out of a set of function calls, a fee payment method and
  * general options for the transaction
@@ -22,10 +35,23 @@ export interface EntrypointInterface {
      * Generates an execution request out of set of function calls.
      * @param exec - The execution intents to be run.
      * @param gasSettings - The gas settings for the transaction.
+     * @param chainInfo - Chain information (chainId and version) for replay protection.
      * @param options - Miscellaneous tx options that enable/disable features of the entrypoint
      * @returns The authenticated transaction execution request.
      */
-    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, options?: any): Promise<TxExecutionRequest>;
+    createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings, chainInfo: ChainInfo, options?: any): Promise<TxExecutionRequest>;
+    /**
+     * Wraps an execution payload such that it is executed *via* this entrypoint.
+     * This returns an ExecutionPayload with the entrypoint as the caller for the wrapped payload.
+     * Useful for account self-funding deployments and batching calls beyond the limit
+     * of a single entrypoint call.
+     *
+     * @param exec - The execution payload to wrap
+     * @param options - Implementation-specific options
+     * @returns A new execution payload with a single call to this entrypoint
+     * @throws Error if the payload cannot be wrapped (e.g., exceeds call limit)
+     */
+    wrapExecutionPayload(exec: ExecutionPayload, options?: any): Promise<ExecutionPayload>;
 }
 /** Creates authorization witnesses. */
 export interface AuthWitnessProvider {
@@ -36,4 +62,4 @@ export interface AuthWitnessProvider {
      */
     createAuthWit(messageHash: Fr | Buffer): Promise<AuthWitness>;
 }
-//# sourceMappingURL=interfaces.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3JELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFN0UsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4Qjs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sU0FBUyxHQUFHO0lBQ3RCLHNCQUFzQjtJQUN0QixPQUFPLEVBQUUsRUFBRSxDQUFDO0lBQ1osaUNBQWlDO0lBQ2pDLE9BQU8sRUFBRSxFQUFFLENBQUM7Q0FDYixDQUFDO0FBRUY7O0dBRUc7QUFDSCxlQUFPLE1BQU0sZUFBZTs7Ozs7Ozs7O0VBRzFCLENBQUM7QUFFSDs7O0dBR0c7QUFDSCxNQUFNLFdBQVcsbUJBQW1CO0lBQ2xDOzs7Ozs7O09BT0c7SUFDSCx3QkFBd0IsQ0FDdEIsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixXQUFXLEVBQUUsV0FBVyxFQUN4QixTQUFTLEVBQUUsU0FBUyxFQUNwQixPQUFPLENBQUMsRUFBRSxHQUFHLEdBQ1osT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUM7SUFFL0I7Ozs7Ozs7Ozs7T0FVRztJQUNILG9CQUFvQixDQUFDLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxPQUFPLENBQUMsRUFBRSxHQUFHLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7Q0FDeEY7QUFFRCx1Q0FBdUM7QUFDdkMsTUFBTSxXQUFXLG1CQUFtQjtJQUNsQzs7OztPQUlHO0lBQ0gsYUFBYSxDQUFDLFdBQVcsRUFBRSxFQUFFLEdBQUcsTUFBTSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztDQUMvRCJ9

package/dest/interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD;;;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"}
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,sBAAsB;IACtB,OAAO,EAAE,EAAE,CAAC;IACZ,iCAAiC;IACjC,OAAO,EAAE,EAAE,CAAC;CACb,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;EAG1B,CAAC;AAEH;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;;;OAOG;IACH,wBAAwB,CACtB,IAAI,EAAE,gBAAgB,EACtB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAE/B;;;;;;;;;;OAUG;IACH,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CACxF;AAED,uCAAuC;AACvC,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC/D"}

package/dest/interfaces.js

@@ -1 +1,8 @@
-/** Creates authorization witnesses. */ export { };
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { z } from 'zod';
+/**
+ * Zod schema for ChainInfo
+ */ export const ChainInfoSchema = z.object({
+    chainId: Fr.schema,
+    version: Fr.schema
+});

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": "0.0.1-commit.b655e406",
+  "version": "0.0.1-commit.d1f2d6c",
   "type": "module",
   "exports": {
     "./account": "./dest/account_entrypoint.js",
@@ -20,9 +20,9 @@
     "tsconfig": "./tsconfig.json"
   },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
-    "build:ts": "tsc -b",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
+    "build:ts": "../scripts/tsc.sh",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -67,15 +67,17 @@
     ]
   },
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.b655e406",
-    "@aztec/foundation": "0.0.1-commit.b655e406",
-    "@aztec/protocol-contracts": "0.0.1-commit.b655e406",
-    "@aztec/stdlib": "0.0.1-commit.b655e406",
-    "tslib": "^2.4.0"
+    "@aztec/constants": "0.0.1-commit.d1f2d6c",
+    "@aztec/foundation": "0.0.1-commit.d1f2d6c",
+    "@aztec/protocol-contracts": "0.0.1-commit.d1f2d6c",
+    "@aztec/stdlib": "0.0.1-commit.d1f2d6c",
+    "tslib": "^2.4.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"

package/src/account_entrypoint.ts

@@ -1,13 +1,11 @@
-import { Fr } from '@aztec/foundation/fields';
-import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { type FunctionAbi, FunctionCall, 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 { ExecutionPayload, HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from './constants.js';
 import { EncodedAppEntrypointCalls } from './encoding.js';
-import type { AuthWitnessProvider, EntrypointInterface } from './interfaces.js';
-import { ExecutionPayload } from './payload.js';
+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.
@@ -59,39 +57,24 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
   constructor(
     private address: AztecAddress,
     private auth: AuthWitnessProvider,
-    private chainId: number = DEFAULT_CHAIN_ID,
-    private version: number = DEFAULT_VERSION,
   ) {}
 
   async createTxExecutionRequest(
     exec: ExecutionPayload,
     gasSettings: GasSettings,
+    chainInfo: ChainInfo,
     options: DefaultAccountEntrypointOptions,
   ): Promise<TxExecutionRequest> {
-    // Initial request with calls, authWitnesses and capsules
-    const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
-    // Global tx options
-    const { cancellable, txNonce, feePaymentMethodOptions } = options;
-    // Encode the calls for the app
-    const encodedCalls = await EncodedAppEntrypointCalls.create(calls, txNonce);
-
-    // Obtain the entrypoint hashed args, built from the app encoded calls and global options
-    const abi = this.getEntrypointAbi();
-    const entrypointHashedArgs = await HashedValues.fromArgs(
-      encodeArguments(abi, [encodedCalls, feePaymentMethodOptions, !!cancellable]),
-    );
-
-    // 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 { 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, gasSettings),
-      argsOfCalls: [...encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs],
-      authWitnesses: [...authWitnesses, appPayloadAuthwitness],
+      functionSelector: callData.functionSelector,
+      txContext: new TxContext(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings),
+      argsOfCalls: [...callData.encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs],
+      authWitnesses: [...authWitnesses, callData.payloadAuthWitness],
       capsules,
       salt: Fr.random(),
     });
@@ -99,12 +82,70 @@ export class DefaultAccountEntrypoint implements EntrypointInterface {
     return txRequest;
   }
 
+  async wrapExecutionPayload(
+    exec: ExecutionPayload,
+    options: DefaultAccountEntrypointOptions,
+  ): Promise<ExecutionPayload> {
+    const { authWitnesses, capsules, extraHashedArgs, feePayer } = exec;
+    const callData = await this.#buildEntrypointCallData(exec, options);
+
+    // Build the entrypoint function call
+    const entrypointCall = new FunctionCall(
+      callData.abi.name,
+      this.address,
+      callData.functionSelector,
+      callData.abi.functionType,
+      false,
+      callData.abi.isStatic,
+      callData.encodedArgs,
+      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: ExecutionPayload, options: DefaultAccountEntrypointOptions) {
+    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,
+    };
+  }
+
   private getEntrypointAbi() {
     return {
       name: 'entrypoint',
       isInitializer: false,
       functionType: 'private',
-      isInternal: false,
+      isOnlySelf: false,
       isStatic: false,
       parameters: [
         {

package/src/default_entrypoint.ts

@@ -1,20 +1,18 @@
 import { FunctionType } from '@aztec/stdlib/abi';
 import type { GasSettings } from '@aztec/stdlib/gas';
-import { HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
+import { ExecutionPayload, HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import type { EntrypointInterface } from './interfaces.js';
-import type { ExecutionPayload } from './payload.js';
+import type { ChainInfo, EntrypointInterface } from './interfaces.js';
 
 /**
  * Default implementation of the entrypoint interface. It calls a function on a contract directly
  */
 export class DefaultEntrypoint implements EntrypointInterface {
-  constructor(
-    private chainId: number,
-    private rollupVersion: number,
-  ) {}
-
-  async createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings): Promise<TxExecutionRequest> {
+  async createTxExecutionRequest(
+    exec: ExecutionPayload,
+    gasSettings: GasSettings,
+    chainInfo: ChainInfo,
+  ): Promise<TxExecutionRequest> {
     // Initial request with calls, authWitnesses and capsules
     const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
 
@@ -36,10 +34,28 @@ export class DefaultEntrypoint implements EntrypointInterface {
       call.to,
       call.selector,
       hashedArguments[0].hash,
-      new TxContext(this.chainId, this.rollupVersion, gasSettings),
+      new TxContext(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings),
       [...hashedArguments, ...extraHashedArgs],
       authWitnesses,
       capsules,
     );
   }
+
+  async wrapExecutionPayload(exec: ExecutionPayload, _options?: any): Promise<ExecutionPayload> {
+    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/src/default_multi_call_entrypoint.ts

@@ -1,42 +1,34 @@
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { type FunctionAbi, FunctionSelector, encodeArguments } from '@aztec/stdlib/abi';
+import { type FunctionAbi, FunctionCall, 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 { ExecutionPayload, HashedValues, TxContext, TxExecutionRequest } from '@aztec/stdlib/tx';
 
 import { EncodedAppEntrypointCalls } from './encoding.js';
-import type { EntrypointInterface } from './interfaces.js';
-import type { ExecutionPayload } from './payload.js';
+import type { ChainInfo, EntrypointInterface } from './interfaces.js';
 
 /**
  * Implementation for an entrypoint interface that can execute multiple function calls in a single transaction
  */
 export class DefaultMultiCallEntrypoint implements EntrypointInterface {
-  constructor(
-    private chainId: number,
-    private version: number,
-    private address: AztecAddress = ProtocolContractAddress.MultiCallEntrypoint,
-  ) {}
+  constructor(private address: AztecAddress = ProtocolContractAddress.MultiCallEntrypoint) {}
 
-  async createTxExecutionRequest(exec: ExecutionPayload, gasSettings: GasSettings): Promise<TxExecutionRequest> {
-    // Initial request with calls, authWitnesses and capsules
-    const { calls, authWitnesses, capsules, extraHashedArgs } = exec;
+  async createTxExecutionRequest(
+    exec: ExecutionPayload,
+    gasSettings: GasSettings,
+    chainInfo: ChainInfo,
+  ): Promise<TxExecutionRequest> {
+    const { authWitnesses, capsules, extraHashedArgs } = exec;
+    const callData = await this.#buildEntrypointCallData(exec);
 
-    // 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, [encodedCalls]));
-
-    // Assemble the tx request
+    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, gasSettings),
-      argsOfCalls: [...encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs],
+      functionSelector: callData.functionSelector,
+      txContext: new TxContext(chainInfo.chainId.toNumber(), chainInfo.version.toNumber(), gasSettings),
+      argsOfCalls: [...callData.encodedCalls.hashedArguments, entrypointHashedArgs, ...extraHashedArgs],
       authWitnesses,
       capsules,
       salt: Fr.random(),
@@ -45,12 +37,59 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
     return Promise.resolve(txRequest);
   }
 
+  async wrapExecutionPayload(exec: ExecutionPayload, _options?: any): Promise<ExecutionPayload> {
+    const { authWitnesses, capsules, extraHashedArgs } = exec;
+    const callData = await this.#buildEntrypointCallData(exec);
+    const entrypointCall = new FunctionCall(
+      callData.abi.name,
+      this.address,
+      callData.functionSelector,
+      callData.abi.functionType,
+      false,
+      callData.abi.isStatic,
+      callData.encodedArgs,
+      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: ExecutionPayload) {
+    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,
+    };
+  }
+
   private getEntrypointAbi() {
     return {
       name: 'entrypoint',
       isInitializer: false,
       functionType: 'private',
-      isInternal: false,
+      isOnlySelf: false,
       isStatic: false,
       parameters: [
         {

package/src/encoding.ts

@@ -1,14 +1,14 @@
 import { GeneratorIndex } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
-import { Fr } from '@aztec/foundation/fields';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { Tuple } from '@aztec/foundation/serialize';
 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 = 5;
+export const APP_MAX_CALLS = 5;
 
 /** Encoded function call for an Aztec entrypoint */
 export type EncodedFunctionCall = {

package/src/interfaces.ts

@@ -1,9 +1,9 @@
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { GasSettings } from '@aztec/stdlib/gas';
-import type { TxExecutionRequest } from '@aztec/stdlib/tx';
+import type { ExecutionPayload, TxExecutionRequest } from '@aztec/stdlib/tx';
 
-import type { ExecutionPayload } from './payload.js';
+import { z } from 'zod';
 
 /**
  * Information on the connected chain. Used by wallets when constructing transactions to protect against replay
@@ -16,6 +16,14 @@ export type ChainInfo = {
   version: Fr;
 };
 
+/**
+ * Zod schema for ChainInfo
+ */
+export const ChainInfoSchema = z.object({
+  chainId: Fr.schema,
+  version: Fr.schema,
+});
+
 /**
  * Creates transaction execution requests out of a set of function calls, a fee payment method and
  * general options for the transaction
@@ -25,14 +33,29 @@ export interface EntrypointInterface {
    * Generates an execution request out of set of function calls.
    * @param exec - The execution intents to be run.
    * @param gasSettings - The gas settings for the transaction.
+   * @param chainInfo - Chain information (chainId and version) for replay protection.
    * @param options - Miscellaneous tx options that enable/disable features of the entrypoint
    * @returns The authenticated transaction execution request.
    */
   createTxExecutionRequest(
     exec: ExecutionPayload,
     gasSettings: GasSettings,
+    chainInfo: ChainInfo,
     options?: any,
   ): Promise<TxExecutionRequest>;
+
+  /**
+   * Wraps an execution payload such that it is executed *via* this entrypoint.
+   * This returns an ExecutionPayload with the entrypoint as the caller for the wrapped payload.
+   * Useful for account self-funding deployments and batching calls beyond the limit
+   * of a single entrypoint call.
+   *
+   * @param exec - The execution payload to wrap
+   * @param options - Implementation-specific options
+   * @returns A new execution payload with a single call to this entrypoint
+   * @throws Error if the payload cannot be wrapped (e.g., exceeds call limit)
+   */
+  wrapExecutionPayload(exec: ExecutionPayload, options?: any): Promise<ExecutionPayload>;
 }
 
 /** Creates authorization witnesses. */

package/dest/payload.d.ts

@@ -1,32 +0,0 @@
-import { FunctionCall } from '@aztec/stdlib/abi';
-import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import { Capsule, HashedValues } from '@aztec/stdlib/tx';
-/**
- * Represents data necessary to perform an action in the network successfully.
- * This class can be considered Aztec's "minimal execution unit".
- * */
-export declare class ExecutionPayload {
-    /** The function calls to be executed. */
-    calls: FunctionCall[];
-    /** Any transient auth witnesses needed for this execution */
-    authWitnesses: AuthWitness[];
-    /** Data passed through an oracle for this execution. */
-    capsules: Capsule[];
-    /** Extra hashed values to be injected in the execution cache */
-    extraHashedArgs: HashedValues[];
-    constructor(
-    /** The function calls to be executed. */
-    calls: FunctionCall[], 
-    /** Any transient auth witnesses needed for this execution */
-    authWitnesses: AuthWitness[], 
-    /** Data passed through an oracle for this execution. */
-    capsules: Capsule[], 
-    /** Extra hashed values to be injected in the execution cache */
-    extraHashedArgs?: HashedValues[]);
-    static empty(): ExecutionPayload;
-}
-/**
- * Merges an array ExecutionPayloads combining their calls, authWitnesses, capsules and extraArgHashes.
- */
-export declare function mergeExecutionPayloads(requests: ExecutionPayload[]): ExecutionPayload;
-//# sourceMappingURL=payload.d.ts.map

package/dest/payload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"payload.d.ts","sourceRoot":"","sources":["../src/payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzD;;;KAGK;AACL,qBAAa,gBAAgB;IAEzB,yCAAyC;IAClC,KAAK,EAAE,YAAY,EAAE;IAC5B,6DAA6D;IACtD,aAAa,EAAE,WAAW,EAAE;IACnC,wDAAwD;IACjD,QAAQ,EAAE,OAAO,EAAE;IAC1B,gEAAgE;IACzD,eAAe,EAAE,YAAY,EAAE;;IAPtC,yCAAyC;IAClC,KAAK,EAAE,YAAY,EAAE;IAC5B,6DAA6D;IACtD,aAAa,EAAE,WAAW,EAAE;IACnC,wDAAwD;IACjD,QAAQ,EAAE,OAAO,EAAE;IAC1B,gEAAgE;IACzD,eAAe,GAAE,YAAY,EAAO;IAG7C,MAAM,CAAC,KAAK;CAGb;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,CAMrF"}

package/dest/payload.js

@@ -1,27 +0,0 @@
-/**
- * Represents data necessary to perform an action in the network successfully.
- * This class can be considered Aztec's "minimal execution unit".
- * */ export class ExecutionPayload {
-    calls;
-    authWitnesses;
-    capsules;
-    extraHashedArgs;
-    constructor(/** The function calls to be executed. */ calls, /** Any transient auth witnesses needed for this execution */ authWitnesses, /** Data passed through an oracle for this execution. */ capsules, /** Extra hashed values to be injected in the execution cache */ extraHashedArgs = []){
-        this.calls = calls;
-        this.authWitnesses = authWitnesses;
-        this.capsules = capsules;
-        this.extraHashedArgs = extraHashedArgs;
-    }
-    static empty() {
-        return new ExecutionPayload([], [], []);
-    }
-}
-/**
- * Merges an array ExecutionPayloads combining their calls, authWitnesses, capsules and extraArgHashes.
- */ export function mergeExecutionPayloads(requests) {
-    const calls = requests.map((r)=>r.calls).flat();
-    const combinedAuthWitnesses = requests.map((r)=>r.authWitnesses ?? []).flat();
-    const combinedCapsules = requests.map((r)=>r.capsules ?? []).flat();
-    const combinedextraHashedArgs = requests.map((r)=>r.extraHashedArgs ?? []).flat();
-    return new ExecutionPayload(calls, combinedAuthWitnesses, combinedCapsules, combinedextraHashedArgs);
-}

package/src/payload.ts

@@ -1,35 +0,0 @@
-import { FunctionCall } from '@aztec/stdlib/abi';
-import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import { Capsule, HashedValues } from '@aztec/stdlib/tx';
-
-/**
- * Represents data necessary to perform an action in the network successfully.
- * This class can be considered Aztec's "minimal execution unit".
- * */
-export class ExecutionPayload {
-  public constructor(
-    /** The function calls to be executed. */
-    public calls: FunctionCall[],
-    /** Any transient auth witnesses needed for this execution */
-    public authWitnesses: AuthWitness[],
-    /** Data passed through an oracle for this execution. */
-    public capsules: Capsule[],
-    /** Extra hashed values to be injected in the execution cache */
-    public extraHashedArgs: HashedValues[] = [],
-  ) {}
-
-  static empty() {
-    return new ExecutionPayload([], [], []);
-  }
-}
-
-/**
- * Merges an array ExecutionPayloads combining their calls, authWitnesses, capsules and extraArgHashes.
- */
-export function mergeExecutionPayloads(requests: ExecutionPayload[]): ExecutionPayload {
-  const calls = requests.map(r => r.calls).flat();
-  const combinedAuthWitnesses = requests.map(r => r.authWitnesses ?? []).flat();
-  const combinedCapsules = requests.map(r => r.capsules ?? []).flat();
-  const combinedextraHashedArgs = requests.map(r => r.extraHashedArgs ?? []).flat();
-  return new ExecutionPayload(calls, combinedAuthWitnesses, combinedCapsules, combinedextraHashedArgs);
-}