@fuel-ts/account 0.0.0-pr-2364-20240523174104 → 0.0.0-pr-2364-20240524224403

package/dist/test-utils.mjs

@@ -1751,6 +1751,8 @@ 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);
@@ -2013,7 +2015,7 @@ var BaseTransactionRequest = class {
    * @param coin - Coin resource.
    */
   addCoinInput(coin) {
-    const { assetId, owner, amount, id, predicate } = coin;
+    const { assetId, owner, amount, id, predicate, predicateData } = coin;
     let witnessIndex;
     if (coin.predicate) {
       witnessIndex = 0;
@@ -2031,7 +2033,8 @@ var BaseTransactionRequest = class {
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate
+      predicate,
+      predicateData
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -2043,7 +2046,7 @@ var BaseTransactionRequest = class {
    * @param message - Message resource.
    */
   addMessageInput(message) {
-    const { recipient, sender, amount, predicate, nonce, assetId } = message;
+    const { recipient, sender, amount, predicate, nonce, assetId, predicateData } = message;
     let witnessIndex;
     if (message.predicate) {
       witnessIndex = 0;
@@ -2060,7 +2063,8 @@ var BaseTransactionRequest = class {
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate
+      predicate,
+      predicateData
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -2262,23 +2266,13 @@ var BaseTransactionRequest = class {
     });
   }
   updatePredicateGasUsed(inputs) {
-    this.inputs.forEach((i) => {
-      let correspondingInput;
-      switch (i.type) {
-        case InputType3.Coin:
-          correspondingInput = inputs.find((x) => x.type === InputType3.Coin && x.owner === i.owner);
-          break;
-        case InputType3.Message:
-          correspondingInput = inputs.find(
-            (x) => x.type === InputType3.Message && x.sender === i.sender
-          );
-          break;
-        default:
-          return;
-      }
+    const inputsToExtractGasUsed = inputs.filter(isRequestInputResource);
+    this.inputs.filter(isRequestInputResource).forEach((i) => {
+      const owner = getRequestInputResourceOwner(i);
+      const correspondingInput = inputsToExtractGasUsed.find(
+        (x) => isRequestInputResourceFromOwner(x, Address.fromString(String(owner)))
+      );
       if (correspondingInput && "predicateGasUsed" in correspondingInput && bn8(correspondingInput.predicateGasUsed).gt(0)) {
-        i.predicate = correspondingInput.predicate;
-        i.predicateData = correspondingInput.predicateData;
         i.predicateGasUsed = correspondingInput.predicateGasUsed;
       }
     });