@aztec/aztec.js 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/contract/deploy_method.js

@@ -1,5 +1,6 @@
-import { AztecAddress, computePartialAddress, getContractClassFromArtifact, getContractInstanceFromDeployParams, } from '@aztec/circuits.js';
-import { getInitializer } from '@aztec/foundation/abi';
+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 { BaseContractInteraction } from './base_contract_interaction.js';
@@ -11,41 +12,38 @@ import { DeploySentTx } from './deploy_sent_tx.js';
 /**
  * Contract interaction for deployment. Handles class registration, public instance deployment,
  * and initialization of the contract. Extends the BaseContractInteraction class.
- */
-export class DeployMethod extends BaseContractInteraction {
-    constructor(publicKeys, wallet, artifact, postDeployCtor, args = [], constructorNameOrArtifact) {
-        super(wallet);
-        this.publicKeys = publicKeys;
-        this.artifact = artifact;
-        this.postDeployCtor = postDeployCtor;
-        this.args = args;
-        /** The contract instance to be deployed. */
-        this.instance = undefined;
+ */ export class DeployMethod extends BaseContractInteraction {
+    publicKeys;
+    artifact;
+    postDeployCtor;
+    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;
         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 = {}) {
+   * 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 = {}) {
+   * 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
@@ -56,129 +54,159 @@ export class DeployMethod extends BaseContractInteraction {
         // 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) });
+        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}`);
         }
-        const calls = [...deployment.calls, ...bootstrap.calls];
-        const authWitnesses = [...(deployment.authWitnesses ?? []), ...(bootstrap.authWitnesses ?? [])];
-        const hashedArguments = [...(deployment.hashedArguments ?? []), ...(bootstrap.hashedArguments ?? [])];
+        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, cancellable, fee: userFee, nonce };
+        const request = {
+            calls,
+            authWitnesses,
+            hashedArguments,
+            capsules,
+            cancellable,
+            fee: userFee,
+            nonce
+        };
         const fee = await this.getFeeOptions(request);
-        return { ...request, fee };
+        return {
+            ...request,
+            fee
+        };
     }
     /**
-     * Register this contract in the PXE and returns the Contract object.
-     * @param options - Deployment options.
-     */
-    async register(options = {}) {
+   * Register this contract in the PXE and returns the Contract object.
+   * @param options - Deployment options.
+   */ async register(options = {}) {
         const instance = await this.getInstance(options);
-        await this.wallet.registerContract({ artifact: this.artifact, instance });
+        await this.wallet.registerContract({
+            artifact: this.artifact,
+            instance
+        });
         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 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 = {}) {
         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.
         // TODO(@spalladino): We're unnecessarily calculating the contract class multiple times here.
         const contractClass = await getContractClassFromArtifact(this.artifact);
-        if (!instance.contractClassId.equals(contractClass.id)) {
-            throw new Error(`Contract class mismatch when deploying contract: got ${instance.contractClassId.toString()} from instance and ${contractClass.id.toString()} from artifact`);
+        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) {
             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()}`);
-            }
-            else {
+            } else {
                 this.log.info(`Creating request for registering contract class ${contractClass.id.toString()} as part of deployment for ${instance.address.toString()}`);
                 const registerContractClassInteraction = await registerContractClass(this.wallet, this.artifact);
                 calls.push(await registerContractClassInteraction.request());
+                capsules.push(...registerContractClassInteraction.getCapsules());
             }
         }
         // Deploy the contract via the instance deployer.
         if (!options.skipPublicDeployment) {
             const deploymentInteraction = await deployInstance(this.wallet, instance);
             calls.push(await deploymentInteraction.request());
+            capsules.push(...deploymentInteraction.getCapsules());
         }
-        return { calls };
+        return {
+            calls,
+            capsules
+        };
     }
     /**
-     * Returns the calls necessary to initialize the contract.
-     * @param options - Deployment options.
-     * @returns - An array of function calls.
-     */
-    async getInitializeFunctionCalls(options) {
+   * 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) {
             const constructorCall = new ContractFunctionInteraction(this.wallet, address, this.constructorArtifact, this.args);
             calls.push(await constructorCall.request());
+            capsules.push(...constructorCall.getCapsules());
         }
-        return { calls };
+        return {
+            calls,
+            capsules
+        };
     }
     /**
-     * Send the contract deployment transaction 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 = {}) {
+   * Send the contract deployment transaction 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();
         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, txHashPromise, this.postDeployCtor, ()=>this.getInstance(options));
     }
     /**
-     * Builds the contract instance to be deployed and returns it.
-     *
-     * @param options - An object containing various deployment options.
-     * @returns An instance object.
-     */
-    async getInstance(options = {}) {
+   * Builds the contract instance to be deployed and returns it.
+   *
+   * @param options - An object containing various deployment options.
+   * @returns An instance object.
+   */ async getInstance(options = {}) {
         if (!this.instance) {
             this.instance = await getContractInstanceFromDeployParams(this.artifact, {
                 constructorArgs: this.args,
                 salt: options.contractAddressSalt,
                 publicKeys: this.publicKeys,
                 constructorArtifact: this.constructorArtifact,
-                deployer: options.universalDeploy ? AztecAddress.ZERO : this.wallet.getAddress(),
+                deployer: options.universalDeploy ? AztecAddress.ZERO : this.wallet.getAddress()
             });
         }
         return this.instance;
     }
     /**
-     * Prove the request.
-     * @param options - Deployment options.
-     * @returns The proven tx.
-     */
-    async prove(options) {
+   * 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));
+        return new DeployProvenTx(this.wallet, txProvingResult.toTx(), this.postDeployCtor, ()=>this.getInstance(options));
     }
     /**
-     * Estimates gas cost for this deployment operation.
-     * @param options - Options.
-     */
-    estimateGas(options) {
+   * Estimates gas cost for this deployment operation.
+   * @param options - Options.
+   */ estimateGas(options) {
         return super.estimateGas(options);
     }
-    /** Return this deployment address. */
-    get address() {
+    /** Return this deployment address. */ get address() {
         return this.instance?.address;
     }
-    /** Returns the partial address for this deployment. */
-    get partialAddress() {
+    /** Returns the partial address for this deployment. */ get partialAddress() {
         return this.instance && computePartialAddress(this.instance);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9kZXBsb3lfbWV0aG9kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFDTCxZQUFZLEVBR1oscUJBQXFCLEVBQ3JCLDRCQUE0QixFQUM1QixtQ0FBbUMsR0FDcEMsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQWdELGNBQWMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSXJHLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQztBQUNsRSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV4RSxPQUFPLEVBQUUsdUJBQXVCLEVBQTBCLE1BQU0sZ0NBQWdDLENBQUM7QUFHakcsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sb0NBQW9DLENBQUM7QUFDakYsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3ZELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQW1CbkQsMEJBQTBCO0FBQzFCLG9EQUFvRDtBQUVwRDs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sWUFBd0QsU0FBUSx1QkFBdUI7SUFPbEcsWUFDVSxVQUFzQixFQUM5QixNQUFjLEVBQ04sUUFBMEIsRUFDMUIsY0FBNkUsRUFDN0UsT0FBYyxFQUFFLEVBQ3hCLHlCQUFxRDtRQUVyRCxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFQTixlQUFVLEdBQVYsVUFBVSxDQUFZO1FBRXRCLGFBQVEsR0FBUixRQUFRLENBQWtCO1FBQzFCLG1CQUFjLEdBQWQsY0FBYyxDQUErRDtRQUM3RSxTQUFJLEdBQUosSUFBSSxDQUFZO1FBWDFCLDRDQUE0QztRQUNwQyxhQUFRLEdBQWlDLFNBQVMsQ0FBQztRQWN6RCxJQUFJLENBQUMsbUJBQW1CLEdBQUcsY0FBYyxDQUFDLFFBQVEsRUFBRSx5QkFB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

package/dest/contract/deploy_proven_tx.d.ts

@@ -1,7 +1,9 @@
-import { type PXE, type Tx } from '@aztec/circuit-types';
-import { type AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { type Wallet } from '../account/index.js';
-import { type Contract } from './contract.js';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { Tx } from '@aztec/stdlib/tx';
+import type { Wallet } from '../account/index.js';
+import type { Contract } from './contract.js';
 import { DeploySentTx } from './deploy_sent_tx.js';
 import { ProvenTx } from './proven_tx.js';
 /**

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

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

package/dest/contract/deploy_proven_tx.js

@@ -2,21 +2,18 @@ import { DeploySentTx } from './deploy_sent_tx.js';
 import { ProvenTx } from './proven_tx.js';
 /**
  * A proven transaction that can be sent to the network. Returned by the `prove` method of a contract deployment.
- */
-export class DeployProvenTx extends ProvenTx {
-    constructor(wallet, tx, postDeployCtor, instanceGetter) {
-        super(wallet, tx);
-        this.postDeployCtor = postDeployCtor;
-        this.instanceGetter = instanceGetter;
+ */ export class DeployProvenTx extends ProvenTx {
+    postDeployCtor;
+    instanceGetter;
+    constructor(wallet, tx, postDeployCtor, instanceGetter){
+        super(wallet, tx), this.postDeployCtor = postDeployCtor, this.instanceGetter = instanceGetter;
     }
     /**
-     * Sends the transaction to the network via the provided wallet.
-     */
-    send() {
-        const promise = (() => {
+   * Sends the transaction to the network via the provided wallet.
+   */ send() {
+        const promise = (()=>{
             return this.wallet.sendTx(this.getPlainDataTx());
         })();
         return new DeploySentTx(this.wallet, promise, this.postDeployCtor, this.instanceGetter);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X3Byb3Zlbl90eC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9kZXBsb3lfcHJvdmVuX3R4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFMUM7O0dBRUc7QUFDSCxNQUFNLE9BQU8sY0FBc0QsU0FBUSxRQUFRO0lBQ2pGLFlBQ0UsTUFBb0IsRUFDcEIsRUFBTSxFQUNFLGNBQTZFLEVBQzdFLGNBQTBEO1FBRWxFLEtBQUssQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFIVixtQkFBYyxHQUFkLGNBQWMsQ0FBK0Q7UUFDN0UsbUJBQWMsR0FBZCxjQUFjLENBQTRDO0lBR3BFLENBQUM7SUFFRDs7T0FFRztJQUNhLElBQUk7UUFDbEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxHQUFHLEVBQUU7WUFDcEIsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUMsQ0FBQztRQUNuRCxDQUFDLENBQUMsRUFBRSxDQUFDO1FBRUwsT0FBTyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsY0FBYyxFQUFFLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUMxRixDQUFDO0NBQ0YifQ==

package/dest/contract/deploy_sent_tx.d.ts

@@ -1,9 +1,11 @@
-import { type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types';
-import { type AztecAddress, type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { type FieldsOf } from '@aztec/foundation/types';
-import { type Wallet } from '../account/index.js';
-import { type Contract } from './contract.js';
-import { type ContractBase } from './contract_base.js';
+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 { ContractBase } from './contract_base.js';
 import { SentTx, type WaitOpts } from './sent_tx.js';
 /** Options related to waiting for a deployment tx. */
 export type DeployedWaitOpts = WaitOpts & {

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":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAEzF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,KAAK,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,GAAG,GAAG,MAAM,EACpB,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;CASvE"}
+{"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,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAC3D,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,GAAG,GAAG,MAAM,EACpB,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;CASvE"}

package/dest/contract/deploy_sent_tx.js

@@ -2,39 +2,37 @@ 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.
- */
-export class DeploySentTx extends SentTx {
-    constructor(wallet, txHashPromise, postDeployCtor, 
-    /** A getter for the deployed contract instance */
-    instanceGetter) {
-        super(wallet, txHashPromise);
-        this.postDeployCtor = postDeployCtor;
-        this.instanceGetter = instanceGetter;
-        this.log = createLogger('aztecjs:deploy_sent_tx');
+ */ export class DeploySentTx extends SentTx {
+    postDeployCtor;
+    instanceGetter;
+    log;
+    constructor(wallet, txHashPromise, postDeployCtor, /** A getter for the deployed contract instance */ instanceGetter){
+        super(wallet, txHashPromise), 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.
-     * @param opts - Options for configuring the waiting for the tx to be mined.
-     * @returns The deployed contract instance.
-     */
-    async deployed(opts) {
+   * 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.
+   * @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.`);
         return receipt.contract;
     }
     /**
-     * Awaits for the tx to be mined and returns the receipt along with a contract instance. Throws if tx is not mined.
-     * @param opts - Options for configuring the waiting for the tx to be mined.
-     * @returns The transaction receipt with the deployed contract instance.
-     */
-    async wait(opts) {
+   * Awaits for the tx to be mined and returns the receipt along with a contract instance. Throws if tx is not mined.
+   * @param opts - Options for configuring the waiting for the tx to be mined.
+   * @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 };
+        return {
+            ...receipt,
+            contract
+        };
     }
     async getContractObject(wallet) {
-        const isWallet = (pxe) => !!pxe.createTxExecutionRequest;
+        const isWallet = (pxe)=>!!pxe.createTxExecutionRequest;
         const contractWallet = wallet ?? (isWallet(this.pxe) && this.pxe);
         if (!contractWallet) {
             throw new Error(`A wallet is required for creating a contract instance`);
@@ -43,4 +41,3 @@ export class DeploySentTx extends SentTx {
         return this.postDeployCtor(instance.address, contractWallet);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X3NlbnRfdHguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvZGVwbG95X3NlbnRfdHgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBTXJELE9BQU8sRUFBRSxNQUFNLEVBQWlCLE1BQU0sY0FBYyxDQUFDO0FBY3JEOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQW9ELFNBQVEsTUFBTTtJQUc3RSxZQUNFLE1BQW9CLEVBQ3BCLGFBQThCLEVBQ3RCLGNBQTZFO0lBQ3JGLGtEQUFrRDtJQUMzQyxjQUEwRDtRQUVqRSxLQUFLLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxDQUFDO1FBSnJCLG1CQUFjLEdBQWQsY0FBYyxDQUErRDtRQUU5RSxtQkFBYyxHQUFkLGNBQWMsQ0FBNEM7UUFQM0QsUUFBRyxHQUFHLFlBQVksQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0lBVXJELENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUF1QjtRQUMzQyxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEMsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0MsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsWUFBWSxRQUFRLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSx5QkFBeUIsQ0FBQyxDQUFDO1FBQ2hGLE9BQU8sT0FBTyxDQUFDLFFBQVEsQ0FBQztJQUMxQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNhLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBdUI7UUFDaEQsTUFBTSxPQUFPLEdBQUcsTUFBTSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZDLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQztRQUM1RCxPQUFPLEVBQUUsR0FBRyxPQUFPLEVBQUUsUUFBUSxFQUFFLENBQUM7SUFDbEMsQ0FBQztJQUVTLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxNQUFlO1FBQy9DLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBaUIsRUFBaUIsRUFBRSxDQUFDLENBQUMsQ0FBRSxHQUFjLENBQUMsd0JBQXdCLENBQUM7UUFDbEcsTUFBTSxjQUFjLEdBQUcsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbEUsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1lBQ3BCLE1BQU0sSUFBSSxLQUFLLENBQUMsdURBQXVELENBQUMsQ0FBQztRQUMzRSxDQUFDO1FBQ0QsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDN0MsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsY0FBYyxDQUF1QixDQUFDO0lBQ3JGLENBQUM7Q0FDRiJ9

package/dest/contract/get_gas_limits.d.ts

@@ -1,5 +1,5 @@
-import { type TxSimulationResult } from '@aztec/circuit-types';
-import { type Gas } from '@aztec/circuits.js';
+import type { 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.

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,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;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":"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"}

package/dest/contract/get_gas_limits.js

@@ -2,11 +2,9 @@
  * 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) {
+ */ export function getGasLimits(simulationResult, pad = 0.1) {
     return {
         totalGas: simulationResult.gasUsed.totalGas.mul(1 + pad),
-        teardownGas: simulationResult.gasUsed.teardownGas.mul(1 + pad),
+        teardownGas: simulationResult.gasUsed.teardownGas.mul(1 + pad)
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2dhc19saW1pdHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvZ2V0X2dhc19saW1pdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0E7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxZQUFZLENBQzFCLGdCQUFvQyxFQUNwQyxHQUFHLEdBQUcsR0FBRztJQVdULE9BQU87UUFDTCxRQUFRLEVBQUUsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEdBQUcsQ0FBQztRQUN4RCxXQUFXLEVBQUUsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEdBQUcsQ0FBQztLQUMvRCxDQUFDO0FBQ0osQ0FBQyJ9

package/dest/contract/index.js

@@ -34,12 +34,10 @@
  * for interacting with your contracts.
  *
  * @packageDocumentation
- */
-export { Contract } from './contract.js';
-export { ContractFunctionInteraction, } from './contract_function_interaction.js';
+ */ export { Contract } from './contract.js';
+export { ContractFunctionInteraction } from './contract_function_interaction.js';
 export { DefaultWaitOpts, SentTx } from './sent_tx.js';
 export { ContractBase } from './contract_base.js';
 export { BatchCall } from './batch_call.js';
 export { DeployMethod } from './deploy_method.js';
 export { DeploySentTx } from './deploy_sent_tx.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQW9DRztBQUNILE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDekMsT0FBTyxFQUNMLDJCQUEyQixHQUc1QixNQUFNLG9DQUFvQyxDQUFDO0FBQzVDLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxFQUFpQixNQUFNLGNBQWMsQ0FBQztBQUN0RSxPQUFPLEVBQUUsWUFBWSxFQUF1RSxNQUFNLG9CQUFvQixDQUFDO0FBQ3ZILE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUM1QyxPQUFPLEVBQXNCLFlBQVksRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQyJ9

package/dest/{deployment → contract}/protocol_contracts.d.ts

@@ -1,7 +1,9 @@
-import { UnsafeContract } from '../contract/unsafe_contract.js';
-import { type Wallet } from '../wallet/index.js';
+import type { Wallet } from '../wallet/index.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 */
+export declare function getFeeJuice(wallet: Wallet): Promise<UnsafeContract>;
 //# sourceMappingURL=protocol_contracts.d.ts.map

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

@@ -0,0 +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"}

package/dest/contract/protocol_contracts.js

@@ -0,0 +1,26 @@
+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);
+    if (!contractInstance) {
+        throw new Error("ContractClassRegisterer 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);
+    if (!contractInstance) {
+        throw new Error("ContractInstanceDeployer 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) {
+    const { contractInstance } = await wallet.getContractMetadata(ProtocolContractAddress.FeeJuice);
+    if (!contractInstance) {
+        throw new Error("FeeJuice is not registered in this wallet's instance");
+    }
+    const { artifact } = await wallet.getContractClassMetadata(contractInstance.currentContractClassId, true);
+    return new UnsafeContract(contractInstance, artifact, wallet);
+}

package/dest/contract/proven_tx.d.ts

@@ -1,5 +1,6 @@
-import { type PXE, Tx } from '@aztec/circuit-types';
-import { type Wallet } from '../account/index.js';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+import { Tx } from '@aztec/stdlib/tx';
+import type { Wallet } from '../account/index.js';
 import { SentTx } from './sent_tx.js';
 /**
  * A proven transaction that can be sent to the network. Returned by the `prove` method of a contract interaction.

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

@@ -1 +1 @@
-{"version":3,"file":"proven_tx.d.ts","sourceRoot":"","sources":["../../src/contract/proven_tx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,qBAAa,QAAS,SAAQ,EAAE;IAClB,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM;gBAApB,MAAM,EAAE,GAAG,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE;IAWlD,SAAS,CAAC,cAAc,IAAI,EAAE;IAU9B;;OAEG;IACI,IAAI,IAAI,MAAM;CAOtB"}
+{"version":3,"file":"proven_tx.d.ts","sourceRoot":"","sources":["../../src/contract/proven_tx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,qBAAa,QAAS,SAAQ,EAAE;IAClB,SAAS,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM;gBAApB,MAAM,EAAE,GAAG,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE;IAWlD,SAAS,CAAC,cAAc,IAAI,EAAE;IAU9B;;OAEG;IACI,IAAI,IAAI,MAAM;CAOtB"}

package/dest/contract/proven_tx.js

@@ -1,25 +1,22 @@
-import { Tx } from '@aztec/circuit-types';
+import { Tx } from '@aztec/stdlib/tx';
 import { SentTx } from './sent_tx.js';
 /**
  * A proven transaction that can be sent to the network. Returned by the `prove` method of a contract interaction.
- */
-export class ProvenTx extends Tx {
-    constructor(wallet, tx) {
-        super(tx.data, tx.clientIvcProof, tx.contractClassLogs, tx.enqueuedPublicFunctionCalls, tx.publicTeardownFunctionCall);
-        this.wallet = wallet;
+ */ export class ProvenTx extends Tx {
+    wallet;
+    constructor(wallet, tx){
+        super(tx.data, tx.clientIvcProof, tx.contractClassLogs, tx.enqueuedPublicFunctionCalls, tx.publicTeardownFunctionCall), this.wallet = wallet;
     }
     // Clone the TX data to get a serializable object.
     getPlainDataTx() {
         return new Tx(this.data, this.clientIvcProof, this.contractClassLogs, this.enqueuedPublicFunctionCalls, this.publicTeardownFunctionCall);
     }
     /**
-     * Sends the transaction to the network via the provided wallet.
-     */
-    send() {
-        const promise = (() => {
+   * Sends the transaction to the network via the provided wallet.
+   */ send() {
+        const promise = (()=>{
             return this.wallet.sendTx(this.getPlainDataTx());
         })();
         return new SentTx(this.wallet, promise);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmVuX3R4LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L3Byb3Zlbl90eC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQVksRUFBRSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFHcEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUV0Qzs7R0FFRztBQUNILE1BQU0sT0FBTyxRQUFTLFNBQVEsRUFBRTtJQUM5QixZQUFzQixNQUFvQixFQUFFLEVBQU07UUFDaEQsS0FBSyxDQUNILEVBQUUsQ0FBQyxJQUFJLEVBQ1AsRUFBRSxDQUFDLGNBQWMsRUFDakIsRUFBRSxDQUFDLGlCQUFpQixFQUNwQixFQUFFLENBQUMsMkJBQTJCLEVBQzlCLEVBQUUsQ0FBQywwQkFBMEIsQ0FDOUIsQ0FBQztRQVBrQixXQUFNLEdBQU4sTUFBTSxDQUFjO0lBUTFDLENBQUM7SUFFRCxrREFBa0Q7SUFDeEMsY0FBYztRQUN0QixPQUFPLElBQUksRUFBRSxDQUNYLElBQUksQ0FBQyxJQUFJLEVBQ1QsSUFBSSxDQUFDLGNBQWMsRUFDbkIsSUFBSSxDQUFDLGlCQUFpQixFQUN0QixJQUFJLENBQUMsMkJBQTJCLEVBQ2hDLElBQUksQ0FBQywwQkFBMEIsQ0FDaEMsQ0FBQztJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNJLElBQUk7UUFDVCxNQUFNLE9BQU8sR0FBRyxDQUFDLEdBQUcsRUFBRTtZQUNwQixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFDO1FBQ25ELENBQUMsQ0FBQyxFQUFFLENBQUM7UUFFTCxPQUFPLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDMUMsQ0FBQztDQUNGIn0=

package/dest/contract/sent_tx.d.ts

@@ -1,5 +1,6 @@
-import { type GetPublicLogsResponse, type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types';
-import { type FieldsOf } from '@aztec/foundation/types';
+import type { FieldsOf } from '@aztec/foundation/types';
+import type { GetPublicLogsResponse, PXE } from '@aztec/stdlib/interfaces/client';
+import { type TxHash, type TxReceipt } from '@aztec/stdlib/tx';
 /** 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. */