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

package/dist/test-utils.mjs

@@ -70,7 +70,7 @@ import { Address as Address2 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode13, FuelError as FuelError13 } from "@fuel-ts/errors";
 import { BN, bn as bn16 } from "@fuel-ts/math";
 import {
-  InputType as InputType7,
+  InputType as InputType8,
   TransactionType as TransactionType8,
   InputMessageCoder,
   TransactionCoder as TransactionCoder5
@@ -1235,7 +1235,7 @@ import { bn as bn7 } from "@fuel-ts/math";
 import {
   PolicyType,
   TransactionCoder,
-  InputType as InputType2,
+  InputType as InputType3,
   OutputType as OutputType2,
   TransactionType
 } from "@fuel-ts/transactions";
@@ -1685,6 +1685,12 @@ 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) => {
@@ -1875,7 +1881,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType2.Coin
+      (input) => input.type === InputType3.Coin
     );
   }
   /**
@@ -1907,9 +1913,9 @@ var BaseTransactionRequest = class {
     const ownerAddress = addressify(owner);
     const found = this.inputs.find((input) => {
       switch (input.type) {
-        case InputType2.Coin:
+        case InputType3.Coin:
           return hexlify7(input.owner) === ownerAddress.toB256();
-        case InputType2.Message:
+        case InputType3.Message:
           return hexlify7(input.recipient) === ownerAddress.toB256();
         default:
           return false;
@@ -1924,7 +1930,7 @@ var BaseTransactionRequest = class {
    * @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;
@@ -1935,13 +1941,14 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...coin,
-      type: InputType2.Coin,
+      id,
+      type: InputType3.Coin,
       owner: owner.toB256(),
       amount,
       assetId,
       txPointer: "0x00000000000000000000000000000000",
-      witnessIndex
+      witnessIndex,
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(owner, assetId);
@@ -1953,7 +1960,7 @@ var BaseTransactionRequest = class {
    * @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;
@@ -1964,12 +1971,13 @@ var BaseTransactionRequest = class {
       }
     }
     const input = {
-      ...message,
-      type: InputType2.Message,
+      nonce,
+      type: InputType3.Message,
       sender: sender.toB256(),
       recipient: recipient.toB256(),
       amount,
-      witnessIndex
+      witnessIndex,
+      predicate
     };
     this.pushInput(input);
     this.addChangeOutput(recipient, assetId);
@@ -2153,16 +2161,27 @@ var BaseTransactionRequest = class {
   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;
       switch (i.type) {
-        case InputType2.Coin:
-          correspondingInput = inputs.find((x) => x.type === InputType2.Coin && x.owner === i.owner);
+        case InputType3.Coin:
+          correspondingInput = inputs.find((x) => x.type === InputType3.Coin && x.owner === i.owner);
           break;
-        case InputType2.Message:
+        case InputType3.Message:
           correspondingInput = inputs.find(
-            (x) => x.type === InputType2.Message && x.sender === i.sender
+            (x) => x.type === InputType3.Message && x.sender === i.sender
           );
           break;
         default:
@@ -2196,7 +2215,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 InputType3, OutputType as OutputType3, TransactionCoder as TransactionCoder2 } from "@fuel-ts/transactions";
+import { TransactionType as TransactionType2, InputType as InputType4, 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) {
@@ -2207,7 +2226,7 @@ function hashTransaction(transactionRequest, chainId) {
   transaction.inputs = transaction.inputs.map((input) => {
     const inputClone = clone2(input);
     switch (inputClone.type) {
-      case InputType3.Coin: {
+      case InputType4.Coin: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
@@ -2215,11 +2234,11 @@ function hashTransaction(transactionRequest, chainId) {
         inputClone.predicateGasUsed = bn8(0);
         return inputClone;
       }
-      case InputType3.Message: {
+      case InputType4.Message: {
         inputClone.predicateGasUsed = bn8(0);
         return inputClone;
       }
-      case InputType3.Contract: {
+      case InputType4.Contract: {
         inputClone.txPointer = {
           blockHeight: 0,
           txIndex: 0
@@ -2379,7 +2398,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 InputType4, OutputType as OutputType5, TransactionType as TransactionType4 } from "@fuel-ts/transactions";
+import { InputType as InputType5, 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
@@ -2463,7 +2482,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType4.Contract
+      (input) => input.type === InputType5.Contract
     );
   }
   /**
@@ -2540,7 +2559,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       return this;
     }
     const inputIndex = super.pushInput({
-      type: InputType4.Contract,
+      type: InputType5.Contract,
       contractId: contractAddress.toB256(),
       txPointer: "0x00000000000000000000000000000000"
     });
@@ -2582,7 +2601,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
 
 // src/providers/transaction-request/utils.ts
 import { ErrorCode as ErrorCode8, FuelError as FuelError8 } from "@fuel-ts/errors";
-import { TransactionType as TransactionType5, InputType as InputType5 } from "@fuel-ts/transactions";
+import { TransactionType as TransactionType5, InputType as InputType6 } from "@fuel-ts/transactions";
 var transactionRequestify = (obj) => {
   if (obj instanceof ScriptTransactionRequest || obj instanceof CreateTransactionRequest) {
     return obj;
@@ -2602,10 +2621,10 @@ var transactionRequestify = (obj) => {
 };
 var cacheTxInputsFromOwner = (inputs, owner) => inputs.reduce(
   (acc, input) => {
-    if (input.type === InputType5.Coin && input.owner === owner) {
+    if (input.type === InputType6.Coin && input.owner === owner) {
       acc.utxos.push(input.id);
     }
-    if (input.type === InputType5.Message && input.recipient === owner) {
+    if (input.type === InputType6.Message && input.recipient === owner) {
       acc.messages.push(input.nonce);
     }
     return acc;
@@ -2759,7 +2778,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 InputType7 } from "@fuel-ts/transactions";
 function getInputsByTypes(inputs, types) {
   return inputs.filter((i) => types.includes(i.type));
 }
@@ -2767,16 +2786,16 @@ function getInputsByType(inputs, type) {
   return inputs.filter((i) => i.type === type);
 }
 function getInputsCoin(inputs) {
-  return getInputsByType(inputs, InputType6.Coin);
+  return getInputsByType(inputs, InputType7.Coin);
 }
 function getInputsMessage(inputs) {
-  return getInputsByType(inputs, InputType6.Message);
+  return getInputsByType(inputs, InputType7.Message);
 }
 function getInputsCoinAndMessage(inputs) {
-  return getInputsByTypes(inputs, [InputType6.Coin, InputType6.Message]);
+  return getInputsByTypes(inputs, [InputType7.Coin, InputType7.Message]);
 }
 function getInputsContract(inputs) {
-  return getInputsByType(inputs, InputType6.Contract);
+  return getInputsByType(inputs, InputType7.Contract);
 }
 function getInputFromAssetId(inputs, assetId) {
   const coinInputs = getInputsCoin(inputs);
@@ -2795,7 +2814,7 @@ function getInputContractFromIndex(inputs, inputIndex) {
   if (!contractInput) {
     return void 0;
   }
-  if (contractInput.type !== InputType6.Contract) {
+  if (contractInput.type !== InputType7.Contract) {
     throw new FuelError9(
       ErrorCode9.INVALID_TRANSACTION_INPUT,
       `Contract input should be of type 'contract'.`
@@ -2804,10 +2823,10 @@ function getInputContractFromIndex(inputs, inputIndex) {
   return contractInput;
 }
 function getInputAccountAddress(input) {
-  if (input.type === InputType6.Coin) {
+  if (input.type === InputType7.Coin) {
     return input.owner.toString();
   }
-  if (input.type === InputType6.Message) {
+  if (input.type === InputType7.Message) {
     return input.recipient.toString();
   }
   return "";
@@ -4644,7 +4663,7 @@ cacheInputs_fn = function(inputs) {
     return;
   }
   inputs.forEach((input) => {
-    if (input.type === InputType7.Coin) {
+    if (input.type === InputType8.Coin) {
       this.cache?.set(input.id);
     }
   });
@@ -8211,16 +8230,21 @@ __publicField(Wallet, "fromEncryptedJson", WalletUnlocked.fromEncryptedJson);
 
 // src/test-utils/seedTestWallet.ts
 import { randomBytes as randomBytes5 } from "@fuel-ts/crypto";
-var seedTestWallet = async (wallet, quantities) => {
+var seedTestWallet = async (wallet, quantities, utxosAmount = 1) => {
+  const toFundAccounts = Array.isArray(wallet) ? wallet : [wallet];
   const genesisWallet = new WalletUnlocked(
     process.env.GENESIS_SECRET || randomBytes5(32),
-    wallet.provider
+    // Connect to the same Provider as wallet
+    toFundAccounts[0].provider
   );
   const request = new ScriptTransactionRequest();
-  quantities.forEach((quantity) => {
-    const { amount, assetId } = coinQuantityfy(quantity);
-    request.addCoinOutput(wallet.address, amount, assetId);
-  });
+  quantities.map(coinQuantityfy).forEach(
+    ({ amount, assetId }) => toFundAccounts.forEach(({ address }) => {
+      for (let i = 0; i < utxosAmount; i++) {
+        request.addCoinOutput(address, amount.div(utxosAmount), assetId);
+      }
+    })
+  );
   const txCost = await genesisWallet.provider.getTransactionCost(request);
   request.gasLimit = txCost.gasUsed;
   request.maxFee = txCost.maxFee;
@@ -8284,7 +8308,6 @@ var launchNode = async ({
   ip,
   port,
   args = [],
-  fuelCorePath = void 0,
   useSystemFuelCore = false,
   loggingEnabled = true,
   debugEnabled = false,
@@ -8305,7 +8328,7 @@ var launchNode = async ({
     const poaInstantFlagValue = getFlagValueFromArgs(args, "--poa-instant");
     const poaInstant = poaInstantFlagValue === "true" || poaInstantFlagValue === void 0;
     const graphQLStartSubstring = "Binding GraphQL provider to";
-    const binPath = fuelCorePath ?? findBinPath("fuels-core", __dirname);
+    const binPath = findBinPath("fuels-core", __dirname);
     const command = useSystemFuelCore ? "fuel-core" : binPath;
     const ipToUse = ip || "0.0.0.0";
     const portToUse = port || (await getPortPromise({
@@ -8443,7 +8466,44 @@ var launchNodeAndGetWallets = async ({
   };
   return { wallets, stop: cleanup, provider };
 };
+
+// src/test-utils/transactionRequest.ts
+import { UTXO_ID_LEN as UTXO_ID_LEN4 } from "@fuel-ts/abi-coder";
+import { getRandomB256 } from "@fuel-ts/address";
+import { ZeroBytes32 as ZeroBytes329 } from "@fuel-ts/address/configs";
+import { randomBytes as randomBytes7 } from "@fuel-ts/crypto";
+import { bn as bn20 } from "@fuel-ts/math";
+import { InputType as InputType9 } from "@fuel-ts/transactions";
+import { hexlify as hexlify19 } from "@fuel-ts/utils";
+var generateFakeRequestInputCoin = (partial = {}) => ({
+  id: hexlify19(randomBytes7(UTXO_ID_LEN4)),
+  type: InputType9.Coin,
+  owner: getRandomB256(),
+  amount: bn20(100),
+  assetId: ZeroBytes329,
+  txPointer: "0x00000000000000000000000000000000",
+  witnessIndex: 0,
+  ...partial
+});
+var generateFakeRequestInputMessage = (partial = {}) => ({
+  nonce: getRandomB256(),
+  type: InputType9.Message,
+  sender: getRandomB256(),
+  recipient: getRandomB256(),
+  amount: bn20(100),
+  witnessIndex: 0,
+  ...partial
+});
+var generateFakeRequestInputContract = (partial = {}) => ({
+  contractId: getRandomB256(),
+  type: InputType9.Contract,
+  txPointer: "0x00000000000000000000000000000000",
+  ...partial
+});
 export {
+  generateFakeRequestInputCoin,
+  generateFakeRequestInputContract,
+  generateFakeRequestInputMessage,
   generateTestWallet,
   killNode,
   launchNode,