@fuel-ts/account 0.0.0-rc-1356-20240510142347 → 0.0.0-rc-2037-20240510174704

package/dist/index.mjs

@@ -73,7 +73,7 @@ var addAmountToCoinQuantities = (params) => {
 // src/providers/provider.ts
 import { Address as Address2 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode13, FuelError as FuelError13 } from "@fuel-ts/errors";
-import { BN, bn as bn17 } from "@fuel-ts/math";
+import { BN, bn as bn18 } from "@fuel-ts/math";
 import {
   InputType as InputType7,
   TransactionType as TransactionType8,
@@ -1296,11 +1296,11 @@ import { UTXO_ID_LEN as UTXO_ID_LEN2 } from "@fuel-ts/abi-coder";
 import { Address, addressify } from "@fuel-ts/address";
 import { ZeroBytes32 as ZeroBytes324 } from "@fuel-ts/address/configs";
 import { randomBytes } from "@fuel-ts/crypto";
-import { bn as bn7 } from "@fuel-ts/math";
+import { bn as bn8 } from "@fuel-ts/math";
 import {
   PolicyType,
   TransactionCoder,
-  InputType as InputType2,
+  InputType as InputType3,
   OutputType as OutputType2,
   TransactionType
 } from "@fuel-ts/transactions";
@@ -1712,6 +1712,15 @@ function normalizeJSON(root) {
   return normalize(clone(root));
 }
 
+// src/providers/utils/sleep.ts
+function sleep(time) {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+}
+
 // src/providers/utils/extract-tx-error.ts
 import { ErrorCode as ErrorCode7, FuelError as FuelError7 } from "@fuel-ts/errors";
 import { bn as bn6 } from "@fuel-ts/math";
@@ -1814,6 +1823,52 @@ var NoWitnessByOwnerError = class extends Error {
   name = "NoWitnessByOwnerError";
 };
 
+// src/providers/transaction-request/helpers.ts
+import { bn as bn7 } from "@fuel-ts/math";
+import { InputType as InputType2 } from "@fuel-ts/transactions";
+var isRequestInputCoin = (input) => input.type === InputType2.Coin;
+var isRequestInputMessage = (input) => input.type === InputType2.Message;
+var isRequestInputResource = (input) => isRequestInputCoin(input) || isRequestInputMessage(input);
+var getRequestInputResourceOwner = (input) => isRequestInputCoin(input) ? input.owner : input.recipient;
+var isRequestInputResourceFromOwner = (input, owner) => getRequestInputResourceOwner(input) === owner.toB256();
+var getAssetAmountInRequestInputs = (inputs, assetId, baseAsset) => inputs.filter(isRequestInputResource).reduce((acc, input) => {
+  if (isRequestInputCoin(input) && input.assetId === assetId) {
+    return acc.add(input.amount);
+  }
+  if (isRequestInputMessage(input) && assetId === baseAsset) {
+    return acc.add(input.amount);
+  }
+  return acc;
+}, bn7(0));
+var cacheRequestInputsResources = (inputs) => inputs.filter(isRequestInputResource).reduce(
+  (cache2, input) => {
+    if (isRequestInputCoin(input)) {
+      cache2.utxos.push(input.id);
+    } else {
+      cache2.messages.push(input.nonce);
+    }
+    return cache2;
+  },
+  {
+    utxos: [],
+    messages: []
+  }
+);
+var cacheRequestInputsResourcesFromOwner = (inputs, owner) => inputs.reduce(
+  (acc, input) => {
+    if (isRequestInputCoin(input) && input.owner === owner.toB256()) {
+      acc.utxos.push(input.id);
+    } else if (isRequestInputMessage(input) && input.recipient === owner.toB256()) {
+      acc.messages.push(input.nonce);
+    }
+    return acc;
+  },
+  {
+    utxos: [],
+    messages: []
+  }
+);
+
 // src/providers/transaction-request/witness.ts
 import { arrayify as arrayify4, hexlify as hexlify6 } from "@fuel-ts/utils";
 var witnessify = (value) => {
@@ -1854,10 +1909,10 @@ var BaseTransactionRequest = class {
     outputs,
     witnesses
   } = {}) {
-    this.tip = tip ? bn7(tip) : void 0;
+    this.tip = tip ? bn8(tip) : void 0;
     this.maturity = maturity && maturity > 0 ? maturity : void 0;
-    this.witnessLimit = isDefined(witnessLimit) ? bn7(witnessLimit) : void 0;
-    this.maxFee = bn7(maxFee);
+    this.witnessLimit = isDefined(witnessLimit) ? bn8(witnessLimit) : void 0;
+    this.maxFee = bn8(maxFee);
     this.inputs = inputs ?? [];
     this.outputs = outputs ?? [];
     this.witnesses = witnesses ?? [];
@@ -1866,13 +1921,13 @@ var BaseTransactionRequest = class {
     let policyTypes = 0;
     const policies = [];
     const { tip, witnessLimit, maturity } = req;
-    if (bn7(tip).gt(0)) {
+    if (bn8(tip).gt(0)) {
       policyTypes += PolicyType.Tip;
-      policies.push({ data: bn7(tip), type: PolicyType.Tip });
+      policies.push({ data: bn8(tip), type: PolicyType.Tip });
     }
-    if (isDefined(witnessLimit) && bn7(witnessLimit).gte(0)) {
+    if (isDefined(witnessLimit) && bn8(witnessLimit).gte(0)) {
       policyTypes += PolicyType.WitnessLimit;
-      policies.push({ data: bn7(witnessLimit), type: PolicyType.WitnessLimit });
+      policies.push({ data: bn8(witnessLimit), type: PolicyType.WitnessLimit });
     }
     if (maturity && maturity > 0) {
       policyTypes += PolicyType.Maturity;
@@ -2003,7 +2058,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType2.Coin
+      (input) => input.type === InputType3.Coin
     );
   }
   /**
@@ -2035,9 +2090,9 @@ var BaseTransactionRequest = class {
     const ownerAddress = addressify(owner);
     const found = this.inputs.find((input) => {
       switch (input.type) {
-        case InputType2.Coin:
+        case InputType3.Coin:
           return hexlify7(input.owner) === ownerAddress.toB256();
-        case InputType2.Message:
+        case InputType3.Message:
           return hexlify7(input.recipient) === ownerAddress.toB256();
         default:
           return false;
@@ -2052,7 +2107,7 @@ var BaseTransactionRequest = class {
    * @param coin - Coin resource.
    */
   addCoinInput(coin) {
-    const { assetId, owner, amount } = coin;
+    const { assetId, owner, amount, id, predicate } = coin;
     let witnessIndex;
     if (coin.predicate) {
       witnessIndex = 0;
@@ -2063,13 +2118,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...coin,
-      type: InputType2.Coin,
+      id,
+      type: InputType3.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
-      witnessIndex
+      witnessIndex,
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -2081,7 +2137,7 @@ var BaseTransactionRequest = class {
    * @param message - Message resource.
    */
   addMessageInput(message) {
-    const { recipient, sender, amount, assetId } = message;
+    const { recipient, sender, amount, predicate, nonce, assetId } = message;
     let witnessIndex;
     if (message.predicate) {
       witnessIndex = 0;
@@ -2092,12 +2148,13 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...message,
-      type: InputType2.Message,
+      nonce,
+      type: InputType3.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
-      witnessIndex
+      witnessIndex,
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -2244,7 +2301,7 @@ var BaseTransactionRequest = class {
       const assetInput = findAssetInput(assetId);
       let usedQuantity = quantity;
       if (assetId === baseAssetId) {
-        usedQuantity = bn7("1000000000000000000");
+        usedQuantity = bn8("1000000000000000000");
       }
       if (assetInput && "assetId" in assetInput) {
         assetInput.id = hexlify7(randomBytes(UTXO_ID_LEN2));
@@ -2256,13 +2313,13 @@ var BaseTransactionRequest = class {
             amount: usedQuantity,
             assetId,
             owner: resourcesOwner || Address.fromRandom(),
-            blockCreated: bn7(1),
-            txCreatedIdx: bn7(1)
+            blockCreated: bn8(1),
+            txCreatedIdx: bn8(1)
           }
         ]);
       }
     };
-    updateAssetInput(baseAssetId, bn7(1e11));
+    updateAssetInput(baseAssetId, bn8(1e11));
     quantities.forEach((q) => updateAssetInput(q.assetId, q.amount));
   }
   /**
@@ -2273,7 +2330,7 @@ var BaseTransactionRequest = class {
    */
   getCoinOutputsQuantities() {
     const coinsQuantities = this.getCoinOutputs().map(({ amount, assetId }) => ({
-      amount: bn7(amount),
+      amount: bn8(amount),
       assetId: assetId.toString()
     }));
     return coinsQuantities;
@@ -2287,22 +2344,33 @@ var BaseTransactionRequest = class {
   toJSON() {
     return normalizeJSON(this);
   }
+  removeWitness(index) {
+    this.witnesses.splice(index, 1);
+    this.adjustWitnessIndexes(index);
+  }
+  adjustWitnessIndexes(removedIndex) {
+    this.inputs.filter(isRequestInputResource).forEach((input) => {
+      if (input.witnessIndex > removedIndex) {
+        input.witnessIndex -= 1;
+      }
+    });
+  }
   updatePredicateGasUsed(inputs) {
     this.inputs.forEach((i) => {
       let correspondingInput;
       switch (i.type) {
-        case InputType2.Coin:
-          correspondingInput = inputs.find((x) => x.type === InputType2.Coin && x.owner === i.owner);
+        case InputType3.Coin:
+          correspondingInput = inputs.find((x) => x.type === InputType3.Coin && x.owner === i.owner);
           break;
-        case InputType2.Message:
+        case InputType3.Message:
           correspondingInput = inputs.find(
-            (x) => x.type === InputType2.Message && x.sender === i.sender
+            (x) => x.type === InputType3.Message && x.sender === i.sender
           );
           break;
         default:
           return;
       }
-      if (correspondingInput && "predicateGasUsed" in correspondingInput && bn7(correspondingInput.predicateGasUsed).gt(0)) {
+      if (correspondingInput && "predicateGasUsed" in correspondingInput && bn8(correspondingInput.predicateGasUsed).gt(0)) {
         i.predicate = correspondingInput.predicate;
         i.predicateData = correspondingInput.predicateData;
         i.predicateGasUsed = correspondingInput.predicateGasUsed;
@@ -2322,15 +2390,15 @@ var BaseTransactionRequest = class {
 
 // src/providers/transaction-request/create-transaction-request.ts
 import { ZeroBytes32 as ZeroBytes326 } from "@fuel-ts/address/configs";
-import { bn as bn9 } from "@fuel-ts/math";
+import { bn as bn10 } from "@fuel-ts/math";
 import { TransactionType as TransactionType3, OutputType as OutputType4 } from "@fuel-ts/transactions";
 import { arrayify as arrayify6, hexlify as hexlify9 } from "@fuel-ts/utils";
 
 // src/providers/transaction-request/hash-transaction.ts
 import { ZeroBytes32 as ZeroBytes325 } from "@fuel-ts/address/configs";
 import { uint64ToBytesBE, sha256 } from "@fuel-ts/hasher";
-import { bn as bn8 } from "@fuel-ts/math";
-import { TransactionType as TransactionType2, InputType as InputType3, OutputType as OutputType3, TransactionCoder as TransactionCoder2 } from "@fuel-ts/transactions";
+import { bn as bn9 } from "@fuel-ts/math";
+import { TransactionType as TransactionType2, InputType as InputType4, OutputType as OutputType3, TransactionCoder as TransactionCoder2 } from "@fuel-ts/transactions";
 import { concat as concat2 } from "@fuel-ts/utils";
 import { clone as clone2 } from "ramda";
 function hashTransaction(transactionRequest, chainId) {
@@ -2341,19 +2409,19 @@ function hashTransaction(transactionRequest, chainId) {
   transaction.inputs = transaction.inputs.map((input) => {
     const inputClone = clone2(input);
     switch (inputClone.type) {
-      case InputType3.Coin: {
+      case InputType4.Coin: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
         };
-        inputClone.predicateGasUsed = bn8(0);
+        inputClone.predicateGasUsed = bn9(0);
         return inputClone;
       }
-      case InputType3.Message: {
-        inputClone.predicateGasUsed = bn8(0);
+      case InputType4.Message: {
+        inputClone.predicateGasUsed = bn9(0);
         return inputClone;
       }
-      case InputType3.Contract: {
+      case InputType4.Contract: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
@@ -2377,12 +2445,12 @@ function hashTransaction(transactionRequest, chainId) {
         return outputClone;
       }
       case OutputType3.Change: {
-        outputClone.amount = bn8(0);
+        outputClone.amount = bn9(0);
         return outputClone;
       }
       case OutputType3.Variable: {
         outputClone.to = ZeroBytes325;
-        outputClone.amount = bn8(0);
+        outputClone.amount = bn9(0);
         outputClone.assetId = ZeroBytes325;
         return outputClone;
       }
@@ -2460,7 +2528,7 @@ var CreateTransactionRequest = class extends BaseTransactionRequest {
       type: TransactionType3.Create,
       ...baseTransaction,
       bytecodeWitnessIndex,
-      storageSlotsCount: bn9(storageSlots.length),
+      storageSlotsCount: bn10(storageSlots.length),
       salt: this.salt ? hexlify9(this.salt) : ZeroBytes326,
       storageSlots
     };
@@ -2500,7 +2568,7 @@ var CreateTransactionRequest = class extends BaseTransactionRequest {
   }
   metadataGas(gasCosts) {
     return calculateMetadataGasForTxCreate({
-      contractBytesSize: bn9(arrayify6(this.witnesses[this.bytecodeWitnessIndex] || "0x").length),
+      contractBytesSize: bn10(arrayify6(this.witnesses[this.bytecodeWitnessIndex] || "0x").length),
       gasCosts,
       stateRootSize: this.storageSlots.length,
       txBytesSize: this.byteSize()
@@ -2512,8 +2580,8 @@ var CreateTransactionRequest = class extends BaseTransactionRequest {
 import { Interface } from "@fuel-ts/abi-coder";
 import { addressify as addressify2 } from "@fuel-ts/address";
 import { ZeroBytes32 as ZeroBytes327 } from "@fuel-ts/address/configs";
-import { bn as bn10 } from "@fuel-ts/math";
-import { InputType as InputType4, OutputType as OutputType5, TransactionType as TransactionType4 } from "@fuel-ts/transactions";
+import { bn as bn11 } from "@fuel-ts/math";
+import { InputType as InputType5, OutputType as OutputType5, TransactionType as TransactionType4 } from "@fuel-ts/transactions";
 import { arrayify as arrayify8, hexlify as hexlify10 } from "@fuel-ts/utils";
 
 // src/providers/transaction-request/scripts.ts
@@ -2566,7 +2634,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   constructor({ script, scriptData, gasLimit, ...rest } = {}) {
     super(rest);
-    this.gasLimit = bn10(gasLimit);
+    this.gasLimit = bn11(gasLimit);
     this.script = arrayify8(script ?? returnZeroScript.bytes);
     this.scriptData = arrayify8(scriptData ?? returnZeroScript.encodeScriptData());
     this.abis = rest.abis;
@@ -2583,8 +2651,8 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       type: TransactionType4.Script,
       scriptGasLimit: this.gasLimit,
       ...super.getBaseTransaction(),
-      scriptLength: bn10(script.length),
-      scriptDataLength: bn10(scriptData.length),
+      scriptLength: bn11(script.length),
+      scriptDataLength: bn11(scriptData.length),
       receiptsRoot: ZeroBytes327,
       script: hexlify10(script),
       scriptData: hexlify10(scriptData)
@@ -2597,7 +2665,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType4.Contract
+      (input) => input.type === InputType5.Contract
     );
   }
   /**
@@ -2677,7 +2745,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       return this;
     }
     const inputIndex = super.pushInput({
-      type: InputType4.Contract,
+      type: InputType5.Contract,
       contractId: contractAddress.toB256(),
       txPointer: "0x00000000000000000000000000000000"
     });
@@ -2719,7 +2787,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
 
 // src/providers/transaction-request/utils.ts
 import { ErrorCode as ErrorCode8, FuelError as FuelError8 } from "@fuel-ts/errors";
-import { TransactionType as TransactionType5, InputType as InputType5 } from "@fuel-ts/transactions";
+import { TransactionType as TransactionType5 } from "@fuel-ts/transactions";
 var transactionRequestify = (obj) => {
   if (obj instanceof ScriptTransactionRequest || obj instanceof CreateTransactionRequest) {
     return obj;
@@ -2737,35 +2805,20 @@ var transactionRequestify = (obj) => {
     }
   }
 };
-var cacheTxInputsFromOwner = (inputs, owner) => inputs.reduce(
-  (acc, input) => {
-    if (input.type === InputType5.Coin && input.owner === owner.toB256()) {
-      acc.utxos.push(input.id);
-    }
-    if (input.type === InputType5.Message && input.recipient === owner.toB256()) {
-      acc.messages.push(input.nonce);
-    }
-    return acc;
-  },
-  {
-    utxos: [],
-    messages: []
-  }
-);
 
 // src/providers/transaction-response/transaction-response.ts
 import { ErrorCode as ErrorCode12, FuelError as FuelError12 } from "@fuel-ts/errors";
-import { bn as bn16 } from "@fuel-ts/math";
+import { bn as bn17 } from "@fuel-ts/math";
 import { TransactionCoder as TransactionCoder4 } from "@fuel-ts/transactions";
 import { arrayify as arrayify10 } from "@fuel-ts/utils";
 
 // src/providers/transaction-summary/assemble-transaction-summary.ts
-import { bn as bn15 } from "@fuel-ts/math";
+import { bn as bn16 } from "@fuel-ts/math";
 import { PolicyType as PolicyType3 } from "@fuel-ts/transactions";
 import { DateTime, hexlify as hexlify11 } from "@fuel-ts/utils";
 
 // src/providers/transaction-summary/calculate-tx-fee-for-summary.ts
-import { bn as bn11 } from "@fuel-ts/math";
+import { bn as bn12 } from "@fuel-ts/math";
 import { PolicyType as PolicyType2, TransactionCoder as TransactionCoder3, TransactionType as TransactionType6 } from "@fuel-ts/transactions";
 import { arrayify as arrayify9 } from "@fuel-ts/utils";
 var calculateTXFeeForSummary = (params) => {
@@ -2779,19 +2832,19 @@ var calculateTXFeeForSummary = (params) => {
   if (totalFee) {
     return totalFee;
   }
-  const gasPerByte = bn11(feeParams.gasPerByte);
-  const gasPriceFactor = bn11(feeParams.gasPriceFactor);
+  const gasPerByte = bn12(feeParams.gasPerByte);
+  const gasPriceFactor = bn12(feeParams.gasPriceFactor);
   const transactionBytes = arrayify9(rawPayload);
   const [transaction] = new TransactionCoder3().decode(transactionBytes, 0);
   const { type, witnesses, inputs, policies } = transaction;
-  let metadataGas = bn11(0);
-  let gasLimit = bn11(0);
+  let metadataGas = bn12(0);
+  let gasLimit = bn12(0);
   if (type !== TransactionType6.Create && type !== TransactionType6.Script) {
-    return bn11(0);
+    return bn12(0);
   }
   if (type === TransactionType6.Create) {
     const { bytecodeWitnessIndex, storageSlots } = transaction;
-    const contractBytesSize = bn11(arrayify9(witnesses[bytecodeWitnessIndex].data).length);
+    const contractBytesSize = bn12(arrayify9(witnesses[bytecodeWitnessIndex].data).length);
     metadataGas = calculateMetadataGasForTxCreate({
       contractBytesSize,
       gasCosts,
@@ -2810,7 +2863,7 @@ var calculateTXFeeForSummary = (params) => {
   }
   const minGas = getMinGas({
     gasCosts,
-    gasPerByte: bn11(gasPerByte),
+    gasPerByte: bn12(gasPerByte),
     inputs,
     metadataGas,
     txBytesSize: transactionBytes.length
@@ -2837,12 +2890,12 @@ var calculateTXFeeForSummary = (params) => {
 // src/providers/transaction-summary/operations.ts
 import { ZeroBytes32 as ZeroBytes328 } from "@fuel-ts/address/configs";
 import { ErrorCode as ErrorCode10, FuelError as FuelError10 } from "@fuel-ts/errors";
-import { bn as bn13 } from "@fuel-ts/math";
+import { bn as bn14 } from "@fuel-ts/math";
 import { ReceiptType as ReceiptType4, TransactionType as TransactionType7 } from "@fuel-ts/transactions";
 
 // src/providers/transaction-summary/call.ts
 import { Interface as Interface2, calculateVmTxMemory } from "@fuel-ts/abi-coder";
-import { bn as bn12 } from "@fuel-ts/math";
+import { bn as bn13 } from "@fuel-ts/math";
 var getFunctionCall = ({ abi, receipt, rawPayload, maxInputs }) => {
   const abiInterface = new Interface2(abi);
   const callFunctionSelector = receipt.param1.toHex(8);
@@ -2851,7 +2904,7 @@ var getFunctionCall = ({ abi, receipt, rawPayload, maxInputs }) => {
   let encodedArgs;
   if (functionFragment.isInputDataPointer) {
     if (rawPayload) {
-      const argsOffset = bn12(receipt.param2).sub(calculateVmTxMemory({ maxInputs: maxInputs.toNumber() })).toNumber();
+      const argsOffset = bn13(receipt.param2).sub(calculateVmTxMemory({ maxInputs: maxInputs.toNumber() })).toNumber();
       encodedArgs = `0x${rawPayload.slice(2).slice(argsOffset * 2)}`;
     }
   } else {
@@ -3059,7 +3112,7 @@ var mergeAssets = (op1, op2) => {
     if (!matchingAsset) {
       return asset1;
     }
-    const mergedAmount = bn13(asset1.amount).add(matchingAsset.amount);
+    const mergedAmount = bn14(asset1.amount).add(matchingAsset.amount);
     return { ...asset1, amount: mergedAmount };
   });
   return mergedAssets.concat(filteredAssets);
@@ -3385,7 +3438,7 @@ var extractBurnedAssetsFromReceipts = (receipts) => {
 
 // src/providers/transaction-summary/status.ts
 import { ErrorCode as ErrorCode11, FuelError as FuelError11 } from "@fuel-ts/errors";
-import { bn as bn14 } from "@fuel-ts/math";
+import { bn as bn15 } from "@fuel-ts/math";
 var getTransactionStatusName = (gqlStatus) => {
   switch (gqlStatus) {
     case "FailureStatus":
@@ -3419,15 +3472,15 @@ var processGraphqlStatus = (gqlTransactionStatus) => {
         time = gqlTransactionStatus.time;
         blockId = gqlTransactionStatus.block.id;
         isStatusSuccess = true;
-        totalFee = bn14(gqlTransactionStatus.totalFee);
-        totalGas = bn14(gqlTransactionStatus.totalGas);
+        totalFee = bn15(gqlTransactionStatus.totalFee);
+        totalGas = bn15(gqlTransactionStatus.totalGas);
         break;
       case "FailureStatus":
         time = gqlTransactionStatus.time;
         blockId = gqlTransactionStatus.block.id;
         isStatusFailure = true;
-        totalFee = bn14(gqlTransactionStatus.totalFee);
-        totalGas = bn14(gqlTransactionStatus.totalGas);
+        totalFee = bn15(gqlTransactionStatus.totalFee);
+        totalGas = bn15(gqlTransactionStatus.totalGas);
         break;
       case "SubmittedStatus":
         time = gqlTransactionStatus.time;
@@ -3477,7 +3530,7 @@ function assembleTransactionSummary(params) {
     maxInputs
   });
   const typeName = getTransactionTypeName(transaction.type);
-  const tip = bn15(transaction.policies?.find((policy) => policy.type === PolicyType3.Tip)?.data);
+  const tip = bn16(transaction.policies?.find((policy) => policy.type === PolicyType3.Tip)?.data);
   const { isStatusFailure, isStatusPending, isStatusSuccess, blockId, status, time, totalFee } = processGraphqlStatus(gqlTransactionStatus);
   const fee = calculateTXFeeForSummary({
     totalFee,
@@ -3548,7 +3601,7 @@ var TransactionResponse = class {
   /** Current provider */
   provider;
   /** Gas used on the transaction */
-  gasUsed = bn16(0);
+  gasUsed = bn17(0);
   /** The graphql Transaction with receipts object. */
   gqlTransaction;
   abis;
@@ -3716,7 +3769,6 @@ var TransactionResponse = class {
 };
 
 // src/providers/utils/auto-retry-fetch.ts
-import { sleep } from "@fuel-ts/utils";
 function getWaitDelay(options, retryAttemptNum) {
   const duration = options.baseDelay ?? 150;
   switch (options.backoff) {
@@ -3783,47 +3835,47 @@ var processGqlChain = (chain) => {
   } = consensusParameters;
   return {
     name,
-    baseChainHeight: bn17(daHeight),
+    baseChainHeight: bn18(daHeight),
     consensusParameters: {
       version,
-      chainId: bn17(chainId),
+      chainId: bn18(chainId),
       baseAssetId,
       feeParameters: {
         version: feeParams.version,
-        gasPerByte: bn17(feeParams.gasPerByte),
-        gasPriceFactor: bn17(feeParams.gasPriceFactor)
+        gasPerByte: bn18(feeParams.gasPerByte),
+        gasPriceFactor: bn18(feeParams.gasPriceFactor)
       },
       contractParameters: {
         version: contractParams.version,
-        contractMaxSize: bn17(contractParams.contractMaxSize),
-        maxStorageSlots: bn17(contractParams.maxStorageSlots)
+        contractMaxSize: bn18(contractParams.contractMaxSize),
+        maxStorageSlots: bn18(contractParams.maxStorageSlots)
       },
       txParameters: {
         version: txParams.version,
-        maxInputs: bn17(txParams.maxInputs),
-        maxOutputs: bn17(txParams.maxOutputs),
-        maxWitnesses: bn17(txParams.maxWitnesses),
-        maxGasPerTx: bn17(txParams.maxGasPerTx),
-        maxSize: bn17(txParams.maxSize),
-        maxBytecodeSubsections: bn17(txParams.maxBytecodeSubsections)
+        maxInputs: bn18(txParams.maxInputs),
+        maxOutputs: bn18(txParams.maxOutputs),
+        maxWitnesses: bn18(txParams.maxWitnesses),
+        maxGasPerTx: bn18(txParams.maxGasPerTx),
+        maxSize: bn18(txParams.maxSize),
+        maxBytecodeSubsections: bn18(txParams.maxBytecodeSubsections)
       },
       predicateParameters: {
         version: predicateParams.version,
-        maxPredicateLength: bn17(predicateParams.maxPredicateLength),
-        maxPredicateDataLength: bn17(predicateParams.maxPredicateDataLength),
-        maxGasPerPredicate: bn17(predicateParams.maxGasPerPredicate),
-        maxMessageDataLength: bn17(predicateParams.maxMessageDataLength)
+        maxPredicateLength: bn18(predicateParams.maxPredicateLength),
+        maxPredicateDataLength: bn18(predicateParams.maxPredicateDataLength),
+        maxGasPerPredicate: bn18(predicateParams.maxGasPerPredicate),
+        maxMessageDataLength: bn18(predicateParams.maxMessageDataLength)
       },
       scriptParameters: {
         version: scriptParams.version,
-        maxScriptLength: bn17(scriptParams.maxScriptLength),
-        maxScriptDataLength: bn17(scriptParams.maxScriptDataLength)
+        maxScriptLength: bn18(scriptParams.maxScriptLength),
+        maxScriptDataLength: bn18(scriptParams.maxScriptDataLength)
       },
       gasCosts
     },
     latestBlock: {
       id: latestBlock.id,
-      height: bn17(latestBlock.height),
+      height: bn18(latestBlock.height),
       time: latestBlock.header.time,
       transactions: latestBlock.transactions.map((i) => ({
         id: i.id
@@ -4019,7 +4071,7 @@ Supported fuel-core version: ${supportedVersion}.`
    */
   async getBlockNumber() {
     const { chain } = await this.operations.getChain();
-    return bn17(chain.latestBlock.height, 10);
+    return bn18(chain.latestBlock.height, 10);
   }
   /**
    * Returns the chain information.
@@ -4029,8 +4081,8 @@ Supported fuel-core version: ${supportedVersion}.`
   async fetchNode() {
     const { nodeInfo } = await this.operations.getNodeInfo();
     const processedNodeInfo = {
-      maxDepth: bn17(nodeInfo.maxDepth),
-      maxTx: bn17(nodeInfo.maxTx),
+      maxDepth: bn18(nodeInfo.maxDepth),
+      maxTx: bn18(nodeInfo.maxTx),
       nodeVersion: nodeInfo.nodeVersion,
       utxoValidation: nodeInfo.utxoValidation,
       vmBacktrace: nodeInfo.vmBacktrace
@@ -4162,7 +4214,7 @@ Supported fuel-core version: ${supportedVersion}.`
     } = response;
     if (inputs) {
       inputs.forEach((input, index) => {
-        if ("predicateGasUsed" in input && bn17(input.predicateGasUsed).gt(0)) {
+        if ("predicateGasUsed" in input && bn18(input.predicateGasUsed).gt(0)) {
           transactionRequest.inputs[index].predicateGasUsed = input.predicateGasUsed;
         }
       });
@@ -4320,12 +4372,12 @@ Supported fuel-core version: ${supportedVersion}.`
       gasPrice = await this.estimateGasPrice(10);
     }
     const minFee = calculateGasFee({
-      gasPrice: bn17(gasPrice),
+      gasPrice: bn18(gasPrice),
       gas: minGas,
       priceFactor: gasPriceFactor,
       tip: transactionRequest.tip
     }).add(1);
-    let gasLimit = bn17(0);
+    let gasLimit = bn18(0);
     if (transactionRequest.type === TransactionType8.Script) {
       gasLimit = transactionRequest.gasLimit;
       if (transactionRequest.gasLimit.eq(0)) {
@@ -4338,7 +4390,7 @@ Supported fuel-core version: ${supportedVersion}.`
     }
     const maxGas = transactionRequest.calculateMaxGas(chainInfo, minGas);
     const maxFee = calculateGasFee({
-      gasPrice: bn17(gasPrice),
+      gasPrice: bn18(gasPrice),
       gas: maxGas,
       priceFactor: gasPriceFactor,
       tip: transactionRequest.tip
@@ -4403,7 +4455,7 @@ Supported fuel-core version: ${supportedVersion}.`
     const allQuantities = mergeQuantities(coinOutputsQuantities, quantitiesToContract);
     txRequestClone.fundWithFakeUtxos(allQuantities, baseAssetId, resourcesOwner?.address);
     if (isScriptTransaction) {
-      txRequestClone.gasLimit = bn17(0);
+      txRequestClone.gasLimit = bn18(0);
     }
     if (resourcesOwner && "populateTransactionPredicateData" in resourcesOwner) {
       resourcesOwner.populateTransactionPredicateData(txRequestClone);
@@ -4424,7 +4476,7 @@ Supported fuel-core version: ${supportedVersion}.`
     let dryRunStatus;
     let missingContractIds = [];
     let outputVariables = 0;
-    let gasUsed = bn17(0);
+    let gasUsed = bn18(0);
     txRequestClone.maxFee = maxFee;
     if (isScriptTransaction) {
       txRequestClone.gasLimit = gasLimit;
@@ -4489,10 +4541,10 @@ Supported fuel-core version: ${supportedVersion}.`
     return coins.map((coin) => ({
       id: coin.utxoId,
       assetId: coin.assetId,
-      amount: bn17(coin.amount),
+      amount: bn18(coin.amount),
       owner: Address2.fromAddressOrString(coin.owner),
-      blockCreated: bn17(coin.blockCreated),
-      txCreatedIdx: bn17(coin.txCreatedIdx)
+      blockCreated: bn18(coin.blockCreated),
+      txCreatedIdx: bn18(coin.txCreatedIdx)
     }));
   }
   /**
@@ -4529,9 +4581,9 @@ Supported fuel-core version: ${supportedVersion}.`
       switch (coin.type) {
         case "MessageCoin":
           return {
-            amount: bn17(coin.amount),
+            amount: bn18(coin.amount),
             assetId: coin.assetId,
-            daHeight: bn17(coin.daHeight),
+            daHeight: bn18(coin.daHeight),
             sender: Address2.fromAddressOrString(coin.sender),
             recipient: Address2.fromAddressOrString(coin.recipient),
             nonce: coin.nonce
@@ -4539,11 +4591,11 @@ Supported fuel-core version: ${supportedVersion}.`
         case "Coin":
           return {
             id: coin.utxoId,
-            amount: bn17(coin.amount),
+            amount: bn18(coin.amount),
             assetId: coin.assetId,
             owner: Address2.fromAddressOrString(coin.owner),
-            blockCreated: bn17(coin.blockCreated),
-            txCreatedIdx: bn17(coin.txCreatedIdx)
+            blockCreated: bn18(coin.blockCreated),
+            txCreatedIdx: bn18(coin.txCreatedIdx)
           };
         default:
           return null;
@@ -4560,13 +4612,13 @@ Supported fuel-core version: ${supportedVersion}.`
   async getBlock(idOrHeight) {
     let variables;
     if (typeof idOrHeight === "number") {
-      variables = { height: bn17(idOrHeight).toString(10) };
+      variables = { height: bn18(idOrHeight).toString(10) };
     } else if (idOrHeight === "latest") {
       variables = { height: (await this.getBlockNumber()).toString(10) };
     } else if (idOrHeight.length === 66) {
       variables = { blockId: idOrHeight };
     } else {
-      variables = { blockId: bn17(idOrHeight).toString(10) };
+      variables = { blockId: bn18(idOrHeight).toString(10) };
     }
     const { block } = await this.operations.getBlock(variables);
     if (!block) {
@@ -4574,7 +4626,7 @@ Supported fuel-core version: ${supportedVersion}.`
     }
     return {
       id: block.id,
-      height: bn17(block.height),
+      height: bn18(block.height),
       time: block.header.time,
       transactionIds: block.transactions.map((tx) => tx.id)
     };
@@ -4589,7 +4641,7 @@ Supported fuel-core version: ${supportedVersion}.`
     const { blocks: fetchedData } = await this.operations.getBlocks(params);
     const blocks = fetchedData.edges.map(({ node: block }) => ({
       id: block.id,
-      height: bn17(block.height),
+      height: bn18(block.height),
       time: block.header.time,
       transactionIds: block.transactions.map((tx) => tx.id)
     }));
@@ -4604,7 +4656,7 @@ Supported fuel-core version: ${supportedVersion}.`
   async getBlockWithTransactions(idOrHeight) {
     let variables;
     if (typeof idOrHeight === "number") {
-      variables = { blockHeight: bn17(idOrHeight).toString(10) };
+      variables = { blockHeight: bn18(idOrHeight).toString(10) };
     } else if (idOrHeight === "latest") {
       variables = { blockHeight: (await this.getBlockNumber()).toString() };
     } else {
@@ -4616,7 +4668,7 @@ Supported fuel-core version: ${supportedVersion}.`
     }
     return {
       id: block.id,
-      height: bn17(block.height, 10),
+      height: bn18(block.height, 10),
       time: block.header.time,
       transactionIds: block.transactions.map((tx) => tx.id),
       transactions: block.transactions.map(
@@ -4665,7 +4717,7 @@ Supported fuel-core version: ${supportedVersion}.`
       contract: Address2.fromAddressOrString(contractId).toB256(),
       asset: hexlify12(assetId)
     });
-    return bn17(contractBalance.amount, 10);
+    return bn18(contractBalance.amount, 10);
   }
   /**
    * Returns the balance for the given owner for the given asset ID.
@@ -4679,7 +4731,7 @@ Supported fuel-core version: ${supportedVersion}.`
       owner: Address2.fromAddressOrString(owner).toB256(),
       assetId: hexlify12(assetId)
     });
-    return bn17(balance.amount, 10);
+    return bn18(balance.amount, 10);
   }
   /**
    * Returns balances for the given owner.
@@ -4697,7 +4749,7 @@ Supported fuel-core version: ${supportedVersion}.`
     const balances = result.balances.edges.map((edge) => edge.node);
     return balances.map((balance) => ({
       assetId: balance.assetId,
-      amount: bn17(balance.amount)
+      amount: bn18(balance.amount)
     }));
   }
   /**
@@ -4719,15 +4771,15 @@ Supported fuel-core version: ${supportedVersion}.`
         sender: message.sender,
         recipient: message.recipient,
         nonce: message.nonce,
-        amount: bn17(message.amount),
+        amount: bn18(message.amount),
         data: message.data
       }),
       sender: Address2.fromAddressOrString(message.sender),
       recipient: Address2.fromAddressOrString(message.recipient),
       nonce: message.nonce,
-      amount: bn17(message.amount),
+      amount: bn18(message.amount),
       data: InputMessageCoder.decodeData(message.data),
-      daHeight: bn17(message.daHeight)
+      daHeight: bn18(message.daHeight)
     }));
   }
   /**
@@ -4780,19 +4832,19 @@ Supported fuel-core version: ${supportedVersion}.`
     } = result.messageProof;
     return {
       messageProof: {
-        proofIndex: bn17(messageProof.proofIndex),
+        proofIndex: bn18(messageProof.proofIndex),
         proofSet: messageProof.proofSet
       },
       blockProof: {
-        proofIndex: bn17(blockProof.proofIndex),
+        proofIndex: bn18(blockProof.proofIndex),
         proofSet: blockProof.proofSet
       },
       messageBlockHeader: {
         id: messageBlockHeader.id,
-        daHeight: bn17(messageBlockHeader.daHeight),
+        daHeight: bn18(messageBlockHeader.daHeight),
         transactionsCount: Number(messageBlockHeader.transactionsCount),
         transactionsRoot: messageBlockHeader.transactionsRoot,
-        height: bn17(messageBlockHeader.height),
+        height: bn18(messageBlockHeader.height),
         prevRoot: messageBlockHeader.prevRoot,
         time: messageBlockHeader.time,
         applicationHash: messageBlockHeader.applicationHash,
@@ -4804,10 +4856,10 @@ Supported fuel-core version: ${supportedVersion}.`
       },
       commitBlockHeader: {
         id: commitBlockHeader.id,
-        daHeight: bn17(commitBlockHeader.daHeight),
+        daHeight: bn18(commitBlockHeader.daHeight),
         transactionsCount: Number(commitBlockHeader.transactionsCount),
         transactionsRoot: commitBlockHeader.transactionsRoot,
-        height: bn17(commitBlockHeader.height),
+        height: bn18(commitBlockHeader.height),
         prevRoot: commitBlockHeader.prevRoot,
         time: commitBlockHeader.time,
         applicationHash: commitBlockHeader.applicationHash,
@@ -4820,19 +4872,19 @@ Supported fuel-core version: ${supportedVersion}.`
       sender: Address2.fromAddressOrString(sender),
       recipient: Address2.fromAddressOrString(recipient),
       nonce,
-      amount: bn17(amount),
+      amount: bn18(amount),
       data
     };
   }
   async getLatestGasPrice() {
     const { latestGasPrice } = await this.operations.getLatestGasPrice();
-    return bn17(latestGasPrice.gasPrice);
+    return bn18(latestGasPrice.gasPrice);
   }
   async estimateGasPrice(blockHorizon) {
     const { estimateGasPrice } = await this.operations.estimateGasPrice({
       blockHorizon: String(blockHorizon)
     });
-    return bn17(estimateGasPrice.gasPrice);
+    return bn18(estimateGasPrice.gasPrice);
   }
   /**
    * Returns Message Proof for given transaction id and the message id from MessageOut receipt.
@@ -4853,10 +4905,10 @@ Supported fuel-core version: ${supportedVersion}.`
    */
   async produceBlocks(amount, startTime) {
     const { produceBlocks: latestBlockHeight } = await this.operations.produceBlocks({
-      blocksToProduce: bn17(amount).toString(10),
+      blocksToProduce: bn18(amount).toString(10),
       startTimestamp: startTime ? DateTime2.fromUnixMilliseconds(startTime).toTai64() : void 0
     });
-    return bn17(latestBlockHeight);
+    return bn18(latestBlockHeight);
   }
   // eslint-disable-next-line @typescript-eslint/require-await
   async getTransactionResponse(transactionId) {
@@ -4902,7 +4954,7 @@ __publicField(Provider, "nodeInfoCache", {});
 
 // src/providers/transaction-summary/get-transaction-summary.ts
 import { ErrorCode as ErrorCode14, FuelError as FuelError14 } from "@fuel-ts/errors";
-import { bn as bn18 } from "@fuel-ts/math";
+import { bn as bn19 } from "@fuel-ts/math";
 import { TransactionCoder as TransactionCoder6 } from "@fuel-ts/transactions";
 import { arrayify as arrayify12 } from "@fuel-ts/utils";
 async function getTransactionSummary(params) {
@@ -4939,8 +4991,8 @@ async function getTransactionSummary(params) {
     transaction: decodedTransaction,
     transactionBytes: arrayify12(gqlTransaction.rawPayload),
     gqlTransactionStatus: gqlTransaction.status,
-    gasPerByte: bn18(gasPerByte),
-    gasPriceFactor: bn18(gasPriceFactor),
+    gasPerByte: bn19(gasPerByte),
+    gasPriceFactor: bn19(gasPriceFactor),
     abiMap,
     maxInputs,
     gasCosts,
@@ -5146,22 +5198,6 @@ var rawAssets = [
 ];
 var assets = resolveIconPaths(rawAssets, fuelAssetsBaseUrl);
 
-// src/providers/transaction-request/helpers.ts
-import { bn as bn19 } from "@fuel-ts/math";
-import { InputType as InputType8 } from "@fuel-ts/transactions";
-var isRequestInputCoin = (input) => input.type === InputType8.Coin;
-var isRequestInputMessage = (input) => input.type === InputType8.Message;
-var isRequestInputResource = (input) => isRequestInputCoin(input) || isRequestInputMessage(input);
-var getAssetAmountInRequestInputs = (inputs, assetId, baseAsset) => inputs.filter(isRequestInputResource).reduce((acc, input) => {
-  if (isRequestInputCoin(input) && input.assetId === assetId) {
-    return acc.add(input.amount);
-  }
-  if (isRequestInputMessage(input) && assetId === baseAsset) {
-    return acc.add(input.amount);
-  }
-  return acc;
-}, bn19(0));
-
 // src/utils/formatTransferToContractScriptData.ts
 import { BigNumberCoder as BigNumberCoder2 } from "@fuel-ts/abi-coder";
 import { BN as BN2 } from "@fuel-ts/math";
@@ -5399,7 +5435,7 @@ var Account = class extends AbstractAccount {
     while (needsToBeFunded && fundingAttempts < MAX_FUNDING_ATTEMPTS) {
       const resources = await this.getResourcesToSpend(
         missingQuantities,
-        cacheTxInputsFromOwner(request.inputs, this.address)
+        cacheRequestInputsResourcesFromOwner(request.inputs, this.address)
       );
       request.addResources(resources);
       request.shiftPredicateData();
@@ -9141,7 +9177,7 @@ import {
 } from "@fuel-ts/abi-coder";
 import { Address as Address9 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode24, FuelError as FuelError24 } from "@fuel-ts/errors";
-import { ByteArrayCoder, InputType as InputType9 } from "@fuel-ts/transactions";
+import { ByteArrayCoder } from "@fuel-ts/transactions";
 import { arrayify as arrayify20, hexlify as hexlify19 } from "@fuel-ts/utils";
 
 // src/predicate/utils/getPredicateRoot.ts
@@ -9200,10 +9236,15 @@ var Predicate = class extends Account {
   populateTransactionPredicateData(transactionRequestLike) {
     const request = transactionRequestify(transactionRequestLike);
     const { policies } = BaseTransactionRequest.getPolicyMeta(request);
-    request.inputs?.forEach((input) => {
-      if (input.type === InputType9.Coin && hexlify19(input.owner) === this.address.toB256()) {
+    const placeholderIndex = this.getIndexFromPlaceholderWitness(request);
+    if (placeholderIndex !== -1) {
+      request.removeWitness(placeholderIndex);
+    }
+    request.inputs.filter(isRequestInputResource).forEach((input) => {
+      if (isRequestInputResourceFromOwner(input, this.address)) {
         input.predicate = hexlify19(this.bytes);
         input.predicateData = hexlify19(this.getPredicateData(policies.length));
+        input.witnessIndex = 0;
       }
     });
     return request;
@@ -9326,6 +9367,28 @@ var Predicate = class extends Account {
     }
     return mutatedBytes;
   }
+  /**
+   * Returns the index of the witness placeholder that was added to this predicate.
+   * If no witness placeholder was added, it returns -1.
+   * @param request - The transaction request.
+   * @returns The index of the witness placeholder, or -1 if there is no witness placeholder.
+   */
+  getIndexFromPlaceholderWitness(request) {
+    const predicateInputs = request.inputs.filter(isRequestInputResource).filter((input) => isRequestInputResourceFromOwner(input, this.address));
+    let index = -1;
+    const hasEmptyPredicateInputs = predicateInputs.find((input) => !input.predicate);
+    if (hasEmptyPredicateInputs) {
+      index = hasEmptyPredicateInputs.witnessIndex;
+      const allInputsAreEmpty = predicateInputs.every((input) => !input.predicate);
+      if (!allInputsAreEmpty) {
+        const wasFilledInputAddedFirst = !!predicateInputs[0]?.predicate;
+        if (wasFilledInputAddedFirst) {
+          index = -1;
+        }
+      }
+    }
+    return index;
+  }
 };
 
 // src/connectors/fuel.ts
@@ -10048,7 +10111,8 @@ export {
   assets,
   buildBlockExplorerUrl,
   cacheFor,
-  cacheTxInputsFromOwner,
+  cacheRequestInputsResources,
+  cacheRequestInputsResourcesFromOwner,
   calculateGasFee,
   calculateMetadataGasForTxCreate,
   calculateMetadataGasForTxScript,
@@ -10062,6 +10126,7 @@ export {
   extractTxError,
   fuelAssetsBaseUrl,
   gasUsedByInputs,
+  getAssetAmountInRequestInputs,
   getAssetEth,
   getAssetFuel,
   getAssetNetwork,
@@ -10096,6 +10161,7 @@ export {
   getReceiptsMessageOut,
   getReceiptsTransferOut,
   getReceiptsWithMissingData,
+  getRequestInputResourceOwner,
   getTransactionStatusName,
   getTransactionSummary,
   getTransactionSummaryFromRequest,
@@ -10109,6 +10175,10 @@ export {
   isMessage,
   isRawCoin,
   isRawMessage,
+  isRequestInputCoin,
+  isRequestInputMessage,
+  isRequestInputResource,
+  isRequestInputResourceFromOwner,
   isType,
   isTypeCreate,
   isTypeMint,
@@ -10123,6 +10193,7 @@ export {
   resolveGasDependentCosts,
   resolveIconPaths,
   returnZeroScript,
+  sleep,
   transactionRequestify,
   urlJoin,
   withTimeout,