@aztec/aztec.js 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/dest/contract/contract_function_interaction.js

@@ -1,8 +1,9 @@
-import { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { FunctionSelector, FunctionType, decodeFromAbi, encodeArguments } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
 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';
 /**
  * This is the class that is returned when calling e.g. `contract.methods.myMethod(arg0, arg1)`.
  * It contains available interactions one can call on a method, including view.
@@ -17,67 +18,59 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
             throw new Error(`All function interaction arguments must be defined and not null. Received: ${args}`);
         }
     }
-    // docs:start:create
     /**
-   * Create a transaction execution request that represents this call, encoded and authenticated by the
-   * user's wallet, ready to be simulated.
-   * @param options - An optional object containing additional configuration for the transaction.
-   * @returns A Promise that resolves to a transaction instance.
-   */ async create(options = {}) {
-        // docs:end:create
-        if (this.functionDao.functionType === FunctionType.UTILITY) {
-            throw new Error("Can't call `create` on a utility  function.");
-        }
-        const requestWithoutFee = await this.request(options);
-        const { fee: userFee, txNonce, cancellable } = options;
-        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {
-            txNonce,
-            cancellable
-        });
-        return await this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
-            txNonce,
-            cancellable
-        });
+   * Returns the encoded function call wrapped by this interaction
+   * Useful when generating authwits
+   * @returns An encoded function call
+   */ async getFunctionCall() {
+        const args = encodeArguments(this.functionDao, this.args);
+        return {
+            name: this.functionDao.name,
+            args,
+            selector: await FunctionSelector.fromNameAndParameters(this.functionDao.name, this.functionDao.parameters),
+            type: this.functionDao.functionType,
+            to: this.contractAddress,
+            isStatic: this.functionDao.isStatic,
+            hideMsgSender: false,
+            returnTypes: this.functionDao.returnTypes
+        };
     }
-    // docs:start:request
     /**
-   * Returns an execution request that represents this operation.
-   * Can be used as a building block for constructing batch requests.
-   * @param options - An optional object containing additional configuration for the request generation.
-   * @returns An execution payload wrapped in promise.
+   * Returns the execution payload that allows this operation to happen on chain.
+   * @param options - Configuration options.
+   * @returns The execution payload for this operation
    */ async request(options = {}) {
-        // docs:end:request
-        const args = encodeArguments(this.functionDao, this.args);
         const calls = [
-            {
-                name: this.functionDao.name,
-                args,
-                selector: await FunctionSelector.fromNameAndParameters(this.functionDao.name, this.functionDao.parameters),
-                type: this.functionDao.functionType,
-                to: this.contractAddress,
-                isStatic: this.functionDao.isStatic,
-                returnTypes: this.functionDao.returnTypes
-            }
+            await this.getFunctionCall()
         ];
         const { authWitnesses, capsules } = options;
-        return new ExecutionPayload(calls, this.authWitnesses.concat(authWitnesses ?? []), this.capsules.concat(capsules ?? []), this.extraHashedArgs);
+        const feeExecutionPayload = options.fee?.paymentMethod ? await options.fee.paymentMethod.getExecutionPayload() : undefined;
+        const functionExecutionPayload = new ExecutionPayload(calls, this.authWitnesses.concat(authWitnesses ?? []), this.capsules.concat(capsules ?? []), this.extraHashedArgs);
+        const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
+            feeExecutionPayload,
+            functionExecutionPayload
+        ]) : functionExecutionPayload;
+        return finalExecutionPayload;
     }
     // eslint-disable-next-line jsdoc/require-jsdoc
     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.simulateUtility(call, 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 txRequest = await this.create(options);
-        const simulatedTx = await this.wallet.simulateTx(txRequest, true, options.skipTxValidation, options.skipFeeEnforcement ?? true);
+        const executionPayload = await this.request(options);
+        const simulatedTx = await this.wallet.simulateTx(executionPayload, toSimulateOptions(options));
         let rawReturnValues;
         if (this.functionDao.functionType == FunctionType.PRIVATE) {
             if (simulatedTx.getPrivateReturnValues().nested.length > 0) {
@@ -93,11 +86,17 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
             rawReturnValues = simulatedTx.getPublicReturnValues()?.[0]?.values;
         }
         const returnValue = rawReturnValues ? decodeFromAbi(this.functionDao.returnTypes, rawReturnValues) : [];
-        if (options.includeMetadata) {
+        if (options.includeMetadata || options.fee?.estimateGas) {
+            const { gasLimits, teardownGasLimits } = getGasLimits(simulatedTx, options.fee?.estimatedGasPadding);
+            this.log.verbose(`Estimated gas limits for tx: DA=${gasLimits.daGas} L2=${gasLimits.l2Gas} teardownDA=${teardownGasLimits.daGas} teardownL2=${teardownGasLimits.l2Gas}`);
             return {
                 stats: simulatedTx.stats,
                 offchainEffects: collectOffchainEffects(simulatedTx.privateExecutionResult),
-                result: returnValue
+                result: returnValue,
+                estimatedGas: {
+                    gasLimits,
+                    teardownGasLimits
+                }
             };
         } else {
             return returnValue;
@@ -109,19 +108,11 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
    *
    * @returns An object containing the function return value and profile result.
    */ async profile(options) {
-        if (options.from !== AztecAddress.ZERO && !options.from.equals(this.wallet.getAddress())) {
-            throw new Error(`The address provided as from does not match the wallet address. Expected ${this.wallet.getAddress().toString()}, got ${options.from.toString()}.`);
-        }
         if (this.functionDao.functionType == FunctionType.UTILITY) {
             throw new Error("Can't profile a utility function.");
         }
-        const { authWitnesses, capsules, fee } = options;
-        const txRequest = await this.create({
-            fee,
-            authWitnesses,
-            capsules
-        });
-        return await this.wallet.profileTx(txRequest, options.profileMode, options.skipProofGeneration, options?.from);
+        const executionPayload = await this.request(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,35 +1,65 @@
-import type { ExecutionPayload } from '@aztec/entrypoints/payload';
-import type { 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 { GasSettings } from '@aztec/stdlib/gas';
 import type { PublicKeys } from '@aztec/stdlib/keys';
-import type { Capsule, TxExecutionRequest, TxProfileResult } from '@aztec/stdlib/tx';
+import { type Capsule, 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 { Contract } from './contract.js';
 import type { ContractBase } from './contract_base.js';
-import { DeployProvenTx } from './deploy_proven_tx.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
-import type { ProfileMethodOptions, SendMethodOptions } from './interaction_options.js';
+import { type ProfileInteractionOptions, type RequestInteractionOptions, type SendInteractionOptions, type SimulationInteractionFeeOptions, type SimulationReturn } from './interaction_options.js';
 /**
  * Options for deploying a contract on the Aztec network.
- * Allows specifying a contract address salt, and additional send method options.
+ * Allows specifying a contract address salt and different options to tweak contract publication
+ * and initialization
  */
-export type DeployOptions = {
+export type RequestDeployOptions = RequestInteractionOptions & {
     /** An optional salt value used to deterministically calculate the contract address. */
     contractAddressSalt?: Fr;
-    /** Set to true to *not* include the sender in the address computation. */
-    universalDeploy?: boolean;
+    /**
+     * Deployer address that will be used for the deployed contract's address computation.
+     * If set to 0, the sender's address won't be mixed in
+     */
+    deployer?: AztecAddress;
     /** Skip contract class publication. */
     skipClassPublication?: boolean;
     /** Skip publication, instead just privately initialize the contract. */
     skipInstancePublication?: boolean;
     /** Skip contract initialization. */
     skipInitialization?: boolean;
-} & SendMethodOptions;
+    /** Skip contract registration in the wallet */
+    skipRegistration?: boolean;
+};
+/**
+ * Extends the deployment options with the required parameters to send the transaction
+ */
+export type DeployOptions = 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'>;
+/**
+ * Options for simulating the deployment of a contract
+ * Allows skipping certain validations and computing gas estimations
+ */
+export type SimulateDeployOptions = Omit<DeployOptions, '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;
+};
 /**
  * Contract interaction for deployment.
  * Handles class publication, instance publication, and initialization of the contract.
@@ -42,54 +72,28 @@ export type DeployOptions = {
  *
  * 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;
-    private artifact;
-    private postDeployCtor;
+    protected artifact: ContractArtifact;
+    protected postDeployCtor: (instance: ContractInstanceWithAddress, wallet: Wallet) => TContract;
     private args;
     /** 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[]);
     /**
-     * Prepare a transaction execution request which can optionally (depending on the `options`):
-     * - Publish the contract's class_id
-     * - Publish the contract instance data, to enable execution of its public functions.
-     * - Initialize the contract
-     *
-     * A tx is not necessary if the function has no public functions nor any
-     * initializer function.
-     *
-     * This function internally calls `request()` and `sign()` methods to prepare
-     * the transaction for deployment. The resulting signed transaction can be
-     * later sent using the `send()` method.
-     *
-     * @param options - An object containing optional deployment settings, contractAddressSalt, and from.
-     * @returns A Promise resolving to an object containing the signed transaction data and other relevant information.
+     * Returns the execution payload that allows this operation to happen on chain.
+     * @param options - Configuration options.
+     * @returns The execution payload for this operation
      */
-    create(options: DeployOptions): Promise<TxExecutionRequest>;
+    request(options?: RequestDeployOptions): Promise<ExecutionPayload>;
+    convertDeployOptionsToRequestOptions(options: DeployOptions): RequestDeployOptions;
     /**
-     * Returns an array of function calls that represent this operation. Useful as a building
-     * block for constructing batch requests.
+     * Adds this contract to the wallet and returns the Contract object.
      * @param options - Deployment options.
-     * @returns An array of function calls.
-     * @remarks This method does not have the same return type as the `request` in the ContractInteraction object,
-     * it returns a promise for an array instead of a function call directly.
      */
-    request(options: DeployOptions): Promise<ExecutionPayload>;
-    /**
-     * Simulate a deployment and profile the gate count for each function in the transaction.
-     * @param options - Same options as `send`, plus extra profiling options.
-     *
-     * @returns An object containing the function return value and profile result.
-     */
-    profile(options: DeployOptions & ProfileMethodOptions): Promise<TxProfileResult>;
-    /**
-     * Adds this contract to the PXE and returns the Contract object.
-     * @param options - Deployment options.
-     */
-    register(options?: Omit<DeployOptions, 'from'>): Promise<TContract>;
+    register(options?: RequestDeployOptions): Promise<TContract>;
     /**
      * Returns an execution payload for:
      * - publication of the contract class and
@@ -98,13 +102,13 @@ export declare class DeployMethod<TContract extends ContractBase = Contract> ext
      * @param options - Contract creation options.
      * @returns An execution payload with potentially calls (and bytecode capsule) to the class registry and instance registry.
      */
-    protected getPublicationExecutionPayload(options?: Omit<DeployOptions, 'from'>): Promise<ExecutionPayload>;
+    protected getPublicationExecutionPayload(options?: RequestDeployOptions): Promise<ExecutionPayload>;
     /**
      * Returns the calls necessary to initialize the contract.
      * @param options - Deployment options.
      * @returns - An array of function calls.
      */
-    protected getInitializationExecutionPayload(options?: Omit<DeployOptions, 'from'>): Promise<ExecutionPayload>;
+    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,
@@ -120,18 +124,22 @@ export declare class DeployMethod<TContract extends ContractBase = Contract> ext
      * @param options - An object containing various initialization and publication options.
      * @returns An instance object.
      */
-    getInstance(options?: Omit<DeployOptions, 'from'>): Promise<ContractInstanceWithAddress>;
+    getInstance(options?: RequestDeployOptions): Promise<ContractInstanceWithAddress>;
     /**
-     * Prove the request.
-     * @param options - initialization and publication options.
-     * @returns The proven tx.
+     * Simulate the deployment
+     *
+     * @param options - An optional object containing additional configuration for the simulation.
+     * @returns A simulation result object containing metadata of the execution, including gas
+     * estimations (if requested via options), execution statistics and emitted offchain effects
      */
-    prove(options: DeployOptions): Promise<DeployProvenTx<TContract>>;
+    simulate(options: SimulateDeployOptions): Promise<SimulationReturn<true>>;
     /**
-     * Estimates gas cost for this deployment operation.
-     * @param options - Options.
+     * Simulate a deployment and profile the gate count for each function in the transaction.
+     * @param options - Same options as `send`, plus extra profiling options.
+     *
+     * @returns An object containing the function return value and profile result.
      */
-    estimateGas(options: Omit<DeployOptions, 'estimateGas'>): Promise<Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>>;
+    profile(options: DeployOptions & ProfileInteractionOptions): Promise<TxProfileResult>;
     /** Return this deployment address. */
     get address(): AztecAddress | undefined;
     /** Returns the partial address for this deployment. */
@@ -141,11 +149,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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X21ldGhvZC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2RlcGxveV9tZXRob2QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUFvQixLQUFLLGdCQUFnQixFQUFrQixNQUFNLG1CQUFtQixDQUFDO0FBQ25ILE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUMzRCxPQUFPLEVBQ0wsS0FBSywyQkFBMkIsRUFJakMsTUFBTSx3QkFBd0IsQ0FBQztBQUNoQyxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNyRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQTBCLE1BQU0sa0JBQWtCLENBQUM7QUFDOUYsT0FBTyxFQUFFLGdCQUFnQixFQUEwQixNQUFNLGtCQUFrQixDQUFDO0FBSTVFLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ2xELE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3pFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXZELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVuRCxPQUFPLEVBQ0wsS0FBSyx5QkFBeUIsRUFDOUIsS0FBSyx5QkFBeUIsRUFDOUIsS0FBSyxzQkFBc0IsRUFDM0IsS0FBSywrQkFBK0IsRUFDcEMsS0FBSyxnQkFBZ0IsRUFJdEIsTUFBTSwwQkFBMEIsQ0FBQztBQUVsQzs7OztHQUlHO0FBQ0gsTUFBTSxNQUFNLG9CQUFvQixHQUFHLHlCQUF5QixHQUFH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

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

@@ -1 +1 @@
-{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_method.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy_method.d.ts","sourceRoot":"","sources":["../../src/contract/deploy_method.ts"],"names":[],"mappings":"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"}

package/dest/contract/deploy_method.js

@@ -1,15 +1,16 @@
-import { mergeExecutionPayloads } from '@aztec/entrypoints/payload';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { getInitializer } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { computePartialAddress, getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { collectOffchainEffects } from '@aztec/stdlib/tx';
+import { mergeExecutionPayloads } from '@aztec/stdlib/tx';
 import { publishContractClass } from '../deployment/publish_class.js';
 import { publishInstance } from '../deployment/publish_instance.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
-import { DeployProvenTx } from './deploy_proven_tx.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
-// docs:end:deploy_options
-// TODO(@spalladino): Add unit tests for this class!
+import { getGasLimits } from './get_gas_limits.js';
+import { toProfileOptions, toSendOptions, toSimulateOptions } from './interaction_options.js';
 /**
  * Contract interaction for deployment.
  * Handles class publication, instance publication, and initialization of the contract.
@@ -33,83 +34,42 @@ import { DeploySentTx } from './deploy_sent_tx.js';
         this.constructorArtifact = getInitializer(artifact, constructorNameOrArtifact);
     }
     /**
-   * Prepare a transaction execution request which can optionally (depending on the `options`):
-   * - Publish the contract's class_id
-   * - Publish the contract instance data, to enable execution of its public functions.
-   * - Initialize the contract
-   *
-   * A tx is not necessary if the function has no public functions nor any
-   * initializer function.
-   *
-   * This function internally calls `request()` and `sign()` methods to prepare
-   * the transaction for deployment. The resulting signed transaction can be
-   * later sent using the `send()` method.
-   *
-   * @param options - An object containing optional deployment settings, contractAddressSalt, and from.
-   * @returns A Promise resolving to an object containing the signed transaction data and other relevant information.
-   */ async create(options) {
-        const requestWithoutFee = await this.request(options);
-        const { fee: userFee, txNonce, cancellable } = options;
-        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {
-            txNonce,
-            cancellable
-        });
-        return this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
-            txNonce,
-            cancellable
-        });
-    }
-    // REFACTOR: Having a `request` method with different semantics than the ones in the other
-    // derived ContractInteractions is confusing. We should unify the flow of all ContractInteractions.
-    /**
-   * Returns an array of function calls that represent this operation. Useful as a building
-   * block for constructing batch requests.
-   * @param options - Deployment options.
-   * @returns An array of function calls.
-   * @remarks This method does not have the same return type as the `request` in the ContractInteraction object,
-   * it returns a promise for an array instead of a function call directly.
+   * Returns the execution payload that allows this operation to happen on chain.
+   * @param options - Configuration options.
+   * @returns The execution payload for this operation
    */ async request(options) {
         const publication = await this.getPublicationExecutionPayload(options);
-        // TODO: Should we add the contracts to the DB here, or once the tx has been sent or mined?
-        // Note that we need to run this registerContract here so it's available when computeFeeOptionsFromEstimatedGas
-        // runs, since it needs the contract to have been registered in order to estimate gas for its initialization,
-        // in case the initializer is public. This hints at the need of having "transient" contracts scoped to a
-        // simulation, so we can run the simulation with a set of contracts, but only "commit" them to the wallet
-        // once this tx has gone through.
-        await this.wallet.registerContract({
-            artifact: this.artifact,
-            instance: await this.getInstance(options)
-        });
+        if (!options?.skipRegistration) {
+            await this.wallet.registerContract(await this.getInstance(options), this.artifact);
+        }
         const initialization = await this.getInitializationExecutionPayload(options);
-        const exec = [
+        const feeExecutionPayload = options?.fee?.paymentMethod ? await options.fee.paymentMethod.getExecutionPayload() : undefined;
+        const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
+            feeExecutionPayload,
             publication,
             initialization
-        ];
-        const fnCalls = exec.map((exec)=>exec.calls).flat();
-        if (!fnCalls.length) {
+        ]) : mergeExecutionPayloads([
+            publication,
+            initialization
+        ]);
+        if (!finalExecutionPayload.calls.length) {
             throw new Error(`No transactions are needed to publish or initialize contract ${this.artifact.name}`);
         }
-        return mergeExecutionPayloads(exec);
+        return finalExecutionPayload;
     }
-    /**
-   * Simulate a deployment and profile the gate count for each function in the transaction.
-   * @param options - Same options as `send`, plus extra profiling options.
-   *
-   * @returns An object containing the function return value and profile result.
-   */ async profile(options) {
-        const txRequest = await this.create(options);
-        return await this.wallet.profileTx(txRequest, options.profileMode, options.skipProofGeneration, options?.from);
+    convertDeployOptionsToRequestOptions(options) {
+        return {
+            ...options,
+            deployer: !options?.universalDeploy ? options.from : undefined
+        };
     }
     /**
-   * Adds this contract to the PXE and returns the Contract object.
+   * Adds this contract to the wallet and returns the Contract object.
    * @param options - Deployment options.
-   */ async register(options = {}) {
+   */ async register(options) {
         const instance = await this.getInstance(options);
-        await this.wallet.registerContract({
-            artifact: this.artifact,
-            instance
-        });
-        return this.postDeployCtor(instance.address, this.wallet);
+        await this.wallet.registerContract(instance, this.artifact);
+        return this.postDeployCtor(instance, this.wallet);
     }
     /**
    * Returns an execution payload for:
@@ -118,7 +78,7 @@ import { DeploySentTx } from './deploy_sent_tx.js';
    * depending on the provided options.
    * @param options - Contract creation options.
    * @returns An execution payload with potentially calls (and bytecode capsule) to the class registry and instance registry.
-   */ async getPublicationExecutionPayload(options = {}) {
+   */ async getPublicationExecutionPayload(options) {
         const calls = [];
         // Set contract instance object so it's available for populating the DeploySendTx object
         const instance = await this.getInstance(options);
@@ -129,7 +89,7 @@ import { DeploySentTx } from './deploy_sent_tx.js';
             throw new Error(`Contract class mismatch when deploying contract: got ${instance.currentContractClassId.toString()} from instance and ${contractClass.id.toString()} from artifact`);
         }
         // Publish the contract class if it hasn't been published already.
-        if (!options.skipClassPublication) {
+        if (!options?.skipClassPublication) {
             if ((await this.wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered) {
                 this.log.debug(`Skipping publication of already-registered contract class ${contractClass.id.toString()} for ${instance.address.toString()}`);
             } else {
@@ -139,7 +99,7 @@ import { DeploySentTx } from './deploy_sent_tx.js';
             }
         }
         // Publish the contract instance:
-        if (!options.skipInstancePublication) {
+        if (!options?.skipInstancePublication) {
             // TODO(https://github.com/AztecProtocol/aztec-packages/issues/15596):
             // Read the artifact, and if there are no public functions, warn the caller that publication of the
             // contract instance is not necessary (until such time as they wish to update the instance (i.e. change its class_id)).
@@ -152,9 +112,9 @@ import { DeploySentTx } from './deploy_sent_tx.js';
    * Returns the calls necessary to initialize the contract.
    * @param options - Deployment options.
    * @returns - An array of function calls.
-   */ async getInitializationExecutionPayload(options = {}) {
+   */ async getInitializationExecutionPayload(options) {
         const executionsPayloads = [];
-        if (this.constructorArtifact && !options.skipInitialization) {
+        if (this.constructorArtifact && !options?.skipInitialization) {
             const { address } = await this.getInstance(options);
             const constructorCall = new ContractFunctionInteraction(this.wallet, address, this.constructorArtifact, this.args);
             executionsPayloads.push(await constructorCall.request());
@@ -169,7 +129,11 @@ import { DeploySentTx } from './deploy_sent_tx.js';
    * @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.
    */ send(options) {
-        const sendTx = ()=>super.send(options).getTxHash();
+        const sendTx = async ()=>{
+            const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
+            const sendOptions = toSendOptions(options);
+            return this.wallet.sendTx(executionPayload, sendOptions);
+        };
         this.log.debug(`Sent deployment tx of ${this.artifact.name} contract`);
         return new DeploySentTx(this.wallet, sendTx, this.postDeployCtor, ()=>this.getInstance(options));
     }
@@ -178,31 +142,51 @@ import { DeploySentTx } from './deploy_sent_tx.js';
    *
    * @param options - An object containing various initialization and publication options.
    * @returns An instance object.
-   */ async getInstance(options = {}) {
+   */ async getInstance(options) {
         if (!this.instance) {
             this.instance = await getContractInstanceFromInstantiationParams(this.artifact, {
                 constructorArgs: this.args,
-                salt: options.contractAddressSalt,
+                salt: options?.contractAddressSalt ?? Fr.random(),
                 publicKeys: this.publicKeys,
                 constructorArtifact: this.constructorArtifact,
-                deployer: options.universalDeploy ? AztecAddress.ZERO : this.wallet.getAddress()
+                deployer: options?.deployer ? options.deployer : AztecAddress.ZERO
             });
         }
         return this.instance;
     }
     /**
-   * Prove the request.
-   * @param options - initialization and publication options.
-   * @returns The proven tx.
-   */ async prove(options) {
-        const txProvingResult = await this.proveInternal(options);
-        return await DeployProvenTx.fromProvingResult(this.wallet, txProvingResult, this.postDeployCtor, ()=>this.getInstance(options), txProvingResult.stats);
+   * Simulate the deployment
+   *
+   * @param options - An optional object containing additional configuration for the simulation.
+   * @returns A simulation result object containing metadata of the execution, including gas
+   * estimations (if requested via options), execution statistics and emitted offchain effects
+   */ async simulate(options) {
+        const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
+        const simulatedTx = await this.wallet.simulateTx(executionPayload, toSimulateOptions(options));
+        const { gasLimits, teardownGasLimits } = getGasLimits(simulatedTx, options.fee?.estimatedGasPadding);
+        this.log.verbose(`Estimated gas limits for tx: DA=${gasLimits.daGas} L2=${gasLimits.l2Gas} teardownDA=${teardownGasLimits.daGas} teardownL2=${teardownGasLimits.l2Gas}`);
+        return {
+            stats: simulatedTx.stats,
+            offchainEffects: collectOffchainEffects(simulatedTx.privateExecutionResult),
+            result: undefined,
+            estimatedGas: {
+                gasLimits,
+                teardownGasLimits
+            }
+        };
     }
     /**
-   * Estimates gas cost for this deployment operation.
-   * @param options - Options.
-   */ estimateGas(options) {
-        return super.estimateGas(options);
+   * Simulate a deployment and profile the gate count for each function in the transaction.
+   * @param options - Same options as `send`, plus extra profiling options.
+   *
+   * @returns An object containing the function return value and profile result.
+   */ async profile(options) {
+        const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
+        return await this.wallet.profileTx(executionPayload, {
+            ...toProfileOptions(options),
+            profileMode: options.profileMode,
+            skipProofGeneration: options.skipProofGeneration
+        });
     }
     /** Return this deployment address. */ get address() {
         return this.instance?.address;