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

package/dest/contract/interaction_options.js

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

package/dest/contract/protocol_contracts.d.ts

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

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

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

package/dest/contract/protocol_contracts.js

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

package/dest/contract/sent_tx.d.ts

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

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

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

package/dest/contract/sent_tx.js

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

package/dest/contract/unsafe_contract.d.ts

@@ -1,6 +1,6 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { Wallet } from '../wallet/index.js';
+import type { Wallet } from '../wallet/wallet.js';
 import { ContractBase } from './contract_base.js';
 /** Unsafe constructor for ContractBase that bypasses the check that the instance is registered in the wallet. */
 export declare class UnsafeContract extends ContractBase {

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

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

package/dest/contract/wait_for_proven.d.ts

@@ -0,0 +1,17 @@
+import type { AztecNode } from '@aztec/stdlib/interfaces/client';
+import type { TxReceipt } from '@aztec/stdlib/tx';
+/**
+ * Options for waiting for a transaction to be proven.
+ */
+export type WaitForProvenOpts = {
+    /** Time to wait for the tx to be proven before timing out */
+    provenTimeout?: number;
+    /** Elapsed time between polls to the node */
+    interval?: number;
+};
+export declare const DefaultWaitForProvenOpts: WaitForProvenOpts;
+/**
+ * Wait for a transaction to be proven by polling the node
+ */
+export declare function waitForProven(node: AztecNode, receipt: TxReceipt, opts?: WaitForProvenOpts): Promise<number>;
+//# sourceMappingURL=wait_for_proven.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wait_for_proven.d.ts","sourceRoot":"","sources":["../../src/contract/wait_for_proven.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIlD;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,6DAA6D;IAC7D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,iBAGtC,CAAC;AAEF;;GAEG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,iBAAiB,mBAahG"}

package/dest/contract/wait_for_proven.js

@@ -0,0 +1,17 @@
+import { retryUntil } from '@aztec/foundation/retry';
+import { DefaultWaitOpts } from './sent_tx.js';
+export const DefaultWaitForProvenOpts = {
+    provenTimeout: 600,
+    interval: DefaultWaitOpts.interval
+};
+/**
+ * Wait for a transaction to be proven by polling the node
+ */ export async function waitForProven(node, receipt, opts) {
+    if (!receipt.blockNumber) {
+        throw new Error(`Cannot wait for proven: receipt of tx ${receipt.txHash} does not have a block number`);
+    }
+    return await retryUntil(async ()=>{
+        const provenBlock = await node.getProvenBlockNumber();
+        return provenBlock >= receipt.blockNumber ? provenBlock : undefined;
+    }, 'isProven', opts?.provenTimeout ?? DefaultWaitForProvenOpts.provenTimeout, opts?.interval ?? DefaultWaitForProvenOpts.interval);
+}

package/dest/deployment/broadcast_function.d.ts

@@ -2,7 +2,7 @@ import { type ContractArtifact, FunctionSelector } from '@aztec/stdlib/abi';
 import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 import type { Wallet } from '../wallet/index.js';
 /**
- * Sets up a call to broadcast a private function's bytecode via the ClassRegisterer contract.
+ * Sets up a call to broadcast a private function's bytecode via the ClassRegistry contract.
  * Note that this is not required for users to call the function, but is rather a convenience to make
  * this code publicly available so dapps or wallets do not need to redistribute it.
  * @param wallet - Wallet to send the transaction.
@@ -12,7 +12,7 @@ import type { Wallet } from '../wallet/index.js';
  */
 export declare function broadcastPrivateFunction(wallet: Wallet, artifact: ContractArtifact, selector: FunctionSelector): Promise<ContractFunctionInteraction>;
 /**
- * Sets up a call to broadcast an unconstrained function's bytecode via the ClassRegisterer contract.
+ * Sets up a call to broadcast a utility function's bytecode via the ClassRegistry contract.
  * Note that this is not required for users to call the function, but is rather a convenience to make
  * this code publicly available so dapps or wallets do not need to redistribute it.
  * @param wallet - Wallet to send the transaction.
@@ -20,5 +20,5 @@ export declare function broadcastPrivateFunction(wallet: Wallet, artifact: Contr
  * @param selector - Selector of the function to be broadcast.
  * @returns A ContractFunctionInteraction object that can be used to send the transaction.
  */
-export declare function broadcastUnconstrainedFunction(wallet: Wallet, artifact: ContractArtifact, selector: FunctionSelector): Promise<ContractFunctionInteraction>;
+export declare function broadcastUtilityFunction(wallet: Wallet, artifact: ContractArtifact, selector: FunctionSelector): Promise<ContractFunctionInteraction>;
 //# sourceMappingURL=broadcast_function.d.ts.map

package/dest/deployment/broadcast_function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"broadcast_function.d.ts","sourceRoot":"","sources":["../../src/deployment/broadcast_function.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAgC,MAAM,mBAAmB,CAAC;AAS1G,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAEhG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,2BAA2B,CAAC,CAoDtC;AAED;;;;;;;;GAQG;AACH,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,2BAA2B,CAAC,CA8CtC"}
+{"version":3,"file":"broadcast_function.d.ts","sourceRoot":"","sources":["../../src/deployment/broadcast_function.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAgC,MAAM,mBAAmB,CAAC;AAS1G,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAEhG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,2BAA2B,CAAC,CAoDtC;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,2BAA2B,CAAC,CA8CtC"}

package/dest/deployment/broadcast_function.js

@@ -1,13 +1,13 @@
-import { ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS, REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT } from '@aztec/constants';
+import { ARTIFACT_FUNCTION_TREE_MAX_HEIGHT, CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS } from '@aztec/constants';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { FunctionSelector, FunctionType, bufferAsFields } from '@aztec/stdlib/abi';
-import { computeVerificationKeyHash, createPrivateFunctionMembershipProof, createUnconstrainedFunctionMembershipProof, getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { computeVerificationKeyHash, createPrivateFunctionMembershipProof, createUtilityFunctionMembershipProof, getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { Capsule } from '@aztec/stdlib/tx';
-import { getRegistererContract } from '../contract/protocol_contracts.js';
+import { getClassRegistryContract } from '../contract/protocol_contracts.js';
 /**
- * Sets up a call to broadcast a private function's bytecode via the ClassRegisterer contract.
+ * Sets up a call to broadcast a private function's bytecode via the ClassRegistry contract.
  * Note that this is not required for users to call the function, but is rather a convenience to make
  * this code publicly available so dapps or wallets do not need to redistribute it.
  * @param wallet - Wallet to send the transaction.
@@ -25,46 +25,50 @@ import { getRegistererContract } from '../contract/protocol_contracts.js';
     if (!privateFunctionArtifact) {
         throw new Error(`Private function with selector ${selector.toString()} not found`);
     }
-    const { artifactTreeSiblingPath, artifactTreeLeafIndex, artifactMetadataHash, functionMetadataHash, unconstrainedFunctionsArtifactTreeRoot, privateFunctionTreeSiblingPath, privateFunctionTreeLeafIndex } = await createPrivateFunctionMembershipProof(selector, artifact);
+    const { artifactTreeSiblingPath, artifactTreeLeafIndex, artifactMetadataHash, functionMetadataHash, utilityFunctionsTreeRoot, privateFunctionTreeSiblingPath, privateFunctionTreeLeafIndex } = await createPrivateFunctionMembershipProof(selector, artifact);
     const vkHash = await computeVerificationKeyHash(privateFunctionArtifact);
-    const registerer = await getRegistererContract(wallet);
-    const fn = registerer.methods.broadcast_private_function(contractClass.id, artifactMetadataHash, unconstrainedFunctionsArtifactTreeRoot, privateFunctionTreeSiblingPath, privateFunctionTreeLeafIndex, padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT), artifactTreeLeafIndex, // eslint-disable-next-line camelcase
+    const classRegistry = await getClassRegistryContract(wallet);
+    const bytecode = bufferAsFields(privateFunctionArtifact.bytecode, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS);
+    return classRegistry.methods.broadcast_private_function(contractClass.id, artifactMetadataHash, utilityFunctionsTreeRoot, privateFunctionTreeSiblingPath, privateFunctionTreeLeafIndex, padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT), artifactTreeLeafIndex, // eslint-disable-next-line camelcase
     {
         selector,
         metadata_hash: functionMetadataHash,
         vk_hash: vkHash
+    }).with({
+        capsules: [
+            new Capsule(ProtocolContractAddress.ContractClassRegistry, new Fr(CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT), bytecode)
+        ]
     });
-    const bytecode = bufferAsFields(privateFunctionArtifact.bytecode, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS);
-    fn.addCapsule(new Capsule(ProtocolContractAddress.ContractClassRegisterer, new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT), bytecode));
-    return fn;
 }
 /**
- * Sets up a call to broadcast an unconstrained function's bytecode via the ClassRegisterer contract.
+ * Sets up a call to broadcast a utility function's bytecode via the ClassRegistry contract.
  * Note that this is not required for users to call the function, but is rather a convenience to make
  * this code publicly available so dapps or wallets do not need to redistribute it.
  * @param wallet - Wallet to send the transaction.
  * @param artifact - Contract artifact that contains the function to be broadcast.
  * @param selector - Selector of the function to be broadcast.
  * @returns A ContractFunctionInteraction object that can be used to send the transaction.
- */ export async function broadcastUnconstrainedFunction(wallet, artifact, selector) {
+ */ export async function broadcastUtilityFunction(wallet, artifact, selector) {
     const contractClass = await getContractClassFromArtifact(artifact);
-    const unconstrainedFunctions = artifact.functions.filter((fn)=>fn.functionType === FunctionType.UNCONSTRAINED);
-    const unconstrainedFunctionsAndSelectors = await Promise.all(unconstrainedFunctions.map(async (fn)=>({
+    const utilityFunctions = artifact.functions.filter((fn)=>fn.functionType === FunctionType.UTILITY);
+    const utilityFunctionsAndSelectors = await Promise.all(utilityFunctions.map(async (fn)=>({
             f: fn,
             selector: await FunctionSelector.fromNameAndParameters(fn.name, fn.parameters)
         })));
-    const unconstrainedFunctionArtifact = unconstrainedFunctionsAndSelectors.find((fn)=>selector.equals(fn.selector))?.f;
-    if (!unconstrainedFunctionArtifact) {
-        throw new Error(`Unconstrained function with selector ${selector.toString()} not found`);
+    const utilityFunctionArtifact = utilityFunctionsAndSelectors.find((fn)=>selector.equals(fn.selector))?.f;
+    if (!utilityFunctionArtifact) {
+        throw new Error(`Utility function with selector ${selector.toString()} not found`);
     }
-    const { artifactMetadataHash, artifactTreeLeafIndex, artifactTreeSiblingPath, functionMetadataHash, privateFunctionsArtifactTreeRoot } = await createUnconstrainedFunctionMembershipProof(selector, artifact);
-    const registerer = await getRegistererContract(wallet);
-    const fn = registerer.methods.broadcast_unconstrained_function(contractClass.id, artifactMetadataHash, privateFunctionsArtifactTreeRoot, padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT), artifactTreeLeafIndex, // eslint-disable-next-line camelcase
+    const { artifactMetadataHash, artifactTreeLeafIndex, artifactTreeSiblingPath, functionMetadataHash, privateFunctionsArtifactTreeRoot } = await createUtilityFunctionMembershipProof(selector, artifact);
+    const classRegistry = await getClassRegistryContract(wallet);
+    const bytecode = bufferAsFields(utilityFunctionArtifact.bytecode, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS);
+    return classRegistry.methods.broadcast_utility_function(contractClass.id, artifactMetadataHash, privateFunctionsArtifactTreeRoot, padArrayEnd(artifactTreeSiblingPath, Fr.ZERO, ARTIFACT_FUNCTION_TREE_MAX_HEIGHT), artifactTreeLeafIndex, // eslint-disable-next-line camelcase
     {
         selector,
         metadata_hash: functionMetadataHash
+    }).with({
+        capsules: [
+            new Capsule(ProtocolContractAddress.ContractClassRegistry, new Fr(CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT), bytecode)
+        ]
     });
-    const bytecode = bufferAsFields(unconstrainedFunctionArtifact.bytecode, MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS);
-    fn.addCapsule(new Capsule(ProtocolContractAddress.ContractClassRegisterer, new Fr(REGISTERER_CONTRACT_BYTECODE_CAPSULE_SLOT), bytecode));
-    return fn;
 }

package/dest/deployment/contract_deployer.d.ts

@@ -1,8 +1,8 @@
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { PublicKeys } from '@aztec/stdlib/keys';
-import type { Wallet } from '../account/wallet.js';
 import { Contract } from '../contract/contract.js';
 import { DeployMethod } from '../contract/deploy_method.js';
+import type { Wallet } from '../wallet/wallet.js';
 /**
  * A class for deploying contract.
  * @remarks Keeping this around even though we have Aztec.nr contract types because it can be useful for non-TS users.

package/dest/deployment/contract_deployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_deployer.d.ts","sourceRoot":"","sources":["../../src/deployment/contract_deployer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D;;;GAGG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,eAAe,CAAC;gBAHhB,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,wBAAY,EACvB,eAAe,CAAC,oBAAQ;IAGlC;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAW7B"}
+{"version":3,"file":"contract_deployer.d.ts","sourceRoot":"","sources":["../../src/deployment/contract_deployer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD;;;GAGG;AACH,qBAAa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,eAAe,CAAC;gBAHhB,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,YAAA,EACvB,eAAe,CAAC,EAAE,MAAM,YAAA;IAGlC;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;CAW7B"}

package/dest/deployment/publish_class.d.ts

@@ -0,0 +1,6 @@
+import { type ContractArtifact } from '@aztec/stdlib/abi';
+import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import type { Wallet } from '../wallet/index.js';
+/** Sets up a call to publish a contract class given its artifact. */
+export declare function publishContractClass(wallet: Wallet, artifact: ContractArtifact): Promise<ContractFunctionInteraction>;
+//# sourceMappingURL=publish_class.d.ts.map

package/dest/deployment/publish_class.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"publish_class.d.ts","sourceRoot":"","sources":["../../src/deployment/publish_class.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,gBAAgB,EAAkB,MAAM,mBAAmB,CAAC;AAI1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAEhG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qEAAqE;AACrE,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,2BAA2B,CAAC,CAetC"}

package/dest/deployment/publish_class.js

@@ -0,0 +1,17 @@
+import { CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
+import { bufferAsFields } from '@aztec/stdlib/abi';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { Capsule } from '@aztec/stdlib/tx';
+import { getClassRegistryContract } from '../contract/protocol_contracts.js';
+/** Sets up a call to publish a contract class given its artifact. */ export async function publishContractClass(wallet, artifact) {
+    const { artifactHash, privateFunctionsRoot, publicBytecodeCommitment, packedBytecode } = await getContractClassFromArtifact(artifact);
+    const classRegistry = await getClassRegistryContract(wallet);
+    const encodedBytecode = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
+    return classRegistry.methods.publish(artifactHash, privateFunctionsRoot, publicBytecodeCommitment).with({
+        capsules: [
+            new Capsule(ProtocolContractAddress.ContractClassRegistry, new Fr(CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT), encodedBytecode)
+        ]
+    });
+}

package/dest/deployment/publish_instance.d.ts

@@ -0,0 +1,10 @@
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
+import type { Wallet } from '../wallet/wallet.js';
+/**
+ * Sets up a call to the canonical contract instance registry to publish a contract instance.
+ * @param wallet - The wallet to use for the publication (setup) tx.
+ * @param instance - The instance to publish.
+ */
+export declare function publishInstance(wallet: Wallet, instance: ContractInstanceWithAddress): Promise<ContractFunctionInteraction>;
+//# sourceMappingURL=publish_instance.d.ts.map

package/dest/deployment/publish_instance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"publish_instance.d.ts","sourceRoot":"","sources":["../../src/deployment/publish_instance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAEhG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,2BAA2B,GACpC,OAAO,CAAC,2BAA2B,CAAC,CAWtC"}

package/dest/deployment/publish_instance.js

@@ -0,0 +1,11 @@
+import { getInstanceRegistryContract } from '../contract/protocol_contracts.js';
+/**
+ * Sets up a call to the canonical contract instance registry to publish a contract instance.
+ * @param wallet - The wallet to use for the publication (setup) tx.
+ * @param instance - The instance to publish.
+ */ export async function publishInstance(wallet, instance) {
+    const contractInstanceRegistry = await getInstanceRegistryContract(wallet);
+    const { salt, currentContractClassId: contractClassId, publicKeys, deployer: instanceDeployer } = instance;
+    const isUniversalDeploy = instanceDeployer.isZero();
+    return contractInstanceRegistry.methods.publish_for_public_execution(salt, contractClassId, instance.initializationHash, publicKeys, isUniversalDeploy);
+}