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

package/dist/index.mjs

@@ -75,7 +75,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
@@ -1240,7 +1240,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";
@@ -1764,6 +1764,28 @@ 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) => {
@@ -1954,7 +1976,7 @@ var BaseTransactionRequest = class {
    */
   getCoinInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType2.Coin
+      (input) => input.type === InputType3.Coin
     );
   }
   /**
@@ -1986,9 +2008,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;
@@ -2003,7 +2025,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;
@@ -2014,13 +2036,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);
@@ -2032,7 +2055,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;
@@ -2043,12 +2066,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);
@@ -2232,16 +2256,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:
@@ -2275,7 +2310,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) {
@@ -2286,7 +2321,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
@@ -2294,11 +2329,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
@@ -2458,7 +2493,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
@@ -2542,7 +2577,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
    */
   getContractInputs() {
     return this.inputs.filter(
-      (input) => input.type === InputType4.Contract
+      (input) => input.type === InputType5.Contract
     );
   }
   /**
@@ -2619,7 +2654,7 @@ var ScriptTransactionRequest = class extends BaseTransactionRequest {
       return this;
     }
     const inputIndex = super.pushInput({
-      type: InputType4.Contract,
+      type: InputType5.Contract,
       contractId: contractAddress.toB256(),
       txPointer: "0x00000000000000000000000000000000"
     });
@@ -2661,7 +2696,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;
@@ -2681,10 +2716,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;
@@ -2838,7 +2873,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));
 }
@@ -2846,16 +2881,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);
@@ -2874,7 +2909,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'.`
@@ -2883,10 +2918,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 "";
@@ -4770,7 +4805,7 @@ cacheInputs_fn = function(inputs) {
     return;
   }
   inputs.forEach((input) => {
-    if (input.type === InputType7.Coin) {
+    if (input.type === InputType8.Coin) {
       this.cache?.set(input.id);
     }
   });
@@ -8952,7 +8987,7 @@ import {
 } from "@fuel-ts/abi-coder";
 import { Address as Address9 } from "@fuel-ts/address";
 import { ErrorCode as ErrorCode24, FuelError as FuelError24 } from "@fuel-ts/errors";
-import { ByteArrayCoder, InputType as InputType8 } from "@fuel-ts/transactions";
+import { ByteArrayCoder } from "@fuel-ts/transactions";
 import { arrayify as arrayify20, hexlify as hexlify19 } from "@fuel-ts/utils";
 
 // src/predicate/utils/getPredicateRoot.ts
@@ -9011,10 +9046,15 @@ var Predicate = class extends Account {
   populateTransactionPredicateData(transactionRequestLike) {
     const request = transactionRequestify(transactionRequestLike);
     const { policies } = BaseTransactionRequest.getPolicyMeta(request);
-    request.inputs?.forEach((input) => {
-      if (input.type === InputType8.Coin && hexlify19(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 = hexlify19(this.bytes);
         input.predicateData = hexlify19(this.getPredicateData(policies.length));
+        input.witnessIndex = 0;
       }
     });
     return request;
@@ -9137,6 +9177,28 @@ 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
@@ -9859,6 +9921,7 @@ export {
   assets,
   buildBlockExplorerUrl,
   cacheFor,
+  cacheResources,
   cacheTxInputsFromOwner,
   calculateGasFee,
   calculateMetadataGasForTxCreate,
@@ -9906,6 +9969,7 @@ export {
   getReceiptsMessageOut,
   getReceiptsTransferOut,
   getReceiptsWithMissingData,
+  getRequestInputResourceOwner,
   getTransactionStatusName,
   getTransactionSummary,
   getTransactionSummaryFromRequest,
@@ -9919,6 +9983,10 @@ export {
   isMessage,
   isRawCoin,
   isRawMessage,
+  isRequestInputCoin,
+  isRequestInputMessage,
+  isRequestInputResource,
+  isRequestInputResourceFromOwner,
   isType,
   isTypeCreate,
   isTypeMint,