@aztec/aztec.js 0.0.0-test.1 → 0.0.1-commit.5daedc8

package/dest/contract/deploy_sent_tx.d.ts

@@ -1,10 +1,7 @@
 import type { FieldsOf } from '@aztec/foundation/types';
-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 { TxHash, TxReceipt } from '@aztec/stdlib/tx';
-import type { Wallet } from '../account/index.js';
-import type { Contract } from './contract.js';
+import type { Wallet } from '../wallet/wallet.js';
 import type { ContractBase } from './contract_base.js';
 import { SentTx, type WaitOpts } from './sent_tx.js';
 /** Options related to waiting for a deployment tx. */
@@ -13,21 +10,28 @@ export type DeployedWaitOpts = WaitOpts & {
     wallet?: Wallet;
 };
 /** Extends a transaction receipt with a contract instance that represents the newly deployed contract. */
-export type DeployTxReceipt<TContract extends ContractBase = Contract> = FieldsOf<TxReceipt> & {
+export type DeployTxReceipt<TContract extends ContractBase = ContractBase> = FieldsOf<TxReceipt> & {
     /** Instance of the newly deployed contract. */
     contract: TContract;
+    /** The deployed contract instance with address and metadata. */
+    instance: ContractInstanceWithAddress;
 };
 /**
- * A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
+ * A contract deployment transaction sent to the network, extending SentTx with methods to publish a contract instance.
  */
-export declare class DeploySentTx<TContract extends Contract = Contract> extends SentTx {
+export declare class DeploySentTx<TContract extends ContractBase = ContractBase> extends SentTx {
     private postDeployCtor;
     /** A getter for the deployed contract instance */
-    instanceGetter: () => Promise<ContractInstanceWithAddress>;
+    private instanceGetter;
     private log;
-    constructor(pxeOrWallet: PXE | Wallet, txHashPromise: Promise<TxHash>, postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>, 
+    constructor(wallet: Wallet, sendTx: () => Promise<TxHash>, postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract, 
     /** A getter for the deployed contract instance */
     instanceGetter: () => Promise<ContractInstanceWithAddress>);
+    /**
+     * Returns the contract instance for this deployment.
+     * @returns The deployed contract instance with address and metadata.
+     */
+    getInstance(): Promise<ContractInstanceWithAddress>;
     /**
      * Awaits for the tx to be mined and returns the contract instance. Throws if tx is not mined.
      * @param opts - Options for configuring the waiting for the tx to be mined.
@@ -40,6 +44,5 @@ export declare class DeploySentTx<TContract extends Contract = Contract> extends
      * @returns The transaction receipt with the deployed contract instance.
      */
     wait(opts?: DeployedWaitOpts): Promise<DeployTxReceipt<TContract>>;
-    protected getContractObject(wallet?: Wallet): Promise<TContract>;
 }
-//# sourceMappingURL=deploy_sent_tx.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X3NlbnRfdHguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9kZXBsb3lfc2VudF90eC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RCxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUxRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN2RCxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssUUFBUSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRXJELHNEQUFzRDtBQUN0RCxNQUFNLE1BQU0sZ0JBQWdCLEdBQUcsUUFBUSxHQUFHO0lBQ3hDLCtHQUErRztJQUMvRyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakIsQ0FBQztBQUVGLDBHQUEwRztBQUMxRyxNQUFNLE1BQU0sZUFBZSxDQUFDLFNBQVMsU0FBUyxZQUFZLEdBQUcsWUFBWSxJQUFJLFFBQVEsQ0FBQyxTQUFTLENBQUMsR0FBRztJQUNqRywrQ0FBK0M7SUFDL0MsUUFBUSxFQUFFLFNBQVMsQ0FBQztJQUNwQixnRUFBZ0U7SUFDaEUsUUFBUSxFQUFFLDJCQUEyQixDQUFDO0NBQ3ZDLENBQUM7QUFFRjs7R0FFRztBQUNILHFCQUFhLFlBQVksQ0FBQyxTQUFTLFNBQVMsWUFBWSxHQUFHLFlBQVksQ0FBRSxTQUFRLE1BQU07SUFNbkYsT0FBTyxDQUFDLGNBQWM7SUFDdEIsa0RBQWtEO0lBQ2xELE9BQU8sQ0FBQyxjQUFjO0lBUHhCLE9BQU8sQ0FBQyxHQUFHLENBQTBDO0lBRXJELFlBQ0UsTUFBTSxFQUFFLE1BQU0sRUFDZCxNQUFNLEVBQUUsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQ3JCLGNBQWMsRUFBRSxDQUFDLFFBQVEsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLEVBQUUsTUFBTSxLQUFLLFNBQVM7SUFDNUYsa0RBQWtEO0lBQzFDLGNBQWMsRUFBRSxNQUFNLE9BQU8sQ0FBQywyQkFBMkIsQ0FBQyxFQUduRTtJQUVEOzs7T0FHRztJQUNVLFdBQVcsSUFBSSxPQUFPLENBQUMsMkJBQTJCLENBQUMsQ0FFL0Q7SUFFRDs7OztPQUlHO0lBQ1UsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FJakU7SUFFRDs7OztPQUlHO0lBQ21CLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBVXZGO0NBQ0YifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"deploy_sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_sent_tx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAa,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAErD,sDAAsD;AACtD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IACxC,+GAA+G;IAC/G,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,0GAA0G;AAC1G,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,YAAY,GAAG,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG;IAC7F,+CAA+C;IAC/C,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAY,CAAC,SAAS,SAAS,QAAQ,GAAG,QAAQ,CAAE,SAAQ,MAAM;IAM3E,OAAO,CAAC,cAAc;IACtB,kDAAkD;IAC3C,cAAc,EAAE,MAAM,OAAO,CAAC,2BAA2B,CAAC;IAPnE,OAAO,CAAC,GAAG,CAA0C;gBAGnD,WAAW,EAAE,GAAG,GAAG,MAAM,EACzB,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,EACtB,cAAc,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC;IACrF,kDAAkD;IAC3C,cAAc,EAAE,MAAM,OAAO,CAAC,2BAA2B,CAAC;IAKnE;;;;OAIG;IACU,QAAQ,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC;IAOlE;;;;OAIG;IACmB,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;cAMxE,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;CAUvE"}
+{"version":3,"file":"deploy_sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_sent_tx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAErD,sDAAsD;AACtD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG;IACxC,+GAA+G;IAC/G,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,0GAA0G;AAC1G,MAAM,MAAM,eAAe,CAAC,SAAS,SAAS,YAAY,GAAG,YAAY,IAAI,QAAQ,CAAC,SAAS,CAAC,GAAG;IACjG,+CAA+C;IAC/C,QAAQ,EAAE,SAAS,CAAC;IACpB,gEAAgE;IAChE,QAAQ,EAAE,2BAA2B,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAY,CAAC,SAAS,SAAS,YAAY,GAAG,YAAY,CAAE,SAAQ,MAAM;IAMnF,OAAO,CAAC,cAAc;IACtB,kDAAkD;IAClD,OAAO,CAAC,cAAc;IAPxB,OAAO,CAAC,GAAG,CAA0C;IAErD,YACE,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACrB,cAAc,EAAE,CAAC,QAAQ,EAAE,2BAA2B,EAAE,MAAM,EAAE,MAAM,KAAK,SAAS;IAC5F,kDAAkD;IAC1C,cAAc,EAAE,MAAM,OAAO,CAAC,2BAA2B,CAAC,EAGnE;IAED;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAE/D;IAED;;;;OAIG;IACU,QAAQ,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,CAIjE;IAED;;;;OAIG;IACmB,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAUvF;CACF"}

package/dest/contract/deploy_sent_tx.js

@@ -1,13 +1,19 @@
 import { createLogger } from '@aztec/foundation/log';
 import { SentTx } from './sent_tx.js';
 /**
- * A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
+ * A contract deployment transaction sent to the network, extending SentTx with methods to publish a contract instance.
  */ export class DeploySentTx extends SentTx {
     postDeployCtor;
     instanceGetter;
     log;
-    constructor(pxeOrWallet, txHashPromise, postDeployCtor, /** A getter for the deployed contract instance */ instanceGetter){
-        super(pxeOrWallet, txHashPromise), this.postDeployCtor = postDeployCtor, this.instanceGetter = instanceGetter, this.log = createLogger('aztecjs:deploy_sent_tx');
+    constructor(wallet, sendTx, postDeployCtor, /** A getter for the deployed contract instance */ instanceGetter){
+        super(wallet, sendTx), this.postDeployCtor = postDeployCtor, this.instanceGetter = instanceGetter, this.log = createLogger('aztecjs:deploy_sent_tx');
+    }
+    /**
+   * Returns the contract instance for this deployment.
+   * @returns The deployed contract instance with address and metadata.
+   */ async getInstance() {
+        return await this.instanceGetter();
     }
     /**
    * Awaits for the tx to be mined and returns the contract instance. Throws if tx is not mined.
@@ -15,8 +21,7 @@ import { SentTx } from './sent_tx.js';
    * @returns The deployed contract instance.
    */ async deployed(opts) {
         const receipt = await this.wait(opts);
-        const instance = await this.instanceGetter();
-        this.log.info(`Contract ${instance.address.toString()} successfully deployed.`);
+        this.log.info(`Contract ${receipt.instance.address.toString()} successfully deployed.`);
         return receipt.contract;
     }
     /**
@@ -25,19 +30,17 @@ import { SentTx } from './sent_tx.js';
    * @returns The transaction receipt with the deployed contract instance.
    */ async wait(opts) {
         const receipt = await super.wait(opts);
-        const contract = await this.getContractObject(opts?.wallet);
-        return {
-            ...receipt,
-            contract
-        };
-    }
-    async getContractObject(wallet) {
-        const isWallet = (pxeOrWallet)=>!!pxeOrWallet.createTxExecutionRequest;
-        const contractWallet = wallet ?? (isWallet(this.pxeOrNode) && this.pxeOrNode);
+        // In the case of DeploySentTx we have a guarantee that this.walletOrNode is a Wallet so we can cast it to Wallet.
+        const contractWallet = opts?.wallet ?? this.walletOrNode;
         if (!contractWallet) {
             throw new Error(`A wallet is required for creating a contract instance`);
         }
         const instance = await this.instanceGetter();
-        return this.postDeployCtor(instance.address, contractWallet);
+        const contract = this.postDeployCtor(instance, contractWallet);
+        return {
+            ...receipt,
+            contract,
+            instance
+        };
     }
 }

package/dest/contract/get_gas_limits.d.ts

@@ -1,18 +1,17 @@
-import type { Gas } from '@aztec/stdlib/gas';
+import { Gas } from '@aztec/stdlib/gas';
 import type { TxSimulationResult } from '@aztec/stdlib/tx';
 /**
  * Returns suggested total and teardown gas limits for a simulated tx.
- * Note that public gas usage is only accounted for if the publicOutput is present.
  * @param pad - Percentage to pad the suggested gas limits by, (as decimal, e.g., 0.10 for 10%).
  */
 export declare function getGasLimits(simulationResult: TxSimulationResult, pad?: number): {
     /**
-     * Total gas used across private and public
+     * Gas limit for the tx, excluding teardown gas
      */
-    totalGas: Gas;
+    gasLimits: Gas;
     /**
-     * Teardown gas used
+     * Gas limit for the teardown phase
      */
-    teardownGas: Gas;
+    teardownGasLimits: Gas;
 };
-//# sourceMappingURL=get_gas_limits.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2dhc19saW1pdHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9nZXRfZ2FzX2xpbWl0cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDeEMsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzRDs7O0dBR0c7QUFDSCx3QkFBZ0IsWUFBWSxDQUMxQixnQkFBZ0IsRUFBRSxrQkFBa0IsRUFDcEMsR0FBRyxTQUFNLEdBQ1I7SUFDRDs7T0FFRztJQUNILFNBQVMsRUFBRSxHQUFHLENBQUM7SUFDZjs7T0FFRztJQUNILGlCQUFpQixFQUFFLEdBQUcsQ0FBQztDQUN4QixDQVlBIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"get_gas_limits.d.ts","sourceRoot":"","sources":["../../src/contract/get_gas_limits.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,gBAAgB,EAAE,kBAAkB,EACpC,GAAG,SAAM,GACR;IACD;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC;IACd;;OAEG;IACH,WAAW,EAAE,GAAG,CAAC;CAClB,CAKA"}
+{"version":3,"file":"get_gas_limits.d.ts","sourceRoot":"","sources":["../../src/contract/get_gas_limits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,gBAAgB,EAAE,kBAAkB,EACpC,GAAG,SAAM,GACR;IACD;;OAEG;IACH,SAAS,EAAE,GAAG,CAAC;IACf;;OAEG;IACH,iBAAiB,EAAE,GAAG,CAAC;CACxB,CAYA"}

package/dest/contract/get_gas_limits.js

@@ -1,10 +1,16 @@
+import { AVM_MAX_PROCESSABLE_L2_GAS } from '@aztec/constants';
 /**
  * Returns suggested total and teardown gas limits for a simulated tx.
- * Note that public gas usage is only accounted for if the publicOutput is present.
  * @param pad - Percentage to pad the suggested gas limits by, (as decimal, e.g., 0.10 for 10%).
  */ export function getGasLimits(simulationResult, pad = 0.1) {
+    // Total gas does not use the teardown gas limit, but the actual total gas used by the tx.
+    const gasLimits = simulationResult.gasUsed.totalGas.mul(1 + pad);
+    const teardownGasLimits = simulationResult.gasUsed.teardownGas.mul(1 + pad);
+    if (gasLimits.l2Gas > AVM_MAX_PROCESSABLE_L2_GAS) {
+        throw new Error('Transaction consumes more gas than the AVM maximum processable gas');
+    }
     return {
-        totalGas: simulationResult.gasUsed.totalGas.mul(1 + pad),
-        teardownGas: simulationResult.gasUsed.teardownGas.mul(1 + pad)
+        gasLimits,
+        teardownGasLimits
     };
 }

package/dest/contract/interaction_options.d.ts

@@ -0,0 +1,114 @@
+import type { FieldsOf } from '@aztec/foundation/types';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { GasSettings } from '@aztec/stdlib/gas';
+import type { Capsule, OffchainEffect, SimulationStats } from '@aztec/stdlib/tx';
+import type { FeePaymentMethod } from '../fee/fee_payment_method.js';
+import type { ProfileOptions, SendOptions, SimulateOptions } from '../wallet/index.js';
+/**
+ * Options used to tweak the simulation and add gas estimation capabilities
+ */
+export type FeeEstimationOptions = {
+    /** Whether to modify the fee settings of the simulation with high gas limit to figure out actual gas settings. */
+    estimateGas?: boolean;
+    /** Percentage to pad the estimated gas limits by, if empty, defaults to 0.1. Only relevant if estimateGas is set. */
+    estimatedGasPadding?: number;
+};
+/**
+ * Interactions allow configuring a custom fee payment method that gets bundled with the transaction before
+ * sending it to the wallet
+ */
+export type FeePaymentMethodOption = {
+    /** Fee payment method to embed in the interaction */
+    paymentMethod?: FeePaymentMethod;
+};
+/**
+ * User-defined partial gas settings for the interaction. This type is completely optional since
+ * the wallet will fill in the missing options
+ */
+export type GasSettingsOption = {
+    /** The gas settings */
+    gasSettings?: Partial<FieldsOf<GasSettings>>;
+};
+/** Fee options as set by a user. */
+export type InteractionFeeOptions = GasSettingsOption & FeePaymentMethodOption;
+/**  Fee options that can be set for simulation *only* */
+export type SimulationInteractionFeeOptions = InteractionFeeOptions & FeeEstimationOptions;
+/**
+ * Represents the options to configure a request from a contract interaction.
+ * Allows specifying additional auth witnesses and capsules to use during execution
+ */
+export type RequestInteractionOptions = {
+    /** Extra authwits to use during execution */
+    authWitnesses?: AuthWitness[];
+    /** Extra capsules to use during execution */
+    capsules?: Capsule[];
+    /** Fee payment method to embed in the interaction request */
+    fee?: FeePaymentMethodOption;
+};
+/**
+ * Represents options for calling a (constrained) function in a contract.
+ */
+export type SendInteractionOptions = RequestInteractionOptions & {
+    /** The sender's Aztec address. */
+    from: AztecAddress;
+    /** The fee options for the transaction. */
+    fee?: InteractionFeeOptions;
+};
+/**
+ * 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 SimulateInteractionOptions = Omit<SendInteractionOptions, 'fee'> & {
+    /** The fee options for the transaction. */
+    fee?: SimulationInteractionFeeOptions;
+    /** Simulate without checking for the validity of the resulting transaction, e.g. whether it emits any existing nullifiers. */
+    skipTxValidation?: boolean;
+    /** Whether to ensure the fee payer is not empty and has enough balance to pay for the fee. */
+    skipFeeEnforcement?: boolean;
+    /** Whether to include metadata such as offchain effects and performance statistics (e.g. timing information of the different circuits and oracles) in
+     * the simulation result, instead of just the return value of the function */
+    includeMetadata?: boolean;
+};
+/**
+ * Represents the options for profiling an interaction.
+ */
+export type ProfileInteractionOptions = SimulateInteractionOptions & {
+    /** Whether to return gates information or the bytecode/witnesses. */
+    profileMode: 'gates' | 'execution-steps' | 'full';
+    /** Whether to generate a Chonk proof or not */
+    skipProofGeneration?: boolean;
+};
+/**
+ * Represents the result type of a simulation.
+ * By default, it will just be the return value of the simulated function
+ * If `includeMetadata` is set to true in `SimulateInteractionOptions` on the input of `simulate(...)`,
+ * it will provide extra information.
+ */
+export type SimulationReturn<T extends boolean | undefined> = T extends true ? {
+    /** Additional stats about the simulation */
+    stats: SimulationStats;
+    /** Offchain effects generated during the simulation */
+    offchainEffects: OffchainEffect[];
+    /**  Return value of the function */
+    result: any;
+    /** Gas estimation results */
+    estimatedGas: Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>;
+} : any;
+/**
+ * Transforms and cleans up the higher level SendInteractionOptions defined by the interaction into
+ * SendOptions, which are the ones that can be serialized and forwarded to the wallet
+ */
+export declare function toSendOptions(options: SendInteractionOptions): SendOptions;
+/**
+ * Transforms and cleans up the higher level SimulateInteractionOptions defined by the interaction into
+ * SimulateOptions, which are the ones that can be serialized and forwarded to the wallet
+ */
+export declare function toSimulateOptions(options: SimulateInteractionOptions): SimulateOptions;
+/**
+ * Transforms and cleans up the higher level ProfileInteractionOptions defined by the interaction into
+ * ProfileOptions, which are the ones that can be serialized and forwarded to the wallet
+ */
+export declare function toProfileOptions(options: ProfileInteractionOptions): ProfileOptions;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJhY3Rpb25fb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2ludGVyYWN0aW9uX29wdGlvbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDOUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDckQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLGNBQWMsRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVqRixPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxXQUFXLEVBQUUsZUFBZSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFdkY7O0dBRUc7QUFDSCxNQUFNLE1BQU0sb0JBQW9CLEdBQUc7SUFDakMsa0hBQWtIO0lBQ2xILFdBQVcsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN0QixxSEFBcUg7SUFDckgsbUJBQW1CLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDOUIsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0sTUFBTSxzQkFBc0IsR0FBRztJQUNuQyxxREFBcUQ7SUFDckQsYUFBYSxDQUFDLEVBQUUsZ0JBQWdCLENBQUM7Q0FDbEMsQ0FBQztBQUVGOzs7R0FHRztBQUNILE1BQU0sTUFBTSxpQkFBaUIsR0FBRztJQUM5Qix1QkFBdUI7SUFDdkIsV0FBVyxDQUFDLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO0NBQzlDLENBQUM7QUFFRixvQ0FBb0M7QUFDcEMsTUFBTSxNQUFNLHFCQUFxQixHQUFHLGlCQUFpQixHQUFHLHNCQUFzQixDQUFDO0FBRS9FLHlEQUF5RDtBQUN6RCxNQUFNLE1BQU0sK0JBQStCLEdBQUcscUJBQXFCLEdBQUcsb0JBQW9CLENBQUM7QUFFM0Y7OztHQUdHO0FBQ0gsTUFBTSxNQUFNLHlCQUF5QixHQUFHO0lBQ3RDLDZDQUE2QztJQUM3QyxhQUFhLENBQUMsRUFBRSxXQUFXLEVBQUUsQ0FBQztJQUM5Qiw2Q0FBNkM7SUFDN0MsUUFBUSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUM7SUFDckIsNkRBQTZEO0lBQzdELEdBQUcsQ0FBQyxFQUFFLHNCQUFzQixDQUFDO0NBQzlCLENBQUM7QUFFRjs7R0FFRztBQUNILE1BQU0sTUFBTSxzQkFBc0IsR0FBRyx5QkFBeUIsR0FBRztJQUMvRCxrQ0FBa0M7SUFDbEMsSUFBSSxFQUFFLFlBQVksQ0FBQztJQUNuQiwyQ0FBMkM7SUFDM0MsR0FBRyxDQUFDLEVBQUUscUJBQXFCLENBQUM7Q0FDN0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxNQUFNLE1BQU0sMEJBQTBCLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixFQUFFLEtBQUssQ0FBQyxHQUFHO0lBQzdFLDJDQUEyQztJQUMzQyxHQUFHLENBQUMsRUFBRSwrQkFBK0IsQ0FBQztJQUN0Qyw4SEFBOEg7SUFDOUgsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDM0IsOEZBQThGO0lBQzlGLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCO2lGQUM2RTtJQUM3RSxlQUFlLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDM0IsQ0FBQztBQUVGOztHQUVHO0FBQ0gsTUFBTSxNQUFNLHlCQUF5QixHQUFHLDBCQUEwQixHQUFHO0lBQ25FLHFFQUFxRTtJQUNyRSxXQUFXLEVBQUUsT0FBTyxHQUFHLGlCQUFpQixHQUFHLE1BQU0sQ0FBQztJQUNsRCwrQ0FBK0M7SUFDL0MsbUJBQW1CLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDL0IsQ0FBQztBQUVGOzs7OztHQUtHO0FBQ0gsTUFBTSxNQUFNLGdCQUFnQixDQUFDLENBQUMsU0FBUyxPQUFPLEdBQUcsU0FBUyxJQUFJLENBQUMsU0FBUyxJQUFJLEdBQ3hFO0lBQ0UsNENBQTRDO0lBQzVDLEtBQUssRUFBRSxlQUFlLENBQUM7SUFDdkIsdURBQXVEO0lBQ3ZELGVBQWUsRUFBRSxjQUFjLEVBQUUsQ0FBQztJQUNsQyxvQ0FBb0M7SUFDcEMsTUFBTSxFQUFFLEdBQUcsQ0FBQztJQUNaLDZCQUE2QjtJQUM3QixZQUFZLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsbUJBQW1CLENBQUMsQ0FBQztDQUNwRSxHQUNELEdBQUcsQ0FBQztBQUVSOzs7R0FHRztBQUNILHdCQUFnQixhQUFhLENBQUMsT0FBTyxFQUFFLHNCQUFzQixHQUFHLFdBQVcsQ0FhMUU7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsaUJBQWlCLENBQUMsT0FBTyxFQUFFLDBCQUEwQixHQUFHLGVBQWUsQ0FldEY7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsZ0JBQWdCLENBQUMsT0FBTyxFQUFFLHlCQUF5QixHQUFHLGNBQWMsQ0FNbkYifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"interaction_options.d.ts","sourceRoot":"","sources":["../../src/contract/interaction_options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEvF;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,kHAAkH;IAClH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,qHAAqH;IACrH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,qDAAqD;IACrD,aAAa,CAAC,EAAE,gBAAgB,CAAC;CAClC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,uBAAuB;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;CAC9C,CAAC;AAEF,oCAAoC;AACpC,MAAM,MAAM,qBAAqB,GAAG,iBAAiB,GAAG,sBAAsB,CAAC;AAE/E,yDAAyD;AACzD,MAAM,MAAM,+BAA+B,GAAG,qBAAqB,GAAG,oBAAoB,CAAC;AAE3F;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,6CAA6C;IAC7C,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;IAC9B,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,6DAA6D;IAC7D,GAAG,CAAC,EAAE,sBAAsB,CAAC;CAC9B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,yBAAyB,GAAG;IAC/D,kCAAkC;IAClC,IAAI,EAAE,YAAY,CAAC;IACnB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,qBAAqB,CAAC;CAC7B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAC,GAAG;IAC7E,2CAA2C;IAC3C,GAAG,CAAC,EAAE,+BAA+B,CAAC;IACtC,8HAA8H;IAC9H,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,8FAA8F;IAC9F,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;iFAC6E;IAC7E,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG,0BAA0B,GAAG;IACnE,qEAAqE;IACrE,WAAW,EAAE,OAAO,GAAG,iBAAiB,GAAG,MAAM,CAAC;IAClD,+CAA+C;IAC/C,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,OAAO,GAAG,SAAS,IAAI,CAAC,SAAS,IAAI,GACxE;IACE,4CAA4C;IAC5C,KAAK,EAAE,eAAe,CAAC;IACvB,uDAAuD;IACvD,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,oCAAoC;IACpC,MAAM,EAAE,GAAG,CAAC;IACZ,6BAA6B;IAC7B,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,CAAC;CACpE,GACD,GAAG,CAAC;AAER;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,WAAW,CAa1E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,0BAA0B,GAAG,eAAe,CAetF;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,yBAAyB,GAAG,cAAc,CAMnF"}

package/dest/contract/interaction_options.js

@@ -0,0 +1,46 @@
+/**
+ * Transforms and cleans up the higher level SendInteractionOptions defined by the interaction into
+ * SendOptions, which are the ones that can be serialized and forwarded to the wallet
+ */ export function toSendOptions(options) {
+    return {
+        ...options,
+        fee: {
+            // If a payment method that includes gas settings was used,
+            // try to reuse as much as possible while still allowing
+            // manual override. CAREFUL: this can cause mismatches during proving
+            gasSettings: {
+                ...options.fee?.paymentMethod?.getGasSettings(),
+                ...options.fee?.gasSettings
+            }
+        }
+    };
+}
+/**
+ * Transforms and cleans up the higher level SimulateInteractionOptions defined by the interaction into
+ * SimulateOptions, which are the ones that can be serialized and forwarded to the wallet
+ */ export function toSimulateOptions(options) {
+    return {
+        ...options,
+        fee: {
+            // If a payment method that includes gas settings was used,
+            // try to reuse as much as possible while still allowing
+            // manual override. CAREFUL: this can cause mismatches during proving
+            gasSettings: {
+                ...options.fee?.paymentMethod?.getGasSettings(),
+                ...options.fee?.gasSettings
+            },
+            estimateGas: options.fee?.estimateGas,
+            estimatedGasPadding: options.fee?.estimatedGasPadding
+        }
+    };
+}
+/**
+ * Transforms and cleans up the higher level ProfileInteractionOptions defined by the interaction into
+ * ProfileOptions, which are the ones that can be serialized and forwarded to the wallet
+ */ export function toProfileOptions(options) {
+    return {
+        ...toSimulateOptions(options),
+        profileMode: options.profileMode,
+        skipProofGeneration: options.skipProofGeneration
+    };
+}

package/dest/contract/protocol_contracts.d.ts

@@ -1,9 +1,9 @@
-import type { Wallet } from '../wallet/index.js';
+import type { Wallet } from '../wallet/wallet.js';
 import { UnsafeContract } from './unsafe_contract.js';
-/** Returns a Contract wrapper for the class registerer. */
-export declare function getRegistererContract(wallet: Wallet): Promise<UnsafeContract>;
-/** Returns a Contract wrapper for the instance deployer. */
-export declare function getDeployerContract(wallet: Wallet): Promise<UnsafeContract>;
-/** Returns a Contract wrapper for the fee juice */
+/** Returns a Contract wrapper for the contract class registry. */
+export declare function getClassRegistryContract(wallet: Wallet): Promise<UnsafeContract>;
+/** Returns a Contract wrapper for the contract instance registry. */
+export declare function getInstanceRegistryContract(wallet: Wallet): Promise<UnsafeContract>;
+/** Returns a Contract wrapper for the fee juice contract */
 export declare function getFeeJuice(wallet: Wallet): Promise<UnsafeContract>;
-//# sourceMappingURL=protocol_contracts.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvcHJvdG9jb2xfY29udHJhY3RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUV0RCxrRUFBa0U7QUFDbEUsd0JBQXNCLHdCQUF3QixDQUFDLE1BQU0sRUFBRSxNQUFNLDJCQVE1RDtBQUVELHFFQUFxRTtBQUNyRSx3QkFBc0IsMkJBQTJCLENBQUMsTUFBTSxFQUFFLE1BQU0sMkJBTy9EO0FBRUQsNERBQTREO0FBQzVELHdCQUFzQixXQUFXLENBQUMsTUFBTSxFQUFFLE1BQU0sMkJBTy9DIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"protocol_contracts.d.ts","sourceRoot":"","sources":["../../src/contract/protocol_contracts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,2DAA2D;AAC3D,wBAAsB,qBAAqB,CAAC,MAAM,EAAE,MAAM,2BAQzD;AAED,4DAA4D;AAC5D,wBAAsB,mBAAmB,CAAC,MAAM,EAAE,MAAM,2BAOvD;AAED,mDAAmD;AACnD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,2BAO/C"}
+{"version":3,"file":"protocol_contracts.d.ts","sourceRoot":"","sources":["../../src/contract/protocol_contracts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,kEAAkE;AAClE,wBAAsB,wBAAwB,CAAC,MAAM,EAAE,MAAM,2BAQ5D;AAED,qEAAqE;AACrE,wBAAsB,2BAA2B,CAAC,MAAM,EAAE,MAAM,2BAO/D;AAED,4DAA4D;AAC5D,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,2BAO/C"}

package/dest/contract/protocol_contracts.js

@@ -1,22 +1,22 @@
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { UnsafeContract } from './unsafe_contract.js';
-/** Returns a Contract wrapper for the class registerer. */ export async function getRegistererContract(wallet) {
-    const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.ContractClassRegisterer);
+/** Returns a Contract wrapper for the contract class registry. */ export async function getClassRegistryContract(wallet) {
+    const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.ContractClassRegistry);
     if (!contractInstance) {
-        throw new Error("ContractClassRegisterer is not registered in this wallet's instance");
+        throw new Error("ContractClassRegistry is not registered in this wallet's instance");
     }
     const { artifact } = await wallet.getContractClassMetadata(contractInstance.currentContractClassId, true);
     return new UnsafeContract(contractInstance, artifact, wallet);
 }
-/** Returns a Contract wrapper for the instance deployer. */ export async function getDeployerContract(wallet) {
-    const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.ContractInstanceDeployer);
+/** Returns a Contract wrapper for the contract instance registry. */ export async function getInstanceRegistryContract(wallet) {
+    const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.ContractInstanceRegistry);
     if (!contractInstance) {
-        throw new Error("ContractInstanceDeployer is not registered in this wallet's instance");
+        throw new Error("ContractInstanceRegistry is not registered in this wallet's instance");
     }
     const { artifact } = await wallet.getContractClassMetadata(contractInstance.currentContractClassId, true);
     return new UnsafeContract(contractInstance, artifact, wallet);
 }
-/** Returns a Contract wrapper for the fee juice */ export async function getFeeJuice(wallet) {
+/** Returns a Contract wrapper for the fee juice contract */ export async function getFeeJuice(wallet) {
     const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.FeeJuice);
     if (!contractInstance) {
         throw new Error("FeeJuice is not registered in this wallet's instance");

package/dest/contract/sent_tx.d.ts

@@ -1,20 +1,15 @@
 import type { FieldsOf } from '@aztec/foundation/types';
-import type { AztecNode, GetPublicLogsResponse, PXE } from '@aztec/stdlib/interfaces/client';
-import { type TxHash, type TxReceipt } from '@aztec/stdlib/tx';
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import { TxHash, type TxReceipt } from '@aztec/stdlib/tx';
+import type { Wallet } from '../wallet/wallet.js';
 /** Options related to waiting for a tx. */
 export type WaitOpts = {
     /** The amount of time to ignore TxStatus.DROPPED receipts (in seconds) due to the presumption that it is being propagated by the p2p network. Defaults to 5. */
     ignoreDroppedReceiptsFor?: number;
     /** The maximum time (in seconds) to wait for the transaction to be mined. Defaults to 60. */
     timeout?: number;
-    /** The maximum time (in seconds) to wait for the transaction to be proven. Defaults to 600. */
-    provenTimeout?: number;
     /** The time interval (in seconds) between retries to fetch the transaction receipt. Defaults to 1. */
     interval?: number;
-    /** Whether to wait for the tx to be proven. */
-    proven?: boolean;
-    /** Whether to include information useful for debugging/testing in the receipt. */
-    debug?: boolean;
     /** Whether to accept a revert as a status code for the tx when waiting for it. If false, will throw if the tx reverts. */
     dontThrowOnRevert?: boolean;
 };
@@ -24,9 +19,11 @@ export declare const DefaultWaitOpts: WaitOpts;
  * its hash, receipt, and mining status.
  */
 export declare class SentTx {
-    protected pxeOrNode: PXE | AztecNode;
-    protected txHashPromise: Promise<TxHash>;
-    constructor(pxeOrNode: PXE | AztecNode, txHashPromise: Promise<TxHash>);
+    protected walletOrNode: Wallet | AztecNode;
+    protected sendTxPromise: Promise<void>;
+    protected sendTxError?: Error;
+    protected txHash?: TxHash;
+    constructor(walletOrNode: Wallet | AztecNode, sendTx: () => Promise<TxHash>);
     /**
      * Retrieves the transaction hash of the SentTx instance.
      * The function internally awaits for the 'txHashPromise' to resolve, and then returns the resolved transaction hash.
@@ -49,13 +46,6 @@ export declare class SentTx {
      * @returns The transaction receipt.
      */
     wait(opts?: WaitOpts): Promise<FieldsOf<TxReceipt>>;
-    /**
-     * Gets public logs emitted by this tx.
-     * @remarks This function will wait for the tx to be mined if it hasn't been already.
-     * @returns The requested logs.
-     */
-    getPublicLogs(): Promise<GetPublicLogsResponse>;
     protected waitForReceipt(opts?: WaitOpts): Promise<TxReceipt>;
-    protected waitForProven(minedBlock: number, opts?: WaitOpts): Promise<number>;
 }
-//# sourceMappingURL=sent_tx.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VudF90eC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L3NlbnRfdHgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDeEQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDakUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLFNBQVMsRUFBWSxNQUFNLGtCQUFrQixDQUFDO0FBRXBFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRWxELDJDQUEyQztBQUMzQyxNQUFNLE1BQU0sUUFBUSxHQUFHO0lBQ3JCLGdLQUFnSztJQUNoSyx3QkFBd0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQyw2RkFBNkY7SUFDN0YsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLHNHQUFzRztJQUN0RyxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEIsMEhBQTBIO0lBQzFILGlCQUFpQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQzdCLENBQUM7QUFFRixlQUFPLE1BQU0sZUFBZSxFQUFFLFFBSTdCLENBQUM7QUFFRjs7O0dBR0c7QUFDSCxxQkFBYSxNQUFNO0lBTWYsU0FBUyxDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsU0FBUztJQUw1QyxTQUFTLENBQUMsYUFBYSxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN2QyxTQUFTLENBQUMsV0FBVyxDQUFDLEVBQUUsS0FBSyxDQUFDO0lBQzlCLFNBQVMsQ0FBQyxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFFMUIsWUFDWSxZQUFZLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDMUMsTUFBTSxFQUFFLE1BQU0sT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQWM5QjtJQUVEOzs7Ozs7T0FNRztJQUNVLFNBQVMsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLENBV3hDO0lBRUQ7Ozs7OztPQU1HO0lBQ1UsVUFBVSxJQUFJLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FHNUM7SUFFRDs7OztPQUlHO0lBQ1UsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLFFBQVEsR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBUS9EO0lBRUQsVUFBZ0IsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLFFBQVEsR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBNEJsRTtDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract/sent_tx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,qBAAqB,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAC7F,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAY,MAAM,kBAAkB,CAAC;AAEzE,2CAA2C;AAC3C,MAAM,MAAM,QAAQ,GAAG;IACrB,gKAAgK;IAChK,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,6FAA6F;IAC7F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sGAAsG;IACtG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kFAAkF;IAClF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,0HAA0H;IAC1H,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,QAM7B,CAAC;AAEF;;;GAGG;AACH,qBAAa,MAAM;IACL,SAAS,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS;IAAE,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC;gBAApE,SAAS,EAAE,GAAG,GAAG,SAAS,EAAY,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC;IAE1F;;;;;;OAMG;IACI,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAInC;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC;IAK7C;;;;OAIG;IACU,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAuBhE;;;;OAIG;IACU,aAAa,IAAI,OAAO,CAAC,qBAAqB,CAAC;cAK5C,cAAc,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;cA8BnD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ;CAWlE"}
+{"version":3,"file":"sent_tx.d.ts","sourceRoot":"","sources":["../../src/contract/sent_tx.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,KAAK,SAAS,EAAY,MAAM,kBAAkB,CAAC;AAEpE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,2CAA2C;AAC3C,MAAM,MAAM,QAAQ,GAAG;IACrB,gKAAgK;IAChK,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,6FAA6F;IAC7F,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sGAAsG;IACtG,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0HAA0H;IAC1H,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,QAI7B,CAAC;AAEF;;;GAGG;AACH,qBAAa,MAAM;IAMf,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS;IAL5C,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,SAAS,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC;IAC9B,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAE1B,YACY,YAAY,EAAE,MAAM,GAAG,SAAS,EAC1C,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EAc9B;IAED;;;;;;OAMG;IACU,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAWxC;IAED;;;;;;OAMG;IACU,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,CAG5C;IAED;;;;OAIG;IACU,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAQ/D;IAED,UAAgB,cAAc,CAAC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC,CA4BlE;CACF"}

package/dest/contract/sent_tx.js

@@ -1,21 +1,31 @@
+import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { retryUntil } from '@aztec/foundation/retry';
 import { TxStatus } from '@aztec/stdlib/tx';
 export const DefaultWaitOpts = {
     ignoreDroppedReceiptsFor: 5,
-    timeout: 60,
-    provenTimeout: 600,
-    interval: 1,
-    debug: false
+    timeout: 300,
+    interval: 1
 };
 /**
  * The SentTx class represents a sent transaction through the PXE (or directly to a node) providing methods to fetch
  * its hash, receipt, and mining status.
  */ export class SentTx {
-    pxeOrNode;
-    txHashPromise;
-    constructor(pxeOrNode, txHashPromise){
-        this.pxeOrNode = pxeOrNode;
-        this.txHashPromise = txHashPromise;
+    walletOrNode;
+    sendTxPromise;
+    sendTxError;
+    txHash;
+    constructor(walletOrNode, sendTx){
+        this.walletOrNode = walletOrNode;
+        const { promise, resolve } = promiseWithResolvers();
+        this.sendTxPromise = promise;
+        sendTx().then((txHash)=>{
+            this.txHash = txHash;
+            resolve();
+        }).catch((err)=>{
+            this.sendTxError = err;
+            // Calling resolve instead of reject here because we want to throw the error when getTxHash is called.
+            resolve();
+        });
     }
     /**
    * Retrieves the transaction hash of the SentTx instance.
@@ -23,8 +33,15 @@ export const DefaultWaitOpts = {
    *
    * @returns A promise that resolves to the transaction hash of the SentTx instance.
    * TODO(#7717): Don't throw here.
-   */ getTxHash() {
-        return this.txHashPromise;
+   */ async getTxHash() {
+        // Make sure sendTx has been resolved, which can be triggered when it returns a txHash or when it throws an error.
+        await this.sendTxPromise;
+        // If sendTx threw an error, throw it.
+        if (this.sendTxError) {
+            throw this.sendTxError;
+        }
+        // sendTx returned a txHash if it's been resolved and no error was set.
+        return Promise.resolve(this.txHash);
     }
     /**
    * Retrieve the transaction receipt associated with the current SentTx instance.
@@ -34,7 +51,7 @@ export const DefaultWaitOpts = {
    * @returns A promise that resolves to a TxReceipt object representing the fetched transaction receipt.
    */ async getReceipt() {
         const txHash = await this.getTxHash();
-        return await this.pxeOrNode.getTxReceipt(txHash);
+        return await this.walletOrNode.getTxReceipt(txHash);
     }
     /**
    * Awaits for a tx to be mined and returns the receipt. Throws if tx is not mined.
@@ -43,39 +60,16 @@ export const DefaultWaitOpts = {
    */ async wait(opts) {
         const receipt = await this.waitForReceipt(opts);
         if (receipt.status !== TxStatus.SUCCESS && !opts?.dontThrowOnRevert) {
-            throw new Error(`Transaction ${await this.getTxHash()} was ${receipt.status}. Reason: ${receipt.error ?? 'unknown'}`);
-        }
-        if (opts?.proven && receipt.blockNumber !== undefined) {
-            await this.waitForProven(receipt.blockNumber, opts);
-        }
-        if (opts?.debug) {
-            const txHash = await this.getTxHash();
-            const { data: tx } = await this.pxeOrNode.getTxEffect(txHash);
-            receipt.debugInfo = {
-                noteHashes: tx.noteHashes,
-                nullifiers: tx.nullifiers,
-                publicDataWrites: tx.publicDataWrites,
-                l2ToL1Msgs: tx.l2ToL1Msgs
-            };
+            throw new Error(`Transaction ${(await this.getTxHash()).toString()} was ${receipt.status}. Reason: ${receipt.error ?? 'unknown'}`);
         }
         return receipt;
     }
-    /**
-   * Gets public logs emitted by this tx.
-   * @remarks This function will wait for the tx to be mined if it hasn't been already.
-   * @returns The requested logs.
-   */ async getPublicLogs() {
-        await this.wait();
-        return this.pxeOrNode.getPublicLogs({
-            txHash: await this.getTxHash()
-        });
-    }
     async waitForReceipt(opts) {
         const txHash = await this.getTxHash();
         const startTime = Date.now();
         const ignoreDroppedReceiptsFor = opts?.ignoreDroppedReceiptsFor ?? DefaultWaitOpts.ignoreDroppedReceiptsFor;
         return await retryUntil(async ()=>{
-            const txReceipt = await this.pxeOrNode.getTxReceipt(txHash);
+            const txReceipt = await this.walletOrNode.getTxReceipt(txHash);
             // If receipt is not yet available, try again
             if (txReceipt.status === TxStatus.PENDING) {
                 return undefined;
@@ -93,10 +87,4 @@ export const DefaultWaitOpts = {
             return txReceipt;
         }, 'isMined', opts?.timeout ?? DefaultWaitOpts.timeout, opts?.interval ?? DefaultWaitOpts.interval);
     }
-    async waitForProven(minedBlock, opts) {
-        return await retryUntil(async ()=>{
-            const provenBlock = await this.pxeOrNode.getProvenBlockNumber();
-            return provenBlock >= minedBlock ? provenBlock : undefined;
-        }, 'isProven', opts?.provenTimeout ?? DefaultWaitOpts.provenTimeout, opts?.interval ?? DefaultWaitOpts.interval);
-    }
 }

package/dest/contract/unsafe_contract.d.ts

@@ -1,6 +1,6 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { Wallet } from '../wallet/index.js';
+import type { Wallet } from '../wallet/wallet.js';
 import { ContractBase } from './contract_base.js';
 /** Unsafe constructor for ContractBase that bypasses the check that the instance is registered in the wallet. */
 export declare class UnsafeContract extends ContractBase {
@@ -12,4 +12,4 @@ export declare class UnsafeContract extends ContractBase {
     /** The wallet used for interacting with this contract. */
     wallet: Wallet);
 }
-//# sourceMappingURL=unsafe_contract.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5zYWZlX2NvbnRyYWN0LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvdW5zYWZlX2NvbnRyYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUUxRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQsaUhBQWlIO0FBQ2pILHFCQUFhLGNBQWUsU0FBUSxZQUFZO0lBQzlDO0lBQ0UsaURBQWlEO0lBQ2pELFFBQVEsRUFBRSwyQkFBMkI7SUFDckMseURBQXlEO0lBQ3pELFFBQVEsRUFBRSxnQkFBZ0I7SUFDMUIsMERBQTBEO0lBQzFELE1BQU0sRUFBRSxNQUFNLEVBR2Y7Q0FDRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"unsafe_contract.d.ts","sourceRoot":"","sources":["../../src/contract/unsafe_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,iHAAiH;AACjH,qBAAa,cAAe,SAAQ,YAAY;;IAE5C,iDAAiD;IACjD,QAAQ,EAAE,2BAA2B;IACrC,yDAAyD;IACzD,QAAQ,EAAE,gBAAgB;IAC1B,0DAA0D;IAC1D,MAAM,EAAE,MAAM;CAIjB"}
+{"version":3,"file":"unsafe_contract.d.ts","sourceRoot":"","sources":["../../src/contract/unsafe_contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,iHAAiH;AACjH,qBAAa,cAAe,SAAQ,YAAY;IAC9C;IACE,iDAAiD;IACjD,QAAQ,EAAE,2BAA2B;IACrC,yDAAyD;IACzD,QAAQ,EAAE,gBAAgB;IAC1B,0DAA0D;IAC1D,MAAM,EAAE,MAAM,EAGf;CACF"}

package/dest/contract/unsafe_contract.js

@@ -1,6 +1,6 @@
 import { ContractBase } from './contract_base.js';
 /** Unsafe constructor for ContractBase that bypasses the check that the instance is registered in the wallet. */ export class UnsafeContract extends ContractBase {
     constructor(/** The deployed contract instance definition. */ instance, /** The Application Binary Interface for the contract. */ artifact, /** The wallet used for interacting with this contract. */ wallet){
-        super(instance, artifact, wallet);
+        super(instance.address, artifact, wallet);
     }
 }