@ledgerhq/cryptoassets 13.32.0 → 13.33.0-nightly.20251108023448

package/src/hooks.test.ts

@@ -86,19 +86,21 @@ beforeEach(() => {
   jest.clearAllMocks();
 
   // Default mock implementations
-  mockFindTokenById.mockImplementation((id: string) => {
+  mockFindTokenById.mockImplementation(async (id: string) => {
     if (id === "ethereum/erc20/usd_coin") {
       return mockToken;
     }
     return undefined;
   });
 
-  mockFindTokenByAddressInCurrency.mockImplementation((address: string, currencyId: string) => {
-    if (address === "0xA0b86a33E6441b8c4C8C0e4b8b8c4C8C0e4b8b8c4" && currencyId === "ethereum") {
-      return mockToken;
-    }
-    return undefined;
-  });
+  mockFindTokenByAddressInCurrency.mockImplementation(
+    async (address: string, currencyId: string) => {
+      if (address === "0xA0b86a33E6441b8c4C8C0e4b8b8c4C8C0e4b8b8c4" && currencyId === "ethereum") {
+        return mockToken;
+      }
+      return undefined;
+    },
+  );
 
   mockFindCryptoCurrencyById.mockImplementation((id: string) => {
     if (id === "bitcoin") {

package/src/legacy/legacy-store.ts

@@ -2,14 +2,14 @@ import type { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
 import { tokensById, tokensByCurrencyAddress, tokensByCryptoCurrency } from "./legacy-state";
 
-function findTokenById(id: string): TokenCurrency | undefined {
+async function findTokenById(id: string): Promise<TokenCurrency | undefined> {
   return tokensById[id];
 }
 
-function findTokenByAddressInCurrency(
+async function findTokenByAddressInCurrency(
   address: string,
   currencyId: string,
-): TokenCurrency | undefined {
+): Promise<TokenCurrency | undefined> {
   return tokensByCurrencyAddress[currencyId + ":" + address.toLowerCase()];
 }
 
@@ -18,10 +18,6 @@ function getTokensSyncHash(currencyId: string): Promise<string> {
   return Promise.resolve("legacy_" + tokens?.length);
 }
 
-/**
- * Legacy CryptoAssetsStore adapter that wraps the legacy token lookup functions
- * and provides the CryptoAssetsStore interface expected by the rest of the codebase.
- */
 export const legacyCryptoAssetsStore: CryptoAssetsStore = {
   findTokenById,
   findTokenByAddressInCurrency,

package/src/legacy/legacy-utils.ts

@@ -145,9 +145,14 @@ export function convertTRONTokens(type: "trc10" | "trc20") {
     | TRC20Token): TokenCurrency => {
     const parentCurrency = getCryptoCurrencyById("tron");
 
+    // For TRC20 tokens, use contract address as ID to match backend API format
+    // API expects lowercase addresses, so normalize here
+    // For TRC10 tokens, use numeric ID as before
+    const tokenId = type === "trc20" ? contractAddress.toLowerCase() : id;
+
     return {
       type: "TokenCurrency",
-      id: `tron/${type}/${id}`,
+      id: `tron/${type}/${tokenId}`,
       contractAddress,
       parentCurrency,
       tokenType: type,
@@ -388,6 +393,7 @@ export function convertStellarTokens([
 ]: StellarToken): TokenCurrency {
   const parentCurrency = getCryptoCurrencyById("stellar");
 
+  // FIXME: to be discussed with CAL service as values are Uppercase IRL
   return {
     type: "TokenCurrency",
     id: `stellar/asset/${assetCode.toUpperCase()}:${assetIssuer.toUpperCase()}`,
@@ -521,7 +527,6 @@ export function addTokens(list: (TokenCurrency | undefined)[]): void {
     if (!delisted) tokensArray.push(token);
     tokensArrayWithDelisted.push(token);
     tokensById[id] = token;
-
     tokensByCurrencyAddress[parentCurrency.id + ":" + lowCaseContract] = token;
 
     if (!(parentCurrency.id in tokensByCryptoCurrency)) {

package/src/legacy/legacy.test.ts

@@ -324,7 +324,7 @@ describe("Legacy Utils", () => {
       expect(tokensArray.length).toBe(1);
     });
 
-    it("should handle ticker conflicts (first wins)", () => {
+    it("should handle tokens with same ticker", () => {
       const token1: TokenCurrency = {
         type: "TokenCurrency",
         id: "ethereum/erc20/test1",
@@ -349,9 +349,8 @@ describe("Legacy Utils", () => {
 
       addTokens([token1, token2]);
 
-      // Both tokens should be added successfully
-      expect(tokensById[token1.id]).toBe(token1);
-      expect(tokensById[token2.id]).toBe(token2);
+      // Both tokens should be added since they have different IDs
+      expect(tokensArray.length).toBe(2);
     });
 
     it("should handle undefined tokens", () => {
@@ -573,7 +572,7 @@ describe("legacyCryptoAssetsStore", () => {
     __clearAllLists();
   });
 
-  it("should find token by id", () => {
+  it("should find token by id", async () => {
     const erc20Token: ERC20Token = [
       "ethereum",
       "test_token",
@@ -588,12 +587,12 @@ describe("legacyCryptoAssetsStore", () => {
 
     addTokens([convertERC20(erc20Token)].filter(Boolean) as TokenCurrency[]);
 
-    const token = legacyCryptoAssetsStore.findTokenById("ethereum/erc20/test_token");
+    const token = await legacyCryptoAssetsStore.findTokenById("ethereum/erc20/test_token");
 
     expect(token).toMatchObject({ ticker: "TEST" });
   });
 
-  it("should find token by address in currency", () => {
+  it("should find token by address in currency", async () => {
     const erc20Token: ERC20Token = [
       "ethereum",
       "test_token",
@@ -608,13 +607,19 @@ describe("legacyCryptoAssetsStore", () => {
 
     addTokens([convertERC20(erc20Token)].filter(Boolean) as TokenCurrency[]);
 
-    const token = legacyCryptoAssetsStore.findTokenByAddressInCurrency("0xabc123", "ethereum");
+    const token = await legacyCryptoAssetsStore.findTokenByAddressInCurrency(
+      "0xabc123",
+      "ethereum",
+    );
 
     expect(token).toMatchObject({ ticker: "TEST" });
   });
 
-  it("should return undefined for non-existent token by address", () => {
-    const token = legacyCryptoAssetsStore.findTokenByAddressInCurrency("0xnonexistent", "ethereum");
+  it("should return undefined for non-existent token by address", async () => {
+    const token = await legacyCryptoAssetsStore.findTokenByAddressInCurrency(
+      "0xnonexistent",
+      "ethereum",
+    );
 
     expect(token).toBeUndefined();
   });

package/src/tokens.test.ts

@@ -1,14 +1,12 @@
 import { getCryptoCurrencyById } from "./currencies";
-import {
-  addTokens,
-  convertERC20,
-  listTokens,
-  __clearAllLists,
-  findTokenById,
-  listTokensForCryptoCurrency,
-} from "./tokens";
-import { createTokenHash } from "./legacy/legacy-utils";
+import { listTokens, listTokensForCryptoCurrency } from "./tokens";
+import { addTokens, __clearAllLists, createTokenHash, convertERC20 } from "./legacy/legacy-utils";
+import { initializeLegacyTokens } from "./legacy/legacy-data";
 import { ERC20Token } from "./types";
+import { legacyCryptoAssetsStore } from "./legacy/legacy-store";
+
+// Initialize legacy tokens for tests
+initializeLegacyTokens(addTokens);
 
 const initMainToken: ERC20Token[] = [
   [
@@ -119,7 +117,7 @@ describe("tokens", () => {
       ];
       addTokens(changeToken.map(convertERC20));
       expect(listTokens().length).toBe(1);
-      findTokenById("kiba_inu");
+      legacyCryptoAssetsStore.findTokenById("kiba_inu");
       expect(listTokens({ withDelisted: true }).length).toBe(4);
 
       expect(listTokensForCryptoCurrency(ethereumCurrency).length).toBe(1);

package/src/tokens.ts

@@ -4,78 +4,22 @@
 
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import {
-  addTokens,
   listTokensLegacy,
   listTokensForCryptoCurrencyLegacy,
   type TokensListOptions,
-  __clearAllLists,
-  convertERC20,
-  convertAlgorandASATokens,
-  convertVechainToken,
-  convertTRONTokens,
-  convertMultiversXESDTTokens,
-  convertCardanoNativeTokens,
-  convertStellarTokens,
-  convertJettonToken,
-  convertSplTokens,
-  convertSuiTokens,
-  convertAptCoinTokens,
-  convertAptFaTokens,
-  convertHederaTokens,
 } from "./legacy/legacy-utils";
-import { tokensByCurrencyAddress, tokensById } from "./legacy/legacy-state";
-import { initializeLegacyTokens } from "./legacy/legacy-data";
-import { legacyCryptoAssetsStore } from "./legacy/legacy-store";
-
-export {
-  addTokens,
-  convertERC20,
-  convertAlgorandASATokens,
-  convertVechainToken,
-  convertTRONTokens,
-  convertMultiversXESDTTokens,
-  convertCardanoNativeTokens,
-  convertStellarTokens,
-  convertJettonToken,
-  convertSplTokens,
-  convertSuiTokens,
-  convertAptCoinTokens,
-  convertAptFaTokens,
-  convertHederaTokens,
-  __clearAllLists,
-  legacyCryptoAssetsStore,
-};
-
-initializeLegacyTokens(addTokens);
-
-/**
- * @deprecated Please do `await getCryptoAssetsStore().findTokenById(id)` instead to anticipate https://github.com/LedgerHQ/ledger-live/pull/11905
- */
-export function findTokenById(id: string): TokenCurrency | undefined {
-  return tokensById[id];
-}
-
-/**
- * @deprecated Please do `await getCryptoAssetsStore().findTokenByAddress(address, currencyId)` instead to anticipate https://github.com/LedgerHQ/ledger-live/pull/11905
- */
-export function findTokenByAddressInCurrency(
-  address: string,
-  currencyId: string,
-): TokenCurrency | undefined {
-  return tokensByCurrencyAddress[currencyId + ":" + address.toLowerCase()];
-}
 
 /**
- * @deprecated This function is deprecated. See https://ledgerhq.atlassian.net/browse/LIVE-21646
- * Tokens will no longer be listable as we moved to DaDa API when possible / or CAL API directly.
+ * @deprecated This function is deprecated since tokens will no longer be listable as we moved to DaDa API everywhere
+ * Use the new async token API instead
  */
 export function listTokens(options?: Partial<TokensListOptions>): TokenCurrency[] {
   return listTokensLegacy(options);
 }
 
 /**
- * @deprecated This function is deprecated. See https://ledgerhq.atlassian.net/browse/LIVE-21646
- * Tokens will no longer be listable as we moved to DaDa API when possible / or CAL API directly.
+ * @deprecated This function is deprecated since tokens will no longer be listable as we moved to DaDa API everywhere
+ * Use the new async token API instead
  */
 export function listTokensForCryptoCurrency(
   currency: CryptoCurrency,
@@ -85,7 +29,7 @@ export function listTokensForCryptoCurrency(
 }
 
 /**
- * @deprecated Prefer using currency.tokenTypes directly.
+ *
  */
 export function listTokenTypesForCryptoCurrency(currency: CryptoCurrency): string[] {
   return currency.tokenTypes || [];