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

package/dest/contract/base_contract_interaction.js

@@ -1,54 +1,54 @@
-import { GasSettings } from '@aztec/circuits.js';
 import { createLogger } from '@aztec/foundation/log';
-import { NoFeePaymentMethod } from '../fee/no_fee_payment_method.js';
+import { GasSettings } from '@aztec/stdlib/gas';
+import { FeeJuicePaymentMethod } from '../fee/fee_juice_payment_method.js';
 import { getGasLimits } from './get_gas_limits.js';
 import { ProvenTx } from './proven_tx.js';
 import { SentTx } from './sent_tx.js';
 /**
  * Base class for an interaction with a contract, be it a deployment, a function call, or a batch.
  * Implements the sequence create/simulate/send.
- */
-export class BaseContractInteraction {
-    constructor(wallet) {
+ */ export class BaseContractInteraction {
+    wallet;
+    log;
+    capsules;
+    constructor(wallet){
         this.wallet = wallet;
         this.log = createLogger('aztecjs:contract_interaction');
+        this.capsules = [];
     }
     /**
-     * Creates a transaction execution request, simulates and proves it. Differs from .prove in
-     * that its result does not include the wallet nor the composed tx object, but only the proving result.
-     * This object can then be used to either create a ProvenTx ready to be sent, or directly send the transaction.
-     * @param options - optional arguments to be used in the creation of the transaction
-     * @returns The proving result.
-     */
-    async proveInternal(options = {}) {
+   * Creates a transaction execution request, simulates and proves it. Differs from .prove in
+   * that its result does not include the wallet nor the composed tx object, but only the proving result.
+   * This object can then be used to either create a ProvenTx ready to be sent, or directly send the transaction.
+   * @param options - optional arguments to be used in the creation of the transaction
+   * @returns The proving result.
+   */ async proveInternal(options = {}) {
         const txRequest = await this.create(options);
         const txSimulationResult = await this.wallet.simulateTx(txRequest, !options.skipPublicSimulation, undefined, true);
         return await this.wallet.proveTx(txRequest, txSimulationResult.privateExecutionResult);
     }
     // docs:start:prove
     /**
-     * Proves a transaction execution request and returns a tx object ready to be sent.
-     * @param options - optional arguments to be used in the creation of the transaction
-     * @returns The resulting transaction
-     */
-    async prove(options = {}) {
+   * Proves a transaction execution request and returns a tx object ready to be sent.
+   * @param options - optional arguments to be used in the creation of the transaction
+   * @returns The resulting transaction
+   */ async prove(options = {}) {
         // docs:end:prove
         const txProvingResult = await this.proveInternal(options);
         return new ProvenTx(this.wallet, txProvingResult.toTx());
     }
     // docs:start:send
     /**
-     * Sends a transaction to the contract function with the specified options.
-     * This function throws an error if called on an unconstrained function.
-     * It creates and signs the transaction if necessary, and returns a SentTx instance,
-     * which can be used to track the transaction status, receipt, and events.
-     * @param options - An optional object containing 'from' property representing
-     * the AztecAddress of the sender. If not provided, the default address is used.
-     * @returns A SentTx instance for tracking the transaction status and information.
-     */
-    send(options = {}) {
+   * Sends a transaction to the contract function with the specified options.
+   * This function throws an error if called on an unconstrained function.
+   * It creates and signs the transaction if necessary, and returns a SentTx instance,
+   * which can be used to track the transaction status, receipt, and events.
+   * @param options - An optional object containing 'from' property representing
+   * the AztecAddress of the sender. If not provided, the default address is used.
+   * @returns A SentTx instance for tracking the transaction status and information.
+   */ send(options = {}) {
         // docs:end:send
-        const promise = (async () => {
+        const promise = (async ()=>{
             const txProvingResult = await this.proveInternal(options);
             return this.wallet.sendTx(txProvingResult.toTx());
         })();
@@ -56,37 +56,49 @@ export class BaseContractInteraction {
     }
     // docs:start:estimateGas
     /**
-     * Estimates gas for a given tx request and returns gas limits for it.
-     * @param opts - Options.
-     * @param pad - Percentage to pad the suggested gas limits by, if empty, defaults to 10%.
-     * @returns Gas limits.
-     */
-    async estimateGas(opts) {
+   * Estimates gas for a given tx request and returns gas limits for it.
+   * @param opts - Options.
+   * @param pad - Percentage to pad the suggested gas limits by, if empty, defaults to 10%.
+   * @returns Gas limits.
+   */ async estimateGas(opts) {
         // docs:end:estimateGas
-        const txRequest = await this.create({ ...opts, fee: { ...opts?.fee, estimateGas: false } });
-        const simulationResult = await this.wallet.simulateTx(txRequest, true /*simulatePublic*/, undefined /* msgSender */, undefined /* skipTxValidation */, false /* enforceFeePayment */);
+        const txRequest = await this.create({
+            ...opts,
+            fee: {
+                ...opts?.fee,
+                estimateGas: false
+            }
+        });
+        const simulationResult = await this.wallet.simulateTx(txRequest, true, undefined /* msgSender */ , undefined /* skipTxValidation */ , true);
         const { totalGas: gasLimits, teardownGas: teardownGasLimits } = getGasLimits(simulationResult, opts?.fee?.estimatedGasPadding);
-        return { gasLimits, teardownGasLimits };
+        return {
+            gasLimits,
+            teardownGasLimits
+        };
     }
     /**
-     * Returns default fee options based on the user opts without running a simulation for gas estimation.
-     * @param fee - User-provided fee options.
-     */
-    async getDefaultFeeOptions(fee) {
+   * Returns default fee options based on the user opts without running a simulation for gas estimation.
+   * @param fee - User-provided fee options.
+   */ async getDefaultFeeOptions(fee) {
         const maxFeesPerGas = fee?.gasSettings?.maxFeesPerGas ?? (await this.wallet.getCurrentBaseFees()).mul(1 + (fee?.baseFeePadding ?? 0.5));
-        const paymentMethod = fee?.paymentMethod ?? new NoFeePaymentMethod();
-        const gasSettings = GasSettings.default({ ...fee?.gasSettings, maxFeesPerGas });
+        const paymentMethod = fee?.paymentMethod ?? new FeeJuicePaymentMethod(this.wallet.getAddress());
+        const gasSettings = GasSettings.default({
+            ...fee?.gasSettings,
+            maxFeesPerGas
+        });
         this.log.debug(`Using L2 gas settings`, gasSettings);
-        return { gasSettings, paymentMethod };
+        return {
+            gasSettings,
+            paymentMethod
+        };
     }
     // docs:start:getFeeOptions
     /**
-     * Return fee options based on the user opts, estimating tx gas if needed.
-     * @param request - Request to execute for this interaction.
-     * @param pad - Percentage to pad the suggested gas limits by, as decimal (e.g., 0.10 for 10%).
-     * @returns Fee options for the actual transaction.
-     */
-    async getFeeOptions(request) {
+   * Return fee options based on the user opts, estimating tx gas if needed.
+   * @param request - Request to execute for this interaction.
+   * @param pad - Percentage to pad the suggested gas limits by, as decimal (e.g., 0.10 for 10%).
+   * @returns Fee options for the actual transaction.
+   */ async getFeeOptions(request) {
         // docs:end:getFeeOptions
         const defaultFeeOptions = await this.getDefaultFeeOptions(request.fee);
         const paymentMethod = defaultFeeOptions.paymentMethod;
@@ -94,14 +106,44 @@ export class BaseContractInteraction {
         const maxPriorityFeesPerGas = defaultFeeOptions.gasSettings.maxPriorityFeesPerGas;
         let gasSettings = defaultFeeOptions.gasSettings;
         if (request.fee?.estimateGas) {
-            const feeForEstimation = { paymentMethod, gasSettings };
-            const txRequest = await this.wallet.createTxExecutionRequest({ ...request, fee: feeForEstimation });
-            const simulationResult = await this.wallet.simulateTx(txRequest, true /*simulatePublic*/, undefined /* msgSender */, undefined /* skipTxValidation */, false /* enforceFeePayment */);
+            const feeForEstimation = {
+                paymentMethod,
+                gasSettings
+            };
+            const txRequest = await this.wallet.createTxExecutionRequest({
+                ...request,
+                fee: feeForEstimation
+            });
+            const simulationResult = await this.wallet.simulateTx(txRequest, true, undefined /* msgSender */ , undefined /* skipTxValidation */ , true);
             const { totalGas: gasLimits, teardownGas: teardownGasLimits } = getGasLimits(simulationResult, request.fee?.estimatedGasPadding);
-            gasSettings = GasSettings.from({ maxFeesPerGas, maxPriorityFeesPerGas, gasLimits, teardownGasLimits });
+            gasSettings = GasSettings.from({
+                maxFeesPerGas,
+                maxPriorityFeesPerGas,
+                gasLimits,
+                teardownGasLimits
+            });
             this.log.verbose(`Estimated gas limits for tx: DA=${gasLimits.daGas} L2=${gasLimits.l2Gas} teardownDA=${teardownGasLimits.daGas} teardownL2=${teardownGasLimits.l2Gas}`);
         }
-        return { gasSettings, paymentMethod };
+        return {
+            gasSettings,
+            paymentMethod
+        };
+    }
+    /**
+   * Add data passed to the oracle calls during this contract interaction.
+   * @param capsule - Data passed to oracle calls.
+   */ addCapsule(capsule) {
+        this.capsules.push(capsule);
+    }
+    /**
+   * Add data passed to the oracle calls during this contract interaction.
+   * @param capsules - Data passed to oracle calls.
+   */ addCapsules(capsules) {
+        this.capsules.push(...capsules);
+    }
+    /**
+   * Return all capsules added for this function interaction.
+   */ getCapsules() {
+        return this.capsules;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZV9jb250cmFjdF9pbnRlcmFjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9iYXNlX2NvbnRyYWN0X2ludGVyYWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBVyxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMxRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFLckQsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDckUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMxQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBaUJ0Qzs7O0dBR0c7QUFDSCxNQUFNLE9BQWdCLHVCQUF1QjtJQUczQyxZQUFzQixNQUFjO1FBQWQsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUYxQixRQUFHLEdBQUcsWUFBWSxDQUFDLDhCQUE4QixDQUFDLENBQUM7SUFFdEIsQ0FBQztJQVN4Qzs7Ozs7O09BTUc7SUFDTyxLQUFLLENBQUMsYUFBYSxDQUFDLFVBQTZCLEVBQUU7UUFDM0QsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdDLE1BQU0sa0JBQWtCLEdBQUcsTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxPQUFPLENBQUMsb0JBQW9CLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ25ILE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsa0JBQWtCLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUN6RixDQUFDO0lBRUQsbUJBQW1CO0lBQ25COzs7O09BSUc7SUFD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

package/dest/contract/batch_call.d.ts

@@ -1,5 +1,6 @@
-import { type FunctionCall, type TxExecutionRequest } from '@aztec/circuit-types';
-import { type Wallet } from '../account/index.js';
+import { type FunctionCall } from '@aztec/stdlib/abi';
+import type { TxExecutionRequest } from '@aztec/stdlib/tx';
+import type { Wallet } from '../account/index.js';
 import { BaseContractInteraction, type SendMethodOptions } from './base_contract_interaction.js';
 import type { SimulateMethodOptions } from './contract_function_interaction.js';
 /** A batch of function calls to be sent as a single transaction through a wallet. */

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

@@ -1 +1 @@
-{"version":3,"file":"batch_call.d.ts","sourceRoot":"","sources":["../../src/contract/batch_call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAGlF,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEhF,qFAAqF;AACrF,qBAAa,SAAU,SAAQ,uBAAuB;IACxB,SAAS,CAAC,KAAK,EAAE,YAAY,EAAE;gBAA/C,MAAM,EAAE,MAAM,EAAY,KAAK,EAAE,YAAY,EAAE;IAI3D;;;;;OAKG;IACU,MAAM,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAM1E;;;;;;;;OAQG;IACU,QAAQ,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;CA0DzE"}
+{"version":3,"file":"batch_call.d.ts","sourceRoot":"","sources":["../../src/contract/batch_call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAA+B,MAAM,mBAAmB,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,KAAK,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAEhF,qFAAqF;AACrF,qBAAa,SAAU,SAAQ,uBAAuB;IACxB,SAAS,CAAC,KAAK,EAAE,YAAY,EAAE;gBAA/C,MAAM,EAAE,MAAM,EAAY,KAAK,EAAE,YAAY,EAAE;IAI3D;;;;;OAKG;IACU,MAAM,CAAC,IAAI,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAO1E;;;;;;;;OAQG;IACU,QAAQ,CAAC,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;CA2DzE"}

package/dest/contract/batch_call.js

@@ -1,67 +1,91 @@
-import { FunctionType, decodeFromAbi } from '@aztec/foundation/abi';
+import { FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
 import { BaseContractInteraction } from './base_contract_interaction.js';
-/** A batch of function calls to be sent as a single transaction through a wallet. */
-export class BatchCall extends BaseContractInteraction {
-    constructor(wallet, calls) {
-        super(wallet);
-        this.calls = calls;
+/** A batch of function calls to be sent as a single transaction through a wallet. */ export class BatchCall extends BaseContractInteraction {
+    calls;
+    constructor(wallet, calls){
+        super(wallet), this.calls = calls;
     }
     /**
-     * Create a transaction execution request that represents this batch, encoded and authenticated by the
-     * user's wallet, ready to be simulated.
-     * @param opts - An optional object containing additional configuration for the transaction.
-     * @returns A Promise that resolves to a transaction instance.
-     */
-    async create(opts) {
+   * Create a transaction execution request that represents this batch, encoded and authenticated by the
+   * user's wallet, ready to be simulated.
+   * @param opts - An optional object containing additional configuration for the transaction.
+   * @returns A Promise that resolves to a transaction instance.
+   */ async create(opts) {
         const calls = this.calls;
-        const fee = await this.getFeeOptions({ calls, ...opts });
-        return await this.wallet.createTxExecutionRequest({ calls, ...opts, fee });
+        const capsules = this.getCapsules();
+        const fee = await this.getFeeOptions({
+            calls,
+            capsules,
+            ...opts
+        });
+        return await this.wallet.createTxExecutionRequest({
+            calls,
+            capsules,
+            ...opts,
+            fee
+        });
     }
     /**
-     * Simulate a transaction and get its return values
-     * Differs from prove in a few important ways:
-     * 1. It returns the values of the function execution
-     * 2. It supports `unconstrained`, `private` and `public` functions
-     *
-     * @param options - An optional object containing additional configuration for the transaction.
-     * @returns The result of the transaction as returned by the contract function.
-     */
-    async simulate(options = {}) {
-        const { indexedCalls, unconstrained } = this.calls.reduce((acc, current, index) => {
+   * Simulate a transaction and get its return values
+   * Differs from prove in a few important ways:
+   * 1. It returns the values of the function execution
+   * 2. It supports `unconstrained`, `private` and `public` functions
+   *
+   * @param options - An optional object containing additional configuration for the transaction.
+   * @returns The result of the transaction as returned by the contract function.
+   */ async simulate(options = {}) {
+        const { indexedCalls, unconstrained } = this.calls.reduce((acc, current, index)=>{
             if (current.type === FunctionType.UNCONSTRAINED) {
-                acc.unconstrained.push([current, index]);
-            }
-            else {
+                acc.unconstrained.push([
+                    current,
+                    index
+                ]);
+            } else {
                 acc.indexedCalls.push([
                     current,
                     index,
-                    current.type === FunctionType.PRIVATE ? acc.privateIndex++ : acc.publicIndex++,
+                    current.type === FunctionType.PRIVATE ? acc.privateIndex++ : acc.publicIndex++
                 ]);
             }
             return acc;
-        }, { indexedCalls: [], unconstrained: [], publicIndex: 0, privateIndex: 0 });
-        const calls = indexedCalls.map(([call]) => call);
-        const fee = await this.getFeeOptions({ calls, ...options });
-        const txRequest = await this.wallet.createTxExecutionRequest({ calls, ...options, fee });
-        const unconstrainedCalls = unconstrained.map(async ([call, index]) => [await this.wallet.simulateUnconstrained(call.name, call.args, call.to, options?.from), index]);
+        }, {
+            indexedCalls: [],
+            unconstrained: [],
+            publicIndex: 0,
+            privateIndex: 0
+        });
+        const calls = indexedCalls.map(([call])=>call);
+        const capsules = this.getCapsules();
+        const fee = await this.getFeeOptions({
+            calls,
+            capsules,
+            ...options
+        });
+        const txRequest = await this.wallet.createTxExecutionRequest({
+            calls,
+            capsules,
+            ...options,
+            fee
+        });
+        const unconstrainedCalls = unconstrained.map(async ([call, index])=>[
+                await this.wallet.simulateUnconstrained(call.name, call.args, call.to, options?.from),
+                index
+            ]);
         const [unconstrainedResults, simulatedTx] = await Promise.all([
             Promise.all(unconstrainedCalls),
-            this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation),
+            this.wallet.simulateTx(txRequest, true, options?.from, options?.skipTxValidation)
         ]);
         const results = [];
-        unconstrainedResults.forEach(([result, index]) => {
+        unconstrainedResults.forEach(([result, index])=>{
             results[index] = result;
         });
-        indexedCalls.forEach(([call, callIndex, resultIndex]) => {
+        indexedCalls.forEach(([call, callIndex, resultIndex])=>{
             // As account entrypoints are private, for private functions we retrieve the return values from the first nested call
             // since we're interested in the first set of values AFTER the account entrypoint
             // For public functions we retrieve the first values directly from the public output.
-            const rawReturnValues = call.type == FunctionType.PRIVATE
-                ? simulatedTx.getPrivateReturnValues()?.nested?.[resultIndex].values
-                : simulatedTx.getPublicReturnValues()?.[resultIndex].values;
+            const rawReturnValues = call.type == FunctionType.PRIVATE ? simulatedTx.getPrivateReturnValues()?.nested?.[resultIndex].values : simulatedTx.getPublicReturnValues()?.[resultIndex].values;
             results[callIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
         });
         return results;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmF0Y2hfY2FsbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9iYXRjaF9jYWxsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHcEUsT0FBTyxFQUFFLHVCQUF1QixFQUEwQixNQUFNLGdDQUFnQyxDQUFDO0FBR2pHLHFGQUFxRjtBQUNyRixNQUFNLE9BQU8sU0FBVSxTQUFRLHVCQUF1QjtJQUNwRCxZQUFZLE1BQWMsRUFBWSxLQUFxQjtRQUN6RCxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7UUFEc0IsVUFBSyxHQUFMLEtBQUssQ0FBZ0I7SUFFM0QsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0ksS0FBSyxDQUFDLE1BQU0sQ0FBQyxJQUF3QjtRQUMxQyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBQ3pCLE1BQU0sR0FBRyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLElBQUksRUFBRSxDQUFDLENBQUM7UUFDekQsT0FBTyxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsd0JBQXdCLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQztJQUM3RSxDQUFDO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSSxLQUFLLENBQUMsUUFBUSxDQUFDLFVBQWlDLEVBQUU7UUFDdkQsTUFBTSxFQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FVdkQsQ0FBQyxHQUFHLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxFQUFFO1lBQ3RCLElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxZQUFZLENBQUMsYUFBYSxFQUFFLENBQUM7Z0JBQ2hELEdBQUcsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFD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

package/dest/contract/checker.d.ts

@@ -1,4 +1,4 @@
-import { type ContractArtifact } from '@aztec/foundation/abi';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
 /**
  * Validates the given ContractArtifact object by checking its functions and their parameters.
  * Ensures that the ABI has at least one function, a constructor, valid bytecode, and correct parameter types.

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

@@ -1 +1 @@
-{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../src/contract/checker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,gBAAgB,EAAmB,MAAM,uBAAuB,CAAC;AAQ7G;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,gBAAgB,WA8BpD"}
+{"version":3,"file":"checker.d.ts","sourceRoot":"","sources":["../../src/contract/checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAsB,gBAAgB,EAAc,MAAM,mBAAmB,CAAC;AAQ1F;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,gBAAgB,WA8BpD"}

package/dest/contract/checker.js

@@ -5,12 +5,11 @@
  *
  * @param artifact - The ContractArtifact object to be validated.
  * @returns A boolean value indicating whether the artifact is valid or not.
- */
-export function abiChecker(artifact) {
+ */ export function abiChecker(artifact) {
     if (!artifact.functions || artifact.functions.length === 0) {
         throw new Error('artifact has no functions');
     }
-    artifact.functions.forEach(func => {
+    artifact.functions.forEach((func)=>{
         if (!('name' in func && typeof func.name === 'string' && func.name.length > 0)) {
             throw new Error('ABI function has no name');
         }
@@ -18,7 +17,7 @@ export function abiChecker(artifact) {
         if (!('bytecode' in func && func.bytecode.length > 0)) {
             throw new Error('ABI function parameter has incorrect bytecode');
         }
-        func.parameters.forEach(param => {
+        func.parameters.forEach((param)=>{
             if (!param.type) {
                 throw new Error('ABI function parameter has no type');
             }
@@ -26,7 +25,7 @@ export function abiChecker(artifact) {
         });
     });
     // TODO: implement a better check for constructor (right now only checks if it has it or not)
-    if (!artifact.functions.find(func => func.name === 'constructor')) {
+    if (!artifact.functions.find((func)=>func.name === 'constructor')) {
         throw new Error('ABI has no constructor');
     }
     return true;
@@ -38,20 +37,30 @@ export function abiChecker(artifact) {
  *
  * @param type - The AbiType object representing the type of the ABI function parameter.
  * @returns A boolean value indicating whether the type is valid or not.
- */
-function abiParameterTypeChecker(type) {
-    switch (type.kind) {
+ */ function abiParameterTypeChecker(type) {
+    switch(type.kind){
         case 'field':
         case 'boolean':
             return checkAttributes(type, {});
         case 'integer':
-            return checkAttributes(type, { sign: 'string', width: 'number' });
+            return checkAttributes(type, {
+                sign: 'string',
+                width: 'number'
+            });
         case 'string':
-            return checkAttributes(type, { length: 'number' });
+            return checkAttributes(type, {
+                length: 'number'
+            });
         case 'array':
-            return checkAttributes(type, { length: 'number', type: 'object' }) && abiParameterTypeChecker(type.type);
+            return checkAttributes(type, {
+                length: 'number',
+                type: 'object'
+            }) && abiParameterTypeChecker(type.type);
         case 'struct':
-            return checkAttributes(type, { fields: 'object', path: 'string' }) && checkStruct(type);
+            return checkAttributes(type, {
+                fields: 'object',
+                path: 'string'
+            }) && checkStruct(type);
         default:
             throw new Error('ABI function parameter has an unrecognized type');
     }
@@ -63,9 +72,8 @@ function abiParameterTypeChecker(type) {
  *
  * @param type - The StructType object containing an array of fields to validate.
  * @returns A boolean value indicating successful validation of the struct's fields.
- */
-function checkStruct(type) {
-    return type.fields.reduce((acc, field) => {
+ */ function checkStruct(type) {
+    return type.fields.reduce((acc, field)=>{
         if (!('name' in field && typeof field.name === 'string')) {
             throw new Error('ABI function parameter has an incorrectly formed struct');
         }
@@ -81,18 +89,19 @@ function checkStruct(type) {
  * @param type - The ABI type object to be checked for correct attributes.
  * @param incompleteAttributes - An object representing the expected attribute types without the 'kind' property.
  * @returns Returns true if the provided ABI type has the correct attributes and their associated types, otherwise throws an error.
- */
-function checkAttributes(type, incompleteAttributes) {
+ */ function checkAttributes(type, incompleteAttributes) {
     const typeKeys = Object.keys(type);
-    const attributes = { ...incompleteAttributes, kind: 'string' };
+    const attributes = {
+        ...incompleteAttributes,
+        kind: 'string'
+    };
     if (typeKeys.length !== Object.keys(attributes).length) {
         throw new Error(`Unrecognized attribute on type ${type.kind}`);
     }
-    typeKeys.forEach(element => {
+    typeKeys.forEach((element)=>{
         if (!(element in type && typeof type[element] === attributes[element])) {
             throw new Error(`ABI function parameter has an incorrectly formed ${type.kind}`);
         }
     });
     return true;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2tlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jaGVja2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLFVBQVUsVUFBVSxDQUFDLFFBQTBCO0lBQ25ELElBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxJQUFJLFFBQVEsQ0FBQyxTQUFTLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQzNELE1BQU0sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBRUQsUUFBUSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUU7UUFDaEMsSUFBSSxDQUFDLENBQUMsTUFBTSxJQUFJLElBQUksSUFBSSxPQUFPLElBQUksQ0FBQyxJQUFJLEtBQUssUUFBUSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDL0UsTUFBTSxJQUFJLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO1FBQzlDLENBQUM7UUFFRCxrRkFBa0Y7UUFDbEYsSUFBSSxDQUFDLENBQUMsVUFBVSxJQUFJLElBQUksSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ3RELE1BQU0sSUFBSSxLQUFLLENBQUMsK0NBQStDLENBQUMsQ0FBQztRQUNuRSxDQUFDO1FBRUQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDOUIsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxvQ0FBb0MsQ0FBQyxDQUFDO1lBQ3hELENBQUM7WUFFRCx1QkFBdUIsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEMsQ0FBQyxDQUFDLENBQUM7SUFDTCxD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

package/dest/contract/contract.d.ts

@@ -1,7 +1,7 @@
-import { PublicKeys } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
-import { type Wallet } from '../account/index.js';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { PublicKeys } from '@aztec/stdlib/keys';
+import type { Wallet } from '../account/index.js';
 import { ContractBase } from './contract_base.js';
 import { DeployMethod } from './deploy_method.js';
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/contract/contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACxC;;;;;;OAMG;WACiB,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAQ5G;;;;;;OAMG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM;IAKtG;;;;;;;OAOG;WACW,oBAAoB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,CAAC,EAAE,MAAM;CAK3B"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/contract/contract.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;GAMG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACxC;;;;;;OAMG;WACiB,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAc5G;;;;;;OAMG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM;IAKtG;;;;;;;OAOG;WACW,oBAAoB,CAChC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,GAAG,EAAE,EACX,eAAe,CAAC,EAAE,MAAM;CAK3B"}

package/dest/contract/contract.js

@@ -1,4 +1,5 @@
-import { PublicKeys } from '@aztec/circuits.js';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+import { PublicKeys } from '@aztec/stdlib/keys';
 import { ContractBase } from './contract_base.js';
 import { DeployMethod } from './deploy_method.js';
 /**
@@ -7,44 +8,45 @@ import { DeployMethod } from './deploy_method.js';
  * allowing users to call or send transactions to these functions. Additionally, the Contract class can be used
  * to attach the contract instance to a deployed contract on-chain through the PXE, which facilitates
  * interaction with Aztec's privacy protocol.
- */
-export class Contract extends ContractBase {
+ */ export class Contract extends ContractBase {
     /**
-     * Creates a contract instance.
-     * @param address - The deployed contract's address.
-     * @param artifact - Build artifact of the contract.
-     * @param wallet - The wallet to use when interacting with the contract.
-     * @returns A promise that resolves to a new Contract instance.
-     */
-    static async at(address, artifact, wallet) {
+   * Creates a contract instance.
+   * @param address - The deployed contract's address.
+   * @param artifact - Build artifact of the contract.
+   * @param wallet - The wallet to use when interacting with the contract.
+   * @returns A promise that resolves to a new Contract instance.
+   */ static async at(address, artifact, wallet) {
         const instance = (await wallet.getContractMetadata(address)).contractInstance;
         if (instance === undefined) {
             throw new Error(`Contract instance at ${address.toString()} has not been registered in the wallet's PXE`);
         }
+        const thisContractClass = await getContractClassFromArtifact(artifact);
+        if (!thisContractClass.id.equals(instance.currentContractClassId)) {
+            // wallet holds an outdated version of this contract
+            await wallet.updateContract(address, artifact);
+            instance.currentContractClassId = thisContractClass.id;
+        }
         return new Contract(instance, artifact, wallet);
     }
     /**
-     * Creates a tx to deploy a new instance of a contract.
-     * @param wallet - The wallet for executing the deployment.
-     * @param artifact - Build artifact of the contract to deploy
-     * @param args - Arguments for the constructor.
-     * @param constructorName - The name of the constructor function to call.
-     */
-    static deploy(wallet, artifact, args, constructorName) {
-        const postDeployCtor = (address, wallet) => Contract.at(address, artifact, wallet);
+   * Creates a tx to deploy a new instance of a contract.
+   * @param wallet - The wallet for executing the deployment.
+   * @param artifact - Build artifact of the contract to deploy
+   * @param args - Arguments for the constructor.
+   * @param constructorName - The name of the constructor function to call.
+   */ static deploy(wallet, artifact, args, constructorName) {
+        const postDeployCtor = (address, wallet)=>Contract.at(address, artifact, wallet);
         return new DeployMethod(PublicKeys.default(), wallet, artifact, postDeployCtor, args, constructorName);
     }
     /**
-     * Creates a tx to deploy a new instance of a contract using the specified public keys hash to derive the address.
-     * @param publicKeys - Hash of public keys to use for deriving the address.
-     * @param wallet - The wallet for executing the deployment.
-     * @param artifact - Build artifact of the contract.
-     * @param args - Arguments for the constructor.
-     * @param constructorName - The name of the constructor function to call.
-     */
-    static deployWithPublicKeys(publicKeys, wallet, artifact, args, constructorName) {
-        const postDeployCtor = (address, wallet) => Contract.at(address, artifact, wallet);
+   * Creates a tx to deploy a new instance of a contract using the specified public keys hash to derive the address.
+   * @param publicKeys - Hash of public keys to use for deriving the address.
+   * @param wallet - The wallet for executing the deployment.
+   * @param artifact - Build artifact of the contract.
+   * @param args - Arguments for the constructor.
+   * @param constructorName - The name of the constructor function to call.
+   */ static deployWithPublicKeys(publicKeys, wallet, artifact, args, constructorName) {
+        const postDeployCtor = (address, wallet)=>Contract.at(address, artifact, wallet);
         return new DeployMethod(publicKeys, wallet, artifact, postDeployCtor, args, constructorName);
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBS2hELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFbEQ7Ozs7OztHQU1HO0FBQ0gsTUFBTSxPQUFPLFFBQVMsU0FBUSxZQUFZO0lBQ3hDOzs7Ozs7T0FNRztJQUNJLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLE9BQXFCLEVBQUUsUUFBMEIsRUFBRSxNQUFjO1FBQ3RGLE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSxNQUFNLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQztRQUM5RSxJQUFJLFFBQVEsS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixPQUFPLENBQUMsUUFBUSxFQUFFLDhDQUE4QyxDQUFDLENBQUM7UUFDNUcsQ0FBQztRQUNELE9BQU8sSUFBSSxRQUFRLENBQUMsUUFBUSxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0ksTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFjLEVBQUUsUUFBMEIsRUFBRSxJQUFXLEVBQUUsZUFBd0I7UUFDcEcsTUFBTSxjQUFjLEdBQUcsQ0FBQyxPQUFxQixFQUFFLE1BQWMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ3pHLE9BQU8sSUFBSSxZQUFZLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsY0FBYyxFQUFFLElBQUksRUFBRSxlQUFlLENBQUMsQ0FBQztJQUN6RyxDQUFDO0lBRUQ7Ozs7Ozs7T0FPRztJQUNJLE1BQU0sQ0FBQyxvQkFBb0IsQ0FDaEMsVUFBc0IsRUFDdEIsTUFBYyxFQUNkLFFBQTBCLEVBQzFCLElBQVcsRUFDWCxlQUF3QjtRQUV4QixNQUFNLGNBQWMsR0FBRyxDQUFDLE9BQXFCLEVBQUUsTUFBYyxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDekcsT0FBTyxJQUFJLFlBQVksQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxjQUFjLEVBQUUsSUFBSSxFQUFFLGVBQWUsQ0FBQyxDQUFDO0lBQy9GLENBQUM7Q0FDRiJ9

package/dest/contract/contract_base.d.ts

@@ -1,6 +1,6 @@
-import { type ContractInstanceWithAddress } from '@aztec/circuits.js';
-import { type ContractArtifact, type ContractNote, type FieldLayout, FunctionSelector } from '@aztec/foundation/abi';
-import { type Wallet } from '../account/index.js';
+import { type ContractArtifact, type ContractNote, type FieldLayout, FunctionSelector } from '@aztec/stdlib/abi';
+import { type ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import type { Wallet } from '../account/index.js';
 import { ContractFunctionInteraction } from './contract_function_interaction.js';
 /**
  * Type representing a contract method that returns a ContractFunctionInteraction instance
@@ -48,9 +48,9 @@ export declare class ContractBase {
     /** The wallet used for interacting with this contract. */
     wallet: Wallet);
     /** Address of the contract. */
-    get address(): import("@aztec/circuits.js").AztecAddress;
+    get address(): import("@aztec/stdlib/aztec-address").AztecAddress;
     /** Partial address of the contract. */
-    get partialAddress(): Promise<import("@aztec/circuits.js").Fr>;
+    get partialAddress(): Promise<import("@aztec/foundation/schemas").Fr>;
     /**
      * Creates a new instance of the contract wrapper attached to a different wallet.
      * @param wallet - Wallet to use for sending txs.