@fuel-ts/account 0.0.0-rc-2037-20240411163513 → 0.0.0-rc-2045-20240411194225

package/dist/index.mjs

@@ -1907,8 +1907,8 @@ var BaseTransactionRequest = class {
    * @param predicate - Predicate bytes.
    * @param predicateData - Predicate data bytes.
    */
-  addCoinInput(coin) {
-    const { assetId, owner, amount, id, predicate } = coin;
+  addCoinInput(coin, predicate) {
+    const { assetId, owner, amount } = coin;
     let witnessIndex;
     if (predicate) {
       witnessIndex = 0;
@@ -1919,14 +1919,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      id,
+      ...coin,
       type: InputType2.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate
+      predicate: predicate?.bytes
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -1939,8 +1939,8 @@ var BaseTransactionRequest = class {
    * @param predicate - Predicate bytes.
    * @param predicateData - Predicate data bytes.
    */
-  addMessageInput(message) {
-    const { recipient, sender, amount, predicate, nonce } = message;
+  addMessageInput(message, predicate) {
+    const { recipient, sender, amount } = message;
     const assetId = BaseAssetId2;
     let witnessIndex;
     if (predicate) {
@@ -1952,13 +1952,13 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      nonce,
+      ...message,
       type: InputType2.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate
+      predicate: predicate?.bytes
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -1989,6 +1989,32 @@ var BaseTransactionRequest = class {
     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.
    *
@@ -8739,7 +8765,6 @@ var Predicate = class extends Account {
       if (input.type === InputType7.Coin && hexlify19(input.owner) === this.address.toB256()) {
         input.predicate = this.bytes;
         input.predicateData = this.getPredicateData(policies.length);
-        input.witnessIndex = 0;
       }
     });
     return request;
@@ -8777,20 +8802,6 @@ var Predicate = class extends Account {
     const transactionRequest = this.populateTransactionPredicateData(transactionRequestLike);
     return super.simulateTransaction(transactionRequest);
   }
-  /**
-   * Retrieves resources satisfying the spend query for the account.
-   *
-   * @param quantities - IDs of coins to exclude.
-   * @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: hexlify19(this.bytes)
-    }));
-  }
   getPredicateData(policiesLength) {
     if (!this.predicateData.length) {
       return new Uint8Array();