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

package/dest/contract/deploy_method.js

@@ -1,17 +1,27 @@
+import { mergeExecutionPayloads } from '@aztec/entrypoints/payload';
+import { Fr } from '@aztec/foundation/fields';
 import { getInitializer } from '@aztec/stdlib/abi';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { computePartialAddress, getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
-import { deployInstance } from '../deployment/deploy_instance.js';
-import { registerContractClass } from '../deployment/register_class.js';
+import { computePartialAddress, getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { collectOffchainEffects } 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 registration, public instance deployment,
- * and initialization of the contract. Extends the BaseContractInteraction class.
+ * Contract interaction for deployment.
+ * Handles class publication, instance publication, and initialization of the contract.
+ *
+ * Note that for some contracts, a tx is not required as part of its "creation":
+ * If there are no public functions, and if there are no initialization functions,
+ * 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 class DeployMethod extends BaseContractInteraction {
     publicKeys;
     artifact;
@@ -19,99 +29,55 @@ import { DeploySentTx } from './deploy_sent_tx.js';
     args;
     /** The contract instance to be deployed. */ instance;
     /** Constructor function to call. */ constructorArtifact;
-    constructor(publicKeys, wallet, artifact, postDeployCtor, args = [], constructorNameOrArtifact){
-        super(wallet), this.publicKeys = publicKeys, this.artifact = artifact, this.postDeployCtor = postDeployCtor, this.args = args, this.instance = undefined;
+    constructor(publicKeys, wallet, artifact, postDeployCtor, args = [], constructorNameOrArtifact, authWitnesses = [], capsules = []){
+        super(wallet, authWitnesses, capsules), this.publicKeys = publicKeys, this.artifact = artifact, this.postDeployCtor = postDeployCtor, this.args = args, this.instance = undefined;
         this.constructorArtifact = getInitializer(artifact, constructorNameOrArtifact);
     }
     /**
-   * Create a contract deployment transaction, given the deployment options.
-   * 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 = {}) {
-        return this.wallet.createTxExecutionRequest(await this.request(options));
-    }
-    // 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.
-   */ async request(options = {}) {
-        const deployment = await this.getDeploymentFunctionCalls(options);
-        // NOTE: MEGA HACK. Remove with #10007
-        // register the contract after generating deployment function calls in order to publicly register the class and (optioanlly) emit its bytecode
-        //
-        // 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)
-        });
-        const bootstrap = await this.getInitializeFunctionCalls(options);
-        if (deployment.calls.length + bootstrap.calls.length === 0) {
-            throw new Error(`No function calls needed to deploy contract ${this.artifact.name}`);
+   * 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);
+        await this.wallet.registerContract(await this.getInstance(options), this.artifact);
+        const initialization = await this.getInitializationExecutionPayload(options);
+        const feeExecutionPayload = options?.fee?.paymentMethod ? await options.fee.paymentMethod.getExecutionPayload() : undefined;
+        const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
+            feeExecutionPayload,
+            publication,
+            initialization
+        ]) : mergeExecutionPayloads([
+            publication,
+            initialization
+        ]);
+        if (!finalExecutionPayload.calls.length) {
+            throw new Error(`No transactions are needed to publish or initialize contract ${this.artifact.name}`);
         }
-        const calls = [
-            ...deployment.calls,
-            ...bootstrap.calls
-        ];
-        const authWitnesses = [
-            ...deployment.authWitnesses ?? [],
-            ...bootstrap.authWitnesses ?? []
-        ];
-        const hashedArguments = [
-            ...deployment.hashedArguments ?? [],
-            ...bootstrap.hashedArguments ?? []
-        ];
-        const capsules = [
-            ...deployment.capsules ?? [],
-            ...bootstrap.capsules ?? []
-        ];
-        const { cancellable, nonce, fee: userFee } = options;
-        const request = {
-            calls,
-            authWitnesses,
-            hashedArguments,
-            capsules,
-            cancellable,
-            fee: userFee,
-            nonce
-        };
-        const fee = await this.getFeeOptions(request);
+        return finalExecutionPayload;
+    }
+    convertDeployOptionsToRequestOptions(options) {
         return {
-            ...request,
-            fee
+            ...options,
+            deployer: !options?.universalDeploy ? options.from : undefined
         };
     }
     /**
-   * Register this contract in 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
-        });
+        await this.wallet.registerContract(instance, this.artifact);
         return this.postDeployCtor(instance.address, this.wallet);
     }
     /**
-   * Returns calls for registration of the class and deployment of the instance, depending on the provided options.
-   * @param options - Deployment options.
-   * @returns A function call array with potentially requests to the class registerer and instance deployer.
-   */ async getDeploymentFunctionCalls(options = {}) {
+   * Returns an execution payload for:
+   * - publication of the contract class and
+   * - publication of the contract instance to enable public execution
+   * 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) {
         const calls = [];
-        const capsules = [];
         // Set contract instance object so it's available for populating the DeploySendTx object
         const instance = await this.getInstance(options);
         // Obtain contract class from artifact and check it matches the reported one by the instance.
@@ -120,88 +86,105 @@ import { DeploySentTx } from './deploy_sent_tx.js';
         if (!instance.currentContractClassId.equals(contractClass.id)) {
             throw new Error(`Contract class mismatch when deploying contract: got ${instance.currentContractClassId.toString()} from instance and ${contractClass.id.toString()} from artifact`);
         }
-        // Register the contract class if it hasn't been published already.
-        if (!options.skipClassRegistration) {
+        // Publish the contract class if it hasn't been published already.
+        if (!options?.skipClassPublication) {
             if ((await this.wallet.getContractClassMetadata(contractClass.id)).isContractClassPubliclyRegistered) {
-                this.log.debug(`Skipping registration of already registered contract class ${contractClass.id.toString()} for ${instance.address.toString()}`);
+                this.log.debug(`Skipping publication of already-registered contract class ${contractClass.id.toString()} for ${instance.address.toString()}`);
             } else {
-                this.log.info(`Creating request for registering contract class ${contractClass.id.toString()} as part of deployment for ${instance.address.toString()}`);
-                const registerContractClassInteraction = await registerContractClass(this.wallet, this.artifact);
+                this.log.info(`Creating request for publishing contract class ${contractClass.id.toString()} as part of deployment for ${instance.address.toString()}`);
+                const registerContractClassInteraction = await publishContractClass(this.wallet, this.artifact);
                 calls.push(await registerContractClassInteraction.request());
-                capsules.push(...registerContractClassInteraction.getCapsules());
             }
         }
-        // Deploy the contract via the instance deployer.
-        if (!options.skipPublicDeployment) {
-            const deploymentInteraction = await deployInstance(this.wallet, instance);
+        // Publish the contract instance:
+        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)).
+            const deploymentInteraction = await publishInstance(this.wallet, instance);
             calls.push(await deploymentInteraction.request());
-            capsules.push(...deploymentInteraction.getCapsules());
         }
-        return {
-            calls,
-            capsules
-        };
+        return mergeExecutionPayloads(calls);
     }
     /**
    * Returns the calls necessary to initialize the contract.
    * @param options - Deployment options.
    * @returns - An array of function calls.
-   */ async getInitializeFunctionCalls(options) {
-        const { address } = await this.getInstance(options);
-        const calls = [];
-        const capsules = [];
-        if (this.constructorArtifact && !options.skipInitialization) {
+   */ async getInitializationExecutionPayload(options) {
+        const executionsPayloads = [];
+        if (this.constructorArtifact && !options?.skipInitialization) {
+            const { address } = await this.getInstance(options);
             const constructorCall = new ContractFunctionInteraction(this.wallet, address, this.constructorArtifact, this.args);
-            calls.push(await constructorCall.request());
-            capsules.push(...constructorCall.getCapsules());
+            executionsPayloads.push(await constructorCall.request());
         }
-        return {
-            calls,
-            capsules
-        };
+        return mergeExecutionPayloads(executionsPayloads);
     }
     /**
-   * Send the contract deployment transaction using the provided options.
+   * 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.
    *
    * @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 txHashPromise = super.send(options).getTxHash();
+   */ send(options) {
+        const sendTx = async ()=>{
+            const executionPayload = await this.request(this.convertDeployOptionsToRequestOptions(options));
+            const sendOptions = await toSendOptions(options);
+            return this.wallet.sendTx(executionPayload, sendOptions);
+        };
         this.log.debug(`Sent deployment tx of ${this.artifact.name} contract`);
-        return new DeploySentTx(this.wallet, txHashPromise, this.postDeployCtor, ()=>this.getInstance(options));
+        return new DeploySentTx(this.wallet, sendTx, this.postDeployCtor, ()=>this.getInstance(options));
     }
     /**
-   * Builds the contract instance to be deployed and returns it.
+   * Builds the contract instance and returns it.
    *
-   * @param options - An object containing various deployment options.
+   * @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 getContractInstanceFromDeployParams(this.artifact, {
+            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 - Deployment options.
-   * @returns The proven tx.
-   */ async prove(options) {
-        const txProvingResult = await this.proveInternal(options);
-        return new DeployProvenTx(this.wallet, txProvingResult.toTx(), this.postDeployCtor, ()=>this.getInstance(options));
+   * 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, await 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, {
+            ...await toProfileOptions(options),
+            profileMode: options.profileMode,
+            skipProofGeneration: options.skipProofGeneration
+        });
     }
     /** Return this deployment address. */ get address() {
         return this.instance?.address;
@@ -209,4 +192,11 @@ import { DeploySentTx } from './deploy_sent_tx.js';
     /** Returns the partial address for this deployment. */ get partialAddress() {
         return this.instance && computePartialAddress(this.instance);
     }
+    /**
+   * Augments this DeployMethod with additional metadata, such as authWitnesses and capsules.
+   * @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 = [] }) {
+        return new DeployMethod(this.publicKeys, this.wallet, this.artifact, this.postDeployCtor, this.args, this.constructorArtifact?.name, this.authWitnesses.concat(authWitnesses), this.capsules.concat(capsules));
+    }
 }

package/dest/contract/deploy_sent_tx.d.ts

@@ -1,9 +1,8 @@
 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 { Wallet } from '../wallet/wallet.js';
 import type { Contract } from './contract.js';
 import type { ContractBase } from './contract_base.js';
 import { SentTx, type WaitOpts } from './sent_tx.js';
@@ -18,14 +17,14 @@ export type DeployTxReceipt<TContract extends ContractBase = Contract> = FieldsO
     contract: TContract;
 };
 /**
- * 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 {
     private postDeployCtor;
     /** A getter for the deployed contract instance */
     instanceGetter: () => Promise<ContractInstanceWithAddress>;
     private log;
-    constructor(pxeOrWallet: PXE | Wallet, txHashPromise: Promise<TxHash>, postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>, 
+    constructor(wallet: Wallet, sendTx: () => Promise<TxHash>, postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>, 
     /** A getter for the deployed contract instance */
     instanceGetter: () => Promise<ContractInstanceWithAddress>);
     /**
@@ -40,6 +39,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

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,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,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,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,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACrB,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;CAWzF"}

package/dest/contract/deploy_sent_tx.js

@@ -1,13 +1,13 @@
 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');
     }
     /**
    * Awaits for the tx to be mined and returns the contract instance. Throws if tx is not mined.
@@ -25,19 +25,16 @@ 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 = await this.postDeployCtor(instance.address, contractWallet);
+        return {
+            ...receipt,
+            contract
+        };
     }
 }

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

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): Promise<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): Promise<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): Promise<ProfileOptions>;
+//# sourceMappingURL=interaction_options.d.ts.map

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,wBAAsB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,WAAW,CAAC,CAgBzF;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,eAAe,CAAC,CAkBrG;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,cAAc,CAAC,CAMlG"}