@fuel-ts/account 0.0.0-rc-2037-20240423110545 → 0.0.0-rc-2045-20240423120113

package/dist/index.mjs

@@ -76,7 +76,7 @@ import { Address as Address2 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode13, FuelError as FuelError13 } from "@fuel-ts/errors";
 import { BN, bn as bn15, max } from "@fuel-ts/math";
 import {
-  InputType as InputType7,
+  InputType as InputType6,
   TransactionType as TransactionType8,
   InputMessageCoder,
   TransactionCoder as TransactionCoder5
@@ -1173,7 +1173,7 @@ import { bn as bn7 } from "@fuel-ts/math";
 import {
   PolicyType,
   TransactionCoder,
-  InputType as InputType3,
+  InputType as InputType2,
   OutputType as OutputType2,
   TransactionType
 } from "@fuel-ts/transactions";
@@ -1676,28 +1676,6 @@ var NoWitnessByOwnerError = class extends Error {
   name = "NoWitnessByOwnerError";
 };
 
-// src/providers/transaction-request/helpers.ts
-import { InputType as InputType2 } from "@fuel-ts/transactions";
-var isRequestInputCoin = (input) => input.type === InputType2.Coin;
-var isRequestInputMessage = (input) => input.type === InputType2.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
 import { arrayify as arrayify4, hexlify as hexlify6 } from "@fuel-ts/utils";
 var witnessify = (value) => {
@@ -1888,7 +1866,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType3.Coin
+      (input) => input.type === InputType2.Coin
     );
   }
   /**
@@ -1920,9 +1898,9 @@ var BaseTransactionRequest = class {
     const ownerAddress = addressify(owner);
     const found = this.inputs.find((input) => {
       switch (input.type) {
-        case InputType3.Coin:
+        case InputType2.Coin:
           return hexlify7(input.owner) === ownerAddress.toB256();
-        case InputType3.Message:
+        case InputType2.Message:
           return hexlify7(input.recipient) === ownerAddress.toB256();
         default:
           return false;
@@ -1938,8 +1916,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;
@@ -1950,14 +1928,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      id,
-      type: InputType3.Coin,
+      ...coin,
+      type: InputType2.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
       witnessIndex,
-      predicate
+      predicate: predicate?.bytes
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -1970,8 +1948,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) {
@@ -1983,13 +1961,13 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      nonce,
-      type: InputType3.Message,
+      ...message,
+      type: InputType2.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
       witnessIndex,
-      predicate
+      predicate: predicate?.bytes
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -2020,6 +1998,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.
    *
@@ -2168,20 +2172,16 @@ var BaseTransactionRequest = class {
   toJSON() {
     return normalizeJSON(this);
   }
-  removeWitness(index) {
-    this.witnesses.splice(index, 1);
-    this.adjustWitnessIndexes(index);
-  }
   updatePredicateInputs(inputs) {
     this.inputs.forEach((i) => {
       let correspondingInput;
       switch (i.type) {
-        case InputType3.Coin:
-          correspondingInput = inputs.find((x) => x.type === InputType3.Coin && x.owner === i.owner);
+        case InputType2.Coin:
+          correspondingInput = inputs.find((x) => x.type === InputType2.Coin && x.owner === i.owner);
           break;
-        case InputType3.Message:
+        case InputType2.Message:
           correspondingInput = inputs.find(
-            (x) => x.type === InputType3.Message && x.sender === i.sender
+            (x) => x.type === InputType2.Message && x.sender === i.sender
           );
           break;
         default:
@@ -2194,13 +2194,6 @@ var BaseTransactionRequest = class {
       }
     });
   }
-  adjustWitnessIndexes(removedIndex) {
-    this.inputs.filter(isRequestInputResource).forEach((input) => {
-      if (input.witnessIndex > removedIndex) {
-        input.witnessIndex -= 1;
-      }
-    });
-  }
 };
 
 // src/providers/transaction-request/create-transaction-request.ts
@@ -2213,7 +2206,7 @@ import { arrayify as arrayify6, hexlify as hexlify9 } from "@fuel-ts/utils";
 import { ZeroBytes32 as ZeroBytes325 } from "@fuel-ts/address/configs";
 import { uint64ToBytesBE, sha256 } from "@fuel-ts/hasher";
 import { bn as bn8 } from "@fuel-ts/math";
-import { TransactionType as TransactionType2, InputType as InputType4, OutputType as OutputType3, TransactionCoder as TransactionCoder2 } from "@fuel-ts/transactions";
+import { TransactionType as TransactionType2, InputType as InputType3, OutputType as OutputType3, TransactionCoder as TransactionCoder2 } from "@fuel-ts/transactions";
 import { concat as concat2 } from "@fuel-ts/utils";
 import { clone as clone2 } from "ramda";
 function hashTransaction(transactionRequest, chainId) {
@@ -2224,7 +2217,7 @@ function hashTransaction(transactionRequest, chainId) {
   transaction.inputs = transaction.inputs.map((input) => {
     const inputClone = clone2(input);
     switch (inputClone.type) {
-      case InputType4.Coin: {
+      case InputType3.Coin: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
@@ -2232,11 +2225,11 @@ function hashTransaction(transactionRequest, chainId) {
         inputClone.predicateGasUsed = bn8(0);
         return inputClone;
       }
-      case InputType4.Message: {
+      case InputType3.Message: {
         inputClone.predicateGasUsed = bn8(0);
         return inputClone;
       }
-      case InputType4.Contract: {
+      case InputType3.Contract: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
@@ -2402,7 +2395,7 @@ import { Interface } from "@fuel-ts/abi-coder";
 import { addressify as addressify2 } from "@fuel-ts/address";
 import { ZeroBytes32 as ZeroBytes327 } from "@fuel-ts/address/configs";
 import { bn as bn10 } from "@fuel-ts/math";
-import { InputType as InputType5, OutputType as OutputType5, TransactionType as TransactionType4 } from "@fuel-ts/transactions";
+import { InputType as InputType4, OutputType as OutputType5, TransactionType as TransactionType4 } from "@fuel-ts/transactions";
 import { arrayify as arrayify8, hexlify as hexlify10 } from "@fuel-ts/utils";
 
 // src/providers/transaction-request/scripts.ts
@@ -2486,7 +2479,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType5.Contract
+      (input) => input.type === InputType4.Contract
     );
   }
   /**
@@ -2562,7 +2555,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       return this;
     }
     const inputIndex = super.pushInput({
-      type: InputType5.Contract,
+      type: InputType4.Contract,
       contractId: contractAddress.toB256(),
       txPointer: "0x00000000000000000000000000000000"
     });
@@ -2757,7 +2750,7 @@ var getFunctionCall = ({ abi, receipt, rawPayload, maxInputs }) => {
 
 // src/providers/transaction-summary/input.ts
 import { ErrorCode as ErrorCode9, FuelError as FuelError9 } from "@fuel-ts/errors";
-import { InputType as InputType6 } from "@fuel-ts/transactions";
+import { InputType as InputType5 } from "@fuel-ts/transactions";
 function getInputsByTypes(inputs, types) {
   return inputs.filter((i) => types.includes(i.type));
 }
@@ -2765,16 +2758,16 @@ function getInputsByType(inputs, type) {
   return inputs.filter((i) => i.type === type);
 }
 function getInputsCoin(inputs) {
-  return getInputsByType(inputs, InputType6.Coin);
+  return getInputsByType(inputs, InputType5.Coin);
 }
 function getInputsMessage(inputs) {
-  return getInputsByType(inputs, InputType6.Message);
+  return getInputsByType(inputs, InputType5.Message);
 }
 function getInputsCoinAndMessage(inputs) {
-  return getInputsByTypes(inputs, [InputType6.Coin, InputType6.Message]);
+  return getInputsByTypes(inputs, [InputType5.Coin, InputType5.Message]);
 }
 function getInputsContract(inputs) {
-  return getInputsByType(inputs, InputType6.Contract);
+  return getInputsByType(inputs, InputType5.Contract);
 }
 function getInputFromAssetId(inputs, assetId) {
   const coinInputs = getInputsCoin(inputs);
@@ -2793,7 +2786,7 @@ function getInputContractFromIndex(inputs, inputIndex) {
   if (!contractInput) {
     return void 0;
   }
-  if (contractInput.type !== InputType6.Contract) {
+  if (contractInput.type !== InputType5.Contract) {
     throw new FuelError9(
       ErrorCode9.INVALID_TRANSACTION_INPUT,
       `Contract input should be of type 'contract'.`
@@ -2802,10 +2795,10 @@ function getInputContractFromIndex(inputs, inputIndex) {
   return contractInput;
 }
 function getInputAccountAddress(input) {
-  if (input.type === InputType6.Coin) {
+  if (input.type === InputType5.Coin) {
     return input.owner.toString();
   }
-  if (input.type === InputType6.Message) {
+  if (input.type === InputType5.Message) {
     return input.recipient.toString();
   }
   return "";
@@ -4549,7 +4542,7 @@ cacheInputs_fn = function(inputs) {
     return;
   }
   inputs.forEach((input) => {
-    if (input.type === InputType7.Coin) {
+    if (input.type === InputType6.Coin) {
       this.cache?.set(input.id);
     }
   });
@@ -8718,7 +8711,7 @@ import {
 import { Address as Address9 } from "@fuel-ts/address";
 import { BaseAssetId as BaseAssetId4 } from "@fuel-ts/address/configs";
 import { ErrorCode as ErrorCode24, FuelError as FuelError24 } from "@fuel-ts/errors";
-import { ByteArrayCoder } from "@fuel-ts/transactions";
+import { ByteArrayCoder, InputType as InputType7 } from "@fuel-ts/transactions";
 import { arrayify as arrayify20, hexlify as hexlify19 } from "@fuel-ts/utils";
 
 // src/predicate/utils/getPredicateRoot.ts
@@ -8777,15 +8770,10 @@ var Predicate = class extends Account {
   populateTransactionPredicateData(transactionRequestLike) {
     const request = transactionRequestify(transactionRequestLike);
     const { policies } = BaseTransactionRequest.getPolicyMeta(request);
-    const placeholderIndex = this.getIndexFromPlaceholderWitness(request);
-    if (placeholderIndex !== -1) {
-      request.removeWitness(placeholderIndex);
-    }
-    request.inputs.filter(isRequestInputResource).forEach((input) => {
-      if (isRequestInputResourceFromOwner(input, this.address)) {
+    request.inputs?.forEach((input) => {
+      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;
@@ -8823,20 +8811,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 - 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: hexlify19(this.bytes)
-    }));
-  }
   getPredicateData(policiesLength) {
     if (!this.predicateData.length) {
       return new Uint8Array();
@@ -8916,28 +8890,6 @@ var Predicate = class extends Account {
     }
     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.ts
@@ -9660,7 +9612,6 @@ export {
   assets,
   buildBlockExplorerUrl,
   cacheFor,
-  cacheResources,
   calculateMetadataGasForTxCreate,
   calculateMetadataGasForTxScript,
   calculatePriceWithFactor,
@@ -9707,7 +9658,6 @@ export {
   getReceiptsMessageOut,
   getReceiptsTransferOut,
   getReceiptsWithMissingData,
-  getRequestInputResourceOwner,
   getTransactionStatusName,
   getTransactionSummary,
   getTransactionSummaryFromRequest,
@@ -9721,10 +9671,6 @@ export {
   isMessage,
   isRawCoin,
   isRawMessage,
-  isRequestInputCoin,
-  isRequestInputMessage,
-  isRequestInputResource,
-  isRequestInputResourceFromOwner,
   isType,
   isTypeCreate,
   isTypeMint,