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

package/dist/index.global.js

@@ -37810,7 +37810,7 @@ spurious results.`);
   var lib_default2 = gql;
 
   // src/providers/__generated__/operations.ts
-  var TransactionStatusSubscriptionFragmentDoc = lib_default2`
+  var TransactionStatusSubscriptionFragmentFragmentDoc = lib_default2`
     fragment transactionStatusSubscriptionFragment on TransactionStatus {
   type: __typename
   ... on SqueezedOutStatus {
@@ -37818,13 +37818,7 @@ spurious results.`);
   }
 }
     `;
-  var SubmittedStatusFragmentDoc = lib_default2`
-    fragment SubmittedStatusFragment on SubmittedStatus {
-  type: __typename
-  time
-}
-    `;
-  var ReceiptFragmentDoc = lib_default2`
+  var ReceiptFragmentFragmentDoc = lib_default2`
     fragment receiptFragment on Receipt {
   id
   pc
@@ -37856,65 +37850,45 @@ spurious results.`);
   subId
 }
     `;
-  var SuccessStatusFragmentDoc = lib_default2`
-    fragment SuccessStatusFragment on SuccessStatus {
-  type: __typename
-  block {
-    id
-  }
-  time
-  programState {
-    returnType
-    data
-  }
-  receipts {
-    ...receiptFragment
-  }
-  totalGas
-  totalFee
-}
-    ${ReceiptFragmentDoc}`;
-  var FailureStatusFragmentDoc = lib_default2`
-    fragment FailureStatusFragment on FailureStatus {
-  type: __typename
-  block {
-    id
-  }
-  totalGas
-  totalFee
-  time
-  reason
-  receipts {
-    ...receiptFragment
-  }
-}
-    ${ReceiptFragmentDoc}`;
-  var SqueezedOutStatusFragmentDoc = lib_default2`
-    fragment SqueezedOutStatusFragment on SqueezedOutStatus {
-  type: __typename
-  reason
-}
-    `;
-  var TransactionStatusFragmentDoc = lib_default2`
+  var TransactionStatusFragmentFragmentDoc = lib_default2`
     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 = lib_default2`
+    ${ReceiptFragmentFragmentDoc}`;
+  var TransactionFragmentFragmentDoc = lib_default2`
     fragment transactionFragment on Transaction {
   id
   rawPayload
@@ -37922,8 +37896,8 @@ ${SqueezedOutStatusFragmentDoc}`;
     ...transactionStatusFragment
   }
 }
-    ${TransactionStatusFragmentDoc}`;
-  var InputEstimatePredicatesFragmentDoc = lib_default2`
+    ${TransactionStatusFragmentFragmentDoc}`;
+  var InputEstimatePredicatesFragmentFragmentDoc = lib_default2`
     fragment inputEstimatePredicatesFragment on Input {
   ... on InputCoin {
     predicateGasUsed
@@ -37933,14 +37907,14 @@ ${SqueezedOutStatusFragmentDoc}`;
   }
 }
     `;
-  var TransactionEstimatePredicatesFragmentDoc = lib_default2`
+  var TransactionEstimatePredicatesFragmentFragmentDoc = lib_default2`
     fragment transactionEstimatePredicatesFragment on Transaction {
   inputs {
     ...inputEstimatePredicatesFragment
   }
 }
-    ${InputEstimatePredicatesFragmentDoc}`;
-  var DryRunFailureStatusFragmentDoc = lib_default2`
+    ${InputEstimatePredicatesFragmentFragmentDoc}`;
+  var DryRunFailureStatusFragmentFragmentDoc = lib_default2`
     fragment dryRunFailureStatusFragment on DryRunFailureStatus {
   totalGas
   totalFee
@@ -37951,7 +37925,7 @@ ${SqueezedOutStatusFragmentDoc}`;
   }
 }
     `;
-  var DryRunSuccessStatusFragmentDoc = lib_default2`
+  var DryRunSuccessStatusFragmentFragmentDoc = lib_default2`
     fragment dryRunSuccessStatusFragment on DryRunSuccessStatus {
   totalGas
   totalFee
@@ -37961,7 +37935,7 @@ ${SqueezedOutStatusFragmentDoc}`;
   }
 }
     `;
-  var DryRunTransactionStatusFragmentDoc = lib_default2`
+  var DryRunTransactionStatusFragmentFragmentDoc = lib_default2`
     fragment dryRunTransactionStatusFragment on DryRunTransactionStatus {
   ... on DryRunFailureStatus {
     ...dryRunFailureStatusFragment
@@ -37970,9 +37944,9 @@ ${SqueezedOutStatusFragmentDoc}`;
     ...dryRunSuccessStatusFragment
   }
 }
-    ${DryRunFailureStatusFragmentDoc}
-${DryRunSuccessStatusFragmentDoc}`;
-  var DryRunTransactionExecutionStatusFragmentDoc = lib_default2`
+    ${DryRunFailureStatusFragmentFragmentDoc}
+${DryRunSuccessStatusFragmentFragmentDoc}`;
+  var DryRunTransactionExecutionStatusFragmentFragmentDoc = lib_default2`
     fragment dryRunTransactionExecutionStatusFragment on DryRunTransactionExecutionStatus {
   id
   status {
@@ -37982,11 +37956,11 @@ ${DryRunSuccessStatusFragmentDoc}`;
     ...receiptFragment
   }
 }
-    ${DryRunTransactionStatusFragmentDoc}
-${ReceiptFragmentDoc}`;
-  var CoinFragmentDoc = lib_default2`
+    ${DryRunTransactionStatusFragmentFragmentDoc}
+${ReceiptFragmentFragmentDoc}`;
+  var CoinFragmentFragmentDoc = lib_default2`
     fragment coinFragment on Coin {
-  type: __typename
+  __typename
   utxoId
   owner
   amount
@@ -37995,9 +37969,9 @@ ${ReceiptFragmentDoc}`;
   txCreatedIdx
 }
     `;
-  var MessageCoinFragmentDoc = lib_default2`
+  var MessageCoinFragmentFragmentDoc = lib_default2`
     fragment messageCoinFragment on MessageCoin {
-  type: __typename
+  __typename
   sender
   recipient
   nonce
@@ -38006,7 +37980,7 @@ ${ReceiptFragmentDoc}`;
   daHeight
 }
     `;
-  var MessageFragmentDoc = lib_default2`
+  var MessageFragmentFragmentDoc = lib_default2`
     fragment messageFragment on Message {
   amount
   sender
@@ -38016,7 +37990,7 @@ ${ReceiptFragmentDoc}`;
   daHeight
 }
     `;
-  var MessageProofFragmentDoc = lib_default2`
+  var MessageProofFragmentFragmentDoc = lib_default2`
     fragment messageProofFragment on MessageProof {
   messageProof {
     proofSet
@@ -38063,14 +38037,14 @@ ${ReceiptFragmentDoc}`;
   data
 }
     `;
-  var BalanceFragmentDoc = lib_default2`
+  var BalanceFragmentFragmentDoc = lib_default2`
     fragment balanceFragment on Balance {
   owner
   amount
   assetId
 }
     `;
-  var BlockFragmentDoc = lib_default2`
+  var BlockFragmentFragmentDoc = lib_default2`
     fragment blockFragment on Block {
   id
   height
@@ -38082,7 +38056,7 @@ ${ReceiptFragmentDoc}`;
   }
 }
     `;
-  var TxParametersFragmentDoc = lib_default2`
+  var TxParametersFragmentFragmentDoc = lib_default2`
     fragment TxParametersFragment on TxParameters {
   version
   maxInputs
@@ -38093,7 +38067,7 @@ ${ReceiptFragmentDoc}`;
   maxBytecodeSubsections
 }
     `;
-  var PredicateParametersFragmentDoc = lib_default2`
+  var PredicateParametersFragmentFragmentDoc = lib_default2`
     fragment PredicateParametersFragment on PredicateParameters {
   version
   maxPredicateLength
@@ -38102,42 +38076,41 @@ ${ReceiptFragmentDoc}`;
   maxMessageDataLength
 }
     `;
-  var ScriptParametersFragmentDoc = lib_default2`
+  var ScriptParametersFragmentFragmentDoc = lib_default2`
     fragment ScriptParametersFragment on ScriptParameters {
   version
   maxScriptLength
   maxScriptDataLength
 }
     `;
-  var ContractParametersFragmentDoc = lib_default2`
+  var ContractParametersFragmentFragmentDoc = lib_default2`
     fragment ContractParametersFragment on ContractParameters {
   version
   contractMaxSize
   maxStorageSlots
 }
     `;
-  var FeeParametersFragmentDoc = lib_default2`
+  var FeeParametersFragmentFragmentDoc = lib_default2`
     fragment FeeParametersFragment on FeeParameters {
   version
   gasPriceFactor
   gasPerByte
 }
     `;
-  var DependentCostFragmentDoc = lib_default2`
+  var DependentCostFragmentFragmentDoc = lib_default2`
     fragment DependentCostFragment on DependentCost {
+  __typename
   ... on LightOperation {
-    type: __typename
     base
     unitsPerGas
   }
   ... on HeavyOperation {
-    type: __typename
     base
     gasPerUnit
   }
 }
     `;
-  var GasCostsFragmentDoc = lib_default2`
+  var GasCostsFragmentFragmentDoc = lib_default2`
     fragment GasCostsFragment on GasCosts {
   version
   add
@@ -38293,8 +38266,8 @@ ${ReceiptFragmentDoc}`;
   }
   newStoragePerByte
 }
-    ${DependentCostFragmentDoc}`;
-  var ConsensusParametersFragmentDoc = lib_default2`
+    ${DependentCostFragmentFragmentDoc}`;
+  var ConsensusParametersFragmentFragmentDoc = lib_default2`
     fragment consensusParametersFragment on ConsensusParameters {
   version
   txParams {
@@ -38318,13 +38291,13 @@ ${ReceiptFragmentDoc}`;
   baseAssetId
   chainId
 }
-    ${TxParametersFragmentDoc}
-${PredicateParametersFragmentDoc}
-${ScriptParametersFragmentDoc}
-${ContractParametersFragmentDoc}
-${FeeParametersFragmentDoc}
-${GasCostsFragmentDoc}`;
-  var ChainInfoFragmentDoc = lib_default2`
+    ${TxParametersFragmentFragmentDoc}
+${PredicateParametersFragmentFragmentDoc}
+${ScriptParametersFragmentFragmentDoc}
+${ContractParametersFragmentFragmentDoc}
+${FeeParametersFragmentFragmentDoc}
+${GasCostsFragmentFragmentDoc}`;
+  var ChainInfoFragmentFragmentDoc = lib_default2`
     fragment chainInfoFragment on ChainInfo {
   name
   latestBlock {
@@ -38335,16 +38308,16 @@ ${GasCostsFragmentDoc}`;
     ...consensusParametersFragment
   }
 }
-    ${BlockFragmentDoc}
-${ConsensusParametersFragmentDoc}`;
-  var ContractBalanceFragmentDoc = lib_default2`
+    ${BlockFragmentFragmentDoc}
+${ConsensusParametersFragmentFragmentDoc}`;
+  var ContractBalanceFragmentFragmentDoc = lib_default2`
     fragment contractBalanceFragment on ContractBalance {
   contract
   amount
   assetId
 }
     `;
-  var PageInfoFragmentDoc = lib_default2`
+  var PageInfoFragmentFragmentDoc = lib_default2`
     fragment pageInfoFragment on PageInfo {
   hasPreviousPage
   hasNextPage
@@ -38352,7 +38325,7 @@ ${ConsensusParametersFragmentDoc}`;
   endCursor
 }
     `;
-  var NodeInfoFragmentDoc = lib_default2`
+  var NodeInfoFragmentFragmentDoc = lib_default2`
     fragment nodeInfoFragment on NodeInfo {
   utxoValidation
   vmBacktrace
@@ -38361,7 +38334,7 @@ ${ConsensusParametersFragmentDoc}`;
   nodeVersion
 }
     `;
-  var RelayedTransactionStatusFragmentDoc = lib_default2`
+  var RelayedTransactionStatusFragmentFragmentDoc = lib_default2`
     fragment relayedTransactionStatusFragment on RelayedTransactionStatus {
   ... on RelayedTransactionFailed {
     blockHeight
@@ -38382,28 +38355,28 @@ ${ConsensusParametersFragmentDoc}`;
     ...nodeInfoFragment
   }
 }
-    ${NodeInfoFragmentDoc}`;
+    ${NodeInfoFragmentFragmentDoc}`;
   var GetChainDocument = lib_default2`
     query getChain {
   chain {
     ...chainInfoFragment
   }
 }
-    ${ChainInfoFragmentDoc}`;
+    ${ChainInfoFragmentFragmentDoc}`;
   var GetTransactionDocument = lib_default2`
     query getTransaction($transactionId: TransactionId!) {
   transaction(id: $transactionId) {
     ...transactionFragment
   }
 }
-    ${TransactionFragmentDoc}`;
+    ${TransactionFragmentFragmentDoc}`;
   var GetTransactionWithReceiptsDocument = lib_default2`
     query getTransactionWithReceipts($transactionId: TransactionId!) {
   transaction(id: $transactionId) {
     ...transactionFragment
   }
 }
-    ${TransactionFragmentDoc}`;
+    ${TransactionFragmentFragmentDoc}`;
   var GetTransactionsDocument = lib_default2`
     query getTransactions($after: String, $before: String, $first: Int, $last: Int) {
   transactions(after: $after, before: $before, first: $first, last: $last) {
@@ -38414,7 +38387,7 @@ ${ConsensusParametersFragmentDoc}`;
     }
   }
 }
-    ${TransactionFragmentDoc}`;
+    ${TransactionFragmentFragmentDoc}`;
   var GetTransactionsByOwnerDocument = lib_default2`
     query getTransactionsByOwner($owner: Address!, $after: String, $before: String, $first: Int, $last: Int) {
   transactionsByOwner(
@@ -38434,22 +38407,22 @@ ${ConsensusParametersFragmentDoc}`;
     }
   }
 }
-    ${PageInfoFragmentDoc}
-${TransactionFragmentDoc}`;
+    ${PageInfoFragmentFragmentDoc}
+${TransactionFragmentFragmentDoc}`;
   var EstimatePredicatesDocument = lib_default2`
     query estimatePredicates($encodedTransaction: HexString!) {
   estimatePredicates(tx: $encodedTransaction) {
     ...transactionEstimatePredicatesFragment
   }
 }
-    ${TransactionEstimatePredicatesFragmentDoc}`;
+    ${TransactionEstimatePredicatesFragmentFragmentDoc}`;
   var GetBlockDocument = lib_default2`
     query getBlock($blockId: BlockId, $height: U32) {
   block(id: $blockId, height: $height) {
     ...blockFragment
   }
 }
-    ${BlockFragmentDoc}`;
+    ${BlockFragmentFragmentDoc}`;
   var GetBlockWithTransactionsDocument = lib_default2`
     query getBlockWithTransactions($blockId: BlockId, $blockHeight: U32) {
   block(id: $blockId, height: $blockHeight) {
@@ -38459,8 +38432,8 @@ ${TransactionFragmentDoc}`;
     }
   }
 }
-    ${BlockFragmentDoc}
-${TransactionFragmentDoc}`;
+    ${BlockFragmentFragmentDoc}
+${TransactionFragmentFragmentDoc}`;
   var GetBlocksDocument = lib_default2`
     query getBlocks($after: String, $before: String, $first: Int, $last: Int) {
   blocks(after: $after, before: $before, first: $first, last: $last) {
@@ -38471,14 +38444,14 @@ ${TransactionFragmentDoc}`;
     }
   }
 }
-    ${BlockFragmentDoc}`;
+    ${BlockFragmentFragmentDoc}`;
   var GetCoinDocument = lib_default2`
     query getCoin($coinId: UtxoId!) {
   coin(utxoId: $coinId) {
     ...coinFragment
   }
 }
-    ${CoinFragmentDoc}`;
+    ${CoinFragmentFragmentDoc}`;
   var GetCoinsDocument = lib_default2`
     query getCoins($filter: CoinFilterInput!, $after: String, $before: String, $first: Int, $last: Int) {
   coins(
@@ -38495,7 +38468,7 @@ ${TransactionFragmentDoc}`;
     }
   }
 }
-    ${CoinFragmentDoc}`;
+    ${CoinFragmentFragmentDoc}`;
   var GetCoinsToSpendDocument = lib_default2`
     query getCoinsToSpend($owner: Address!, $queryPerAsset: [SpendQueryElementInput!]!, $excludedIds: ExcludeInput) {
   coinsToSpend(
@@ -38507,8 +38480,8 @@ ${TransactionFragmentDoc}`;
     ...messageCoinFragment
   }
 }
-    ${CoinFragmentDoc}
-${MessageCoinFragmentDoc}`;
+    ${CoinFragmentFragmentDoc}
+${MessageCoinFragmentFragmentDoc}`;
   var GetContractDocument = lib_default2`
     query getContract($contractId: ContractId!) {
   contract(id: $contractId) {
@@ -38523,14 +38496,14 @@ ${MessageCoinFragmentDoc}`;
     ...contractBalanceFragment
   }
 }
-    ${ContractBalanceFragmentDoc}`;
+    ${ContractBalanceFragmentFragmentDoc}`;
   var GetBalanceDocument = lib_default2`
     query getBalance($owner: Address!, $assetId: AssetId!) {
   balance(owner: $owner, assetId: $assetId) {
     ...balanceFragment
   }
 }
-    ${BalanceFragmentDoc}`;
+    ${BalanceFragmentFragmentDoc}`;
   var GetLatestGasPriceDocument = lib_default2`
     query getLatestGasPrice {
   latestGasPrice {
@@ -38561,7 +38534,7 @@ ${MessageCoinFragmentDoc}`;
     }
   }
 }
-    ${BalanceFragmentDoc}`;
+    ${BalanceFragmentFragmentDoc}`;
   var GetMessagesDocument = lib_default2`
     query getMessages($owner: Address!, $after: String, $before: String, $first: Int, $last: Int) {
   messages(
@@ -38578,7 +38551,7 @@ ${MessageCoinFragmentDoc}`;
     }
   }
 }
-    ${MessageFragmentDoc}`;
+    ${MessageFragmentFragmentDoc}`;
   var GetMessageProofDocument = lib_default2`
     query getMessageProof($transactionId: TransactionId!, $nonce: Nonce!, $commitBlockId: BlockId, $commitBlockHeight: U32) {
   messageProof(
@@ -38590,7 +38563,7 @@ ${MessageCoinFragmentDoc}`;
     ...messageProofFragment
   }
 }
-    ${MessageProofFragmentDoc}`;
+    ${MessageProofFragmentFragmentDoc}`;
   var GetMessageStatusDocument = lib_default2`
     query getMessageStatus($nonce: Nonce!) {
   messageStatus(nonce: $nonce) {
@@ -38604,14 +38577,14 @@ ${MessageCoinFragmentDoc}`;
     ...relayedTransactionStatusFragment
   }
 }
-    ${RelayedTransactionStatusFragmentDoc}`;
+    ${RelayedTransactionStatusFragmentFragmentDoc}`;
   var DryRunDocument = lib_default2`
     mutation dryRun($encodedTransactions: [HexString!]!, $utxoValidation: Boolean) {
   dryRun(txs: $encodedTransactions, utxoValidation: $utxoValidation) {
     ...dryRunTransactionExecutionStatusFragment
   }
 }
-    ${DryRunTransactionExecutionStatusFragmentDoc}`;
+    ${DryRunTransactionExecutionStatusFragmentFragmentDoc}`;
   var SubmitDocument = lib_default2`
     mutation submit($encodedTransaction: HexString!) {
   submit(tx: $encodedTransaction) {
@@ -38633,21 +38606,21 @@ ${MessageCoinFragmentDoc}`;
     ...messageFragment
   }
 }
-    ${MessageFragmentDoc}`;
+    ${MessageFragmentFragmentDoc}`;
   var SubmitAndAwaitDocument = lib_default2`
     subscription submitAndAwait($encodedTransaction: HexString!) {
   submitAndAwait(tx: $encodedTransaction) {
     ...transactionStatusSubscriptionFragment
   }
 }
-    ${TransactionStatusSubscriptionFragmentDoc}`;
+    ${TransactionStatusSubscriptionFragmentFragmentDoc}`;
   var StatusChangeDocument = lib_default2`
     subscription statusChange($transactionId: TransactionId!) {
   statusChange(id: $transactionId) {
     ...transactionStatusSubscriptionFragment
   }
 }
-    ${TransactionStatusSubscriptionFragmentDoc}`;
+    ${TransactionStatusSubscriptionFragmentFragmentDoc}`;
   function getSdk(requester) {
     return {
       getVersion(variables, options) {
@@ -39340,9 +39313,10 @@ ${MessageCoinFragmentDoc}`;
   function resolveGasDependentCosts(byteSize, gasDependentCost) {
     const base = bn(gasDependentCost.base);
     let dependentValue = bn(0);
-    if ("unitsPerGas" in gasDependentCost) {
+    if (gasDependentCost.__typename === "LightOperation") {
       dependentValue = bn(byteSize).div(bn(gasDependentCost.unitsPerGas));
-    } else {
+    }
+    if (gasDependentCost.__typename === "HeavyOperation") {
       dependentValue = bn(byteSize).mul(bn(gasDependentCost.gasPerUnit));
     }
     return base.add(dependentValue);
@@ -39550,6 +39524,50 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     name = "NoWitnessByOwnerError";
   };
 
+  // src/providers/transaction-request/helpers.ts
+  var isRequestInputCoin = (input) => input.type === InputType.Coin;
+  var isRequestInputMessage = (input) => input.type === InputType.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;
+  }, bn(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
   var witnessify = (value) => {
     const data = arrayify(value);
@@ -39787,7 +39805,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @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;
@@ -39798,13 +39816,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...coin,
+        id,
         type: InputType.Coin,
         owner: owner.toB256(),
         amount,
         assetId,
         txPointer: "0x00000000000000000000000000000000",
-        witnessIndex
+        witnessIndex,
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(owner, assetId);
@@ -39816,7 +39835,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @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;
@@ -39827,12 +39846,13 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...message,
+        nonce,
         type: InputType.Message,
         sender: sender.toB256(),
         recipient: recipient.toB256(),
         amount,
-        witnessIndex
+        witnessIndex,
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(recipient, assetId);
@@ -40022,6 +40042,17 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     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;
@@ -40448,21 +40479,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       }
     }
   };
-  var cacheTxInputsFromOwner = (inputs, owner) => inputs.reduce(
-    (acc, input) => {
-      if (input.type === InputType.Coin && input.owner === owner.toB256()) {
-        acc.utxos.push(input.id);
-      }
-      if (input.type === InputType.Message && input.recipient === owner.toB256()) {
-        acc.messages.push(input.nonce);
-      }
-      return acc;
-    },
-    {
-      utxos: [],
-      messages: []
-    }
-  );
 
   // src/providers/transaction-summary/calculate-tx-fee-for-summary.ts
   var calculateTXFeeForSummary = (params) => {
@@ -42205,7 +42221,7 @@ 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: bn(coin.amount),
@@ -42817,20 +42833,6 @@ Supported fuel-core version: ${supportedVersion}.`
     }
   ];
 
-  // src/providers/transaction-request/helpers.ts
-  var isRequestInputCoin = (input) => input.type === InputType.Coin;
-  var isRequestInputMessage = (input) => input.type === InputType.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;
-  }, bn(0));
-
   // src/utils/formatTransferToContractScriptData.ts
   var asm = __toESM(require_node());
   var formatTransferToContractScriptData = (params) => {
@@ -43065,7 +43067,7 @@ Supported fuel-core version: ${supportedVersion}.`
       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();
@@ -48165,10 +48167,15 @@ Supported fuel-core version: ${supportedVersion}.`
     populateTransactionPredicateData(transactionRequestLike) {
       const request = transactionRequestify(transactionRequestLike);
       const { policies } = BaseTransactionRequest.getPolicyMeta(request);
-      request.inputs?.forEach((input) => {
-        if (input.type === InputType.Coin && hexlify(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 = hexlify(this.bytes);
           input.predicateData = hexlify(this.getPredicateData(policies.length));
+          input.witnessIndex = 0;
         }
       });
       return request;
@@ -48291,6 +48298,28 @@ Supported fuel-core version: ${supportedVersion}.`
       }
       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-connector.ts