@fuel-ts/account 0.0.0-rc-2143-20240429105111 → 0.0.0-rc-2037-20240429115810

package/dist/index.global.js

@@ -39638,6 +39638,27 @@ ${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 cacheResources = (resources) => resources.reduce(
+    (cache2, resource) => {
+      if (isCoin(resource)) {
+        cache2.utxos.push(resource.id);
+      } else {
+        cache2.messages.push(resource.nonce);
+      }
+      return cache2;
+    },
+    {
+      utxos: [],
+      messages: []
+    }
+  );
+
   // src/providers/transaction-request/witness.ts
   var witnessify = (value) => {
     const data = arrayify(value);
@@ -39876,7 +39897,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;
@@ -39887,13 +39908,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);
@@ -39905,7 +39927,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;
@@ -39916,12 +39938,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);
@@ -40105,6 +40128,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;
@@ -48133,10 +48167,15 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     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;
@@ -48259,6 +48298,28 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       }
       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