@fuel-ts/account 0.0.0-rc-1356-20240510142347 → 0.0.0-rc-2037-20240510174704

package/dist/index.global.js

@@ -29761,13 +29761,6 @@ This unreleased fuel-core build may include features and updates not yet support
   };
   var DateTime = _DateTime;
   __publicField3(DateTime, "TAI64_NULL", "");
-  function sleep(time) {
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        resolve(true);
-      }, time);
-    });
-  }
   function isDefined(value) {
     return value !== void 0;
   }
@@ -39458,6 +39451,15 @@ ${MessageCoinFragmentDoc}`;
     return normalize2(clone_default(root));
   }
 
+  // src/providers/utils/sleep.ts
+  function sleep(time) {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(true);
+      }, time);
+    });
+  }
+
   // src/providers/utils/extract-tx-error.ts
   var assemblePanicError = (status) => {
     let errorMessage = `The transaction reverted with reason: "${status.reason}".`;
@@ -39548,6 +39550,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);
@@ -39785,7 +39831,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;
@@ -39796,13 +39842,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);
@@ -39814,7 +39861,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;
@@ -39825,12 +39872,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);
@@ -40020,6 +40068,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;
@@ -40446,21 +40505,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) => {
@@ -42820,20 +42864,6 @@ Supported fuel-core version: ${supportedVersion}.`
   ];
   var assets = resolveIconPaths(rawAssets, fuelAssetsBaseUrl);
 
-  // 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) => {
@@ -43068,7 +43098,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);
         request.shiftPredicateData();
@@ -48178,10 +48208,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;
@@ -48304,6 +48339,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