@aztec/aztec.js 0.80.0 → 0.82.0

package/dest/contract/batch_call.js

@@ -1,5 +1,5 @@
+import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
-import { mergeExecutionRequestInits } from '../entrypoint/entrypoint.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 /** A batch of function calls to be sent as a single transaction through a wallet. */ export class BatchCall extends BaseContractInteraction {
     calls;
@@ -13,27 +13,24 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
    * @returns A Promise that resolves to a transaction instance.
    */ async create(options = {}) {
         const requestWithoutFee = await this.request(options);
-        const { fee: userFee } = options;
-        const fee = await this.getFeeOptions({
-            ...requestWithoutFee,
-            fee: userFee
+        const { fee: userFee, nonce, cancellable } = options;
+        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {
+            nonce,
+            cancellable
         });
-        return await this.wallet.createTxExecutionRequest({
-            ...requestWithoutFee,
-            fee
+        return await this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
+            nonce,
+            cancellable
         });
     }
     /**
    * Returns an execution request that represents this operation.
-   * @param options - An optional object containing additional configuration for the transaction.
-   * @returns An execution request wrapped in promise.
+   * @param options - An optional object containing additional configuration for the request generation.
+   * @returns An execution payload wrapped in promise.
    */ async request(options = {}) {
         const requests = await this.getRequests();
-        const { nonce, cancellable } = options;
-        return mergeExecutionRequestInits(requests, {
-            nonce,
-            cancellable
-        });
+        const combinedPayload = mergeExecutionPayloads(requests);
+        return new ExecutionPayload(combinedPayload.calls, combinedPayload.authWitnesses.concat(options.authWitnesses ?? []), combinedPayload.capsules.concat(options.capsules ?? []), combinedPayload.extraHashedArgs);
     }
     /**
    * Simulate a transaction and get its return values
@@ -44,7 +41,7 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
    * @param options - An optional object containing additional configuration for the transaction.
    * @returns The result of the transaction as returned by the contract function.
    */ async simulate(options = {}) {
-        const { indexedRequests, unconstrained } = (await this.getRequests()).reduce((acc, current, index)=>{
+        const { indexedExecutionPayloads, unconstrained } = (await this.getRequests()).reduce((acc, current, index)=>{
             const call = current.calls[0];
             if (call.type === FunctionType.UNCONSTRAINED) {
                 acc.unconstrained.push([
@@ -52,7 +49,7 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
                     index
                 ]);
             } else {
-                acc.indexedRequests.push([
+                acc.indexedExecutionPayloads.push([
                     current,
                     index,
                     call.type === FunctionType.PRIVATE ? acc.privateIndex++ : acc.publicIndex++
@@ -60,24 +57,22 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
             }
             return acc;
         }, {
-            indexedRequests: [],
+            indexedExecutionPayloads: [],
             unconstrained: [],
             publicIndex: 0,
             privateIndex: 0
         });
-        const requests = indexedRequests.map(([request])=>request);
-        const requestWithoutFee = mergeExecutionRequestInits(requests);
-        const { fee: userFee } = options;
-        const fee = await this.getFeeOptions({
-            ...requestWithoutFee,
-            fee: userFee
-        });
-        const txRequest = await this.wallet.createTxExecutionRequest({
-            ...requestWithoutFee,
-            fee
+        const payloads = indexedExecutionPayloads.map(([request])=>request);
+        const combinedPayload = mergeExecutionPayloads(payloads);
+        const requestWithoutFee = new ExecutionPayload(combinedPayload.calls, combinedPayload.authWitnesses.concat(options.authWitnesses ?? []), combinedPayload.capsules.concat(options.capsules ?? []), combinedPayload.extraHashedArgs);
+        const { fee: userFee, nonce, cancellable } = options;
+        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {});
+        const txRequest = await this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
+            nonce,
+            cancellable
         });
         const unconstrainedCalls = unconstrained.map(async ([call, index])=>[
-                await this.wallet.simulateUnconstrained(call.name, call.args, call.to, options?.from),
+                await this.wallet.simulateUnconstrained(call.name, call.args, call.to, options?.authWitnesses, options?.from),
                 index
             ]);
         const [unconstrainedResults, simulatedTx] = await Promise.all([
@@ -88,7 +83,7 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
         unconstrainedResults.forEach(([result, index])=>{
             results[index] = result;
         });
-        indexedRequests.forEach(([request, callIndex, resultIndex])=>{
+        indexedExecutionPayloads.forEach(([request, callIndex, resultIndex])=>{
             const call = request.calls[0];
             // As account entrypoints are private, for private functions we retrieve the return values from the first nested call
             // since we're interested in the first set of values AFTER the account entrypoint
@@ -98,30 +93,6 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
         });
         return results;
     }
-    /**
-   * Return all authWitnesses added for this interaction.
-   */ getAuthWitnesses() {
-        return [
-            this.authWitnesses,
-            ...this.calls.map((c)=>c.getAuthWitnesses())
-        ].flat();
-    }
-    /**
-   * Return all hashedArguments added for this interaction.
-   */ getHashedArguments() {
-        return [
-            this.hashedArguments,
-            ...this.calls.map((c)=>c.getHashedArguments())
-        ].flat();
-    }
-    /**
-   * Return all capsules added for this interaction.
-   */ getCapsules() {
-        return [
-            this.capsules,
-            ...this.calls.map((c)=>c.getCapsules())
-        ].flat();
-    }
     async getRequests() {
         return await Promise.all(this.calls.map((c)=>c.request()));
     }

package/dest/contract/contract.d.ts

@@ -1,7 +1,7 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { PublicKeys } from '@aztec/stdlib/keys';
-import type { Wallet } from '../account/wallet.js';
+import type { Wallet } from '../wallet/wallet.js';
 import { ContractBase } from './contract_base.js';
 import { DeployMethod } from './deploy_method.js';
 /**

package/dest/contract/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/contract/contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACxC;;;;;;OAMG;WACiB,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAc5G;;;;;;OAMG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM;IAKtG;;;;;;;OAOG;WACW,oBAAoB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,CAAC,EAAE,MAAM;CAK3B"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/contract/contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACxC;;;;;;OAMG;WACiB,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAc5G;;;;;;OAMG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM;IAKtG;;;;;;;OAOG;WACW,oBAAoB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,CAAC,EAAE,MAAM;CAK3B"}

package/dest/contract/contract_base.d.ts

@@ -1,6 +1,6 @@
 import { type ContractArtifact, type ContractNote, type FieldLayout, FunctionSelector } from '@aztec/stdlib/abi';
 import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { Wallet } from '../account/wallet.js';
+import type { Wallet } from '../wallet/wallet.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 /**
  * Type representing a contract method that returns a ContractFunctionInteraction instance
@@ -48,7 +48,7 @@ export declare class ContractBase {
     /** The wallet used for interacting with this contract. */
     wallet: Wallet);
     /** Address of the contract. */
-    get address(): import("@aztec/stdlib/aztec-address").AztecAddress;
+    get address(): import("../index.js").AztecAddress;
     /** Partial address of the contract. */
     get partialAddress(): Promise<import("@aztec/foundation/schemas").Fr>;
     /**

package/dest/contract/contract_base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_base.d.ts","sourceRoot":"","sources":["../../src/contract/contract_base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,WAAW,EAEhB,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,2BAA2B,EAAyB,MAAM,wBAAwB,CAAC;AAEjG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,2BAA2B,CAAC,GAAG;IAC/E;;OAEG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,MAAM,IAAI;KACnD,CAAC,IAAI,CAAC,GAAG,WAAW;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;KAC3C,CAAC,IAAI,CAAC,GAAG,YAAY;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAY;IAOrB,iDAAiD;aACjC,QAAQ,EAAE,2BAA2B;IACrD,yDAAyD;aACzC,QAAQ,EAAE,gBAAgB;IAC1C,0DAA0D;IACnD,MAAM,EAAE,MAAM;IAXvB;;OAEG;IACI,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAM;IAExD,SAAS;IACP,iDAAiD;IACjC,QAAQ,EAAE,2BAA2B;IACrD,yDAAyD;IACzC,QAAQ,EAAE,gBAAgB;IAC1C,0DAA0D;IACnD,MAAM,EAAE,MAAM;IAmBvB,+BAA+B;IAC/B,IAAW,OAAO,uDAEjB;IAED,uCAAuC;IACvC,IAAW,cAAc,oDAExB;IAED;;;;OAIG;IACI,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAGxC"}
+{"version":3,"file":"contract_base.d.ts","sourceRoot":"","sources":["../../src/contract/contract_base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,WAAW,EAEhB,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,2BAA2B,EAAyB,MAAM,wBAAwB,CAAC;AAEjG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,2BAA2B,CAAC,GAAG;IAC/E;;OAEG;IACH,QAAQ,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC3C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,MAAM,IAAI;KACnD,CAAC,IAAI,CAAC,GAAG,WAAW;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,IAAI;KAC3C,CAAC,IAAI,CAAC,GAAG,YAAY;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAY;IAOrB,iDAAiD;aACjC,QAAQ,EAAE,2BAA2B;IACrD,yDAAyD;aACzC,QAAQ,EAAE,gBAAgB;IAC1C,0DAA0D;IACnD,MAAM,EAAE,MAAM;IAXvB;;OAEG;IACI,OAAO,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAA;KAAE,CAAM;IAExD,SAAS;IACP,iDAAiD;IACjC,QAAQ,EAAE,2BAA2B;IACrD,yDAAyD;IACzC,QAAQ,EAAE,gBAAgB;IAC1C,0DAA0D;IACnD,MAAM,EAAE,MAAM;IAmBvB,+BAA+B;IAC/B,IAAW,OAAO,uCAEjB;IAED,uCAAuC;IACvC,IAAW,cAAc,oDAExB;IAED;;;;OAIG;IACI,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAGxC"}

package/dest/contract/contract_function_interaction.d.ts

@@ -1,17 +1,28 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { type FunctionAbi } from '@aztec/stdlib/abi';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PrivateKernelProverProfileResult } from '@aztec/stdlib/kernel';
-import type { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { Wallet } from '../account/wallet.js';
-import type { ExecutionRequestInit } from '../entrypoint/entrypoint.js';
-import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
+import type { Capsule, HashedValues, TxExecutionRequest, TxProfileResult } from '@aztec/stdlib/tx';
+import type { Wallet } from '../wallet/wallet.js';
+import { BaseContractInteraction, type RequestMethodOptions, type SendMethodOptions } from './base_contract_interaction.js';
 export type { SendMethodOptions };
 /**
  * Represents the options for simulating a contract function interaction.
  * Allows specifying the address from which the view method should be called.
  * Disregarded for simulation of public functions
  */
-export type SimulateMethodOptions = Pick<SendMethodOptions, 'fee'> & {
+export type ProfileMethodOptions = Pick<SendMethodOptions, 'authWitnesses' | 'capsules' | 'fee' | 'nonce' | 'cancellable'> & {
+    /** Whether to return gates information or the bytecode/witnesses. */
+    profileMode: 'gates' | 'execution-steps' | 'full';
+    /** The sender's Aztec address. */
+    from?: AztecAddress;
+};
+/**
+ * Represents the options for simulating a contract function interaction.
+ * Allows specifying the address from which the method should be called.
+ * Disregarded for simulation of public functions
+ */
+export type SimulateMethodOptions = Pick<SendMethodOptions, 'authWitnesses' | 'capsules' | 'fee' | 'nonce' | 'cancellable'> & {
     /** The sender's Aztec address. */
     from?: AztecAddress;
     /** Simulate without checking for the validity of the resulting transaction, e.g. whether it emits any existing nullifiers. */
@@ -19,13 +30,6 @@ export type SimulateMethodOptions = Pick<SendMethodOptions, 'fee'> & {
     /** Whether to ensure the fee payer is not empty and has enough balance to pay for the fee. */
     skipFeeEnforcement?: boolean;
 };
-/**
- * The result of a profile() call.
- */
-export type ProfileResult = PrivateKernelProverProfileResult & {
-    /** The result of the transaction as returned by the contract function. */
-    returnValues: any;
-};
 /**
  * This is the class that is returned when calling e.g. `contract.methods.myMethod(arg0, arg1)`.
  * It contains available interactions one can call on a method, including view.
@@ -34,7 +38,8 @@ export declare class ContractFunctionInteraction extends BaseContractInteraction
     protected contractAddress: AztecAddress;
     protected functionDao: FunctionAbi;
     protected args: any[];
-    constructor(wallet: Wallet, contractAddress: AztecAddress, functionDao: FunctionAbi, args: any[]);
+    private extraHashedArgs;
+    constructor(wallet: Wallet, contractAddress: AztecAddress, functionDao: FunctionAbi, args: any[], authWitnesses?: AuthWitness[], capsules?: Capsule[], extraHashedArgs?: HashedValues[]);
     /**
      * Create a transaction execution request that represents this call, encoded and authenticated by the
      * user's wallet, ready to be simulated.
@@ -45,10 +50,10 @@ export declare class ContractFunctionInteraction extends BaseContractInteraction
     /**
      * Returns an execution request that represents this operation.
      * Can be used as a building block for constructing batch requests.
-     * @param options - An optional object containing additional configuration for the transaction.
-     * @returns An execution request wrapped in promise.
+     * @param options - An optional object containing additional configuration for the request generation.
+     * @returns An execution payload wrapped in promise.
      */
-    request(options?: SendMethodOptions): Promise<Omit<ExecutionRequestInit, 'fee'>>;
+    request(options?: RequestMethodOptions): Promise<ExecutionPayload>;
     /**
      * Simulate a transaction and get its return values
      * Differs from prove in a few important ways:
@@ -65,6 +70,21 @@ export declare class ContractFunctionInteraction extends BaseContractInteraction
      *
      * @returns An object containing the function return value and profile result.
      */
-    simulateWithProfile(options?: SimulateMethodOptions): Promise<ProfileResult>;
+    profile(options?: ProfileMethodOptions): Promise<TxProfileResult>;
+    /**
+     * Augments this ContractFunctionInteraction with additional metadata, such as authWitnesses, capsules, and extraHashedArgs.
+     * This is useful when creating a "batteries included" interaction, such as registering a contract class with its associated
+     * capsule instead of having the user provide them externally.
+     * @param options - An object containing the metadata to add to the interaction
+     * @returns A new ContractFunctionInteraction with the added metadata, but calling the same original function in the same manner
+     */
+    with({ authWitnesses, capsules, extraHashedArgs, }: {
+        /** The authWitnesses to add to the interaction */
+        authWitnesses?: AuthWitness[];
+        /** The capsules to add to the interaction */
+        capsules?: Capsule[];
+        /** The extra hashed args to add to the interaction */
+        extraHashedArgs?: HashedValues[];
+    }): ContractFunctionInteraction;
 }
 //# sourceMappingURL=contract_function_interaction.d.ts.map

package/dest/contract/contract_function_interaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_function_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/contract_function_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAkE,MAAM,mBAAmB,CAAC;AACrH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEjG,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,GAAG;IACnE,kCAAkC;IAClC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,8HAA8H;IAC9H,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,8FAA8F;IAC9F,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,gCAAgC,GAAG;IAC7D,0EAA0E;IAC1E,YAAY,EAAE,GAAG,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,uBAAuB;IAGpE,SAAS,CAAC,eAAe,EAAE,YAAY;IACvC,SAAS,CAAC,WAAW,EAAE,WAAW;IAClC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE;gBAHrB,MAAM,EAAE,MAAM,EACJ,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,GAAG,EAAE;IASvB;;;;;OAKG;IACU,MAAM,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAcjF;;;;;OAKG;IACU,OAAO,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IA6BjG;;;;;;;;OAQG;IACU,QAAQ,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;IAkCxE;;;;;OAKG;IACU,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,aAAa,CAAC;CA0B9F"}
+{"version":3,"file":"contract_function_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/contract_function_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,WAAW,EAAkE,MAAM,mBAAmB,CAAC;AACrH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,uBAAuB,EACvB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACvB,MAAM,gCAAgC,CAAC;AAExC,YAAY,EAAE,iBAAiB,EAAE,CAAC;AAElC;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,iBAAiB,EACjB,eAAe,GAAG,UAAU,GAAG,KAAK,GAAG,OAAO,GAAG,aAAa,CAC/D,GAAG;IACF,qEAAqE;IACrE,WAAW,EAAE,OAAO,GAAG,iBAAiB,GAAG,MAAM,CAAC;IAClD,kCAAkC;IAClC,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,IAAI,CACtC,iBAAiB,EACjB,eAAe,GAAG,UAAU,GAAG,KAAK,GAAG,OAAO,GAAG,aAAa,CAC/D,GAAG;IACF,kCAAkC;IAClC,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,8HAA8H;IAC9H,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,8FAA8F;IAC9F,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,uBAAuB;IAGpE,SAAS,CAAC,eAAe,EAAE,YAAY;IACvC,SAAS,CAAC,WAAW,EAAE,WAAW;IAClC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE;IAGrB,OAAO,CAAC,eAAe;gBANvB,MAAM,EAAE,MAAM,EACJ,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,GAAG,EAAE,EACrB,aAAa,GAAE,WAAW,EAAO,EACjC,QAAQ,GAAE,OAAO,EAAO,EAChB,eAAe,GAAE,YAAY,EAAO;IAS9C;;;;;OAKG;IACU,MAAM,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAcjF;;;;;OAKG;IACU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwBnF;;;;;;;;OAQG;IACU,QAAQ,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;IAuCxE;;;;;OAKG;IACU,OAAO,CAAC,OAAO,GAAE,oBAA+C,GAAG,OAAO,CAAC,eAAe,CAAC;IAUxG;;;;;;OAMG;IACI,IAAI,CAAC,EACV,aAAkB,EAClB,QAAa,EACb,eAAoB,GACrB,EAAE;QACD,kDAAkD;QAClD,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;QAC9B,6CAA6C;QAC7C,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;QACrB,sDAAsD;QACtD,eAAe,CAAC,EAAE,YAAY,EAAE,CAAC;KAClC,GAAG,2BAA2B;CAWhC"}

package/dest/contract/contract_function_interaction.js

@@ -1,6 +1,5 @@
+import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { FunctionSelector, FunctionType, decodeFromAbi, encodeArguments } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 /**
  * This is the class that is returned when calling e.g. `contract.methods.myMethod(arg0, arg1)`.
@@ -9,8 +8,9 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
     contractAddress;
     functionDao;
     args;
-    constructor(wallet, contractAddress, functionDao, args){
-        super(wallet), this.contractAddress = contractAddress, this.functionDao = functionDao, this.args = args;
+    extraHashedArgs;
+    constructor(wallet, contractAddress, functionDao, args, authWitnesses = [], capsules = [], extraHashedArgs = []){
+        super(wallet, authWitnesses, capsules), this.contractAddress = contractAddress, this.functionDao = functionDao, this.args = args, this.extraHashedArgs = extraHashedArgs;
         if (args.some((arg)=>arg === undefined || arg === null)) {
             throw new Error('All function interaction arguments must be defined and not null. Received: ' + args);
         }
@@ -27,22 +27,22 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
             throw new Error("Can't call `create` on an unconstrained function.");
         }
         const requestWithoutFee = await this.request(options);
-        const { fee: userFee } = options;
-        const fee = await this.getFeeOptions({
-            ...requestWithoutFee,
-            fee: userFee
+        const { fee: userFee, nonce, cancellable } = options;
+        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {
+            nonce,
+            cancellable
         });
-        return await this.wallet.createTxExecutionRequest({
-            ...requestWithoutFee,
-            fee
+        return await this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
+            nonce,
+            cancellable
         });
     }
     // docs:start:request
     /**
    * Returns an execution request that represents this operation.
    * Can be used as a building block for constructing batch requests.
-   * @param options - An optional object containing additional configuration for the transaction.
-   * @returns An execution request wrapped in promise.
+   * @param options - An optional object containing additional configuration for the request generation.
+   * @returns An execution payload wrapped in promise.
    */ async request(options = {}) {
         // docs:end:request
         const args = encodeArguments(this.functionDao, this.args);
@@ -57,18 +57,8 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
                 returnTypes: this.functionDao.returnTypes
             }
         ];
-        const authWitnesses = this.getAuthWitnesses();
-        const hashedArguments = this.getHashedArguments();
-        const capsules = this.getCapsules();
-        const { nonce, cancellable } = options;
-        return {
-            calls,
-            authWitnesses,
-            hashedArguments,
-            capsules,
-            nonce,
-            cancellable
-        };
+        const { authWitnesses, capsules } = options;
+        return new ExecutionPayload(calls, this.authWitnesses.concat(authWitnesses ?? []), this.capsules.concat(capsules ?? []), this.extraHashedArgs);
     }
     // docs:start:simulate
     /**
@@ -82,14 +72,9 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
    */ async simulate(options = {}) {
         // docs:end:simulate
         if (this.functionDao.functionType == FunctionType.UNCONSTRAINED) {
-            return this.wallet.simulateUnconstrained(this.functionDao.name, this.args, this.contractAddress, options?.from);
+            return this.wallet.simulateUnconstrained(this.functionDao.name, this.args, this.contractAddress, options.authWitnesses ?? [], options?.from);
         }
-        const fee = options.fee ?? {
-            paymentMethod: new FeeJuicePaymentMethod(AztecAddress.ZERO)
-        };
-        const txRequest = await this.create({
-            fee
-        });
+        const txRequest = await this.create(options);
         const simulatedTx = await this.wallet.simulateTx(txRequest, true, options.from, options.skipTxValidation, options.skipFeeEnforcement ?? true);
         let rawReturnValues;
         if (this.functionDao.functionType == FunctionType.PRIVATE) {
@@ -112,19 +97,27 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
    * @param options - Same options as `simulate`.
    *
    * @returns An object containing the function return value and profile result.
-   */ async simulateWithProfile(options = {}) {
+   */ async profile(options = {
+        profileMode: 'gates'
+    }) {
         if (this.functionDao.functionType == FunctionType.UNCONSTRAINED) {
             throw new Error("Can't profile an unconstrained function.");
         }
+        const { authWitnesses, capsules, fee } = options;
         const txRequest = await this.create({
-            fee: options.fee
+            fee,
+            authWitnesses,
+            capsules
         });
-        const simulatedTx = await this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation, undefined, true);
-        const rawReturnValues = this.functionDao.functionType == FunctionType.PRIVATE ? simulatedTx.getPrivateReturnValues().nested?.[0].values : simulatedTx.getPublicReturnValues()?.[0].values;
-        const rawReturnValuesDecoded = rawReturnValues ? decodeFromAbi(this.functionDao.returnTypes, rawReturnValues) : [];
-        return {
-            returnValues: rawReturnValuesDecoded,
-            gateCounts: simulatedTx.profileResult.gateCounts
-        };
+        return await this.wallet.profileTx(txRequest, options.profileMode, options?.from);
+    }
+    /**
+   * Augments this ContractFunctionInteraction with additional metadata, such as authWitnesses, capsules, and extraHashedArgs.
+   * This is useful when creating a "batteries included" interaction, such as registering a contract class with its associated
+   * capsule instead of having the user provide them externally.
+   * @param options - An object containing the metadata to add to the interaction
+   * @returns A new ContractFunctionInteraction with the added metadata, but calling the same original function in the same manner
+   */ with({ authWitnesses = [], capsules = [], extraHashedArgs = [] }) {
+        return new ContractFunctionInteraction(this.wallet, this.contractAddress, this.functionDao, this.args, this.authWitnesses.concat(authWitnesses), this.capsules.concat(capsules), this.extraHashedArgs.concat(extraHashedArgs));
     }
 }

package/dest/contract/deploy_method.d.ts

@@ -1,3 +1,4 @@
+import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { Fr } from '@aztec/foundation/fields';
 import { type ContractArtifact, type FunctionArtifact } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -5,12 +6,10 @@ import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { GasSettings } from '@aztec/stdlib/gas';
 import type { PublicKeys } from '@aztec/stdlib/keys';
 import type { TxExecutionRequest } from '@aztec/stdlib/tx';
-import type { Wallet } from '../account/wallet.js';
-import { type ExecutionRequestInit } from '../entrypoint/entrypoint.js';
+import type { Wallet } from '../wallet/wallet.js';
 import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
 import type { Contract } from './contract.js';
 import type { ContractBase } from './contract_base.js';
-import { ContractFunctionInteraction } from './contract_function_interaction.js';
 import { DeployProvenTx } from './deploy_proven_tx.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
 /**
@@ -61,24 +60,24 @@ export declare class DeployMethod<TContract extends ContractBase = Contract> ext
      * @remarks This method does not have the same return type as the `request` in the ContractInteraction object,
      * it returns a promise for an array instead of a function call directly.
      */
-    request(options?: DeployOptions): Promise<Omit<ExecutionRequestInit, 'fee'>>;
+    request(options?: DeployOptions): Promise<ExecutionPayload>;
     /**
      * Register this contract in the PXE and returns the Contract object.
      * @param options - Deployment options.
      */
     register(options?: DeployOptions): Promise<TContract>;
     /**
-     * Returns calls for registration of the class and deployment of the instance, depending on the provided options.
+     * Returns the execution payload for registration of the class and deployment of the instance, depending on the provided options.
      * @param options - Deployment options.
-     * @returns A function call array with potentially requests to the class registerer and instance deployer.
+     * @returns An execution payload with potentially calls (and bytecode capsule) to the class registerer  and instance deployer.
      */
-    protected getDeploymentFunctionCalls(options?: DeployOptions): Promise<ContractFunctionInteraction[]>;
+    protected getDeploymentExecutionPayload(options?: DeployOptions): Promise<ExecutionPayload>;
     /**
      * Returns the calls necessary to initialize the contract.
      * @param options - Deployment options.
      * @returns - An array of function calls.
      */
-    protected getInitializeFunctionCalls(options: DeployOptions): Promise<ContractFunctionInteraction[]>;
+    protected getInitializeExecutionPayload(options: DeployOptions): Promise<ExecutionPayload>;
     /**
      * Send the contract deployment transaction using the provided options.
      * This function extends the 'send' method from the ContractFunctionInteraction class,

package/dest/contract/deploy_method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_method.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_method.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,gBAAgB,EAAoB,KAAK,gBAAgB,EAAkB,MAAM,mBAAmB,CAAC;AACnH,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,KAAK,2BAA2B,EAIjC,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAI3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACjG,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AAEH,MAAM,MAAM,aAAa,GAAG;IAC1B,uFAAuF;IACvF,mBAAmB,CAAC,EAAE,EAAE,CAAC;IACzB,0EAA0E;IAC1E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wCAAwC;IACxC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,8EAA8E;IAC9E,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oCAAoC;IACpC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,iBAAiB,CAAC;AAItB;;;GAGG;AACH,qBAAa,YAAY,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,CAAE,SAAQ,uBAAuB;IAQhG,OAAO,CAAC,UAAU;IAElB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,IAAI;IAXd,4CAA4C;IAC5C,OAAO,CAAC,QAAQ,CAAC,CAA0C;IAE3D,oCAAoC;IACpC,OAAO,CAAC,mBAAmB,CAA0B;gBAG3C,UAAU,EAAE,UAAU,EAC9B,MAAM,EAAE,MAAM,EACN,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,EAC7E,IAAI,GAAE,GAAG,EAAO,EACxB,yBAAyB,CAAC,EAAE,MAAM,GAAG,gBAAgB;IAMvD;;;;;;;;OAQG;IACU,MAAM,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAU7E;;;;;;;OAOG;IACU,OAAO,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAqB5E;;;OAGG;IACU,QAAQ,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,SAAS,CAAC;IAMtE;;;;OAIG;cACa,6BAA6B,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuCrG;;;;OAIG;cACa,6BAA6B,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAehG;;;;;;;OAOG;IACa,IAAI,CAAC,OAAO,GAAE,aAAkB,GAAG,YAAY,CAAC,SAAS,CAAC;IAM1E;;;;;OAKG;IACU,WAAW,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAa3F;;;;OAIG;IACmB,KAAK,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAOvF;;;OAGG;IACa,WAAW,CACzB,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,sBAAsB,CAAC,GACpE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,CAAC;IAIhE,sCAAsC;IACtC,IAAW,OAAO,6BAEjB;IAED,uDAAuD;IACvD,IAAW,cAAc,4BAExB;CACF"}

package/dest/contract/deploy_method.js

@@ -1,9 +1,9 @@
+import { mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { getInitializer } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computePartialAddress, getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
 import { deployInstance } from '../deployment/deploy_instance.js';
 import { registerContractClass } from '../deployment/register_class.js';
-import { mergeExecutionRequestInits } from '../entrypoint/entrypoint.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 import { DeployProvenTx } from './deploy_proven_tx.js';
@@ -34,13 +34,14 @@ import { DeploySentTx } from './deploy_sent_tx.js';
    * @returns A Promise resolving to an object containing the signed transaction data and other relevant information.
    */ async create(options = {}) {
         const requestWithoutFee = await this.request(options);
-        const fee = await this.getFeeOptions({
-            ...requestWithoutFee,
-            fee: options.fee
+        const { fee: userFee, nonce, cancellable } = options;
+        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {
+            nonce,
+            cancellable
         });
-        return this.wallet.createTxExecutionRequest({
-            ...requestWithoutFee,
-            fee
+        return this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
+            nonce,
+            cancellable
         });
     }
     // REFACTOR: Having a `request` method with different semantics than the ones in the other
@@ -53,10 +54,7 @@ import { DeploySentTx } from './deploy_sent_tx.js';
    * @remarks This method does not have the same return type as the `request` in the ContractInteraction object,
    * it returns a promise for an array instead of a function call directly.
    */ async request(options = {}) {
-        const deployment = await this.getDeploymentFunctionCalls(options);
-        // NOTE: MEGA HACK. Remove with #10007
-        // register the contract after generating deployment function calls in order to publicly register the class and (optioanlly) emit its bytecode
-        //
+        const deployment = await this.getDeploymentExecutionPayload(options);
         // TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
         // Note that we need to run this registerContract here so it's available when computeFeeOptionsFromEstimatedGas
         // runs, since it needs the contract to have been registered in order to estimate gas for its initialization,
@@ -67,19 +65,16 @@ import { DeploySentTx } from './deploy_sent_tx.js';
             artifact: this.artifact,
             instance: await this.getInstance(options)
         });
-        const bootstrap = await this.getInitializeFunctionCalls(options);
-        const requests = await Promise.all([
-            ...deployment,
-            ...bootstrap
-        ].map((c)=>c.request()));
-        if (!requests.length) {
+        const bootstrap = await this.getInitializeExecutionPayload(options);
+        const exec = [
+            deployment,
+            bootstrap
+        ];
+        const fnCalls = exec.map((exec)=>exec.calls).flat();
+        if (!fnCalls.length) {
             throw new Error(`No function calls needed to deploy contract ${this.artifact.name}`);
         }
-        const { nonce, cancellable } = options;
-        return mergeExecutionRequestInits(requests, {
-            nonce,
-            cancellable
-        });
+        return mergeExecutionPayloads(exec);
     }
     /**
    * Register this contract in the PXE and returns the Contract object.
@@ -93,10 +88,10 @@ import { DeploySentTx } from './deploy_sent_tx.js';
         return this.postDeployCtor(instance.address, this.wallet);
     }
     /**
-   * Returns calls for registration of the class and deployment of the instance, depending on the provided options.
+   * Returns the execution payload for registration of the class and deployment of the instance, depending on the provided options.
    * @param options - Deployment options.
-   * @returns A function call array with potentially requests to the class registerer and instance deployer.
-   */ async getDeploymentFunctionCalls(options = {}) {
+   * @returns An execution payload with potentially calls (and bytecode capsule) to the class registerer  and instance deployer.
+   */ async getDeploymentExecutionPayload(options = {}) {
         const calls = [];
         // Set contract instance object so it's available for populating the DeploySendTx object
         const instance = await this.getInstance(options);
@@ -113,28 +108,28 @@ import { DeploySentTx } from './deploy_sent_tx.js';
             } else {
                 this.log.info(`Creating request for registering contract class ${contractClass.id.toString()} as part of deployment for ${instance.address.toString()}`);
                 const registerContractClassInteraction = await registerContractClass(this.wallet, this.artifact);
-                calls.push(registerContractClassInteraction);
+                calls.push(await registerContractClassInteraction.request());
             }
         }
         // Deploy the contract via the instance deployer.
         if (!options.skipPublicDeployment) {
             const deploymentInteraction = await deployInstance(this.wallet, instance);
-            calls.push(deploymentInteraction);
+            calls.push(await deploymentInteraction.request());
         }
-        return calls;
+        return mergeExecutionPayloads(calls);
     }
     /**
    * Returns the calls necessary to initialize the contract.
    * @param options - Deployment options.
    * @returns - An array of function calls.
-   */ async getInitializeFunctionCalls(options) {
-        const calls = [];
+   */ async getInitializeExecutionPayload(options) {
+        const executionsPayloads = [];
         if (this.constructorArtifact && !options.skipInitialization) {
             const { address } = await this.getInstance(options);
             const constructorCall = new ContractFunctionInteraction(this.wallet, address, this.constructorArtifact, this.args);
-            calls.push(constructorCall);
+            executionsPayloads.push(await constructorCall.request());
         }
-        return calls;
+        return mergeExecutionPayloads(executionsPayloads);
     }
     /**
    * Send the contract deployment transaction using the provided options.

package/dest/contract/deploy_proven_tx.d.ts

@@ -1,8 +1,7 @@
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
 import type { Tx } from '@aztec/stdlib/tx';
-import type { Wallet } from '../account/wallet.js';
+import type { Wallet } from '../wallet/wallet.js';
 import type { Contract } from './contract.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
 import { ProvenTx } from './proven_tx.js';
@@ -12,7 +11,7 @@ import { ProvenTx } from './proven_tx.js';
 export declare class DeployProvenTx<TContract extends Contract = Contract> extends ProvenTx {
     private postDeployCtor;
     private instanceGetter;
-    constructor(wallet: PXE | Wallet, tx: Tx, postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>, instanceGetter: () => Promise<ContractInstanceWithAddress>);
+    constructor(wallet: Wallet, tx: Tx, postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>, instanceGetter: () => Promise<ContractInstanceWithAddress>);
     /**
      * Sends the transaction to the network via the provided wallet.
      */

package/dest/contract/deploy_proven_tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy_proven_tx.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_proven_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C;;GAEG;AACH,qBAAa,cAAc,CAAC,SAAS,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,QAAQ;IAI/E,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;gBAHtB,MAAM,EAAE,GAAG,GAAG,MAAM,EACpB,EAAE,EAAE,EAAE,EACE,cAAc,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,EAC7E,cAAc,EAAE,MAAM,OAAO,CAAC,2BAA2B,CAAC;IAKpE;;OAEG;IACa,IAAI,IAAI,YAAY,CAAC,SAAS,CAAC;CAOhD"}
+{"version":3,"file":"deploy_proven_tx.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_proven_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C;;GAEG;AACH,qBAAa,cAAc,CAAC,SAAS,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,QAAQ;IAI/E,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,cAAc;gBAHtB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,EAAE,EACE,cAAc,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,EAC7E,cAAc,EAAE,MAAM,OAAO,CAAC,2BAA2B,CAAC;IAKpE;;OAEG;IACa,IAAI,IAAI,YAAY,CAAC,SAAS,CAAC;CAOhD"}