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

package/dist/test-utils.mjs

@@ -71,7 +71,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
@@ -1168,7 +1168,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";
@@ -1597,12 +1597,6 @@ var NoWitnessAtIndexError = class extends Error {
   name = "NoWitnessAtIndexError";
 };
 
-// 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);
-
 // src/providers/transaction-request/witness.ts
 import { arrayify as arrayify4, hexlify as hexlify6 } from "@fuel-ts/utils";
 var witnessify = (value) => {
@@ -1793,7 +1787,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType3.Coin
+      (input) => input.type === InputType2.Coin
     );
   }
   /**
@@ -1825,9 +1819,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;
@@ -1843,8 +1837,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;
@@ -1855,14 +1849,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);
@@ -1875,8 +1869,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) {
@@ -1888,13 +1882,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);
@@ -1925,6 +1919,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.
    *
@@ -2073,20 +2093,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:
@@ -2099,13 +2115,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
@@ -2118,7 +2127,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) {
@@ -2129,7 +2138,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
@@ -2137,11 +2146,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
@@ -2307,7 +2316,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
@@ -2391,7 +2400,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType5.Contract
+      (input) => input.type === InputType4.Contract
     );
   }
   /**
@@ -2467,7 +2476,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       return this;
     }
     const inputIndex = super.pushInput({
-      type: InputType5.Contract,
+      type: InputType4.Contract,
       contractId: contractAddress.toB256(),
       txPointer: "0x00000000000000000000000000000000"
     });
@@ -2662,7 +2671,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));
 }
@@ -2670,16 +2679,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);
@@ -2698,7 +2707,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'.`
@@ -2707,10 +2716,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 "";
@@ -4407,7 +4416,7 @@ cacheInputs_fn = function(inputs) {
     return;
   }
   inputs.forEach((input) => {
-    if (input.type === InputType7.Coin) {
+    if (input.type === InputType6.Coin) {
       this.cache?.set(input.id);
     }
   });
@@ -7977,11 +7986,10 @@ __publicField(Wallet, "fromEncryptedJson", WalletUnlocked.fromEncryptedJson);
 
 // src/test-utils/seedTestWallet.ts
 import { randomBytes as randomBytes5 } from "@fuel-ts/crypto";
-var seedTestWallet = async (wallet, quantities, utxosAmount = 1) => {
-  const toFundAccounts = Array.isArray(wallet) ? wallet : [wallet];
+var seedTestWallet = async (wallet, quantities) => {
   const genesisWallet = new WalletUnlocked(
     process.env.GENESIS_SECRET || randomBytes5(32),
-    toFundAccounts[0].provider
+    wallet.provider
   );
   const resources = await genesisWallet.getResourcesToSpend(quantities);
   const { minGasPrice } = genesisWallet.provider.getGasConfig();
@@ -7990,13 +7998,7 @@ var seedTestWallet = async (wallet, quantities, utxosAmount = 1) => {
     gasPrice: minGasPrice
   });
   request.addResources(resources);
-  quantities.map(coinQuantityfy).forEach(
-    ({ amount, assetId }) => toFundAccounts.forEach(({ address }) => {
-      for (let i = 0; i < utxosAmount; i++) {
-        request.addCoinOutput(address, amount.div(utxosAmount), assetId);
-      }
-    })
-  );
+  quantities.map(coinQuantityfy).forEach(({ amount, assetId }) => request.addCoinOutput(wallet.address, amount, assetId));
   await genesisWallet.sendTransaction(request, { awaitExecution: true });
 };
 
@@ -8195,44 +8197,7 @@ var launchNodeAndGetWallets = async ({
   };
   return { wallets, stop: cleanup, provider };
 };
-
-// src/test-utils/transactionRequest.ts
-import { UTXO_ID_LEN as UTXO_ID_LEN3 } from "@fuel-ts/abi-coder";
-import { getRandomB256 } from "@fuel-ts/address";
-import { ZeroBytes32 as ZeroBytes329 } from "@fuel-ts/address/configs";
-import { randomBytes as randomBytes6 } from "@fuel-ts/crypto";
-import { bn as bn19 } from "@fuel-ts/math";
-import { InputType as InputType8 } from "@fuel-ts/transactions";
-import { hexlify as hexlify19 } from "@fuel-ts/utils";
-var generateFakeRequestInputCoin = (partial = {}) => ({
-  id: hexlify19(randomBytes6(UTXO_ID_LEN3)),
-  type: InputType8.Coin,
-  owner: getRandomB256(),
-  amount: bn19(100),
-  assetId: ZeroBytes329,
-  txPointer: "0x00000000000000000000000000000000",
-  witnessIndex: 0,
-  ...partial
-});
-var generateFakeRequestInputMessage = (partial = {}) => ({
-  nonce: getRandomB256(),
-  type: InputType8.Message,
-  sender: getRandomB256(),
-  recipient: getRandomB256(),
-  amount: bn19(100),
-  witnessIndex: 0,
-  ...partial
-});
-var generateFakeRequestInputContract = (partial = {}) => ({
-  contractId: getRandomB256(),
-  type: InputType8.Contract,
-  txPointer: "0x00000000000000000000000000000000",
-  ...partial
-});
 export {
-  generateFakeRequestInputCoin,
-  generateFakeRequestInputContract,
-  generateFakeRequestInputMessage,
   generateTestWallet,
   killNode,
   launchNode,