@fuel-ts/account 0.0.0-rc-2241-20240508114911 → 0.0.0-rc-2037-20240508123129

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,
@@ -88,7 +88,7 @@ import { clone as clone3 } from "ramda";
 
 // src/providers/__generated__/operations.ts
 import gql from "graphql-tag";
-var TransactionStatusSubscriptionFragmentDoc = gql`
+var TransactionStatusSubscriptionFragmentFragmentDoc = gql`
     fragment transactionStatusSubscriptionFragment on TransactionStatus {
   type: __typename
   ... on SqueezedOutStatus {
@@ -96,13 +96,7 @@ var TransactionStatusSubscriptionFragmentDoc = gql`
   }
 }
     `;
-var SubmittedStatusFragmentDoc = gql`
-    fragment SubmittedStatusFragment on SubmittedStatus {
-  type: __typename
-  time
-}
-    `;
-var ReceiptFragmentDoc = gql`
+var ReceiptFragmentFragmentDoc = gql`
     fragment receiptFragment on Receipt {
   id
   pc
@@ -134,65 +128,45 @@ var ReceiptFragmentDoc = gql`
   subId
 }
     `;
-var SuccessStatusFragmentDoc = gql`
-    fragment SuccessStatusFragment on SuccessStatus {
-  type: __typename
-  block {
-    id
-  }
-  time
-  programState {
-    returnType
-    data
-  }
-  receipts {
-    ...receiptFragment
-  }
-  totalGas
-  totalFee
-}
-    ${ReceiptFragmentDoc}`;
-var FailureStatusFragmentDoc = gql`
-    fragment FailureStatusFragment on FailureStatus {
-  type: __typename
-  block {
-    id
-  }
-  totalGas
-  totalFee
-  time
-  reason
-  receipts {
-    ...receiptFragment
-  }
-}
-    ${ReceiptFragmentDoc}`;
-var SqueezedOutStatusFragmentDoc = gql`
-    fragment SqueezedOutStatusFragment on SqueezedOutStatus {
-  type: __typename
-  reason
-}
-    `;
-var TransactionStatusFragmentDoc = gql`
+var TransactionStatusFragmentFragmentDoc = gql`
     fragment transactionStatusFragment on TransactionStatus {
+  type: __typename
   ... on SubmittedStatus {
-    ...SubmittedStatusFragment
+    time
   }
   ... on SuccessStatus {
-    ...SuccessStatusFragment
+    block {
+      id
+    }
+    time
+    programState {
+      returnType
+      data
+    }
+    receipts {
+      ...receiptFragment
+    }
+    totalGas
+    totalFee
   }
   ... on FailureStatus {
-    ...FailureStatusFragment
+    block {
+      id
+    }
+    totalGas
+    totalFee
+    time
+    reason
+    receipts {
+      ...receiptFragment
+    }
   }
   ... on SqueezedOutStatus {
-    ...SqueezedOutStatusFragment
+    reason
   }
 }
-    ${SubmittedStatusFragmentDoc}
-${SuccessStatusFragmentDoc}
-${FailureStatusFragmentDoc}
-${SqueezedOutStatusFragmentDoc}`;
-var TransactionFragmentDoc = gql`
+    ${ReceiptFragmentFragmentDoc}`;
+var TransactionFragmentFragmentDoc = gql`
     fragment transactionFragment on Transaction {
   id
   rawPayload
@@ -200,8 +174,8 @@ var TransactionFragmentDoc = gql`
     ...transactionStatusFragment
   }
 }
-    ${TransactionStatusFragmentDoc}`;
-var InputEstimatePredicatesFragmentDoc = gql`
+    ${TransactionStatusFragmentFragmentDoc}`;
+var InputEstimatePredicatesFragmentFragmentDoc = gql`
     fragment inputEstimatePredicatesFragment on Input {
   ... on InputCoin {
     predicateGasUsed
@@ -211,14 +185,14 @@ var InputEstimatePredicatesFragmentDoc = gql`
   }
 }
     `;
-var TransactionEstimatePredicatesFragmentDoc = gql`
+var TransactionEstimatePredicatesFragmentFragmentDoc = gql`
     fragment transactionEstimatePredicatesFragment on Transaction {
   inputs {
     ...inputEstimatePredicatesFragment
   }
 }
-    ${InputEstimatePredicatesFragmentDoc}`;
-var DryRunFailureStatusFragmentDoc = gql`
+    ${InputEstimatePredicatesFragmentFragmentDoc}`;
+var DryRunFailureStatusFragmentFragmentDoc = gql`
     fragment dryRunFailureStatusFragment on DryRunFailureStatus {
   totalGas
   totalFee
@@ -229,7 +203,7 @@ var DryRunFailureStatusFragmentDoc = gql`
   }
 }
     `;
-var DryRunSuccessStatusFragmentDoc = gql`
+var DryRunSuccessStatusFragmentFragmentDoc = gql`
     fragment dryRunSuccessStatusFragment on DryRunSuccessStatus {
   totalGas
   totalFee
@@ -239,7 +213,7 @@ var DryRunSuccessStatusFragmentDoc = gql`
   }
 }
     `;
-var DryRunTransactionStatusFragmentDoc = gql`
+var DryRunTransactionStatusFragmentFragmentDoc = gql`
     fragment dryRunTransactionStatusFragment on DryRunTransactionStatus {
   ... on DryRunFailureStatus {
     ...dryRunFailureStatusFragment
@@ -248,9 +222,9 @@ var DryRunTransactionStatusFragmentDoc = gql`
     ...dryRunSuccessStatusFragment
   }
 }
-    ${DryRunFailureStatusFragmentDoc}
-${DryRunSuccessStatusFragmentDoc}`;
-var DryRunTransactionExecutionStatusFragmentDoc = gql`
+    ${DryRunFailureStatusFragmentFragmentDoc}
+${DryRunSuccessStatusFragmentFragmentDoc}`;
+var DryRunTransactionExecutionStatusFragmentFragmentDoc = gql`
     fragment dryRunTransactionExecutionStatusFragment on DryRunTransactionExecutionStatus {
   id
   status {
@@ -260,11 +234,11 @@ var DryRunTransactionExecutionStatusFragmentDoc = gql`
     ...receiptFragment
   }
 }
-    ${DryRunTransactionStatusFragmentDoc}
-${ReceiptFragmentDoc}`;
-var CoinFragmentDoc = gql`
+    ${DryRunTransactionStatusFragmentFragmentDoc}
+${ReceiptFragmentFragmentDoc}`;
+var CoinFragmentFragmentDoc = gql`
     fragment coinFragment on Coin {
-  type: __typename
+  __typename
   utxoId
   owner
   amount
@@ -273,9 +247,9 @@ var CoinFragmentDoc = gql`
   txCreatedIdx
 }
     `;
-var MessageCoinFragmentDoc = gql`
+var MessageCoinFragmentFragmentDoc = gql`
     fragment messageCoinFragment on MessageCoin {
-  type: __typename
+  __typename
   sender
   recipient
   nonce
@@ -284,7 +258,7 @@ var MessageCoinFragmentDoc = gql`
   daHeight
 }
     `;
-var MessageFragmentDoc = gql`
+var MessageFragmentFragmentDoc = gql`
     fragment messageFragment on Message {
   amount
   sender
@@ -294,7 +268,7 @@ var MessageFragmentDoc = gql`
   daHeight
 }
     `;
-var MessageProofFragmentDoc = gql`
+var MessageProofFragmentFragmentDoc = gql`
     fragment messageProofFragment on MessageProof {
   messageProof {
     proofSet
@@ -341,14 +315,14 @@ var MessageProofFragmentDoc = gql`
   data
 }
     `;
-var BalanceFragmentDoc = gql`
+var BalanceFragmentFragmentDoc = gql`
     fragment balanceFragment on Balance {
   owner
   amount
   assetId
 }
     `;
-var BlockFragmentDoc = gql`
+var BlockFragmentFragmentDoc = gql`
     fragment blockFragment on Block {
   id
   height
@@ -360,7 +334,7 @@ var BlockFragmentDoc = gql`
   }
 }
     `;
-var TxParametersFragmentDoc = gql`
+var TxParametersFragmentFragmentDoc = gql`
     fragment TxParametersFragment on TxParameters {
   version
   maxInputs
@@ -371,7 +345,7 @@ var TxParametersFragmentDoc = gql`
   maxBytecodeSubsections
 }
     `;
-var PredicateParametersFragmentDoc = gql`
+var PredicateParametersFragmentFragmentDoc = gql`
     fragment PredicateParametersFragment on PredicateParameters {
   version
   maxPredicateLength
@@ -380,42 +354,41 @@ var PredicateParametersFragmentDoc = gql`
   maxMessageDataLength
 }
     `;
-var ScriptParametersFragmentDoc = gql`
+var ScriptParametersFragmentFragmentDoc = gql`
     fragment ScriptParametersFragment on ScriptParameters {
   version
   maxScriptLength
   maxScriptDataLength
 }
     `;
-var ContractParametersFragmentDoc = gql`
+var ContractParametersFragmentFragmentDoc = gql`
     fragment ContractParametersFragment on ContractParameters {
   version
   contractMaxSize
   maxStorageSlots
 }
     `;
-var FeeParametersFragmentDoc = gql`
+var FeeParametersFragmentFragmentDoc = gql`
     fragment FeeParametersFragment on FeeParameters {
   version
   gasPriceFactor
   gasPerByte
 }
     `;
-var DependentCostFragmentDoc = gql`
+var DependentCostFragmentFragmentDoc = gql`
     fragment DependentCostFragment on DependentCost {
+  __typename
   ... on LightOperation {
-    type: __typename
     base
     unitsPerGas
   }
   ... on HeavyOperation {
-    type: __typename
     base
     gasPerUnit
   }
 }
     `;
-var GasCostsFragmentDoc = gql`
+var GasCostsFragmentFragmentDoc = gql`
     fragment GasCostsFragment on GasCosts {
   version
   add
@@ -571,8 +544,8 @@ var GasCostsFragmentDoc = gql`
   }
   newStoragePerByte
 }
-    ${DependentCostFragmentDoc}`;
-var ConsensusParametersFragmentDoc = gql`
+    ${DependentCostFragmentFragmentDoc}`;
+var ConsensusParametersFragmentFragmentDoc = gql`
     fragment consensusParametersFragment on ConsensusParameters {
   version
   txParams {
@@ -596,13 +569,13 @@ var ConsensusParametersFragmentDoc = gql`
   baseAssetId
   chainId
 }
-    ${TxParametersFragmentDoc}
-${PredicateParametersFragmentDoc}
-${ScriptParametersFragmentDoc}
-${ContractParametersFragmentDoc}
-${FeeParametersFragmentDoc}
-${GasCostsFragmentDoc}`;
-var ChainInfoFragmentDoc = gql`
+    ${TxParametersFragmentFragmentDoc}
+${PredicateParametersFragmentFragmentDoc}
+${ScriptParametersFragmentFragmentDoc}
+${ContractParametersFragmentFragmentDoc}
+${FeeParametersFragmentFragmentDoc}
+${GasCostsFragmentFragmentDoc}`;
+var ChainInfoFragmentFragmentDoc = gql`
     fragment chainInfoFragment on ChainInfo {
   name
   latestBlock {
@@ -613,16 +586,16 @@ var ChainInfoFragmentDoc = gql`
     ...consensusParametersFragment
   }
 }
-    ${BlockFragmentDoc}
-${ConsensusParametersFragmentDoc}`;
-var ContractBalanceFragmentDoc = gql`
+    ${BlockFragmentFragmentDoc}
+${ConsensusParametersFragmentFragmentDoc}`;
+var ContractBalanceFragmentFragmentDoc = gql`
     fragment contractBalanceFragment on ContractBalance {
   contract
   amount
   assetId
 }
     `;
-var PageInfoFragmentDoc = gql`
+var PageInfoFragmentFragmentDoc = gql`
     fragment pageInfoFragment on PageInfo {
   hasPreviousPage
   hasNextPage
@@ -630,7 +603,7 @@ var PageInfoFragmentDoc = gql`
   endCursor
 }
     `;
-var NodeInfoFragmentDoc = gql`
+var NodeInfoFragmentFragmentDoc = gql`
     fragment nodeInfoFragment on NodeInfo {
   utxoValidation
   vmBacktrace
@@ -639,7 +612,7 @@ var NodeInfoFragmentDoc = gql`
   nodeVersion
 }
     `;
-var RelayedTransactionStatusFragmentDoc = gql`
+var RelayedTransactionStatusFragmentFragmentDoc = gql`
     fragment relayedTransactionStatusFragment on RelayedTransactionStatus {
   ... on RelayedTransactionFailed {
     blockHeight
@@ -660,28 +633,28 @@ var GetNodeInfoDocument = gql`
     ...nodeInfoFragment
   }
 }
-    ${NodeInfoFragmentDoc}`;
+    ${NodeInfoFragmentFragmentDoc}`;
 var GetChainDocument = gql`
     query getChain {
   chain {
     ...chainInfoFragment
   }
 }
-    ${ChainInfoFragmentDoc}`;
+    ${ChainInfoFragmentFragmentDoc}`;
 var GetTransactionDocument = gql`
     query getTransaction($transactionId: TransactionId!) {
   transaction(id: $transactionId) {
     ...transactionFragment
   }
 }
-    ${TransactionFragmentDoc}`;
+    ${TransactionFragmentFragmentDoc}`;
 var GetTransactionWithReceiptsDocument = gql`
     query getTransactionWithReceipts($transactionId: TransactionId!) {
   transaction(id: $transactionId) {
     ...transactionFragment
   }
 }
-    ${TransactionFragmentDoc}`;
+    ${TransactionFragmentFragmentDoc}`;
 var GetTransactionsDocument = gql`
     query getTransactions($after: String, $before: String, $first: Int, $last: Int) {
   transactions(after: $after, before: $before, first: $first, last: $last) {
@@ -692,7 +665,7 @@ var GetTransactionsDocument = gql`
     }
   }
 }
-    ${TransactionFragmentDoc}`;
+    ${TransactionFragmentFragmentDoc}`;
 var GetTransactionsByOwnerDocument = gql`
     query getTransactionsByOwner($owner: Address!, $after: String, $before: String, $first: Int, $last: Int) {
   transactionsByOwner(
@@ -712,22 +685,22 @@ var GetTransactionsByOwnerDocument = gql`
     }
   }
 }
-    ${PageInfoFragmentDoc}
-${TransactionFragmentDoc}`;
+    ${PageInfoFragmentFragmentDoc}
+${TransactionFragmentFragmentDoc}`;
 var EstimatePredicatesDocument = gql`
     query estimatePredicates($encodedTransaction: HexString!) {
   estimatePredicates(tx: $encodedTransaction) {
     ...transactionEstimatePredicatesFragment
   }
 }
-    ${TransactionEstimatePredicatesFragmentDoc}`;
+    ${TransactionEstimatePredicatesFragmentFragmentDoc}`;
 var GetBlockDocument = gql`
     query getBlock($blockId: BlockId, $height: U32) {
   block(id: $blockId, height: $height) {
     ...blockFragment
   }
 }
-    ${BlockFragmentDoc}`;
+    ${BlockFragmentFragmentDoc}`;
 var GetBlockWithTransactionsDocument = gql`
     query getBlockWithTransactions($blockId: BlockId, $blockHeight: U32) {
   block(id: $blockId, height: $blockHeight) {
@@ -737,8 +710,8 @@ var GetBlockWithTransactionsDocument = gql`
     }
   }
 }
-    ${BlockFragmentDoc}
-${TransactionFragmentDoc}`;
+    ${BlockFragmentFragmentDoc}
+${TransactionFragmentFragmentDoc}`;
 var GetBlocksDocument = gql`
     query getBlocks($after: String, $before: String, $first: Int, $last: Int) {
   blocks(after: $after, before: $before, first: $first, last: $last) {
@@ -749,14 +722,14 @@ var GetBlocksDocument = gql`
     }
   }
 }
-    ${BlockFragmentDoc}`;
+    ${BlockFragmentFragmentDoc}`;
 var GetCoinDocument = gql`
     query getCoin($coinId: UtxoId!) {
   coin(utxoId: $coinId) {
     ...coinFragment
   }
 }
-    ${CoinFragmentDoc}`;
+    ${CoinFragmentFragmentDoc}`;
 var GetCoinsDocument = gql`
     query getCoins($filter: CoinFilterInput!, $after: String, $before: String, $first: Int, $last: Int) {
   coins(
@@ -773,7 +746,7 @@ var GetCoinsDocument = gql`
     }
   }
 }
-    ${CoinFragmentDoc}`;
+    ${CoinFragmentFragmentDoc}`;
 var GetCoinsToSpendDocument = gql`
     query getCoinsToSpend($owner: Address!, $queryPerAsset: [SpendQueryElementInput!]!, $excludedIds: ExcludeInput) {
   coinsToSpend(
@@ -785,8 +758,8 @@ var GetCoinsToSpendDocument = gql`
     ...messageCoinFragment
   }
 }
-    ${CoinFragmentDoc}
-${MessageCoinFragmentDoc}`;
+    ${CoinFragmentFragmentDoc}
+${MessageCoinFragmentFragmentDoc}`;
 var GetContractDocument = gql`
     query getContract($contractId: ContractId!) {
   contract(id: $contractId) {
@@ -801,14 +774,14 @@ var GetContractBalanceDocument = gql`
     ...contractBalanceFragment
   }
 }
-    ${ContractBalanceFragmentDoc}`;
+    ${ContractBalanceFragmentFragmentDoc}`;
 var GetBalanceDocument = gql`
     query getBalance($owner: Address!, $assetId: AssetId!) {
   balance(owner: $owner, assetId: $assetId) {
     ...balanceFragment
   }
 }
-    ${BalanceFragmentDoc}`;
+    ${BalanceFragmentFragmentDoc}`;
 var GetLatestGasPriceDocument = gql`
     query getLatestGasPrice {
   latestGasPrice {
@@ -839,7 +812,7 @@ var GetBalancesDocument = gql`
     }
   }
 }
-    ${BalanceFragmentDoc}`;
+    ${BalanceFragmentFragmentDoc}`;
 var GetMessagesDocument = gql`
     query getMessages($owner: Address!, $after: String, $before: String, $first: Int, $last: Int) {
   messages(
@@ -856,7 +829,7 @@ var GetMessagesDocument = gql`
     }
   }
 }
-    ${MessageFragmentDoc}`;
+    ${MessageFragmentFragmentDoc}`;
 var GetMessageProofDocument = gql`
     query getMessageProof($transactionId: TransactionId!, $nonce: Nonce!, $commitBlockId: BlockId, $commitBlockHeight: U32) {
   messageProof(
@@ -868,7 +841,7 @@ var GetMessageProofDocument = gql`
     ...messageProofFragment
   }
 }
-    ${MessageProofFragmentDoc}`;
+    ${MessageProofFragmentFragmentDoc}`;
 var GetMessageStatusDocument = gql`
     query getMessageStatus($nonce: Nonce!) {
   messageStatus(nonce: $nonce) {
@@ -882,14 +855,14 @@ var GetRelayedTransactionStatusDocument = gql`
     ...relayedTransactionStatusFragment
   }
 }
-    ${RelayedTransactionStatusFragmentDoc}`;
+    ${RelayedTransactionStatusFragmentFragmentDoc}`;
 var DryRunDocument = gql`
     mutation dryRun($encodedTransactions: [HexString!]!, $utxoValidation: Boolean) {
   dryRun(txs: $encodedTransactions, utxoValidation: $utxoValidation) {
     ...dryRunTransactionExecutionStatusFragment
   }
 }
-    ${DryRunTransactionExecutionStatusFragmentDoc}`;
+    ${DryRunTransactionExecutionStatusFragmentFragmentDoc}`;
 var SubmitDocument = gql`
     mutation submit($encodedTransaction: HexString!) {
   submit(tx: $encodedTransaction) {
@@ -911,21 +884,21 @@ var GetMessageByNonceDocument = gql`
     ...messageFragment
   }
 }
-    ${MessageFragmentDoc}`;
+    ${MessageFragmentFragmentDoc}`;
 var SubmitAndAwaitDocument = gql`
     subscription submitAndAwait($encodedTransaction: HexString!) {
   submitAndAwait(tx: $encodedTransaction) {
     ...transactionStatusSubscriptionFragment
   }
 }
-    ${TransactionStatusSubscriptionFragmentDoc}`;
+    ${TransactionStatusSubscriptionFragmentFragmentDoc}`;
 var StatusChangeDocument = gql`
     subscription statusChange($transactionId: TransactionId!) {
   statusChange(id: $transactionId) {
     ...transactionStatusSubscriptionFragment
   }
 }
-    ${TransactionStatusSubscriptionFragmentDoc}`;
+    ${TransactionStatusSubscriptionFragmentFragmentDoc}`;
 function getSdk(requester) {
   return {
     getVersion(variables, options) {
@@ -1296,11 +1269,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";
@@ -1599,9 +1572,10 @@ var getGasUsedFromReceipts = (receipts) => {
 function resolveGasDependentCosts(byteSize, gasDependentCost) {
   const base = bn5(gasDependentCost.base);
   let dependentValue = bn5(0);
-  if ("unitsPerGas" in gasDependentCost) {
+  if (gasDependentCost.__typename === "LightOperation") {
     dependentValue = bn5(byteSize).div(bn5(gasDependentCost.unitsPerGas));
-  } else {
+  }
+  if (gasDependentCost.__typename === "HeavyOperation") {
     dependentValue = bn5(byteSize).mul(bn5(gasDependentCost.gasPerUnit));
   }
   return base.add(dependentValue);
@@ -1823,6 +1797,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 +1883,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 +1895,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 +2032,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType2.Coin
+      (input) => input.type === InputType3.Coin
     );
   }
   /**
@@ -2044,9 +2064,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 +2081,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 +2092,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 +2111,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 +2122,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 +2275,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 +2287,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 +2304,7 @@ var BaseTransactionRequest = class {
    */
   getCoinOutputsQuantities() {
     const coinsQuantities = this.getCoinOutputs().map(({ amount, assetId }) => ({
-      amount: bn7(amount),
+      amount: bn8(amount),
       assetId: assetId.toString()
     }));
     return coinsQuantities;
@@ -2296,22 +2318,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;
@@ -2331,15 +2364,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) {
@@ -2350,19 +2383,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 +2419,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 +2502,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 +2542,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 +2554,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 +2608,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 +2625,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 +2639,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType4.Contract
+      (input) => input.type === InputType5.Contract
     );
   }
   /**
@@ -2686,7 +2719,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 +2761,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,35 +2779,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) => {
@@ -2788,19 +2806,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 +2837,7 @@ var calculateTXFeeForSummary = (params) => {
   }
   const minGas = getMinGas({
     gasCosts,
-    gasPerByte: bn11(gasPerByte),
+    gasPerByte: bn12(gasPerByte),
     inputs,
     metadataGas,
     txBytesSize: transactionBytes.length
@@ -2846,12 +2864,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);
@@ -2860,7 +2878,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 {
@@ -3068,7 +3086,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);
@@ -3394,7 +3412,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":
@@ -3428,15 +3446,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;
@@ -3486,7 +3504,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,
@@ -3557,7 +3575,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;
@@ -3791,47 +3809,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
@@ -4027,7 +4045,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.
@@ -4037,8 +4055,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
@@ -4170,7 +4188,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;
         }
       });
@@ -4328,12 +4346,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)) {
@@ -4346,7 +4364,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
@@ -4409,9 +4427,9 @@ Supported fuel-core version: ${supportedVersion}.`
     const coinOutputsQuantities = txRequestClone.getCoinOutputsQuantities();
     const allQuantities = mergeQuantities(coinOutputsQuantities, quantitiesToContract);
     txRequestClone.fundWithFakeUtxos(allQuantities, baseAssetId, resourcesOwner?.address);
-    txRequestClone.maxFee = bn17(0);
+    txRequestClone.maxFee = bn18(0);
     if (isScriptTransaction) {
-      txRequestClone.gasLimit = bn17(0);
+      txRequestClone.gasLimit = bn18(0);
     }
     if (resourcesOwner && "populateTransactionPredicateData" in resourcesOwner) {
       resourcesOwner.populateTransactionPredicateData(txRequestClone);
@@ -4431,7 +4449,7 @@ Supported fuel-core version: ${supportedVersion}.`
     let dryRunStatus;
     let missingContractIds = [];
     let outputVariables = 0;
-    let gasUsed = bn17(0);
+    let gasUsed = bn18(0);
     txRequestClone.updatePredicateGasUsed(signedRequest.inputs);
     txRequestClone.maxFee = maxFee;
     if (isScriptTransaction) {
@@ -4496,10 +4514,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)
     }));
   }
   /**
@@ -4533,12 +4551,12 @@ Supported fuel-core version: ${supportedVersion}.`
     };
     const result = await this.operations.getCoinsToSpend(coinsQuery);
     const coins = result.coinsToSpend.flat().map((coin) => {
-      switch (coin.type) {
+      switch (coin.__typename) {
         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
@@ -4546,11 +4564,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;
@@ -4567,13 +4585,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) {
@@ -4581,7 +4599,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)
     };
@@ -4596,7 +4614,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)
     }));
@@ -4611,7 +4629,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 {
@@ -4623,7 +4641,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(
@@ -4672,7 +4690,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.
@@ -4686,7 +4704,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.
@@ -4704,7 +4722,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)
     }));
   }
   /**
@@ -4726,15 +4744,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)
     }));
   }
   /**
@@ -4787,19 +4805,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,
@@ -4811,10 +4829,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,
@@ -4827,19 +4845,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.
@@ -4860,10 +4878,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) {
@@ -4909,7 +4927,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) {
@@ -4946,8 +4964,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,
@@ -5149,22 +5167,6 @@ var assets = [
   }
 ];
 
-// 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";
@@ -5402,7 +5404,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);
       txRequest.shiftPredicateData();
@@ -9134,7 +9136,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
@@ -9193,10 +9195,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;
@@ -9319,6 +9326,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
@@ -10041,7 +10070,8 @@ export {
   assets,
   buildBlockExplorerUrl,
   cacheFor,
-  cacheTxInputsFromOwner,
+  cacheRequestInputsResources,
+  cacheRequestInputsResourcesFromOwner,
   calculateGasFee,
   calculateMetadataGasForTxCreate,
   calculateMetadataGasForTxScript,
@@ -10054,6 +10084,7 @@ export {
   extractMintedAssetsFromReceipts,
   extractTxError,
   gasUsedByInputs,
+  getAssetAmountInRequestInputs,
   getAssetEth,
   getAssetFuel,
   getAssetNetwork,
@@ -10088,6 +10119,7 @@ export {
   getReceiptsMessageOut,
   getReceiptsTransferOut,
   getReceiptsWithMissingData,
+  getRequestInputResourceOwner,
   getTransactionStatusName,
   getTransactionSummary,
   getTransactionSummaryFromRequest,
@@ -10101,6 +10133,10 @@ export {
   isMessage,
   isRawCoin,
   isRawMessage,
+  isRequestInputCoin,
+  isRequestInputMessage,
+  isRequestInputResource,
+  isRequestInputResourceFromOwner,
   isType,
   isTypeCreate,
   isTypeMint,