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

package/dest/api/node.d.ts

@@ -0,0 +1,21 @@
+/**
+ * The `node` module provides utilities for connecting to and interacting with an Aztec node.
+ *
+ * The primary function is {@link createAztecNodeClient}, which creates a JSON-RPC client
+ * that connects to a running Aztec node instance. Use {@link waitForNode} to wait for
+ * the node to be ready before proceeding.
+ *
+ * @example
+ * ```ts
+ * import { createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
+ *
+ * const node = createAztecNodeClient('http://localhost:8080');
+ * await waitForNode(node);
+ * const blockNumber = await node.getBlockNumber();
+ * ```
+ *
+ * @packageDocumentation
+ */
+export { createAztecNodeClient, waitForNode, type AztecNode } from '../utils/node.js';
+export { type NodeInfo } from '@aztec/stdlib/contract';
+//# sourceMappingURL=node.d.ts.map

package/dest/api/node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/api/node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,wBAAwB,CAAC"}

package/dest/api/node.js

@@ -0,0 +1,18 @@
+/**
+ * The `node` module provides utilities for connecting to and interacting with an Aztec node.
+ *
+ * The primary function is {@link createAztecNodeClient}, which creates a JSON-RPC client
+ * that connects to a running Aztec node instance. Use {@link waitForNode} to wait for
+ * the node to be ready before proceeding.
+ *
+ * @example
+ * ```ts
+ * import { createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
+ *
+ * const node = createAztecNodeClient('http://localhost:8080');
+ * await waitForNode(node);
+ * const blockNumber = await node.getBlockNumber();
+ * ```
+ *
+ * @packageDocumentation
+ */ export { createAztecNodeClient, waitForNode } from '../utils/node.js';

package/dest/api/note.d.ts

@@ -0,0 +1,2 @@
+export { UniqueNote, Comparator, Note } from '@aztec/stdlib/note';
+//# sourceMappingURL=note.d.ts.map

package/dest/api/note.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"note.d.ts","sourceRoot":"","sources":["../../src/api/note.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/api/note.js

@@ -0,0 +1 @@
+export { UniqueNote, Comparator, Note } from '@aztec/stdlib/note';

package/dest/api/protocol.d.ts

@@ -0,0 +1,3 @@
+export { ProtocolContractAddress } from '@aztec/protocol-contracts';
+export { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
+//# sourceMappingURL=protocol.d.ts.map

package/dest/api/protocol.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/api/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC"}

package/dest/api/protocol.js

@@ -0,0 +1,2 @@
+export { ProtocolContractAddress } from '@aztec/protocol-contracts';
+export { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';

package/dest/api/trees.d.ts

@@ -0,0 +1,3 @@
+export { SiblingPath } from '@aztec/foundation/trees';
+export { MerkleTreeId, merkleTreeIds } from '@aztec/stdlib/trees';
+//# sourceMappingURL=trees.d.ts.map

package/dest/api/trees.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trees.d.ts","sourceRoot":"","sources":["../../src/api/trees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC"}

package/dest/api/trees.js

@@ -0,0 +1,2 @@
+export { SiblingPath } from '@aztec/foundation/trees';
+export { MerkleTreeId, merkleTreeIds } from '@aztec/stdlib/trees';

package/dest/api/tx.d.ts

@@ -0,0 +1,2 @@
+export { Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, Capsule, HashedValues, GlobalVariables, TxProfileResult, } from '@aztec/stdlib/tx';
+//# sourceMappingURL=tx.d.ts.map

package/dest/api/tx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/api/tx.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,kBAAkB,EAClB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,MAAM,kBAAkB,CAAC"}

package/dest/api/tx.js

@@ -0,0 +1 @@
+export { Tx, TxExecutionRequest, TxHash, TxReceipt, TxStatus, Capsule, HashedValues, GlobalVariables, TxProfileResult } from '@aztec/stdlib/tx';

package/dest/api/utils.d.ts

@@ -1,9 +1,13 @@
-export { generatePublicKey } from '../utils/pub_key.js';
-export { type AztecAddressLike, type EthAddressLike, type EventSelectorLike, type FieldLike, type FunctionSelectorLike, type U128Like, type WrappedFieldLike, } from '../utils/abi_types.js';
-export { computeAuthWitMessageHash, computeInnerAuthWitHashFromAction, type IntentAction, type IntentInnerHash, } from '../utils/authwit.js';
-export { computeInnerAuthWitHash } from '@aztec/stdlib/auth-witness';
-export { waitForPXE } from '../utils/pxe.js';
-export { waitForNode, createAztecNodeClient, type AztecNode } from '../utils/node.js';
+/**
+ * Utility functions for aztec.js.
+ *
+ * NOTE: This module contains low-usage utilities and may be deprecated in the future.
+ * Prefer using more specific modules:
+ * - Node connection utilities → `@aztec/aztec.js/node`
+ * - Type converters → `@aztec/aztec.js/abi`
+ * - Key generation → `@aztec/aztec.js/keys`
+ * - Messaging utilities → `@aztec/aztec.js/messaging`
+ */
 export { getFeeJuiceBalance } from '../utils/fee_juice.js';
 export { readFieldCompressedString } from '../utils/field_compressed_string.js';
 //# sourceMappingURL=utils.d.ts.map

package/dest/api/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,oBAAoB,EACzB,KAAK,QAAQ,EACb,KAAK,gBAAgB,GACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,yBAAyB,EACzB,iCAAiC,EACjC,KAAK,YAAY,EACjB,KAAK,eAAe,GACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/api/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC"}

package/dest/api/utils.js

@@ -1,7 +1,12 @@
-export { generatePublicKey } from '../utils/pub_key.js';
-export { computeAuthWitMessageHash, computeInnerAuthWitHashFromAction } from '../utils/authwit.js';
-export { computeInnerAuthWitHash } from '@aztec/stdlib/auth-witness';
-export { waitForPXE } from '../utils/pxe.js';
-export { waitForNode, createAztecNodeClient } from '../utils/node.js';
+/**
+ * Utility functions for aztec.js.
+ *
+ * NOTE: This module contains low-usage utilities and may be deprecated in the future.
+ * Prefer using more specific modules:
+ * - Node connection utilities → `@aztec/aztec.js/node`
+ * - Type converters → `@aztec/aztec.js/abi`
+ * - Key generation → `@aztec/aztec.js/keys`
+ * - Messaging utilities → `@aztec/aztec.js/messaging`
+ */ // Low-usage utilities - consider these internal/experimental
 export { getFeeJuiceBalance } from '../utils/fee_juice.js';
 export { readFieldCompressedString } from '../utils/field_compressed_string.js';

package/dest/api/wallet.d.ts

@@ -1,2 +1,5 @@
-export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet, getWallet, type Wallet, } from '../wallet/index.js';
+export { type Aliased, type ContractInstanceAndArtifact, type UserFeeOptions, type SimulateOptions, type ProfileOptions, type SendOptions, type BatchableMethods, type BatchedMethod, type BatchedMethodResult, type BatchedMethodResultWrapper, type BatchResults, type Wallet, ContractInstantiationDataSchema, FunctionCallSchema, ExecutionPayloadSchema, UserFeeOptionsSchema, WalletSimulationFeeOptionSchema, SendOptionsSchema, SimulateOptionsSchema, ProfileOptionsSchema, InstanceDataSchema, MessageHashOrIntentSchema, BatchedMethodSchema, ContractMetadataSchema, ContractClassMetadataSchema, EventMetadataDefinitionSchema, WalletSchema, } from '../wallet/wallet.js';
+export { type FeeOptions, BaseWallet } from '../wallet/base_wallet.js';
+export { AccountManager } from '../wallet/account_manager.js';
+export { type DeployAccountOptions, DeployAccountMethod } from '../wallet/deploy_account_method.js';
 //# sourceMappingURL=wallet.d.ts.map

package/dest/api/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/api/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,0BAA0B,EAC1B,gBAAgB,EAChB,SAAS,EACT,KAAK,MAAM,GACZ,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../src/api/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,2BAA2B,EAChC,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EACjB,KAAK,MAAM,EACX,+BAA+B,EAC/B,kBAAkB,EAClB,sBAAsB,EACtB,oBAAoB,EACpB,+BAA+B,EAC/B,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,kBAAkB,EAClB,yBAAyB,EACzB,mBAAmB,EACnB,sBAAsB,EACtB,2BAA2B,EAC3B,6BAA6B,EAC7B,YAAY,GACb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,KAAK,UAAU,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,EAAE,KAAK,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC"}

package/dest/api/wallet.js

@@ -1 +1,4 @@
-export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet, getWallet } from '../wallet/index.js';
+export { ContractInstantiationDataSchema, FunctionCallSchema, ExecutionPayloadSchema, UserFeeOptionsSchema, WalletSimulationFeeOptionSchema, SendOptionsSchema, SimulateOptionsSchema, ProfileOptionsSchema, InstanceDataSchema, MessageHashOrIntentSchema, BatchedMethodSchema, ContractMetadataSchema, ContractClassMetadataSchema, EventMetadataDefinitionSchema, WalletSchema } from '../wallet/wallet.js';
+export { BaseWallet } from '../wallet/base_wallet.js';
+export { AccountManager } from '../wallet/account_manager.js';
+export { DeployAccountMethod } from '../wallet/deploy_account_method.js';

package/dest/contract/base_contract_interaction.d.ts

@@ -1,11 +1,8 @@
-import type { FeeOptions, TxExecutionOptions, UserFeeOptions } from '@aztec/entrypoints/interfaces';
 import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
-import { GasSettings } from '@aztec/stdlib/gas';
-import type { Capsule, TxExecutionRequest, TxProvingResult } from '@aztec/stdlib/tx';
+import type { Capsule } from '@aztec/stdlib/tx';
 import type { Wallet } from '../wallet/wallet.js';
-import type { RequestMethodOptions, SendMethodOptions } from './interaction_options.js';
-import { ProvenTx } from './proven_tx.js';
+import { type RequestInteractionOptions, type SendInteractionOptions } from './interaction_options.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.
@@ -17,61 +14,22 @@ export declare abstract class BaseContractInteraction {
     protected capsules: Capsule[];
     protected log: import("@aztec/foundation/log").Logger;
     constructor(wallet: Wallet, authWitnesses?: AuthWitness[], capsules?: Capsule[]);
-    /**
-     * Create a transaction execution request ready to be simulated.
-     * @param options - An optional object containing additional configuration for the transaction.
-     * @returns A transaction execution request.
-     */
-    abstract create(options?: SendMethodOptions): Promise<TxExecutionRequest>;
     /**
      * Returns an execution request that represents this operation.
      * Can be used as a building block for constructing batch requests.
      * @param options - An optional object containing additional configuration for the transaction.
      * @returns An execution request wrapped in promise.
      */
-    abstract request(options?: RequestMethodOptions): Promise<ExecutionPayload>;
-    /**
-     * 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.
-     */
-    protected proveInternal(options: SendMethodOptions): Promise<TxProvingResult>;
-    /**
-     * 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
-     */
-    prove(options: SendMethodOptions): Promise<ProvenTx>;
+    abstract request(options?: RequestInteractionOptions): Promise<ExecutionPayload>;
     /**
      * Sends a transaction to the contract function with the specified options.
      * This function throws an error if called on a utility 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.
+     * @param options - An object containing 'from' property representing
+     * the AztecAddress of the sender and optional fee configuration
      * @returns A SentTx instance for tracking the transaction status and information.
      */
-    send(options: SendMethodOptions): SentTx;
-    /**
-     * Estimates gas for a given tx request and returns gas limits for it.
-     * @param options - Options.
-     * @returns Gas limits.
-     */
-    estimateGas(options: Omit<SendMethodOptions, 'estimateGas'>): Promise<Pick<GasSettings, 'gasLimits' | 'teardownGasLimits'>>;
-    /**
-     * Returns default fee options based on the user opts without running a simulation for gas estimation.
-     * @param fee - User-provided fee options.
-     */
-    protected getDefaultFeeOptions(fee: UserFeeOptions | undefined): Promise<FeeOptions>;
-    /**
-     * Return fee options based on the user opts, estimating tx gas if needed.
-     * @param executionPayload - Execution payload to get the fee for
-     * @param fee - User-provided fee options.
-     * @param options - Additional options for the transaction. They must faithfully represent the tx to get accurate fee estimates
-     * @returns Fee options for the actual transaction.
-     */
-    protected getFeeOptions(executionPayload: ExecutionPayload, fee: UserFeeOptions | undefined, options: TxExecutionOptions): Promise<FeeOptions>;
+    send(options: SendInteractionOptions): SentTx;
 }
 //# sourceMappingURL=base_contract_interaction.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"base_contract_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/base_contract_interaction.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAO,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;GAGG;AACH,8BAAsB,uBAAuB;IAIzC,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,aAAa,EAAE,WAAW,EAAE;IACtC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE;IAL/B,SAAS,CAAC,GAAG,yCAAgD;gBAGjD,MAAM,EAAE,MAAM,EACd,aAAa,GAAE,WAAW,EAAO,EACjC,QAAQ,GAAE,OAAO,EAAO;IAGpC;;;;OAIG;aACa,MAAM,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAEhF;;;;;OAKG;aACa,OAAO,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAElF;;;;;;OAMG;cACa,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC;IAWnF;;;;OAIG;IACU,KAAK,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAYjE;;;;;;;;OAQG;IACI,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM;IAU/C;;;;OAIG;IACU,WAAW,CACtB,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,GAC9C,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,mBAAmB,CAAC,CAAC;IAShE;;;OAGG;cACa,oBAAoB,CAAC,GAAG,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAU1F;;;;;;OAMG;cACa,aAAa,CAC3B,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,EAAE,cAAc,YAAK,EACxB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,UAAU,CAAC;CAkCvB"}
+{"version":3,"file":"base_contract_interaction.d.ts","sourceRoot":"","sources":["../../src/contract/base_contract_interaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,KAAK,yBAAyB,EAAE,KAAK,sBAAsB,EAAiB,MAAM,0BAA0B,CAAC;AACtH,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;;GAGG;AACH,8BAAsB,uBAAuB;IAIzC,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,aAAa,EAAE,WAAW,EAAE;IACtC,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE;IAL/B,SAAS,CAAC,GAAG,yCAAgD;gBAGjD,MAAM,EAAE,MAAM,EACd,aAAa,GAAE,WAAW,EAAO,EACjC,QAAQ,GAAE,OAAO,EAAO;IAGpC;;;;;OAKG;aACa,OAAO,CAAC,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAGvF;;;;;;;;OAQG;IACI,IAAI,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM;CASrD"}

package/dest/contract/base_contract_interaction.js

@@ -1,10 +1,5 @@
-import { GAS_ESTIMATION_DA_GAS_LIMIT, GAS_ESTIMATION_L2_GAS_LIMIT, GAS_ESTIMATION_TEARDOWN_DA_GAS_LIMIT, GAS_ESTIMATION_TEARDOWN_L2_GAS_LIMIT } from '@aztec/constants';
 import { createLogger } from '@aztec/foundation/log';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { Gas, 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 { toSendOptions } from './interaction_options.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.
@@ -20,117 +15,22 @@ import { SentTx } from './sent_tx.js';
         this.capsules = capsules;
         this.log = createLogger('aztecjs:contract_interaction');
     }
-    /**
-   * 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) {
-        if (options.from !== AztecAddress.ZERO && !options.from.equals(this.wallet.getAddress())) {
-            throw new Error(`The address provided as from does not match the wallet address. Expected ${this.wallet.getAddress().toString()}, got ${options.from.toString()}.`);
-        }
-        const txRequest = await this.create(options);
-        return await this.wallet.proveTx(txRequest);
-    }
-    // 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) {
-        // docs:end:prove
-        const txProvingResult = await this.proveInternal(options);
-        return new ProvenTx(this.wallet, await txProvingResult.toTx(), txProvingResult.getOffchainEffects(), txProvingResult.stats);
-    }
     // docs:start:send
     /**
    * Sends a transaction to the contract function with the specified options.
    * This function throws an error if called on a utility 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.
+   * @param options - An object containing 'from' property representing
+   * the AztecAddress of the sender and optional fee configuration
    * @returns A SentTx instance for tracking the transaction status and information.
    */ send(options) {
         // docs:end:send
         const sendTx = async ()=>{
-            const txProvingResult = await this.proveInternal(options);
-            return this.wallet.sendTx(await txProvingResult.toTx());
+            const executionPayload = await this.request(options);
+            const sendOptions = await toSendOptions(options);
+            return this.wallet.sendTx(executionPayload, sendOptions);
         };
         return new SentTx(this.wallet, sendTx);
     }
-    // docs:start:estimateGas
-    /**
-   * Estimates gas for a given tx request and returns gas limits for it.
-   * @param options - Options.
-   * @returns Gas limits.
-   */ async estimateGas(options) {
-        // docs:end:estimateGas
-        const txRequest = await this.create({
-            ...options,
-            fee: {
-                ...options?.fee,
-                estimateGas: true
-            }
-        });
-        return {
-            gasLimits: txRequest.txContext.gasSettings.gasLimits,
-            teardownGasLimits: txRequest.txContext.gasSettings.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) {
-        const maxFeesPerGas = fee?.gasSettings?.maxFeesPerGas ?? (await this.wallet.getCurrentBaseFees()).mul(1 + (fee?.baseFeePadding ?? 0.5));
-        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
-        };
-    }
-    // docs:start:getFeeOptions
-    /**
-   * Return fee options based on the user opts, estimating tx gas if needed.
-   * @param executionPayload - Execution payload to get the fee for
-   * @param fee - User-provided fee options.
-   * @param options - Additional options for the transaction. They must faithfully represent the tx to get accurate fee estimates
-   * @returns Fee options for the actual transaction.
-   */ async getFeeOptions(executionPayload, fee = {}, options) {
-        // docs:end:getFeeOptions
-        const defaultFeeOptions = await this.getDefaultFeeOptions(fee);
-        const paymentMethod = defaultFeeOptions.paymentMethod;
-        const maxFeesPerGas = defaultFeeOptions.gasSettings.maxFeesPerGas;
-        const maxPriorityFeesPerGas = defaultFeeOptions.gasSettings.maxPriorityFeesPerGas;
-        let gasSettings = defaultFeeOptions.gasSettings;
-        if (fee?.estimateGas) {
-            // Use unrealistically high gas limits for estimation to avoid running out of gas.
-            // They will be tuned down after the simulation.
-            const gasSettingsForEstimation = new GasSettings(new Gas(GAS_ESTIMATION_DA_GAS_LIMIT, GAS_ESTIMATION_L2_GAS_LIMIT), new Gas(GAS_ESTIMATION_TEARDOWN_DA_GAS_LIMIT, GAS_ESTIMATION_TEARDOWN_L2_GAS_LIMIT), maxFeesPerGas, maxPriorityFeesPerGas);
-            const feeForEstimation = {
-                paymentMethod,
-                gasSettings: gasSettingsForEstimation
-            };
-            const txRequest = await this.wallet.createTxExecutionRequest(executionPayload, feeForEstimation, options);
-            const simulationResult = await this.wallet.simulateTx(txRequest, true, undefined /* skipTxValidation */ , true);
-            const { gasLimits, teardownGasLimits } = getGasLimits(simulationResult, fee?.estimatedGasPadding);
-            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
-        };
-    }
 }

package/dest/contract/batch_call.d.ts

@@ -1,25 +1,17 @@
 import { ExecutionPayload } from '@aztec/entrypoints/payload';
-import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 import type { Wallet } from '../wallet/wallet.js';
 import { BaseContractInteraction } from './base_contract_interaction.js';
-import type { RequestMethodOptions, SendMethodOptions, SimulateMethodOptions } from './interaction_options.js';
+import { type RequestInteractionOptions, type SimulateInteractionOptions } from './interaction_options.js';
 /** A batch of function calls to be sent as a single transaction through a wallet. */
 export declare class BatchCall extends BaseContractInteraction {
-    protected calls: BaseContractInteraction[];
-    constructor(wallet: Wallet, calls: BaseContractInteraction[]);
-    /**
-     * Create a transaction execution request that represents this batch, encoded and authenticated by the
-     * user's wallet, ready to be simulated.
-     * @param options - An optional object containing additional configuration for the transaction.
-     * @returns A Promise that resolves to a transaction instance.
-     */
-    create(options?: SendMethodOptions): Promise<TxExecutionRequest>;
+    protected interactions: (BaseContractInteraction | ExecutionPayload)[];
+    constructor(wallet: Wallet, interactions: (BaseContractInteraction | ExecutionPayload)[]);
     /**
      * Returns an execution request that represents this operation.
      * @param options - An optional object containing additional configuration for the request generation.
      * @returns An execution payload wrapped in promise.
      */
-    request(options?: RequestMethodOptions): Promise<ExecutionPayload>;
+    request(options?: RequestInteractionOptions): Promise<ExecutionPayload>;
     /**
      * Simulate a transaction and get its return values
      * Differs from prove in a few important ways:
@@ -29,7 +21,7 @@ export declare class BatchCall extends BaseContractInteraction {
      * @param options - An optional object containing additional configuration for the transaction.
      * @returns The result of the transaction as returned by the contract function.
      */
-    simulate(options: SimulateMethodOptions): Promise<any>;
-    private getRequests;
+    simulate(options: SimulateInteractionOptions): Promise<any>;
+    protected getExecutionPayloads(): Promise<ExecutionPayload[]>;
 }
 //# sourceMappingURL=batch_call.d.ts.map

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,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AAEtF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAE/G,qFAAqF;AACrF,qBAAa,SAAU,SAAQ,uBAAuB;IAGlD,SAAS,CAAC,KAAK,EAAE,uBAAuB,EAAE;gBAD1C,MAAM,EAAE,MAAM,EACJ,KAAK,EAAE,uBAAuB,EAAE;IAK5C;;;;;OAKG;IACU,MAAM,CAAC,OAAO,GAAE,iBAAsD,GAAG,OAAO,CAAC,kBAAkB,CAAC;IASjH;;;;OAIG;IACU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWnF;;;;;;;;OAQG;IACU,QAAQ,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC;YA2ErD,WAAW;CAG1B"}
+{"version":3,"file":"batch_call.d.ts","sourceRoot":"","sources":["../../src/contract/batch_call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AAGtF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAEhC,MAAM,0BAA0B,CAAC;AAElC,qFAAqF;AACrF,qBAAa,SAAU,SAAQ,uBAAuB;IAGlD,SAAS,CAAC,YAAY,EAAE,CAAC,uBAAuB,GAAG,gBAAgB,CAAC,EAAE;gBADtE,MAAM,EAAE,MAAM,EACJ,YAAY,EAAE,CAAC,uBAAuB,GAAG,gBAAgB,CAAC,EAAE;IAKxE;;;;OAIG;IACU,OAAO,CAAC,OAAO,GAAE,yBAA8B,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWxF;;;;;;;;OAQG;IACU,QAAQ,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,GAAG,CAAC;cA8ExD,oBAAoB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAGpE"}

package/dest/contract/batch_call.js

@@ -1,38 +1,26 @@
 import { ExecutionPayload, mergeExecutionPayloads } from '@aztec/entrypoints/payload';
 import { FunctionType, decodeFromAbi } from '@aztec/stdlib/abi';
 import { BaseContractInteraction } from './base_contract_interaction.js';
+import { toSimulateOptions } from './interaction_options.js';
 /** 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 options - An optional object containing additional configuration for the transaction.
-   * @returns A Promise that resolves to a transaction instance.
-   */ async create(options = {
-        from: this.wallet.getAddress()
-    }) {
-        const requestWithoutFee = await this.request(options);
-        const { fee: userFee, txNonce, cancellable } = options;
-        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {
-            txNonce,
-            cancellable
-        });
-        return await this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
-            txNonce,
-            cancellable
-        });
+    interactions;
+    constructor(wallet, interactions){
+        super(wallet), this.interactions = interactions;
     }
     /**
    * Returns an execution request that represents this operation.
    * @param options - An optional object containing additional configuration for the request generation.
    * @returns An execution payload wrapped in promise.
    */ async request(options = {}) {
-        const requests = await this.getRequests();
-        const combinedPayload = mergeExecutionPayloads(requests);
-        return new ExecutionPayload(combinedPayload.calls, combinedPayload.authWitnesses.concat(options.authWitnesses ?? []), combinedPayload.capsules.concat(options.capsules ?? []), combinedPayload.extraHashedArgs);
+        const requests = await this.getExecutionPayloads();
+        const feeExecutionPayload = options.fee?.paymentMethod ? await options.fee.paymentMethod.getExecutionPayload() : undefined;
+        const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
+            feeExecutionPayload,
+            ...requests
+        ]) : mergeExecutionPayloads([
+            ...requests
+        ]);
+        return finalExecutionPayload;
     }
     /**
    * Simulate a transaction and get its return values
@@ -43,7 +31,7 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
    * @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 { indexedExecutionPayloads, utility } = (await this.getRequests()).reduce((acc, current, index)=>{
+        const { indexedExecutionPayloads, utility } = (await this.getExecutionPayloads()).reduce((acc, current, index)=>{
             const call = current.calls[0];
             if (call.type === FunctionType.UTILITY) {
                 acc.utility.push([
@@ -66,36 +54,38 @@ import { BaseContractInteraction } from './base_contract_interaction.js';
         });
         const payloads = indexedExecutionPayloads.map(([request])=>request);
         const combinedPayload = mergeExecutionPayloads(payloads);
-        const requestWithoutFee = new ExecutionPayload(combinedPayload.calls, combinedPayload.authWitnesses.concat(options.authWitnesses ?? []), combinedPayload.capsules.concat(options.capsules ?? []), combinedPayload.extraHashedArgs);
-        const { fee: userFee, txNonce, cancellable } = options;
-        const fee = await this.getFeeOptions(requestWithoutFee, userFee, {});
-        const txRequest = await this.wallet.createTxExecutionRequest(requestWithoutFee, fee, {
-            txNonce,
-            cancellable
-        });
-        const utilityCalls = utility.map(async ([call, index])=>[
-                await this.wallet.simulateUtility(call.name, call.args, call.to, options?.authWitnesses, options?.from),
-                index
-            ]);
-        const [utilityResults, simulatedTx] = await Promise.all([
-            Promise.all(utilityCalls),
-            this.wallet.simulateTx(txRequest, true, options?.skipTxValidation, false)
+        const executionPayload = new ExecutionPayload(combinedPayload.calls, combinedPayload.authWitnesses.concat(options.authWitnesses ?? []), combinedPayload.capsules.concat(options.capsules ?? []), combinedPayload.extraHashedArgs);
+        const utilityBatchPromise = utility.length > 0 ? this.wallet.batch(utility.map(([call])=>({
+                name: 'simulateUtility',
+                args: [
+                    call.name,
+                    call.args,
+                    call.to,
+                    options?.authWitnesses
+                ]
+            }))) : Promise.resolve([]);
+        const [utilityBatchResults, simulatedTx] = await Promise.all([
+            utilityBatchPromise,
+            indexedExecutionPayloads.length > 0 ? this.wallet.simulateTx(executionPayload, await toSimulateOptions(options)) : Promise.resolve()
         ]);
         const results = [];
-        utilityResults.forEach(([{ result }, index])=>{
-            results[index] = result;
-        });
-        indexedExecutionPayloads.forEach(([request, callIndex, resultIndex])=>{
-            const call = request.calls[0];
-            // 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;
-            results[callIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
+        utilityBatchResults.forEach((wrappedResult, utilityIndex)=>{
+            const [, originalIndex] = utility[utilityIndex];
+            results[originalIndex] = wrappedResult.result.result;
         });
+        if (simulatedTx) {
+            indexedExecutionPayloads.forEach(([request, callIndex, resultIndex])=>{
+                const call = request.calls[0];
+                // 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;
+                results[callIndex] = rawReturnValues ? decodeFromAbi(call.returnTypes, rawReturnValues) : [];
+            });
+        }
         return results;
     }
-    async getRequests() {
-        return await Promise.all(this.calls.map((c)=>c.request()));
+    async getExecutionPayloads() {
+        return await Promise.all(this.interactions.map((i)=>i instanceof ExecutionPayload ? i : i.request()));
     }
 }

package/dest/contract/contract.d.ts

@@ -8,7 +8,7 @@ import { DeployMethod } from './deploy_method.js';
  * The Contract class represents a contract and provides utility methods for interacting with it.
  * It enables the creation of ContractFunctionInteraction instances for each function in the contract's ABI,
  * 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
+ * to attach the contract instance to a deployed contract onchain through the PXE, which facilitates
  * interaction with Aztec's privacy protocol.
  */
 export declare class Contract extends ContractBase {

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,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;;;;;;;;OAQG;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;AAChE,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;IAK5G;;;;;;OAMG;WACW,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,EAAE,MAAM;IAKtG;;;;;;;;OAQG;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,3 @@
-import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { ContractBase } from './contract_base.js';
 import { DeployMethod } from './deploy_method.js';
@@ -6,7 +5,7 @@ import { DeployMethod } from './deploy_method.js';
  * The Contract class represents a contract and provides utility methods for interacting with it.
  * It enables the creation of ContractFunctionInteraction instances for each function in the contract's ABI,
  * 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
+ * to attach the contract instance to a deployed contract onchain through the PXE, which facilitates
  * interaction with Aztec's privacy protocol.
  */ export class Contract extends ContractBase {
     /**
@@ -16,16 +15,7 @@ import { DeployMethod } from './deploy_method.js';
    * @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;
-        }
+        const instance = await wallet.registerContract(address, artifact);
         return new Contract(instance, artifact, wallet);
     }
     /**