@fuel-ts/account 0.0.0-rc-2045-20240423120441 → 0.0.0-rc-2037-20240423134048

package/dist/index.global.js

@@ -28952,7 +28952,7 @@ spurious results.`);
   // ../versions/dist/index.mjs
   function getBuiltinVersions() {
     return {
-      FORC: "0.55.0",
+      FORC: "0.49.3",
       FUEL_CORE: "0.22.1",
       FUELS: "0.81.0"
     };
@@ -31144,7 +31144,7 @@ This unreleased fuel-core build may include features and updates not yet support
     toEvmAddress() {
       const b256Address = toB256(this.bech32Address);
       return {
-        bits: clearFirst12BytesFromB256(b256Address)
+        value: clearFirst12BytesFromB256(b256Address)
       };
     }
     /**
@@ -31154,7 +31154,7 @@ This unreleased fuel-core build may include features and updates not yet support
      */
     toAssetId() {
       return {
-        bits: this.toB256()
+        value: this.toB256()
       };
     }
     /**
@@ -39541,6 +39541,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);
@@ -39780,8 +39801,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param predicate - Predicate bytes.
      * @param predicateData - Predicate data bytes.
      */
-    addCoinInput(coin, predicate) {
-      const { assetId, owner, amount } = coin;
+    addCoinInput(coin) {
+      const { assetId, owner, amount, id, predicate } = coin;
       let witnessIndex;
       if (predicate) {
         witnessIndex = 0;
@@ -39792,14 +39813,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...coin,
+        id,
         type: InputType.Coin,
         owner: owner.toB256(),
         amount,
         assetId,
         txPointer: "0x00000000000000000000000000000000",
         witnessIndex,
-        predicate: predicate?.bytes
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(owner, assetId);
@@ -39812,8 +39833,8 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @param predicate - Predicate bytes.
      * @param predicateData - Predicate data bytes.
      */
-    addMessageInput(message, predicate) {
-      const { recipient, sender, amount } = message;
+    addMessageInput(message) {
+      const { recipient, sender, amount, predicate, nonce } = message;
       const assetId = BaseAssetId;
       let witnessIndex;
       if (predicate) {
@@ -39825,13 +39846,13 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...message,
+        nonce,
         type: InputType.Message,
         sender: sender.toB256(),
         recipient: recipient.toB256(),
         amount,
         witnessIndex,
-        predicate: predicate?.bytes
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(recipient, assetId);
@@ -39862,32 +39883,6 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       resources.forEach((resource) => this.addResource(resource));
       return this;
     }
-    /**
-     * Adds multiple resources to the transaction by adding coin/message inputs and change
-     * outputs from the related assetIds.
-     *
-     * @param resources - The resources to add.
-     * @returns This transaction.
-     */
-    addPredicateResource(resource, predicate) {
-      if (isCoin(resource)) {
-        this.addCoinInput(resource, predicate);
-      } else {
-        this.addMessageInput(resource, predicate);
-      }
-      return this;
-    }
-    /**
-     * Adds multiple predicate coin/message inputs to the transaction and change outputs
-     * from the related assetIds.
-     *
-     * @param resources - The resources to add.
-     * @returns This transaction.
-     */
-    addPredicateResources(resources, predicate) {
-      resources.forEach((resource) => this.addPredicateResource(resource, predicate));
-      return this;
-    }
     /**
      * Adds a coin output to the transaction.
      *
@@ -40036,6 +40031,10 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     toJSON() {
       return normalizeJSON(this);
     }
+    removeWitness(index) {
+      this.witnesses.splice(index, 1);
+      this.adjustWitnessIndexes(index);
+    }
     updatePredicateInputs(inputs) {
       this.inputs.forEach((i) => {
         let correspondingInput;
@@ -40058,6 +40057,13 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       });
     }
+    adjustWitnessIndexes(removedIndex) {
+      this.inputs.filter(isRequestInputResource).forEach((input) => {
+        if (input.witnessIndex > removedIndex) {
+          input.witnessIndex -= 1;
+        }
+      });
+    }
   };
 
   // src/providers/transaction-request/hash-transaction.ts
@@ -47884,10 +47890,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 = this.bytes;
           input.predicateData = this.getPredicateData(policies.length);
+          input.witnessIndex = 0;
         }
       });
       return request;
@@ -47925,6 +47936,20 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       const transactionRequest = this.populateTransactionPredicateData(transactionRequestLike);
       return super.simulateTransaction(transactionRequest);
     }
+    /**
+     * Retrieves resources satisfying the spend query for the account.
+     *
+     * @param quantities - Coins to retrieve.
+     * @param excludedIds - IDs of resources to be excluded from the query.
+     * @returns A promise that resolves to an array of Resources.
+     */
+    async getResourcesToSpend(quantities, excludedIds) {
+      const resources = await super.getResourcesToSpend(quantities, excludedIds);
+      return resources.map((resource) => ({
+        ...resource,
+        predicate: hexlify(this.bytes)
+      }));
+    }
     getPredicateData(policiesLength) {
       if (!this.predicateData.length) {
         return new Uint8Array();
@@ -48004,6 +48029,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