@aztec/aztec.js 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/contract/batch_call.js

@@ -1,12 +1,14 @@
-import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
+import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 import { toSimulateOptions } from './interaction_options.js';
-/** A batch of function calls to be sent as a single transaction through a wallet. */ export class BatchCall extends BaseContractInteraction {
+/** A batch of function calls to be sent as a single transaction through a wallet. */ // docs:start:batch_call_class
+export class BatchCall extends BaseContractInteraction {
     interactions;
     constructor(wallet, interactions){
         super(wallet), this.interactions = interactions;
     }
+    // docs:end:batch_call_class
     /**
    * Returns an execution request that represents this operation.
    * @param options - An optional object containing additional configuration for the request generation.
@@ -23,13 +25,12 @@ import { toSimulateOptions } from './interaction_options.js';
         return finalExecutionPayload;
     }
     /**
-   * Simulate a transaction and get its return values
-   * Differs from prove in a few important ways:
-   * 1. It returns the values of the function execution
-   * 2. It supports `utility`, `private` and `public` functions
-   *
-   * @param options - An optional object containing additional configuration for the transaction.
-   * @returns The result of the transaction as returned by the contract function.
+   * Simulates/executes the batch, supporting private, public and utility functions. Although this is a single
+   * interaction with the wallet, private and public functions will be grouped into a single ExecutionPayload
+   * that the wallet will simulate as a single transaction. Utility function calls will be executed
+   * one by one.
+   * @param options - An optional object containing additional configuration for the interaction.
+   * @returns The results of all the interactions that make up the batch
    */ async simulate(options) {
         const { indexedExecutionPayloads, utility } = (await this.getExecutionPayloads()).reduce((acc, current, index)=>{
             const call = current.calls[0];
@@ -52,37 +53,59 @@ import { toSimulateOptions } from './interaction_options.js';
             publicIndex: 0,
             privateIndex: 0
         });
-        const payloads = indexedExecutionPayloads.map(([request])=>request);
-        const combinedPayload = mergeExecutionPayloads(payloads);
-        const executionPayload = new ExecutionPayload(combinedPayload.calls, combinedPayload.authWitnesses.concat(options.authWitnesses ?? []), combinedPayload.capsules.concat(options.capsules ?? []), combinedPayload.extraHashedArgs);
-        const utilityBatchPromise = utility.length > 0 ? this.wallet.batch(utility.map(([call])=>({
-                name: 'simulateUtility',
+        const batchRequests = [];
+        // Add utility calls to batch
+        for (const [call] of utility){
+            batchRequests.push({
+                name: 'executeUtility',
                 args: [
-                    call.name,
-                    call.args,
-                    call.to,
-                    options?.authWitnesses
+                    call,
+                    {
+                        scope: options.from,
+                        authWitnesses: options.authWitnesses
+                    }
                 ]
-            }))) : Promise.resolve([]);
-        const [utilityBatchResults, simulatedTx] = await Promise.all([
-            utilityBatchPromise,
-            indexedExecutionPayloads.length > 0 ? this.wallet.simulateTx(executionPayload, await toSimulateOptions(options)) : Promise.resolve()
-        ]);
-        const results = [];
-        utilityBatchResults.forEach((wrappedResult, utilityIndex)=>{
-            const [, originalIndex] = utility[utilityIndex];
-            results[originalIndex] = wrappedResult.result.result;
-        });
-        if (simulatedTx) {
-            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
-                // For public functions we retrieve the first values directly from the public output.
-                const rawReturnValues = call.type == FunctionType.PRIVATE ? simulatedTx.getPrivateReturnValues()?.nested?.[resultIndex].values : simulatedTx.getPublicReturnValues()?.[resultIndex].values;
-                results[callIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
             });
         }
+        // Add tx simulation to batch if there are any private/public calls
+        if (indexedExecutionPayloads.length > 0) {
+            const payloads = indexedExecutionPayloads.map(([request])=>request);
+            const combinedPayload = mergeExecutionPayloads(payloads);
+            const executionPayload = new ExecutionPayload(combinedPayload.calls, combinedPayload.authWitnesses.concat(options.authWitnesses ?? []), combinedPayload.capsules.concat(options.capsules ?? []), combinedPayload.extraHashedArgs);
+            batchRequests.push({
+                name: 'simulateTx',
+                args: [
+                    executionPayload,
+                    toSimulateOptions(options)
+                ]
+            });
+        }
+        const batchResults = batchRequests.length > 0 ? await this.wallet.batch(batchRequests) : [];
+        const results = [];
+        // Process utility results (they come first in batch results)
+        for(let i = 0; i < utility.length; i++){
+            const [call, resultIndex] = utility[i];
+            const wrappedResult = batchResults[i];
+            if (wrappedResult.name === 'executeUtility') {
+                const rawReturnValues = wrappedResult.result.result;
+                results[resultIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
+            }
+        }
+        // Process tx simulation result (it comes last if present)
+        if (indexedExecutionPayloads.length > 0) {
+            const txResultWrapper = batchResults[utility.length];
+            if (txResultWrapper.name === 'simulateTx') {
+                const simulatedTx = txResultWrapper.result;
+                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
+                    // For public functions we retrieve the first values directly from the public output.
+                    const rawReturnValues = call.type == FunctionType.PRIVATE ? simulatedTx.getPrivateReturnValues()?.nested?.[resultIndex].values : simulatedTx.getPublicReturnValues()?.[resultIndex].values;
+                    results[callIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
+                });
+            }
+        }
         return results;
     }
     async getExecutionPayloads() {

package/dest/contract/checker.d.ts

@@ -8,4 +8,4 @@ import { type ContractArtifact } from '@aztec/stdlib/abi';
  * @returns A boolean value indicating whether the artifact is valid or not.
  */
 export declare function abiChecker(artifact: ContractArtifact): boolean;
-//# sourceMappingURL=checker.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2tlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NoZWNrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUdMLEtBQUssZ0JBQWdCLEVBR3RCLE1BQU0sbUJBQW1CLENBQUM7QUFRM0I7Ozs7Ozs7R0FPRztBQUNILHdCQUFnQixVQUFVLENBQUMsUUFBUSxFQUFFLGdCQUFnQixXQTZCcEQifQ==

package/dest/contract/contract.d.ts

@@ -19,7 +19,7 @@ export declare class Contract extends ContractBase {
      * @param wallet - The wallet to use when interacting with the contract.
      * @returns A promise that resolves to a new Contract instance.
      */
-    static at(address: AztecAddress, artifact: ContractArtifact, wallet: Wallet): Promise<Contract>;
+    static at(address: AztecAddress, artifact: ContractArtifact, wallet: Wallet): Contract;
     /**
      * Creates a tx to deploy (initialize and/or publish) a new instance of a contract.
      * @param wallet - The wallet for executing the deployment.
@@ -39,4 +39,4 @@ export declare class Contract extends ContractBase {
      */
     static deployWithPublicKeys(publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, args: any[], constructorName?: string): DeployMethod<Contract>;
 }
-//# sourceMappingURL=contract.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBRWhFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUVoRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDbEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRWxEOzs7Ozs7R0FNRztBQUNILHFCQUFhLFFBQVMsU0FBUSxZQUFZO0lBQ3hDOzs7Ozs7T0FNRztJQUNILE9BQWMsRUFBRSxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsUUFBUSxDQUU1RjtJQUVEOzs7Ozs7T0FNRztJQUNILE9BQWMsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRSxlQUFlLENBQUMsRUFBRSxNQUFNLDBCQUlyRztJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsT0FBYyxvQkFBb0IsQ0FDaEMsVUFBVSxFQUFFLFVBQVUsRUFDdEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxRQUFRLEVBQUUsZ0JBQWdCLEVBQzFCLElBQUksRUFBRSxHQUFHLEVBQUUsRUFDWCxlQUFlLENBQUMsRUFBRSxNQUFNLDBCQUt6QjtDQUNGIn0=

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;AAChE,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;IAK5G;;;;;;OAMG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM;IAKtG;;;;;;;;OAQG;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;IACH,OAAc,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAE5F;IAED;;;;;;OAMG;IACH,OAAc,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM,0BAIrG;IAED;;;;;;;;OAQG;IACH,OAAc,oBAAoB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,CAAC,EAAE,MAAM,0BAKzB;CACF"}

package/dest/contract/contract.js

@@ -14,9 +14,8 @@ import { DeployMethod } from './deploy_method.js';
    * @param artifact - Build artifact of the contract.
    * @param wallet - The wallet to use when interacting with the contract.
    * @returns A promise that resolves to a new Contract instance.
-   */ static async at(address, artifact, wallet) {
-        const instance = await wallet.registerContract(address, artifact);
-        return new Contract(instance, artifact, wallet);
+   */ static at(address, artifact, wallet) {
+        return new Contract(address, artifact, wallet);
     }
     /**
    * Creates a tx to deploy (initialize and/or publish) a new instance of a contract.
@@ -25,7 +24,7 @@ import { DeployMethod } from './deploy_method.js';
    * @param args - Arguments for the constructor.
    * @param constructorName - The name of the constructor function to call.
    */ static deploy(wallet, artifact, args, constructorName) {
-        const postDeployCtor = (address, wallet)=>Contract.at(address, artifact, wallet);
+        const postDeployCtor = (instance, wallet)=>Contract.at(instance.address, artifact, wallet);
         return new DeployMethod(PublicKeys.default(), wallet, artifact, postDeployCtor, args, constructorName);
     }
     /**
@@ -37,7 +36,7 @@ import { DeployMethod } from './deploy_method.js';
    * @param args - Arguments for the constructor.
    * @param constructorName - The name of the constructor function to call.
    */ static deployWithPublicKeys(publicKeys, wallet, artifact, args, constructorName) {
-        const postDeployCtor = (address, wallet)=>Contract.at(address, artifact, wallet);
+        const postDeployCtor = (instance, wallet)=>Contract.at(instance.address, artifact, wallet);
         return new DeployMethod(publicKeys, wallet, artifact, postDeployCtor, args, constructorName);
     }
 }

package/dest/contract/contract_base.d.ts

@@ -1,5 +1,5 @@
 import { type ContractArtifact, type FieldLayout, FunctionSelector } from '@aztec/stdlib/abi';
-import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { Wallet } from '../wallet/wallet.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 /**
@@ -22,8 +22,8 @@ export type ContractStorageLayout<T extends string> = {
  * Abstract implementation of a contract extended by the Contract class and generated contract types.
  */
 export declare class ContractBase {
-    /** The deployed contract instance definition. */
-    readonly instance: ContractInstanceWithAddress;
+    /** The contract's address. */
+    readonly address: AztecAddress;
     /** The Application Binary Interface for the contract. */
     readonly artifact: ContractArtifact;
     /** The wallet used for interacting with this contract. */
@@ -35,16 +35,12 @@ export declare class ContractBase {
         [name: string]: ContractMethod;
     };
     protected constructor(
-    /** The deployed contract instance definition. */
-    instance: ContractInstanceWithAddress, 
+    /** The contract's address. */
+    address: AztecAddress, 
     /** The Application Binary Interface for the contract. */
     artifact: ContractArtifact, 
     /** The wallet used for interacting with this contract. */
     wallet: Wallet);
-    /** Address of the contract. */
-    get address(): import("../api/addresses.js").AztecAddress;
-    /** Partial address of the contract. */
-    get partialAddress(): Promise<import("@aztec/foundation/schemas").Fr>;
     /**
      * Creates a new instance of the contract wrapper attached to a different wallet.
      * @param wallet - Wallet to use for sending txs.
@@ -52,4 +48,4 @@ export declare class ContractBase {
      */
     withWallet(wallet: Wallet): this;
 }
-//# sourceMappingURL=contract_base.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfYmFzZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NvbnRyYWN0X2Jhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLEtBQUssZ0JBQWdCLEVBQ3JCLEtBQUssV0FBVyxFQUVoQixnQkFBZ0IsRUFFakIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUVqRjs7O0dBR0c7QUFDSCxNQUFNLE1BQU0sY0FBYyxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksRUFBRSxHQUFHLEVBQUUsS0FBSywyQkFBMkIsQ0FBQyxHQUFHO0lBQy9FOztPQUVHO0lBQ0gsUUFBUSxFQUFFLE1BQU0sT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7Q0FDM0MsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHFCQUFxQixDQUFDLENBQUMsU0FBUyxNQUFNLElBQUk7S0FDbkQsQ0FBQyxJQUFJLENBQUMsR0FBRyxXQUFXO0NBQ3RCLENBQUM7QUFFRjs7R0FFRztBQUNILHFCQUFhLFlBQVk7SUFPckIsOEJBQThCO2FBQ2QsT0FBTyxFQUFFLFlBQVk7SUFDckMseURBQXlEO2FBQ3pDLFFBQVEsRUFBRSxnQkFBZ0I7SUFDMUMsMERBQTBEO0lBQ25ELE1BQU0sRUFBRSxNQUFNO0lBWHZCOztPQUVHO0lBQ0ksT0FBTyxFQUFFO1FBQUUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLGNBQWMsQ0FBQTtLQUFFLENBQU07SUFFeEQsU0FBUztJQUNQLDhCQUE4QjtJQUNkLE9BQU8sRUFBRSxZQUFZO0lBQ3JDLHlEQUF5RDtJQUN6QyxRQUFRLEVBQUUsZ0JBQWdCO0lBQzFDLDBEQUEwRDtJQUNuRCxNQUFNLEVBQUUsTUFBTSxFQWlCdEI7SUFFRDs7OztPQUlHO0lBQ0ksVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsSUFBSSxDQUV0QztDQUNGIn0=

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,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,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,+CAEjB;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,WAAW,EAEhB,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,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,qBAAa,YAAY;IAOrB,8BAA8B;aACd,OAAO,EAAE,YAAY;IACrC,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,8BAA8B;IACd,OAAO,EAAE,YAAY;IACrC,yDAAyD;IACzC,QAAQ,EAAE,gBAAgB;IAC1C,0DAA0D;IACnD,MAAM,EAAE,MAAM,EAiBtB;IAED;;;;OAIG;IACI,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEtC;CACF"}

package/dest/contract/contract_base.js

@@ -1,23 +1,22 @@
 import { FunctionSelector, getAllFunctionAbis } from '@aztec/stdlib/abi';
-import { computePartialAddress } from '@aztec/stdlib/contract';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 /**
  * Abstract implementation of a contract extended by the Contract class and generated contract types.
  */ export class ContractBase {
-    instance;
+    address;
     artifact;
     wallet;
     /**
    * An object containing contract methods mapped to their respective names.
    */ methods;
-    constructor(/** The deployed contract instance definition. */ instance, /** The Application Binary Interface for the contract. */ artifact, /** The wallet used for interacting with this contract. */ wallet){
-        this.instance = instance;
+    constructor(/** The contract's address. */ address, /** The Application Binary Interface for the contract. */ artifact, /** The wallet used for interacting with this contract. */ wallet){
+        this.address = address;
         this.artifact = artifact;
         this.wallet = wallet;
         this.methods = {};
         getAllFunctionAbis(artifact).forEach((f)=>{
             const interactionFunction = (...args)=>{
-                return new ContractFunctionInteraction(this.wallet, this.instance.address, f, args);
+                return new ContractFunctionInteraction(this.wallet, this.address, f, args);
             };
             this.methods[f.name] = Object.assign(interactionFunction, {
                 /**
@@ -29,17 +28,11 @@ import { ContractFunctionInteraction } from './contract_function_interaction.js'
             });
         });
     }
-    /** Address of the contract. */ get address() {
-        return this.instance.address;
-    }
-    /** Partial address of the contract. */ get partialAddress() {
-        return computePartialAddress(this.instance);
-    }
     /**
    * Creates a new instance of the contract wrapper attached to a different wallet.
    * @param wallet - Wallet to use for sending txs.
    * @returns A new contract instance.
    */ withWallet(wallet) {
-        return new ContractBase(this.instance, this.artifact, wallet);
+        return new ContractBase(this.address, this.artifact, wallet);
     }
 }

package/dest/contract/contract_function_interaction.d.ts

@@ -1,8 +1,8 @@
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { type FunctionAbi, FunctionSelector, FunctionType } from '@aztec/stdlib/abi';
+import { type FunctionAbi, FunctionCall } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type Capsule, type HashedValues, type TxProfileResult } from '@aztec/stdlib/tx';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
 import type { Wallet } from '../wallet/wallet.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 import { type ProfileInteractionOptions, type RequestInteractionOptions, type SimulateInteractionOptions, type SimulationReturn } from './interaction_options.js';
@@ -21,16 +21,7 @@ export declare class ContractFunctionInteraction extends BaseContractInteraction
      * Useful when generating authwits
      * @returns An encoded function call
      */
-    getFunctionCall(): Promise<{
-        name: string;
-        args: import("@aztec/foundation/schemas").Fr[];
-        selector: FunctionSelector;
-        type: FunctionType;
-        to: AztecAddress;
-        isStatic: boolean;
-        hideMsgSender: boolean; /** Only set to `true` for enqueued public function calls */
-        returnTypes: import("@aztec/stdlib/abi").AbiType[];
-    }>;
+    getFunctionCall(): Promise<FunctionCall>;
     /**
      * Returns the execution payload that allows this operation to happen on chain.
      * @param options - Configuration options.
@@ -64,7 +55,7 @@ export declare class ContractFunctionInteraction extends BaseContractInteraction
      * @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, }: {
+    with({ authWitnesses, capsules, extraHashedArgs }: {
         /** The authWitnesses to add to the interaction */
         authWitnesses?: AuthWitness[];
         /** The capsules to add to the interaction */
@@ -73,4 +64,4 @@ export declare class ContractFunctionInteraction extends BaseContractInteraction
         extraHashedArgs?: HashedValues[];
     }): ContractFunctionInteraction;
 }
-//# sourceMappingURL=contract_function_interaction.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZnVuY3Rpb25faW50ZXJhY3Rpb24uZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9mdW5jdGlvbl9pbnRlcmFjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLFlBQVksRUFLYixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsS0FBSyxZQUFZLEVBQUUsS0FBSyxlQUFlLEVBQTBCLE1BQU0sa0JBQWtCLENBQUM7QUFDakgsT0FBTyxFQUFFLGdCQUFnQixFQUEwQixNQUFNLGtCQUFrQixDQUFDO0FBRTVFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpFLE9BQU8sRUFDTCxLQUFLLHlCQUF5QixFQUM5QixLQUFLLHlCQUF5QixFQUM5QixLQUFLLDBCQUEwQixFQUMvQixLQUFLLGdCQUFnQixFQUd0QixNQUFNLDBCQUEwQixDQUFDO0FBRWxDOzs7R0FHRztBQUNILHFCQUFhLDJCQUE0QixTQUFRLHVCQUF1QjtJQUdwRSxTQUFTLENBQUMsZUFBZSxFQUFFLFlBQVk7SUFDdkMsU0FBUyxDQUFDLFdBQVcsRUFBRSxXQUFXO0lBQ2xDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFO0lBR3JCLE9BQU8sQ0FBQyxlQUFlO0lBUHpCLFlBQ0UsTUFBTSxFQUFFLE1BQU0sRUFDSixlQUFlLEVBQUUsWUFBWSxFQUM3QixXQUFXLEVBQUUsV0FBVyxFQUN4QixJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ3JCLGFBQWEsR0FBRSxXQUFXLEVBQU8sRUFDakMsUUFBUSxHQUFFLE9BQU8sRUFBTyxFQUNoQixlQUFlLEdBQUUsWUFBWSxFQUFPLEVBTTdDO0lBRUQ7Ozs7T0FJRztJQUNVLGVBQWUsMEJBWTNCO0lBRUQ7Ozs7T0FJRztJQUNtQixPQUFPLENBQUMsT0FBTyxHQUFFLHlCQUE4QixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxDQWdCaEc7SUFHRDs7Ozs7Ozs7OztPQVVHO0lBQ1UsUUFBUSxDQUFDLENBQUMsU0FBUywwQkFBMEIsRUFDeEQsT0FBTyxFQUFFLENBQUMsR0FDVCxPQUFPLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsRUFBRSxTQUFTLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFFN0QsUUFBUSxDQUFDLENBQUMsU0FBUywwQkFBMEIsRUFDeEQsT0FBTyxFQUFFLENBQUMsR0FDVCxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBOERuRDs7Ozs7T0FLRztJQUNVLE9BQU8sQ0FBQyxPQUFPLEVBQUUseUJBQXlCLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQU9qRjtJQUVEOzs7Ozs7T0FNRztJQUNJLElBQUksQ0FBQyxFQUNWLGFBQWtCLEVBQ2xCLFFBQWEsRUFDYixlQUFvQixFQUNyQixFQUFFO1FBQ0Qsa0RBQWtEO1FBQ2xELGFBQWEsQ0FBQyxFQUFFLFdBQVcsRUFBRSxDQUFDO1FBQzlCLDZDQUE2QztRQUM3QyxRQUFRLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQztRQUNyQixzREFBc0Q7UUFDdEQsZUFBZSxDQUFDLEVBQUUsWUFBWSxFQUFFLENBQUM7S0FDbEMsR0FBRywyQkFBMkIsQ0FVOUI7Q0FDRiJ9

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,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AACtF,OAAO,EAAE,KAAK,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAkC,MAAM,mBAAmB,CAAC;AACrH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAA0B,MAAM,kBAAkB,CAAC;AAEjH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,gBAAgB,EAGtB,MAAM,0BAA0B,CAAC;AAElC;;;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;IAQ9C;;;;OAIG;IACU,eAAe;;;;;;;gCASH,4DAA4D;;;IAKrF;;;;OAIG;IACmB,OAAO,CAAC,OAAO,GAAE,yBAA8B,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmBjG;;;;;;;;;;OAUG;IACU,QAAQ,CAAC,CAAC,SAAS,0BAA0B,EACxD,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IAE5D,QAAQ,CAAC,CAAC,SAAS,0BAA0B,EACxD,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;IA4DlD;;;;;OAKG;IACU,OAAO,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC;IASlF;;;;;;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"}
+{"version":3,"file":"contract_function_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/contract_function_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,YAAY,EAKb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,eAAe,EAA0B,MAAM,kBAAkB,CAAC;AACjH,OAAO,EAAE,gBAAgB,EAA0B,MAAM,kBAAkB,CAAC;AAE5E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,gBAAgB,EAGtB,MAAM,0BAA0B,CAAC;AAElC;;;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;IAPzB,YACE,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,EAM7C;IAED;;;;OAIG;IACU,eAAe,0BAY3B;IAED;;;;OAIG;IACmB,OAAO,CAAC,OAAO,GAAE,yBAA8B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAgBhG;IAGD;;;;;;;;;;OAUG;IACU,QAAQ,CAAC,CAAC,SAAS,0BAA0B,EACxD,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAE7D,QAAQ,CAAC,CAAC,SAAS,0BAA0B,EACxD,OAAO,EAAE,CAAC,GACT,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IA8DnD;;;;;OAKG;IACU,OAAO,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,eAAe,CAAC,CAOjF;IAED;;;;;;OAMG;IACI,IAAI,CAAC,EACV,aAAkB,EAClB,QAAa,EACb,eAAoB,EACrB,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,CAU9B;CACF"}

package/dest/contract/contract_function_interaction.js

@@ -1,6 +1,6 @@
-import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
-import { FunctionSelector, FunctionType, decodeFromAbi, encodeArguments } from '@aztec/stdlib/abi';
+import { FunctionCall, FunctionSelector, FunctionType, decodeFromAbi, encodeArguments } from '@aztec/stdlib/abi';
 import { collectOffchainEffects } from '@aztec/stdlib/tx';
+import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/stdlib/tx';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 import { getGasLimits } from './get_gas_limits.js';
 import { toProfileOptions, toSimulateOptions } from './interaction_options.js';
@@ -24,16 +24,16 @@ import { toProfileOptions, toSimulateOptions } from './interaction_options.js';
    * @returns An encoded function call
    */ async getFunctionCall() {
         const args = encodeArguments(this.functionDao, this.args);
-        return {
+        return FunctionCall.from({
             name: this.functionDao.name,
-            args,
+            to: this.contractAddress,
             selector: await FunctionSelector.fromNameAndParameters(this.functionDao.name, this.functionDao.parameters),
             type: this.functionDao.functionType,
-            to: this.contractAddress,
-            isStatic: this.functionDao.isStatic,
             hideMsgSender: false,
+            isStatic: this.functionDao.isStatic,
+            args,
             returnTypes: this.functionDao.returnTypes
-        };
+        });
     }
     /**
    * Returns the execution payload that allows this operation to happen on chain.
@@ -56,18 +56,24 @@ import { toProfileOptions, toSimulateOptions } from './interaction_options.js';
     async simulate(options) {
         // docs:end:simulate
         if (this.functionDao.functionType == FunctionType.UTILITY) {
-            const utilityResult = await this.wallet.simulateUtility(this.functionDao.name, this.args, this.contractAddress, options.authWitnesses ?? []);
+            const call = await this.getFunctionCall();
+            const utilityResult = await this.wallet.executeUtility(call, {
+                scope: options.from,
+                authWitnesses: options.authWitnesses
+            });
+            // Decode the raw field elements to the actual return type
+            const returnValue = utilityResult.result ? decodeFromAbi(this.functionDao.returnTypes, utilityResult.result) : [];
             if (options.includeMetadata) {
                 return {
                     stats: utilityResult.stats,
-                    result: utilityResult.result
+                    result: returnValue
                 };
             } else {
-                return utilityResult.result;
+                return returnValue;
             }
         }
         const executionPayload = await this.request(options);
-        const simulatedTx = await this.wallet.simulateTx(executionPayload, await toSimulateOptions(options));
+        const simulatedTx = await this.wallet.simulateTx(executionPayload, toSimulateOptions(options));
         let rawReturnValues;
         if (this.functionDao.functionType == FunctionType.PRIVATE) {
             if (simulatedTx.getPrivateReturnValues().nested.length > 0) {
@@ -109,7 +115,7 @@ import { toProfileOptions, toSimulateOptions } from './interaction_options.js';
             throw new Error("Can't profile a utility function.");
         }
         const executionPayload = await this.request(options);
-        return await this.wallet.profileTx(executionPayload, await toProfileOptions(options));
+        return await this.wallet.profileTx(executionPayload, toProfileOptions(options));
     }
     /**
    * Augments this ContractFunctionInteraction with additional metadata, such as authWitnesses, capsules, and extraHashedArgs.

package/dest/contract/deploy_method.d.ts

@@ -1,17 +1,31 @@
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { type ContractArtifact, type FunctionArtifact } from '@aztec/stdlib/abi';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import type { PublicKeys } from '@aztec/stdlib/keys';
-import { type Capsule, type TxProfileResult } from '@aztec/stdlib/tx';
-import type { Wallet } from '../wallet/wallet.js';
+import { type Capsule, HashedValues, TxHash, type TxProfileResult, type TxReceipt } from '@aztec/stdlib/tx';
+import { ExecutionPayload } from '@aztec/stdlib/tx';
+import type { ProfileOptions, SendOptions, SimulateOptions, Wallet } from '../wallet/wallet.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
-import type { Contract } from './contract.js';
 import type { ContractBase } from './contract_base.js';
-import { DeploySentTx } from './deploy_sent_tx.js';
-import { type ProfileInteractionOptions, type RequestInteractionOptions, type SendInteractionOptions, type SimulationInteractionFeeOptions, type SimulationReturn } from './interaction_options.js';
+import { type NoWait, type ProfileInteractionOptions, type RequestInteractionOptions, type SendInteractionOptionsWithoutWait, type SimulationInteractionFeeOptions, type SimulationReturn } from './interaction_options.js';
+import type { WaitOpts } from './wait_opts.js';
+/**
+ * Wait options specific to deployment transactions.
+ * Extends WaitOpts with a flag to return the full receipt instead of just the contract.
+ */
+export type DeployWaitOptions = WaitOpts & {
+    /** If true, return the full DeployTxReceipt instead of just the contract. Defaults to false. */
+    returnReceipt?: boolean;
+};
+/**
+ * Type for wait options in deployment interactions.
+ * - NO_WAIT symbol: Don't wait, return TxHash immediately
+ * - DeployWaitOptions: Wait with custom options
+ * - undefined: Wait with default options
+ */
+export type DeployInteractionWaitOptions = NoWait | DeployWaitOptions | undefined;
 /**
  * Options for deploying a contract on the Aztec network.
  * Allows specifying a contract address salt and different options to tweak contract publication
@@ -31,22 +45,36 @@ export type RequestDeployOptions = RequestInteractionOptions & {
     skipInstancePublication?: boolean;
     /** Skip contract initialization. */
     skipInitialization?: boolean;
+    /** Skip contract registration in the wallet */
+    skipRegistration?: boolean;
 };
 /**
- * Extends the deployment options with the required parameters to send the transaction
+ * Base deployment options without wait parameter.
  */
-export type DeployOptions = Omit<RequestDeployOptions, 'deployer'> & {
+export type DeployOptionsWithoutWait = Omit<RequestDeployOptions, 'deployer'> & {
     /**
      * Set to true to *not* include the sender in the address computation. This option
      * is mutually exclusive with "deployer"
      */
     universalDeploy?: boolean;
-} & Pick<SendInteractionOptions, 'from' | 'fee'>;
+} & Pick<SendInteractionOptionsWithoutWait, 'from' | 'fee' | 'additionalScopes'>;
+/**
+ * Extends the deployment options with the required parameters to send the transaction.
+ */
+export type DeployOptions<W extends DeployInteractionWaitOptions = undefined> = DeployOptionsWithoutWait & {
+    /**
+     * Options for waiting for the transaction to be mined.
+     * - undefined (default): wait with default options and return the contract instance
+     * - DeployWaitOptions: wait with custom options and return contract or receipt based on returnReceipt flag
+     * - NO_WAIT: return TxHash immediately without waiting
+     */
+    wait?: W;
+};
 /**
  * Options for simulating the deployment of a contract
  * Allows skipping certain validations and computing gas estimations
  */
-export type SimulateDeployOptions = Omit<DeployOptions, 'fee'> & {
+export type SimulateDeployOptions = Omit<DeployOptionsWithoutWait, 'fee'> & {
     /** The fee options for the transaction. */
     fee?: SimulationInteractionFeeOptions;
     /** Simulate without checking for the validity of the resulting transaction,
@@ -59,6 +87,22 @@ export type SimulateDeployOptions = Omit<DeployOptions, 'fee'> & {
      * the simulation result, instead of just the return value of the function */
     includeMetadata?: boolean;
 };
+/** Receipt for a deployment transaction with the deployed contract instance. */
+export type DeployTxReceipt<TContract extends ContractBase = ContractBase> = TxReceipt & {
+    /** Type-safe wrapper around the deployed contract instance, linked to the deployment wallet */
+    contract: TContract;
+    /** The deployed contract instance with address and metadata. */
+    instance: ContractInstanceWithAddress;
+};
+/**
+ * Represents the result type of deploying a contract.
+ * - If wait is NO_WAIT, returns TxHash immediately.
+ * - If wait has returnReceipt: true, returns DeployTxReceipt after waiting.
+ * - Otherwise (undefined or DeployWaitOptions without returnReceipt), returns TContract after waiting.
+ */
+export type DeployReturn<TContract extends ContractBase, W extends DeployInteractionWaitOptions> = W extends NoWait ? TxHash : W extends {
+    returnReceipt: true;
+} ? DeployTxReceipt<TContract> : TContract;
 /**
  * Contract interaction for deployment.
  * Handles class publication, instance publication, and initialization of the contract.
@@ -68,26 +112,43 @@ export type SimulateDeployOptions = Omit<DeployOptions, 'fee'> & {
  * then technically the contract has already been "created", and all of the contract's
  * functions (private and utility) can be interacted-with immediately, without any
  * "deployment tx".
- *
- * Extends the BaseContractInteraction class.
  */
-export declare class DeployMethod<TContract extends ContractBase = Contract> extends BaseContractInteraction {
+export declare class DeployMethod<TContract extends ContractBase = ContractBase> extends BaseContractInteraction {
     private publicKeys;
     protected artifact: ContractArtifact;
-    protected postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>;
+    protected postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract;
     private args;
+    private extraHashedArgs;
     /** The contract instance to be deployed. */
     private instance?;
     /** Constructor function to call. */
     private constructorArtifact;
-    constructor(publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>, args?: any[], constructorNameOrArtifact?: string | FunctionArtifact, authWitnesses?: AuthWitness[], capsules?: Capsule[]);
+    constructor(publicKeys: PublicKeys, wallet: Wallet, artifact: ContractArtifact, postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract, args?: any[], constructorNameOrArtifact?: string | FunctionArtifact, authWitnesses?: AuthWitness[], capsules?: Capsule[], extraHashedArgs?: HashedValues[]);
     /**
      * Returns the execution payload that allows this operation to happen on chain.
      * @param options - Configuration options.
      * @returns The execution payload for this operation
      */
     request(options?: RequestDeployOptions): Promise<ExecutionPayload>;
-    convertDeployOptionsToRequestOptions(options: DeployOptions): RequestDeployOptions;
+    convertDeployOptionsToRequestOptions(options: DeployOptionsWithoutWait): RequestDeployOptions;
+    /**
+     * Converts DeployOptions to SendOptions, stripping out the returnReceipt flag if present.
+     * @param options - Deploy options with wait parameter
+     * @returns Send options with wait parameter
+     */
+    protected convertDeployOptionsToSendOptions<W extends DeployInteractionWaitOptions>(options: DeployOptions<W>): SendOptions<W extends {
+        returnReceipt: true;
+    } ? WaitOpts : W>;
+    /**
+     * Converts deploy simulation options into wallet-level simulate options.
+     * @param options - The deploy simulation options to convert.
+     */
+    protected convertDeployOptionsToSimulateOptions(options: SimulateDeployOptions): SimulateOptions;
+    /**
+     * Converts deploy profile options into wallet-level profile options.
+     * @param options - The deploy profile options to convert.
+     */
+    protected convertDeployOptionsToProfileOptions(options: DeployOptionsWithoutWait & ProfileInteractionOptions): ProfileOptions;
     /**
      * Adds this contract to the wallet and returns the Contract object.
      * @param options - Deployment options.
@@ -110,13 +171,13 @@ export declare class DeployMethod<TContract extends ContractBase = Contract> ext
     protected getInitializationExecutionPayload(options?: RequestDeployOptions): Promise<ExecutionPayload>;
     /**
      * Send a contract deployment transaction (initialize and/or publish) using the provided options.
-     * This function extends the 'send' method from the ContractFunctionInteraction class,
-     * allowing us to send a transaction specifically for contract deployment.
+     * By default, waits for the transaction to be mined and returns the deployed contract instance.
      *
      * @param options - An object containing various deployment options such as contractAddressSalt and from.
-     * @returns A SentTx object that returns the receipt and the deployed contract instance.
+     * @returns TxHash (if wait is NO_WAIT), TContract (if wait is undefined or doesn't have returnReceipt), or DeployTxReceipt (if wait.returnReceipt is true)
      */
-    send(options: DeployOptions): DeploySentTx<TContract>;
+    send(options: DeployOptionsWithoutWait): Promise<TContract>;
+    send<W extends DeployInteractionWaitOptions>(options: DeployOptions<W>): Promise<DeployReturn<TContract, W>>;
     /**
      * Builds the contract instance and returns it.
      *
@@ -138,7 +199,7 @@ export declare class DeployMethod<TContract extends ContractBase = Contract> ext
      *
      * @returns An object containing the function return value and profile result.
      */
-    profile(options: DeployOptions & ProfileInteractionOptions): Promise<TxProfileResult>;
+    profile(options: DeployOptionsWithoutWait & ProfileInteractionOptions): Promise<TxProfileResult>;
     /** Return this deployment address. */
     get address(): AztecAddress | undefined;
     /** Returns the partial address for this deployment. */
@@ -148,11 +209,11 @@ export declare class DeployMethod<TContract extends ContractBase = Contract> ext
      * @param options - An object containing the metadata to add to the interaction
      * @returns A new DeployMethod with the added metadata, but calling the same original function in the same manner
      */
-    with({ authWitnesses, capsules, }: {
+    with({ authWitnesses, capsules }: {
         /** The authWitnesses to add to the deployment */
         authWitnesses?: AuthWitness[];
         /** The capsules to add to the deployment */
         capsules?: Capsule[];
     }): DeployMethod;
 }
-//# sourceMappingURL=deploy_method.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X21ldGhvZC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2RlcGxveV9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUFvQixLQUFLLGdCQUFnQixFQUFrQixNQUFNLG1CQUFtQixDQUFDO0FBQ25ILE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSywyQkFBMkIsRUFJakMsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEVBQ0wsS0FBSyxPQUFPLEVBQ1osWUFBWSxFQUNaLE1BQU0sRUFDTixLQUFLLGVBQWUsRUFDcEIsS0FBSyxTQUFTLEVBRWYsTUFBTSxrQkFBa0IsQ0FBQztBQUMxQixPQUFPLEVBQUUsZ0JBQWdCLEVBQTBCLE1BQU0sa0JBQWtCLENBQUM7QUFJNUUsT0FBTyxLQUFLLEVBQUUsY0FBYyxFQUFFLFdBQVcsRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDaEcsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDekUsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHdkQsT0FBTyxFQUVMLEtBQUssTUFBTSxFQUNYLEtBQUsseUJBQXlCLEVBQzlCLEtBQUsseUJBQXlCLEVBQzlCLEtBQUssaUNBQWlDLEVBQ3RDLEtBQUssK0JBQStCLEVBQ3BDLEtBQUssZ0JBQWdCLEVBSXRCLE1BQU0sMEJBQTBCLENBQUM7QUFDbEMsT0FBTyxLQUFL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