@fuel-ts/account 0.85.0 → 0.86.0

package/dist/index.mjs

@@ -31,7 +31,7 @@ var __privateMethod = (obj, member, method) => {
 import { Address as Address3 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode15, FuelError as FuelError15 } from "@fuel-ts/errors";
 import { AbstractAccount } from "@fuel-ts/interfaces";
-import { bn as bn20 } from "@fuel-ts/math";
+import { bn as bn19 } from "@fuel-ts/math";
 import { arrayify as arrayify14, isDefined as isDefined2 } from "@fuel-ts/utils";
 import { clone as clone4 } from "ramda";
 
@@ -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";
@@ -1823,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) => {
@@ -1863,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 ?? [];
@@ -1875,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;
@@ -2012,7 +2058,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType2.Coin
+      (input) => input.type === InputType3.Coin
     );
   }
   /**
@@ -2044,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;
@@ -2061,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;
@@ -2072,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);
@@ -2090,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;
@@ -2101,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);
@@ -2253,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));
@@ -2265,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));
   }
   /**
@@ -2282,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;
@@ -2296,50 +2344,52 @@ 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;
       }
     });
   }
-  shiftPredicateData() {
-    this.inputs.forEach((input) => {
-      if ("predicateData" in input && "padPredicateData" in input && typeof input.padPredicateData === "function") {
-        input.predicateData = input.padPredicateData(
-          BaseTransactionRequest.getPolicyMeta(this).policies.length
-        );
-      }
-    });
-  }
 };
 
 // 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) {
@@ -2350,19 +2400,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
@@ -2386,12 +2436,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;
       }
@@ -2469,7 +2519,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
     };
@@ -2509,7 +2559,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()
@@ -2521,8 +2571,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
@@ -2575,7 +2625,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;
@@ -2592,8 +2642,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)
@@ -2606,7 +2656,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType4.Contract
+      (input) => input.type === InputType5.Contract
     );
   }
   /**
@@ -2686,7 +2736,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       return this;
     }
     const inputIndex = super.pushInput({
-      type: InputType4.Contract,
+      type: InputType5.Contract,
       contractId: contractAddress.toB256(),
       txPointer: "0x00000000000000000000000000000000"
     });
@@ -2728,7 +2778,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;
@@ -2746,21 +2796,6 @@ 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";
@@ -2774,7 +2809,7 @@ 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) => {
@@ -2788,19 +2823,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,
@@ -2819,7 +2854,7 @@ var calculateTXFeeForSummary = (params) => {
   }
   const minGas = getMinGas({
     gasCosts,
-    gasPerByte: bn11(gasPerByte),
+    gasPerByte: bn12(gasPerByte),
     inputs,
     metadataGas,
     txBytesSize: transactionBytes.length
@@ -2850,39 +2885,28 @@ import { bn as bn13 } 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";
-var getFunctionCall = ({ abi, receipt, rawPayload, maxInputs }) => {
+import { Interface as Interface2 } from "@fuel-ts/abi-coder";
+var getFunctionCall = ({ abi, receipt }) => {
   const abiInterface = new Interface2(abi);
   const callFunctionSelector = receipt.param1.toHex(8);
   const functionFragment = abiInterface.getFunction(callFunctionSelector);
   const inputs = functionFragment.jsonFn.inputs;
-  let encodedArgs;
-  if (functionFragment.isInputDataPointer) {
-    if (rawPayload) {
-      const argsOffset = bn12(receipt.param2).sub(calculateVmTxMemory({ maxInputs: maxInputs.toNumber() })).toNumber();
-      encodedArgs = `0x${rawPayload.slice(2).slice(argsOffset * 2)}`;
-    }
-  } else {
-    encodedArgs = receipt.param2.toHex();
-  }
+  const encodedArgs = receipt.param2.toHex();
   let argumentsProvided;
-  if (encodedArgs) {
-    const data = functionFragment.decodeArguments(encodedArgs);
-    if (data) {
-      argumentsProvided = inputs.reduce((prev, input, index) => {
-        const value = data[index];
-        const name = input.name;
-        if (name) {
-          return {
-            ...prev,
-            // reparse to remove bn
-            [name]: JSON.parse(JSON.stringify(value))
-          };
-        }
-        return prev;
-      }, {});
-    }
+  const data = functionFragment.decodeArguments(encodedArgs);
+  if (data) {
+    argumentsProvided = inputs.reduce((prev, input, index) => {
+      const value = data[index];
+      const name = input.name;
+      if (name) {
+        return {
+          ...prev,
+          // reparse to remove bn
+          [name]: JSON.parse(JSON.stringify(value))
+        };
+      }
+      return prev;
+    }, {});
   }
   const call = {
     functionSignature: functionFragment.signature,
@@ -5154,22 +5178,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";
@@ -5373,9 +5381,9 @@ var Account = class extends AbstractAccount {
     const { addedSignatures, estimatedPredicates, requiredQuantities, updateMaxFee } = params;
     const fee = request.maxFee;
     const baseAssetId = this.provider.getBaseAssetId();
-    const requiredInBaseAsset = requiredQuantities.find((quantity) => quantity.assetId === baseAssetId)?.amount || bn20(0);
+    const requiredInBaseAsset = requiredQuantities.find((quantity) => quantity.assetId === baseAssetId)?.amount || bn19(0);
     const requiredQuantitiesWithFee = addAmountToCoinQuantities({
-      amount: bn20(fee),
+      amount: bn19(fee),
       assetId: baseAssetId,
       coinQuantities: requiredQuantities
     });
@@ -5383,7 +5391,7 @@ var Account = class extends AbstractAccount {
     requiredQuantitiesWithFee.forEach(({ amount, assetId }) => {
       quantitiesDict[assetId] = {
         required: amount,
-        owned: bn20(0)
+        owned: bn19(0)
       };
     });
     request.inputs.filter(isRequestInputResource).forEach((input) => {
@@ -5407,10 +5415,9 @@ 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();
       request.updatePredicateGasUsed(estimatedPredicates);
       const requestToReestimate2 = clone4(request);
       if (addedSignatures) {
@@ -5442,7 +5449,6 @@ var Account = class extends AbstractAccount {
       }
       fundingAttempts += 1;
     }
-    request.shiftPredicateData();
     request.updatePredicateGasUsed(estimatedPredicates);
     const requestToReestimate = clone4(request);
     if (addedSignatures) {
@@ -5493,7 +5499,7 @@ var Account = class extends AbstractAccount {
    * @returns A promise that resolves to the transaction response.
    */
   async transfer(destination, amount, assetId, txParams = {}) {
-    if (bn20(amount).lte(0)) {
+    if (bn19(amount).lte(0)) {
       throw new FuelError15(
         ErrorCode15.INVALID_TRANSFER_AMOUNT,
         "Transfer amount must be a positive number."
@@ -5513,7 +5519,7 @@ var Account = class extends AbstractAccount {
    * @returns A promise that resolves to the transaction response.
    */
   async transferToContract(contractId, amount, assetId, txParams = {}) {
-    if (bn20(amount).lte(0)) {
+    if (bn19(amount).lte(0)) {
       throw new FuelError15(
         ErrorCode15.INVALID_TRANSFER_AMOUNT,
         "Transfer amount must be a positive number."
@@ -5523,7 +5529,7 @@ var Account = class extends AbstractAccount {
     const assetIdToTransfer = assetId ?? this.provider.getBaseAssetId();
     const { script, scriptData } = await assembleTransferToContractScript({
       hexlifiedContractId: contractAddress.toB256(),
-      amountToTransfer: bn20(amount),
+      amountToTransfer: bn19(amount),
       assetId: assetIdToTransfer
     });
     let request = new ScriptTransactionRequest({
@@ -5534,7 +5540,7 @@ var Account = class extends AbstractAccount {
     request.addContractInputAndOutput(contractAddress);
     const txCost = await this.provider.getTransactionCost(request, {
       resourcesOwner: this,
-      quantitiesToContract: [{ amount: bn20(amount), assetId: String(assetIdToTransfer) }]
+      quantitiesToContract: [{ amount: bn19(amount), assetId: String(assetIdToTransfer) }]
     });
     request = this.validateGasLimitAndMaxFee({
       transactionRequest: request,
@@ -5559,7 +5565,7 @@ var Account = class extends AbstractAccount {
       "0x".concat(recipientAddress.toHexString().substring(2).padStart(64, "0"))
     );
     const amountDataArray = arrayify14(
-      "0x".concat(bn20(amount).toHex().substring(2).padStart(16, "0"))
+      "0x".concat(bn19(amount).toHex().substring(2).padStart(16, "0"))
     );
     const script = new Uint8Array([
       ...arrayify14(withdrawScript.bytes),
@@ -5569,7 +5575,7 @@ var Account = class extends AbstractAccount {
     const params = { script, ...txParams };
     const baseAssetId = this.provider.getBaseAssetId();
     let request = new ScriptTransactionRequest(params);
-    const quantitiesToContract = [{ amount: bn20(amount), assetId: baseAssetId }];
+    const quantitiesToContract = [{ amount: bn19(amount), assetId: baseAssetId }];
     const txCost = await this.provider.getTransactionCost(request, { quantitiesToContract });
     request = this.validateGasLimitAndMaxFee({
       transactionRequest: request,
@@ -5987,18 +5993,17 @@ var BaseWalletUnlocked = class extends Account {
 __publicField(BaseWalletUnlocked, "defaultPath", "m/44'/1179993420'/0'/0/0");
 
 // src/hdwallet/hdwallet.ts
+import { computeHmac as computeHmac2, ripemd160 } from "@fuel-ts/crypto";
 import { ErrorCode as ErrorCode19, FuelError as FuelError19 } from "@fuel-ts/errors";
 import { sha256 as sha2564 } from "@fuel-ts/hasher";
-import { bn as bn21, toBytes as toBytes2, toHex } from "@fuel-ts/math";
-import { arrayify as arrayify18, hexlify as hexlify17, concat as concat5 } from "@fuel-ts/utils";
-import { toBeHex, dataSlice as dataSlice2, encodeBase58 as encodeBase582, decodeBase58, computeHmac as computeHmac2, ripemd160 } from "ethers";
+import { bn as bn20, toBytes as toBytes2, toHex } from "@fuel-ts/math";
+import { arrayify as arrayify18, hexlify as hexlify17, concat as concat5, dataSlice as dataSlice2, encodeBase58 as encodeBase582, decodeBase58 } from "@fuel-ts/utils";
 
 // src/mnemonic/mnemonic.ts
-import { randomBytes as randomBytes4 } from "@fuel-ts/crypto";
+import { randomBytes as randomBytes4, pbkdf2, computeHmac } from "@fuel-ts/crypto";
 import { ErrorCode as ErrorCode18, FuelError as FuelError18 } from "@fuel-ts/errors";
 import { sha256 as sha2563 } from "@fuel-ts/hasher";
-import { arrayify as arrayify17, hexlify as hexlify16, concat as concat4 } from "@fuel-ts/utils";
-import { dataSlice, pbkdf2, computeHmac, encodeBase58 } from "ethers";
+import { arrayify as arrayify17, hexlify as hexlify16, concat as concat4, dataSlice, encodeBase58, toUtf8Bytes } from "@fuel-ts/utils";
 
 // src/wordlists/words/english.ts
 var english = [
@@ -8062,38 +8067,6 @@ var Language = /* @__PURE__ */ ((Language2) => {
 import { ErrorCode as ErrorCode17, FuelError as FuelError17 } from "@fuel-ts/errors";
 import { sha256 as sha2562 } from "@fuel-ts/hasher";
 import { arrayify as arrayify16 } from "@fuel-ts/utils";
-function toUtf8Bytes(stri) {
-  const str = stri.normalize("NFKD");
-  const result = [];
-  for (let i = 0; i < str.length; i += 1) {
-    const c = str.charCodeAt(i);
-    if (c < 128) {
-      result.push(c);
-    } else if (c < 2048) {
-      result.push(c >> 6 | 192);
-      result.push(c & 63 | 128);
-    } else if ((c & 64512) === 55296) {
-      i += 1;
-      const c2 = str.charCodeAt(i);
-      if (i >= str.length || (c2 & 64512) !== 56320) {
-        throw new FuelError17(
-          ErrorCode17.INVALID_INPUT_PARAMETERS,
-          "Invalid UTF-8 in the input string."
-        );
-      }
-      const pair = 65536 + ((c & 1023) << 10) + (c2 & 1023);
-      result.push(pair >> 18 | 240);
-      result.push(pair >> 12 & 63 | 128);
-      result.push(pair >> 6 & 63 | 128);
-      result.push(pair & 63 | 128);
-    } else {
-      result.push(c >> 12 | 224);
-      result.push(c >> 6 & 63 | 128);
-      result.push(c & 63 | 128);
-    }
-  }
-  return Uint8Array.from(result);
-}
 function getLowerMask(bits) {
   return (1 << bits) - 1;
 }
@@ -8461,7 +8434,7 @@ var HDWallet = class {
     const IR = bytes.slice(32);
     if (privateKey) {
       const N = "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141";
-      const ki = bn21(IL).add(privateKey).mod(N).toBytes(32);
+      const ki = bn20(IL).add(privateKey).mod(N).toBytes(32);
       return new HDWallet({
         privateKey: ki,
         chainCode: IR,
@@ -8527,7 +8500,7 @@ var HDWallet = class {
     });
   }
   static fromExtendedKey(extendedKey) {
-    const decoded = toBeHex(decodeBase58(extendedKey));
+    const decoded = hexlify17(toBytes2(decodeBase58(extendedKey)));
     const bytes = arrayify18(decoded);
     const validChecksum = base58check(bytes.slice(0, 78)) === extendedKey;
     if (bytes.length !== 82 || !isValidExtendedKey(bytes)) {
@@ -9140,16 +9113,9 @@ var StorageAbstract = class {
 };
 
 // src/predicate/predicate.ts
-import {
-  Interface as Interface4,
-  INPUT_COIN_FIXED_SIZE,
-  WORD_SIZE,
-  calculateVmTxMemory as calculateVmTxMemory2,
-  SCRIPT_FIXED_SIZE
-} from "@fuel-ts/abi-coder";
+import { Interface as Interface4 } 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 { arrayify as arrayify20, hexlify as hexlify19 } from "@fuel-ts/utils";
 
 // src/predicate/utils/getPredicateRoot.ts
@@ -9207,11 +9173,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.predicateData = hexlify19(this.getPredicateData());
+        input.witnessIndex = 0;
       }
     });
     return request;
@@ -9236,17 +9206,12 @@ var Predicate = class extends Account {
     const transactionRequest = transactionRequestify(transactionRequestLike);
     return super.simulateTransaction(transactionRequest, { estimateTxDependencies: false });
   }
-  getPredicateData(policiesLength) {
+  getPredicateData() {
     if (!this.predicateData.length) {
       return new Uint8Array();
     }
     const mainFn = this.interface?.functions.main;
-    const paddedCode = new ByteArrayCoder(this.bytes.length).encode(this.bytes);
-    const VM_TX_MEMORY = calculateVmTxMemory2({
-      maxInputs: this.provider.getChain().consensusParameters.txParameters.maxInputs.toNumber()
-    });
-    const OFFSET = VM_TX_MEMORY + SCRIPT_FIXED_SIZE + INPUT_COIN_FIXED_SIZE + WORD_SIZE + paddedCode.byteLength + policiesLength * WORD_SIZE;
-    return mainFn?.encodeArguments(this.predicateData, OFFSET) || new Uint8Array();
+    return mainFn?.encodeArguments(this.predicateData) || new Uint8Array();
   }
   /**
    * Processes the predicate data and returns the altered bytecode and interface.
@@ -9295,8 +9260,7 @@ var Predicate = class extends Account {
     );
     return resources.map((resource) => ({
       ...resource,
-      predicate: hexlify19(this.bytes),
-      padPredicateData: (policiesLength) => hexlify19(this.getPredicateData(policiesLength))
+      predicate: hexlify19(this.bytes)
     }));
   }
   /**
@@ -9334,6 +9298,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
@@ -10056,7 +10042,8 @@ export {
   assets,
   buildBlockExplorerUrl,
   cacheFor,
-  cacheTxInputsFromOwner,
+  cacheRequestInputsResources,
+  cacheRequestInputsResourcesFromOwner,
   calculateGasFee,
   calculateMetadataGasForTxCreate,
   calculateMetadataGasForTxScript,
@@ -10070,6 +10057,7 @@ export {
   extractTxError,
   fuelAssetsBaseUrl,
   gasUsedByInputs,
+  getAssetAmountInRequestInputs,
   getAssetEth,
   getAssetFuel,
   getAssetNetwork,
@@ -10104,6 +10092,7 @@ export {
   getReceiptsMessageOut,
   getReceiptsTransferOut,
   getReceiptsWithMissingData,
+  getRequestInputResourceOwner,
   getTransactionStatusName,
   getTransactionSummary,
   getTransactionSummaryFromRequest,
@@ -10117,6 +10106,10 @@ export {
   isMessage,
   isRawCoin,
   isRawMessage,
+  isRequestInputCoin,
+  isRequestInputMessage,
+  isRequestInputResource,
+  isRequestInputResourceFromOwner,
   isType,
   isTypeCreate,
   isTypeMint,