@fuel-ts/account 0.92.1 → 0.93.0

package/dist/test-utils.js

@@ -2758,7 +2758,10 @@ var transactionRequestify = (obj) => {
       return CreateTransactionRequest.from(obj);
     }
     default: {
-      throw new import_errors9.FuelError(import_errors9.ErrorCode.INVALID_TRANSACTION_TYPE, `Invalid transaction type: ${type}.`);
+      throw new import_errors9.FuelError(
+        import_errors9.ErrorCode.UNSUPPORTED_TRANSACTION_TYPE,
+        `Unsupported transaction type: ${type}.`
+      );
     }
   }
 };
@@ -2971,8 +2974,8 @@ function getTransactionTypeName(transactionType) {
       return "Script" /* Script */;
     default:
       throw new import_errors11.FuelError(
-        import_errors11.ErrorCode.INVALID_TRANSACTION_TYPE,
-        `Invalid transaction type: ${transactionType}.`
+        import_errors11.ErrorCode.UNSUPPORTED_TRANSACTION_TYPE,
+        `Unsupported transaction type: ${transactionType}.`
       );
   }
 }
@@ -3720,24 +3723,11 @@ function autoRetryFetch(fetchFn, options, retryAttemptNum = 0) {
   };
 }
 
-// src/providers/utils/merge-quantities.ts
-var mergeQuantities = (...coinQuantities) => {
-  const resultMap = {};
-  function addToMap({ amount, assetId }) {
-    if (resultMap[assetId]) {
-      resultMap[assetId] = resultMap[assetId].add(amount);
-    } else {
-      resultMap[assetId] = amount;
-    }
-  }
-  coinQuantities.forEach((arr) => arr.forEach(addToMap));
-  return Object.entries(resultMap).map(([assetId, amount]) => ({ assetId, amount }));
-};
-
 // src/providers/provider.ts
 var MAX_RETRIES = 10;
 var RESOURCES_PAGE_SIZE_LIMIT = 512;
 var BLOCKS_PAGE_SIZE_LIMIT = 5;
+var DEFAULT_UTXOS_CACHE_TTL = 2e4;
 var processGqlChain = (chain) => {
   const { name, daHeight, consensusParameters, latestBlock } = chain;
   const {
@@ -3827,7 +3817,16 @@ var _Provider = class {
     this.options = { ...this.options, ...options };
     this.url = url;
     this.operations = this.createOperations();
-    this.cache = options.cacheUtxo ? new MemoryCache(options.cacheUtxo) : void 0;
+    const { cacheUtxo } = this.options;
+    if ((0, import_utils23.isDefined)(cacheUtxo)) {
+      if (cacheUtxo !== -1) {
+        this.cache = new MemoryCache(cacheUtxo);
+      } else {
+        this.cache = void 0;
+      }
+    } else {
+      this.cache = new MemoryCache(DEFAULT_UTXOS_CACHE_TTL);
+    }
   }
   /** @hidden */
   static clearChainAndNodeCaches() {
@@ -4069,9 +4068,8 @@ Supported fuel-core version: ${supportedVersion}.`
    * @returns A promise that resolves to the transaction response object.
    */
   // #region Provider-sendTransaction
-  async sendTransaction(transactionRequestLike, { estimateTxDependencies = true, awaitExecution = false } = {}) {
+  async sendTransaction(transactionRequestLike, { estimateTxDependencies = true } = {}) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
-    __privateMethod(this, _cacheInputs, cacheInputs_fn).call(this, transactionRequest.inputs);
     if (estimateTxDependencies) {
       await this.estimateTxDependencies(transactionRequest);
     }
@@ -4080,27 +4078,10 @@ Supported fuel-core version: ${supportedVersion}.`
     if (transactionRequest.type === import_transactions20.TransactionType.Script) {
       abis = transactionRequest.abis;
     }
-    if (awaitExecution) {
-      const subscription = this.operations.submitAndAwait({ encodedTransaction });
-      for await (const { submitAndAwait } of subscription) {
-        if (submitAndAwait.type === "SqueezedOutStatus") {
-          throw new import_errors14.FuelError(
-            import_errors14.ErrorCode.TRANSACTION_SQUEEZED_OUT,
-            `Transaction Squeezed Out with reason: ${submitAndAwait.reason}`
-          );
-        }
-        if (submitAndAwait.type !== "SubmittedStatus") {
-          break;
-        }
-      }
-      const transactionId2 = transactionRequest.getTransactionId(this.getChainId());
-      const response = new TransactionResponse(transactionId2, this, abis);
-      await response.fetch();
-      return response;
-    }
     const {
       submit: { id: transactionId }
     } = await this.operations.submit({ encodedTransaction });
+    __privateMethod(this, _cacheInputs, cacheInputs_fn).call(this, transactionRequest.inputs);
     return new TransactionResponse(transactionId, this, abis);
   }
   /**
@@ -4379,6 +4360,8 @@ Supported fuel-core version: ${supportedVersion}.`
     return { receipts: callResult[0].receipts };
   }
   /**
+   * @hidden
+   *
    * Returns a transaction cost to enable user
    * to set gasLimit and also reserve balance amounts
    * on the transaction.
@@ -4388,20 +4371,13 @@ Supported fuel-core version: ${supportedVersion}.`
    *
    * @returns A promise that resolves to the transaction cost object.
    */
-  async getTransactionCost(transactionRequestLike, { resourcesOwner, signatureCallback, quantitiesToContract = [] } = {}) {
+  async getTransactionCost(transactionRequestLike, { signatureCallback } = {}) {
     const txRequestClone = (0, import_ramda3.clone)(transactionRequestify(transactionRequestLike));
     const isScriptTransaction = txRequestClone.type === import_transactions20.TransactionType.Script;
-    const baseAssetId = this.getBaseAssetId();
     const updateMaxFee = txRequestClone.maxFee.eq(0);
-    const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
-    const allQuantities = mergeQuantities(coinOutputsQuantities, quantitiesToContract);
-    txRequestClone.fundWithFakeUtxos(allQuantities, baseAssetId, resourcesOwner?.address);
     if (isScriptTransaction) {
       txRequestClone.gasLimit = (0, import_math17.bn)(0);
     }
-    if (resourcesOwner && "populateTransactionPredicateData" in resourcesOwner) {
-      resourcesOwner.populateTransactionPredicateData(txRequestClone);
-    }
     const signedRequest = (0, import_ramda3.clone)(txRequestClone);
     let addedSignatures = 0;
     if (signatureCallback && isScriptTransaction) {
@@ -4437,7 +4413,6 @@ Supported fuel-core version: ${supportedVersion}.`
       }));
     }
     return {
-      requiredQuantities: allQuantities,
       receipts,
       gasUsed,
       gasPrice,
@@ -4453,34 +4428,6 @@ Supported fuel-core version: ${supportedVersion}.`
       updateMaxFee
     };
   }
-  /**
-   * Get the required quantities and associated resources for a transaction.
-   *
-   * @param owner - address to add resources from.
-   * @param transactionRequestLike - transaction request to populate resources for.
-   * @param quantitiesToContract - quantities for the contract (optional).
-   *
-   * @returns a promise resolving to the required quantities for the transaction.
-   */
-  async getResourcesForTransaction(owner, transactionRequestLike, quantitiesToContract = []) {
-    const ownerAddress = import_address3.Address.fromAddressOrString(owner);
-    const transactionRequest = transactionRequestify((0, import_ramda3.clone)(transactionRequestLike));
-    const transactionCost = await this.getTransactionCost(transactionRequest, {
-      quantitiesToContract
-    });
-    transactionRequest.addResources(
-      await this.getResourcesToSpend(ownerAddress, transactionCost.requiredQuantities)
-    );
-    const { requiredQuantities, ...txCost } = await this.getTransactionCost(transactionRequest, {
-      quantitiesToContract
-    });
-    const resources = await this.getResourcesToSpend(ownerAddress, requiredQuantities);
-    return {
-      resources,
-      requiredQuantities,
-      ...txCost
-    };
-  }
   /**
    * Returns coins for the given owner.
    *
@@ -5109,6 +5056,20 @@ var rawAssets = [
 ];
 var assets = resolveIconPaths(rawAssets, fuelAssetsBaseUrl);
 
+// src/providers/utils/merge-quantities.ts
+var mergeQuantities = (...coinQuantities) => {
+  const resultMap = {};
+  function addToMap({ amount, assetId }) {
+    if (resultMap[assetId]) {
+      resultMap[assetId] = resultMap[assetId].add(amount);
+    } else {
+      resultMap[assetId] = amount;
+    }
+  }
+  coinQuantities.forEach((arr) => arr.forEach(addToMap));
+  return Object.entries(resultMap).map(([assetId, amount]) => ({ assetId, amount }));
+};
+
 // src/utils/formatTransferToContractScriptData.ts
 var import_abi_coder6 = require("@fuel-ts/abi-coder");
 var import_math19 = require("@fuel-ts/math");
@@ -5449,9 +5410,8 @@ var Account = class extends import_interfaces.AbstractAccount {
       scriptData
     });
     request.addContractInputAndOutput(contractAddress);
-    const txCost = await this.provider.getTransactionCost(request, {
-      resourcesOwner: this,
-      quantitiesToContract: [{ amount: (0, import_math20.bn)(amount), assetId: String(assetIdToTransfer) }]
+    const txCost = await this.getTransactionCost(request, {
+      quantities: [{ amount: (0, import_math20.bn)(amount), assetId: String(assetIdToTransfer) }]
     });
     request = this.validateGasLimitAndMaxFee({
       transactionRequest: request,
@@ -5486,8 +5446,8 @@ var Account = class extends import_interfaces.AbstractAccount {
     const params = { script, ...txParams };
     const baseAssetId = this.provider.getBaseAssetId();
     let request = new ScriptTransactionRequest(params);
-    const quantitiesToContract = [{ amount: (0, import_math20.bn)(amount), assetId: baseAssetId }];
-    const txCost = await this.provider.getTransactionCost(request, { quantitiesToContract });
+    const quantities = [{ amount: (0, import_math20.bn)(amount), assetId: baseAssetId }];
+    const txCost = await this.getTransactionCost(request, { quantities });
     request = this.validateGasLimitAndMaxFee({
       transactionRequest: request,
       gasUsed: txCost.gasUsed,
@@ -5497,6 +5457,34 @@ var Account = class extends import_interfaces.AbstractAccount {
     await this.fund(request, txCost);
     return this.sendTransaction(request);
   }
+  /**
+   * Returns a transaction cost to enable user
+   * to set gasLimit and also reserve balance amounts
+   * on the transaction.
+   *
+   * @param transactionRequestLike - The transaction request object.
+   * @param transactionCostParams - The transaction cost parameters (optional).
+   *
+   * @returns A promise that resolves to the transaction cost object.
+   */
+  async getTransactionCost(transactionRequestLike, { signatureCallback, quantities = [] } = {}) {
+    const txRequestClone = (0, import_ramda4.clone)(transactionRequestify(transactionRequestLike));
+    const baseAssetId = this.provider.getBaseAssetId();
+    const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
+    const requiredQuantities = mergeQuantities(coinOutputsQuantities, quantities);
+    const transactionFeeForDryRun = [{ assetId: baseAssetId, amount: (0, import_math20.bn)("100000000000000000") }];
+    const resources = this.generateFakeResources(
+      mergeQuantities(requiredQuantities, transactionFeeForDryRun)
+    );
+    txRequestClone.addResources(resources);
+    const txCost = await this.provider.getTransactionCost(txRequestClone, {
+      signatureCallback
+    });
+    return {
+      ...txCost,
+      requiredQuantities
+    };
+  }
   /**
    * Sign a message from the account via the connector.
    *
@@ -5533,7 +5521,7 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @param sendTransactionParams - The provider send transaction parameters (optional).
    * @returns A promise that resolves to the transaction response.
    */
-  async sendTransaction(transactionRequestLike, { estimateTxDependencies = true, awaitExecution } = {}) {
+  async sendTransaction(transactionRequestLike, { estimateTxDependencies = true } = {}) {
     if (this._connector) {
       return this.provider.getTransactionResponse(
         await this._connector.sendTransaction(this.address.toString(), transactionRequestLike)
@@ -5544,7 +5532,6 @@ var Account = class extends import_interfaces.AbstractAccount {
       await this.provider.estimateTxDependencies(transactionRequest);
     }
     return this.provider.sendTransaction(transactionRequest, {
-      awaitExecution,
       estimateTxDependencies: false
     });
   }
@@ -5589,9 +5576,7 @@ var Account = class extends import_interfaces.AbstractAccount {
   /** @hidden * */
   async estimateAndFundTransaction(transactionRequest, txParams) {
     let request = transactionRequest;
-    const txCost = await this.provider.getTransactionCost(request, {
-      resourcesOwner: this
-    });
+    const txCost = await this.getTransactionCost(request);
     request = this.validateGasLimitAndMaxFee({
       transactionRequest: request,
       gasUsed: txCost.gasUsed,
@@ -5902,17 +5887,16 @@ var BaseWalletUnlocked = class extends Account {
    *
    * @param transactionRequestLike - The transaction request to send.
    * @param estimateTxDependencies - Whether to estimate the transaction dependencies.
-   * @param awaitExecution - Whether to wait for the transaction to be executed.
    * @returns A promise that resolves to the TransactionResponse object.
    */
-  async sendTransaction(transactionRequestLike, { estimateTxDependencies = false, awaitExecution } = {}) {
+  async sendTransaction(transactionRequestLike, { estimateTxDependencies = false } = {}) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
     if (estimateTxDependencies) {
       await this.provider.estimateTxDependencies(transactionRequest);
     }
     return this.provider.sendTransaction(
       await this.populateTransactionWitnessesSignature(transactionRequest),
-      { awaitExecution, estimateTxDependencies: false }
+      { estimateTxDependencies: false }
     );
   }
   /**
@@ -8663,11 +8647,12 @@ var seedTestWallet = async (wallet, quantities, utxosAmount = 1) => {
       }
     })
   );
-  const txCost = await genesisWallet.provider.getTransactionCost(request);
+  const txCost = await genesisWallet.getTransactionCost(request);
   request.gasLimit = txCost.gasUsed;
   request.maxFee = txCost.maxFee;
   await genesisWallet.fund(request, txCost);
-  await genesisWallet.sendTransaction(request, { awaitExecution: true });
+  const submit = await genesisWallet.sendTransaction(request);
+  await submit.waitForResult();
 };
 
 // src/test-utils/generateTestWallet.ts
@@ -8755,7 +8740,9 @@ var launchNode = async ({
       "--snapshot",
       "--consensus-key",
       "--db-type",
-      "--poa-instant"
+      "--poa-instant",
+      "--min-gas-price",
+      "--native-executor-version"
     ]);
     const snapshotDir = getFlagValueFromArgs(args, "--snapshot");
     const consensusKey = getFlagValueFromArgs(args, "--consensus-key") || import_utils37.defaultConsensusKey;
@@ -8764,6 +8751,7 @@ var launchNode = async ({
     const poaInstantFlagValue = getFlagValueFromArgs(args, "--poa-instant");
     const poaInstant = poaInstantFlagValue === "true" || poaInstantFlagValue === void 0;
     const nativeExecutorVersion = getFlagValueFromArgs(args, "--native-executor-version") || "0";
+    const minGasPrice = getFlagValueFromArgs(args, "--min-gas-price") || "1";
     const graphQLStartSubstring = "Binding GraphQL provider to";
     const command = fuelCorePath || "fuel-core";
     const ipToUse = ip || "0.0.0.0";
@@ -8802,7 +8790,7 @@ var launchNode = async ({
         ["--ip", ipToUse],
         ["--port", portToUse],
         useInMemoryDb ? ["--db-type", "in-memory"] : ["--db-path", tempDir],
-        ["--min-gas-price", "1"],
+        ["--min-gas-price", minGasPrice],
         poaInstant ? ["--poa-instant", "true"] : [],
         ["--native-executor-version", nativeExecutorVersion],
         ["--consensus-key", consensusKey],
@@ -8893,10 +8881,11 @@ var generateWallets = async (count, provider) => {
 };
 var launchNodeAndGetWallets = async ({
   launchNodeOptions,
+  providerOptions,
   walletCount = 10
 } = {}) => {
   const { cleanup: closeNode, ip, port } = await launchNode(launchNodeOptions || {});
-  const provider = await Provider.create(`http://${ip}:${port}/v1/graphql`);
+  const provider = await Provider.create(`http://${ip}:${port}/v1/graphql`, providerOptions);
   const wallets = await generateWallets(walletCount, provider);
   const cleanup = () => {
     closeNode();