@fuel-ts/account 0.0.0-rc-2143-20240429161457 → 0.0.0-rc-2037-20240430005906

package/README.md

@@ -1,10 +1,10 @@
-# `@fuel-ts/wallet`
+# `@fuel-ts/account`
 
-**@fuel-ts/wallet** is a sub-module for interacting with **Fuel**.
+**@fuel-ts/account** is a sub-module for interacting with **Fuel**.
 
-This module contains the class to manage a private key and signing for a standard Externally Owned Account (EOA)
+This module contains the class to manage a private key and signing for a standard Externally Owned Account (EOA).
 
-# Table of contents
+## Table of contents
 
 - [Documentation](#documentation)
 - [Usage](#usage)
@@ -23,9 +23,9 @@ See [Fuels-ts Documentation](https://docs.fuel.network/docs/fuels-ts/wallets/)
 ### Installation
 
 ```sh
-pnpm add @fuel-ts/wallet
+pnpm add @fuel-ts/account
 # or
-npm add @fuel-ts/wallet
+npm add @fuel-ts/account
 ```
 
 ### Full SDK Installation
@@ -38,13 +38,16 @@ pnpm add fuels
 npm add fuels
 ```
 
-# Test Utilities
+## Test Utilities
 
 These test utilities are exported to assist in testing apps using Fuels.
 
 ```ts
 import { bn } from "@fuel-ts/math";
-import { seedTestWallet, generateTestWallet } from "@account/test-utils";
+import {
+  seedTestWallet,
+  generateTestWallet,
+} from "@fuel-ts/account/test-utils";
 
 const provider = await Provider.create("http://127.0.0.1:4000/v1/graphql");
 
@@ -54,17 +57,17 @@ const baseAssetId = provider.getBaseAssetId();
 seedTestWallet(wallet, [{ assetId: baseAssetId, amount: bn(100_000) }]);
 
 // generating
-const wallet = await generateTestWallet(provider, [[1_000, BaseAssetId]]);
+const wallet = await generateTestWallet(provider, [[1_000, baseAssetId]]);
 ```
 
 ## Contributing
 
-In order to contribute to `@fuel-ts/wallet`, please see the main [fuels-ts](https://github.com/FuelLabs/fuels-ts) monorepo.
+In order to contribute to `@fuel-ts/account`, please see the main [fuels-ts](https://github.com/FuelLabs/fuels-ts) monorepo.
 
 ## Changelog
 
-The `@fuel-ts/wallet` changelog can be found at [CHANGELOG](./CHANGELOG.md).
+The `@fuel-ts/account` changelog can be found at [CHANGELOG](./CHANGELOG.md).
 
 ## License
 
-The primary license for `@fuel-ts/wallet` is `Apache 2.0`, see [LICENSE](./LICENSE).
+The primary license for `@fuel-ts/account` is `Apache 2.0`, see [LICENSE](./LICENSE).

package/dist/index.global.js

@@ -38727,6 +38727,13 @@ ${MessageCoinFragmentFragmentDoc}`;
   )
 }
     `;
+  var GetMessageByNonceDocument = lib_default2`
+    query getMessageByNonce($nonce: Nonce!) {
+  message(nonce: $nonce) {
+    ...messageFragment
+  }
+}
+    ${MessageFragmentFragmentDoc}`;
   var SubmitAndAwaitDocument = lib_default2`
     subscription submitAndAwait($encodedTransaction: HexString!) {
   submitAndAwait(tx: $encodedTransaction) {
@@ -38821,6 +38828,9 @@ ${MessageCoinFragmentFragmentDoc}`;
       produceBlocks(variables, options) {
         return requester(ProduceBlocksDocument, variables, options);
       },
+      getMessageByNonce(variables, options) {
+        return requester(GetMessageByNonceDocument, variables, options);
+      },
       submitAndAwait(variables, options) {
         return requester(SubmitAndAwaitDocument, variables, options);
       },
@@ -39638,6 +39648,27 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     name = "NoWitnessByOwnerError";
   };
 
+  // src/providers/transaction-request/helpers.ts
+  var isRequestInputCoin = (input) => input.type === InputType.Coin;
+  var isRequestInputMessage = (input) => input.type === InputType.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
   var witnessify = (value) => {
     const data = arrayify(value);
@@ -39876,7 +39907,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @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;
@@ -39887,13 +39918,14 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...coin,
+        id,
         type: InputType.Coin,
         owner: owner.toB256(),
         amount,
         assetId,
         txPointer: "0x00000000000000000000000000000000",
-        witnessIndex
+        witnessIndex,
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(owner, assetId);
@@ -39905,7 +39937,7 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
      * @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;
@@ -39916,12 +39948,13 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
         }
       }
       const input = {
-        ...message,
+        nonce,
         type: InputType.Message,
         sender: sender.toB256(),
         recipient: recipient.toB256(),
         amount,
-        witnessIndex
+        witnessIndex,
+        predicate
       };
       this.pushInput(input);
       this.addChangeOutput(recipient, assetId);
@@ -40105,6 +40138,17 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     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;
@@ -42582,6 +42626,19 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     async getTransactionResponse(transactionId) {
       return new TransactionResponse2(transactionId, this);
     }
+    /**
+     * Returns Message for given nonce.
+     *
+     * @param nonce - The nonce of the message to retrieve.
+     * @returns A promise that resolves to the Message object.
+     */
+    async getMessageByNonce(nonce) {
+      const { message } = await this.operations.getMessageByNonce({ nonce });
+      if (!message) {
+        return null;
+      }
+      return message;
+    }
   };
   var Provider = _Provider;
   _cacheInputs = new WeakSet();
@@ -48133,10 +48190,15 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
     populateTransactionPredicateData(transactionRequestLike) {
       const request = transactionRequestify(transactionRequestLike);
       const { policies } = BaseTransactionRequest.getPolicyMeta(request);
-      request.inputs?.forEach((input) => {
-        if (input.type === InputType.Coin && hexlify(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 = hexlify(this.bytes);
           input.predicateData = hexlify(this.getPredicateData(policies.length));
+          input.witnessIndex = 0;
         }
       });
       return request;
@@ -48259,6 +48321,28 @@ ${PANIC_DOC_URL}#variant.${status.reason}`;
       }
       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-connector.ts