@fuel-ts/account 0.0.0-pr-1699-20240214162234 → 0.0.0-pr-1784-20240221124858

package/dist/test-utils.js

@@ -108,7 +108,9 @@ var import_address3 = require("@fuel-ts/address");
 var import_errors13 = require("@fuel-ts/errors");
 var import_math14 = require("@fuel-ts/math");
 var import_transactions17 = require("@fuel-ts/transactions");
+var import_utils5 = require("@fuel-ts/utils");
 var import_versions = require("@fuel-ts/versions");
+var import_utils6 = require("@noble/curves/abstract/utils");
 var import_ethers18 = require("ethers");
 var import_graphql_request = require("graphql-request");
 var import_ramda3 = require("ramda");
@@ -1939,7 +1941,7 @@ var BaseTransactionRequest = class {
    *
    * @param quantities - CoinQuantity Array.
    */
-  fundWithFakeUtxos(quantities) {
+  fundWithFakeUtxos(quantities, resourcesOwner) {
     let idCounter = 0;
     const generateId = () => {
       const counterString = String(idCounter++);
@@ -1963,7 +1965,7 @@ var BaseTransactionRequest = class {
             id: generateId(),
             amount: quantity,
             assetId,
-            owner: import_address.Address.fromRandom(),
+            owner: resourcesOwner || import_address.Address.fromRandom(),
             maturity: 0,
             blockCreated: (0, import_math6.bn)(1),
             txCreatedIdx: (0, import_math6.bn)(1)
@@ -1996,19 +1998,29 @@ var BaseTransactionRequest = class {
   toJSON() {
     return normalizeJSON(this);
   }
-  /**
-   * @hidden
-   *
-   * Determines whether the transaction has a predicate input.
-   *
-   * @returns Whether the transaction has a predicate input.
-   */
-  hasPredicateInput() {
-    return Boolean(
-      this.inputs.find(
-        (input) => "predicate" in input && input.predicate && input.predicate !== (0, import_ethers9.getBytesCopy)("0x")
-      )
-    );
+  updatePredicateInputs(inputs) {
+    this.inputs.forEach((i) => {
+      let correspondingInput;
+      switch (i.type) {
+        case import_transactions5.InputType.Contract:
+          return;
+        case import_transactions5.InputType.Coin:
+          correspondingInput = inputs.find((x) => x.type === import_transactions5.InputType.Coin && x.owner === i.owner);
+          break;
+        case import_transactions5.InputType.Message:
+          correspondingInput = inputs.find(
+            (x) => x.type === import_transactions5.InputType.Message && x.sender === i.sender
+          );
+          break;
+        default:
+          break;
+      }
+      if (correspondingInput && "predicateGasUsed" in correspondingInput && (0, import_math6.bn)(correspondingInput.predicateGasUsed).gt(0)) {
+        i.predicate = correspondingInput.predicate;
+        i.predicateData = correspondingInput.predicateData;
+        i.predicateGasUsed = correspondingInput.predicateGasUsed;
+      }
+    });
   }
 };
 
@@ -3674,7 +3686,7 @@ var _Provider = class {
   async call(transactionRequestLike, { utxoValidation, estimateTxDependencies = true } = {}) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
     if (estimateTxDependencies) {
-      await this.estimateTxDependencies(transactionRequest);
+      return this.estimateTxDependencies(transactionRequest);
     }
     const encodedTransaction = (0, import_ethers18.hexlify)(transactionRequest.toTransactionBytes());
     const { dryRun: gqlReceipts } = await this.operations.dryRun({
@@ -3693,6 +3705,14 @@ var _Provider = class {
    * @returns A promise that resolves to the estimated transaction request object.
    */
   async estimatePredicates(transactionRequest) {
+    const shouldEstimatePredicates = Boolean(
+      transactionRequest.inputs.find(
+        (input) => "predicate" in input && input.predicate && !(0, import_utils6.equalBytes)((0, import_utils5.arrayify)(input.predicate), (0, import_utils5.arrayify)("0x")) && new import_math14.BN(input.predicateGasUsed).isZero()
+      )
+    );
+    if (!shouldEstimatePredicates) {
+      return transactionRequest;
+    }
     const encodedTransaction = (0, import_ethers18.hexlify)(transactionRequest.toTransactionBytes());
     const response = await this.operations.estimatePredicates({
       encodedTransaction
@@ -3723,34 +3743,33 @@ var _Provider = class {
    * @returns A promise.
    */
   async estimateTxDependencies(transactionRequest) {
-    let missingOutputVariableCount = 0;
-    let missingOutputContractIdsCount = 0;
-    let tries = 0;
     if (transactionRequest.type === import_transactions17.TransactionType.Create) {
-      return;
-    }
-    let txRequest = transactionRequest;
-    if (txRequest.hasPredicateInput()) {
-      txRequest = await this.estimatePredicates(txRequest);
+      return {
+        receipts: []
+      };
     }
-    while (tries < MAX_RETRIES) {
+    await this.estimatePredicates(transactionRequest);
+    let receipts = [];
+    for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
       const { dryRun: gqlReceipts } = await this.operations.dryRun({
-        encodedTransaction: (0, import_ethers18.hexlify)(txRequest.toTransactionBytes()),
+        encodedTransaction: (0, import_ethers18.hexlify)(transactionRequest.toTransactionBytes()),
         utxoValidation: false
       });
-      const receipts = gqlReceipts.map(processGqlReceipt);
+      receipts = gqlReceipts.map(processGqlReceipt);
       const { missingOutputVariables, missingOutputContractIds } = getReceiptsWithMissingData(receipts);
-      missingOutputVariableCount = missingOutputVariables.length;
-      missingOutputContractIdsCount = missingOutputContractIds.length;
-      if (missingOutputVariableCount === 0 && missingOutputContractIdsCount === 0) {
-        return;
+      const hasMissingOutputs = missingOutputVariables.length !== 0 || missingOutputContractIds.length !== 0;
+      if (hasMissingOutputs) {
+        transactionRequest.addVariableOutputs(missingOutputVariables.length);
+        missingOutputContractIds.forEach(({ contractId }) => {
+          transactionRequest.addContractInputAndOutput(import_address3.Address.fromString(contractId));
+        });
+      } else {
+        break;
       }
-      txRequest.addVariableOutputs(missingOutputVariableCount);
-      missingOutputContractIds.forEach(
-        ({ contractId }) => txRequest.addContractInputAndOutput(import_address3.Address.fromString(contractId))
-      );
-      tries += 1;
     }
+    return {
+      receipts
+    };
   }
   /**
    * Executes a signed transaction without applying the states changes
@@ -3765,7 +3784,7 @@ var _Provider = class {
   async simulate(transactionRequestLike, { estimateTxDependencies = true } = {}) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
     if (estimateTxDependencies) {
-      await this.estimateTxDependencies(transactionRequest);
+      return this.estimateTxDependencies(transactionRequest);
     }
     const encodedTransaction = (0, import_ethers18.hexlify)(transactionRequest.toTransactionBytes());
     const { dryRun: gqlReceipts } = await this.operations.dryRun({
@@ -3792,36 +3811,38 @@ var _Provider = class {
    * @param tolerance - The tolerance to add on top of the gasUsed.
    * @returns A promise that resolves to the transaction cost object.
    */
-  async getTransactionCost(transactionRequestLike, forwardingQuantities = [], { estimateTxDependencies = true, estimatePredicates = true } = {}) {
-    const transactionRequest = transactionRequestify((0, import_ramda3.clone)(transactionRequestLike));
+  async getTransactionCost(transactionRequestLike, forwardingQuantities = [], {
+    estimateTxDependencies = true,
+    estimatePredicates = true,
+    resourcesOwner
+  } = {}) {
+    const txRequestClone = (0, import_ramda3.clone)(transactionRequestify(transactionRequestLike));
     const chainInfo = this.getChain();
     const { gasPriceFactor, minGasPrice, maxGasPerTx } = this.getGasConfig();
-    const gasPrice = (0, import_math14.max)(transactionRequest.gasPrice, minGasPrice);
-    const isScriptTransaction = transactionRequest.type === import_transactions17.TransactionType.Script;
-    if (transactionRequest.hasPredicateInput() && estimatePredicates) {
+    const gasPrice = (0, import_math14.max)(txRequestClone.gasPrice, minGasPrice);
+    const isScriptTransaction = txRequestClone.type === import_transactions17.TransactionType.Script;
+    const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
+    const allQuantities = mergeQuantities(coinOutputsQuantities, forwardingQuantities);
+    txRequestClone.fundWithFakeUtxos(allQuantities, resourcesOwner?.address);
+    if (estimatePredicates) {
       if (isScriptTransaction) {
-        transactionRequest.gasLimit = (0, import_math14.bn)(0);
+        txRequestClone.gasLimit = (0, import_math14.bn)(0);
+      }
+      if (resourcesOwner && "populateTransactionPredicateData" in resourcesOwner) {
+        resourcesOwner.populateTransactionPredicateData(txRequestClone);
       }
-      await this.estimatePredicates(transactionRequest);
+      await this.estimatePredicates(txRequestClone);
     }
-    const minGas = transactionRequest.calculateMinGas(chainInfo);
-    const maxGas = transactionRequest.calculateMaxGas(chainInfo, minGas);
-    const coinOutputsQuantities = transactionRequest.getCoinOutputsQuantities();
-    const allQuantities = mergeQuantities(coinOutputsQuantities, forwardingQuantities);
-    transactionRequest.fundWithFakeUtxos(allQuantities);
-    let gasUsed = minGas;
+    const minGas = txRequestClone.calculateMinGas(chainInfo);
+    const maxGas = txRequestClone.calculateMaxGas(chainInfo, minGas);
     let receipts = [];
-    if (isScriptTransaction) {
-      transactionRequest.gasPrice = (0, import_math14.bn)(0);
-      transactionRequest.gasLimit = (0, import_math14.bn)(maxGasPerTx.sub(maxGas).toNumber() * 0.9);
-      const result = await this.call(transactionRequest, {
-        estimateTxDependencies
-      });
+    if (isScriptTransaction && estimateTxDependencies) {
+      txRequestClone.gasPrice = (0, import_math14.bn)(0);
+      txRequestClone.gasLimit = (0, import_math14.bn)(maxGasPerTx.sub(maxGas).toNumber() * 0.9);
+      const result = await this.estimateTxDependencies(txRequestClone);
       receipts = result.receipts;
-      gasUsed = getGasUsedFromReceipts(receipts);
-    } else {
-      gasUsed = minGas;
     }
+    const gasUsed = isScriptTransaction ? getGasUsedFromReceipts(receipts) : minGas;
     const usedFee = calculatePriceWithFactor(
       gasUsed,
       gasPrice,
@@ -3839,7 +3860,9 @@ var _Provider = class {
       maxGas,
       usedFee,
       minFee,
-      maxFee
+      maxFee,
+      estimatedInputs: txRequestClone.inputs,
+      estimatedOutputs: txRequestClone.outputs
     };
   }
   async getResourcesForTransaction(owner, transactionRequestLike, forwardingQuantities = []) {
@@ -4229,6 +4252,10 @@ var _Provider = class {
     });
     return (0, import_math14.bn)(latestBlockHeight);
   }
+  // eslint-disable-next-line @typescript-eslint/require-await
+  async getTransactionResponse(transactionId) {
+    return new TransactionResponse(transactionId, this);
+  }
 };
 var Provider = _Provider;
 _cacheInputs = new WeakSet();
@@ -4251,6 +4278,51 @@ var import_math15 = require("@fuel-ts/math");
 var import_transactions18 = require("@fuel-ts/transactions");
 var import_ethers19 = require("ethers");
 
+// src/providers/chains.ts
+var CHAIN_IDS = {
+  eth: {
+    sepolia: 11155111,
+    foundry: 31337
+  },
+  fuel: {
+    beta5: 0,
+    devnet: 10
+  }
+};
+
+// src/providers/assets/index.ts
+var assets = [
+  {
+    name: "Ethereum",
+    symbol: "ETH",
+    icon: "eth.svg",
+    networks: [
+      {
+        type: "ethereum",
+        chainId: CHAIN_IDS.eth.sepolia,
+        decimals: 18
+      },
+      {
+        type: "ethereum",
+        chainId: CHAIN_IDS.eth.foundry,
+        decimals: 18
+      },
+      {
+        type: "fuel",
+        chainId: CHAIN_IDS.fuel.beta5,
+        decimals: 9,
+        assetId: "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        type: "fuel",
+        chainId: CHAIN_IDS.fuel.devnet,
+        decimals: 9,
+        assetId: "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ]
+  }
+];
+
 // src/utils/formatTransferToContractScriptData.ts
 var import_abi_coder4 = require("@fuel-ts/abi-coder");
 var import_math16 = require("@fuel-ts/math");
@@ -4297,15 +4369,17 @@ var Account = class extends import_interfaces.AbstractAccount {
    * The provider used to interact with the network.
    */
   _provider;
+  _connector;
   /**
    * Creates a new Account instance.
    *
    * @param address - The address of the account.
    * @param provider - A Provider instance  (optional).
    */
-  constructor(address, provider) {
+  constructor(address, provider, connector) {
     super();
     this._provider = provider;
+    this._connector = connector;
     this.address = import_address4.Address.fromDynamicInput(address);
   }
   /**
@@ -4511,7 +4585,10 @@ var Account = class extends import_interfaces.AbstractAccount {
     const params = { gasPrice: minGasPrice, ...txParams };
     const request = new ScriptTransactionRequest(params);
     request.addCoinOutput(import_address4.Address.fromAddressOrString(destination), amount, assetId);
-    const { maxFee, requiredQuantities, gasUsed } = await this.provider.getTransactionCost(request);
+    const { maxFee, requiredQuantities, gasUsed, estimatedInputs } = await this.provider.getTransactionCost(request, [], {
+      estimateTxDependencies: true,
+      resourcesOwner: this
+    });
     request.gasPrice = (0, import_math17.bn)(txParams.gasPrice ?? minGasPrice);
     request.gasLimit = (0, import_math17.bn)(txParams.gasLimit ?? gasUsed);
     this.validateGas({
@@ -4521,6 +4598,7 @@ var Account = class extends import_interfaces.AbstractAccount {
       minGasPrice
     });
     await this.fund(request, requiredQuantities, maxFee);
+    request.updatePredicateInputs(estimatedInputs);
     return request;
   }
   /**
@@ -4534,7 +4612,7 @@ var Account = class extends import_interfaces.AbstractAccount {
    */
   async transfer(destination, amount, assetId = import_configs10.BaseAssetId, txParams = {}) {
     const request = await this.createTransfer(destination, amount, assetId, txParams);
-    return this.sendTransaction(request);
+    return this.sendTransaction(request, { estimateTxDependencies: false });
   }
   /**
    * Transfers coins to a contract address.
@@ -4613,17 +4691,30 @@ var Account = class extends import_interfaces.AbstractAccount {
     await this.fund(request, requiredQuantities, maxFee);
     return this.sendTransaction(request);
   }
+  async signMessage(message) {
+    if (!this._connector) {
+      throw new import_errors15.FuelError(import_errors15.ErrorCode.MISSING_CONNECTOR, "A connector is required to sign messages.");
+    }
+    return this._connector.signMessage(this.address.toString(), message);
+  }
   /**
    * Sends a transaction to the network.
    *
    * @param transactionRequestLike - The transaction request to be sent.
    * @returns A promise that resolves to the transaction response.
    */
-  async sendTransaction(transactionRequestLike, options) {
+  async sendTransaction(transactionRequestLike, { estimateTxDependencies = true, awaitExecution } = {}) {
+    if (this._connector) {
+      return this.provider.getTransactionResponse(
+        await this._connector.sendTransaction(this.address.toString(), transactionRequestLike)
+      );
+    }
     const transactionRequest = transactionRequestify(transactionRequestLike);
-    await this.provider.estimateTxDependencies(transactionRequest);
+    if (estimateTxDependencies) {
+      await this.provider.estimateTxDependencies(transactionRequest);
+    }
     return this.provider.sendTransaction(transactionRequest, {
-      ...options,
+      awaitExecution,
       estimateTxDependencies: false
     });
   }
@@ -4633,9 +4724,11 @@ var Account = class extends import_interfaces.AbstractAccount {
    * @param transactionRequestLike - The transaction request to be simulated.
    * @returns A promise that resolves to the call result.
    */
-  async simulateTransaction(transactionRequestLike) {
+  async simulateTransaction(transactionRequestLike, { estimateTxDependencies = true } = {}) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
-    await this.provider.estimateTxDependencies(transactionRequest);
+    if (estimateTxDependencies) {
+      await this.provider.estimateTxDependencies(transactionRequest);
+    }
     return this.provider.simulate(transactionRequest, { estimateTxDependencies: false });
   }
   validateGas({
@@ -4933,12 +5026,14 @@ var BaseWalletUnlocked = class extends Account {
    * @param transactionRequestLike - The transaction request to send.
    * @returns A promise that resolves to the TransactionResponse object.
    */
-  async sendTransaction(transactionRequestLike, options) {
+  async sendTransaction(transactionRequestLike, { estimateTxDependencies = true, awaitExecution } = {}) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
-    await this.provider.estimateTxDependencies(transactionRequest);
+    if (estimateTxDependencies) {
+      await this.provider.estimateTxDependencies(transactionRequest);
+    }
     return this.provider.sendTransaction(
       await this.populateTransactionWitnessesSignature(transactionRequest),
-      { ...options, estimateTxDependencies: false }
+      { awaitExecution, estimateTxDependencies: false }
     );
   }
   /**
@@ -4947,9 +5042,11 @@ var BaseWalletUnlocked = class extends Account {
    * @param transactionRequestLike - The transaction request to simulate.
    * @returns A promise that resolves to the CallResult object.
    */
-  async simulateTransaction(transactionRequestLike) {
+  async simulateTransaction(transactionRequestLike, { estimateTxDependencies = true } = {}) {
     const transactionRequest = transactionRequestify(transactionRequestLike);
-    await this.provider.estimateTxDependencies(transactionRequest);
+    if (estimateTxDependencies) {
+      await this.provider.estimateTxDependencies(transactionRequest);
+    }
     return this.provider.call(
       await this.populateTransactionWitnessesSignature(transactionRequest),
       {
@@ -7727,7 +7824,7 @@ var generateTestWallet = async (provider, quantities) => {
 // src/test-utils/launchNode.ts
 var import_configs11 = require("@fuel-ts/address/configs");
 var import_math20 = require("@fuel-ts/math");
-var import_utils7 = require("@fuel-ts/utils");
+var import_utils9 = require("@fuel-ts/utils");
 var import_cli_utils = require("@fuel-ts/utils/cli-utils");
 var import_child_process = require("child_process");
 var import_crypto5 = require("crypto");
@@ -7786,7 +7883,7 @@ var launchNode = async ({
       "--poa-instant"
     ]);
     const chainConfigPath = getFlagValueFromArgs(args, "--chain");
-    const consensusKey = getFlagValueFromArgs(args, "--consensus-key") || import_utils7.defaultConsensusKey;
+    const consensusKey = getFlagValueFromArgs(args, "--consensus-key") || import_utils9.defaultConsensusKey;
     const dbTypeFlagValue = getFlagValueFromArgs(args, "--db-type");
     const useInMemoryDb = dbTypeFlagValue === "in-memory" || dbTypeFlagValue === void 0;
     const poaInstantFlagValue = getFlagValueFromArgs(args, "--poa-instant");
@@ -7812,17 +7909,17 @@ var launchNode = async ({
         (0, import_fs.mkdirSync)(tempDirPath, { recursive: true });
       }
       const tempChainConfigFilePath = import_path.default.join(tempDirPath, "chainConfig.json");
-      let chainConfig = import_utils7.defaultChainConfig;
+      let chainConfig = import_utils9.defaultChainConfig;
       if (!process.env.GENESIS_SECRET) {
         const pk = Signer.generatePrivateKey();
         const signer = new Signer(pk);
         process.env.GENESIS_SECRET = (0, import_ethers27.hexlify)(pk);
         chainConfig = {
-          ...import_utils7.defaultChainConfig,
+          ...import_utils9.defaultChainConfig,
           initial_state: {
-            ...import_utils7.defaultChainConfig.initial_state,
+            ...import_utils9.defaultChainConfig.initial_state,
             coins: [
-              ...import_utils7.defaultChainConfig.initial_state.coins,
+              ...import_utils9.defaultChainConfig.initial_state.coins,
               {
                 owner: signer.address.toHexString(),
                 amount: (0, import_math20.toHex)(1e9),