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

package/dist/index.js

@@ -2251,7 +2251,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;
@@ -2269,7 +2269,8 @@ var BaseTransactionRequest = class {
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate
+      predicate,
+      predicateData
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -2281,7 +2282,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;
@@ -2298,7 +2299,8 @@ var BaseTransactionRequest = class {
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate
+      predicate,
+      predicateData
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -2500,23 +2502,13 @@ var BaseTransactionRequest = class {
     });
   }
   updatePredicateGasUsed(inputs) {
-    this.inputs.forEach((i) => {
-      let correspondingInput;
-      switch (i.type) {
-        case import_transactions7.InputType.Coin:
-          correspondingInput = inputs.find((x) => x.type === import_transactions7.InputType.Coin && x.owner === i.owner);
-          break;
-        case import_transactions7.InputType.Message:
-          correspondingInput = inputs.find(
-            (x) => x.type === import_transactions7.InputType.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, import_address.Address.fromString(String(owner)))
+      );
       if (correspondingInput && "predicateGasUsed" in correspondingInput && (0, import_math8.bn)(correspondingInput.predicateGasUsed).gt(0)) {
-        i.predicate = correspondingInput.predicate;
-        i.predicateData = correspondingInput.predicateData;
         i.predicateGasUsed = correspondingInput.predicateGasUsed;
       }
     });
@@ -9564,7 +9556,8 @@ var Predicate = class extends Account {
     );
     return resources.map((resource) => ({
       ...resource,
-      predicate: (0, import_utils37.hexlify)(this.bytes)
+      predicate: (0, import_utils37.hexlify)(this.bytes),
+      predicateData: (0, import_utils37.hexlify)(this.getPredicateData())
     }));
   }
   /**