@ledgerhq/live-common 34.52.0 → 34.53.0-nightly.20251107095716

package/src/deposit/deposit.test.ts

@@ -9,18 +9,24 @@ import { MOCK_TOKENS_ONLY, MOCK_WITH_TOKEN_AND_CURRENCY_ASSET, MOCK_IDS, MOCK_PO
 import { MappedAsset } from "./type";
 import {
   getCryptoCurrencyById,
-  findTokenById,
   setSupportedCurrencies,
   sortCurrenciesByIds,
 } from "../currencies/index";
 import { isCurrencySupported, listSupportedCurrencies, listTokens } from "../currencies";
 import { CryptoOrTokenCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { getCryptoAssetsStore } from "../bridge/crypto-assets/index";
+import { initializeLegacyTokens } from "@ledgerhq/cryptoassets/legacy/legacy-data";
+import { addTokens } from "@ledgerhq/cryptoassets/legacy/legacy-utils";
 
 const TOKEN_ONLY_ASSETS = MOCK_TOKENS_ONLY as MappedAsset[];
 
 const listSupportedTokens = () => listTokens().filter(t => isCurrencySupported(t.parentCurrency));
 
 describe("Deposit logic", () => {
+  beforeAll(() => {
+    initializeLegacyTokens(addTokens);
+  });
+
   afterEach(() => {
     setSupportedCurrencies([]);
   });
@@ -106,10 +112,12 @@ describe("Deposit logic", () => {
   });
 
   describe("groupCurrenciesByProvider", () => {
-    test("should group currencies by provider", () => {
-      const currencies = TOKEN_ONLY_ASSETS.map(asset => findTokenById(asset.ledgerId)).filter(
-        (t): t is TokenCurrency => t !== undefined,
-      );
+    test("should group currencies by provider", async () => {
+      const currencies = (
+        await Promise.all(
+          TOKEN_ONLY_ASSETS.map(asset => getCryptoAssetsStore().findTokenById(asset.ledgerId)),
+        )
+      ).filter((t): t is TokenCurrency => t !== undefined);
       const { currenciesByProvider } = groupCurrenciesByProvider(TOKEN_ONLY_ASSETS, currencies);
       expect(currenciesByProvider).toEqual([
         {
@@ -119,11 +127,15 @@ describe("Deposit logic", () => {
       ]);
     });
 
-    test("should handle POL assets correctly", () => {
-      const currenciesPol = MOCK_POL.map(asset =>
-        asset.$type === "Token"
-          ? findTokenById(asset.ledgerId)
-          : getCryptoCurrencyById(asset.ledgerId),
+    test("should handle POL assets correctly", async () => {
+      const currenciesPol = (
+        await Promise.all(
+          MOCK_POL.map(asset =>
+            asset.$type === "Token"
+              ? getCryptoAssetsStore().findTokenById(asset.ledgerId)
+              : Promise.resolve(getCryptoCurrencyById(asset.ledgerId)),
+          ),
+        )
       ).filter((c): c is CryptoOrTokenCurrency => c !== undefined);
       const { currenciesByProvider: currenciesByProviderBis, sortedCryptoCurrencies } =
         groupCurrenciesByProvider(MOCK_POL as MappedAsset[], currenciesPol);
@@ -137,10 +149,12 @@ describe("Deposit logic", () => {
       expect(sortedCryptoCurrencies).toEqual([currenciesPol[1]]);
     });
 
-    test("should handle empty assets array", () => {
-      const currencies = TOKEN_ONLY_ASSETS.map(asset => findTokenById(asset.ledgerId)).filter(
-        (t): t is TokenCurrency => t !== undefined,
-      );
+    test("should handle empty assets array", async () => {
+      const currencies = (
+        await Promise.all(
+          TOKEN_ONLY_ASSETS.map(asset => getCryptoAssetsStore().findTokenById(asset.ledgerId)),
+        )
+      ).filter((t): t is TokenCurrency => t !== undefined);
       const { currenciesByProvider, sortedCryptoCurrencies } = groupCurrenciesByProvider(
         [],
         currencies,
@@ -169,14 +183,16 @@ describe("Deposit logic", () => {
       expect(sortedCryptoCurrencies).toEqual([]);
     });
 
-    test("should prioritize crypto currencies over tokens in sortedCryptoCurrencies", () => {
+    test("should prioritize crypto currencies over tokens in sortedCryptoCurrencies", async () => {
       const mockAssets = [
         { ...TOKEN_ONLY_ASSETS[0], providerId: "test-provider" },
       ] as MappedAsset[];
 
       setSupportedCurrencies(["ethereum"]);
       const ethCurrency = getCryptoCurrencyById("ethereum");
-      const tokenCurrency = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const tokenCurrency = await getCryptoAssetsStore().findTokenById(
+        TOKEN_ONLY_ASSETS[0].ledgerId,
+      );
       if (!tokenCurrency) throw new Error("Token not found");
 
       const { sortedCryptoCurrencies } = groupCurrenciesByProvider(mockAssets, [
@@ -187,13 +203,13 @@ describe("Deposit logic", () => {
       expect(sortedCryptoCurrencies.length).toBeGreaterThan(0);
     });
 
-    test("should handle duplicate provider IDs correctly", () => {
+    test("should handle duplicate provider IDs correctly", async () => {
       const duplicateAssets = [
         TOKEN_ONLY_ASSETS[0],
         { ...TOKEN_ONLY_ASSETS[0], ledgerId: "different-id" },
       ] as MappedAsset[];
 
-      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const token = await getCryptoAssetsStore().findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
       if (!token) throw new Error("Token not found");
       const currencies = [token];
       const { currenciesByProvider } = groupCurrenciesByProvider(duplicateAssets, currencies);
@@ -204,28 +220,28 @@ describe("Deposit logic", () => {
   });
 
   describe("getTokenOrCryptoCurrencyById", () => {
-    test("should return crypto currency by ID", () => {
-      const result = getTokenOrCryptoCurrencyById("bitcoin");
+    test("should return crypto currency by ID", async () => {
+      const result = await getTokenOrCryptoCurrencyById("bitcoin");
       expect(result).toBeDefined();
       expect(result.type).toBe("CryptoCurrency");
     });
 
-    test("should return token by ID", () => {
-      const result = getTokenOrCryptoCurrencyById("ethereum/erc20/usd_tether__erc20_");
+    test("should return token by ID", async () => {
+      const result = await getTokenOrCryptoCurrencyById("ethereum/erc20/usd_tether__erc20_");
       expect(result).toBeDefined();
       expect(result.type).toBe("TokenCurrency");
     });
 
-    test("should handle invalid crypto currency ID", () => {
-      expect(() => getTokenOrCryptoCurrencyById("invalid-crypto-id")).toThrow();
+    test("should handle invalid crypto currency ID", async () => {
+      await expect(getTokenOrCryptoCurrencyById("invalid-crypto-id")).rejects.toThrow();
     });
 
-    test("should handle invalid token ID", () => {
-      expect(() => getTokenOrCryptoCurrencyById("invalid/token/id")).toThrow();
+    test("should handle invalid token ID", async () => {
+      await expect(getTokenOrCryptoCurrencyById("invalid/token/id")).rejects.toThrow();
     });
 
-    test("should handle empty ID", () => {
-      expect(() => getTokenOrCryptoCurrencyById("")).toThrow();
+    test("should handle empty ID", async () => {
+      await expect(getTokenOrCryptoCurrencyById("")).rejects.toThrow();
     });
   });
 
@@ -315,7 +331,7 @@ describe("Deposit logic", () => {
   });
 
   describe("Token-only scenarios", () => {
-    it("should return only Polygon token while its currency is supported in the list", () => {
+    it("should return only Polygon token while its currency is supported in the list", async () => {
       setSupportedCurrencies(["polygon"]);
 
       const currencies = sortCurrenciesByIds(
@@ -326,10 +342,12 @@ describe("Deposit logic", () => {
         MOCK_TOKENS_ONLY as MappedAsset[],
         currencies,
       );
-      expect(sortedCryptoCurrencies).toEqual([findTokenById("polygon/erc20/(pos)_tether_usd")]);
+      expect(sortedCryptoCurrencies).toEqual([
+        await getCryptoAssetsStore().findTokenById("polygon/erc20/(pos)_tether_usd"),
+      ]);
     });
 
-    it("should return only BSC token while its currency is supported in the list", () => {
+    it("should return only BSC token while its currency is supported in the list", async () => {
       setSupportedCurrencies(["bsc"]);
 
       const currencies = sortCurrenciesByIds(
@@ -340,7 +358,9 @@ describe("Deposit logic", () => {
         MOCK_TOKENS_ONLY as MappedAsset[],
         currencies,
       );
-      expect(sortedCryptoCurrencies).toEqual([findTokenById("bsc/bep20/binance-peg_bsc-usd")]);
+      expect(sortedCryptoCurrencies).toEqual([
+        await getCryptoAssetsStore().findTokenById("bsc/bep20/binance-peg_bsc-usd"),
+      ]);
     });
 
     it("should return tokens that are actually supported based on mock data", () => {
@@ -597,13 +617,13 @@ describe("Deposit logic", () => {
   });
 
   describe("Error handling", () => {
-    test("should handle malformed asset data by throwing error", () => {
+    test("should handle malformed asset data by throwing error", async () => {
       const malformedAssets = [
         { ...TOKEN_ONLY_ASSETS[0], ledgerId: undefined as any },
         { ...TOKEN_ONLY_ASSETS[0], providerId: null as any },
       ] as MappedAsset[];
 
-      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const token = await getCryptoAssetsStore().findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
       if (!token) throw new Error("Token not found");
       const currencies = [token];
 
@@ -612,12 +632,12 @@ describe("Deposit logic", () => {
       }).toThrow();
     });
 
-    test("should handle assets with null/undefined fields gracefully where possible", () => {
+    test("should handle assets with null/undefined fields gracefully where possible", async () => {
       const partiallyMalformedAssets = [
         { ...TOKEN_ONLY_ASSETS[0], providerId: "" },
       ] as MappedAsset[];
 
-      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const token = await getCryptoAssetsStore().findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
       if (!token) throw new Error("Token not found");
       const currencies = [token];
 
@@ -626,7 +646,7 @@ describe("Deposit logic", () => {
       }).not.toThrow();
     });
 
-    test("should handle very large datasets efficiently", () => {
+    test("should handle very large datasets efficiently", async () => {
       const largeAssetList = Array(10000)
         .fill(TOKEN_ONLY_ASSETS[0])
         .map((asset, index) => ({
@@ -635,7 +655,7 @@ describe("Deposit logic", () => {
           providerId: `provider_${index % 10}`,
         })) as MappedAsset[];
 
-      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const token = await getCryptoAssetsStore().findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
       if (!token) throw new Error("Token not found");
       const currencies = [token];
 
@@ -648,12 +668,12 @@ describe("Deposit logic", () => {
       expect(result.sortedCryptoCurrencies).toBeDefined();
     });
 
-    test("should handle case sensitivity in ledger IDs correctly", () => {
+    test("should handle case sensitivity in ledger IDs correctly", async () => {
       const mixedCaseAssets = [
         { ...TOKEN_ONLY_ASSETS[0], ledgerId: TOKEN_ONLY_ASSETS[0].ledgerId.toUpperCase() },
       ] as MappedAsset[];
 
-      const token = findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
+      const token = await getCryptoAssetsStore().findTokenById(TOKEN_ONLY_ASSETS[0].ledgerId);
       if (!token) throw new Error("Token not found");
       const currencies = [token];
       const { currenciesByProvider } = groupCurrenciesByProvider(mixedCaseAssets, currencies);

package/src/deposit/helper.ts

@@ -1,11 +1,7 @@
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { MappedAsset, CurrenciesByProviderId, GroupedCurrencies } from "./type";
-import {
-  currenciesByMarketcap,
-  getCryptoCurrencyById,
-  findTokenById,
-  hasCryptoCurrencyId,
-} from "../currencies";
+import { currenciesByMarketcap, getCryptoCurrencyById, hasCryptoCurrencyId } from "../currencies";
+import { getCryptoAssetsStore } from "../bridge/crypto-assets/index";
 import { getMappedAssets } from "./api";
 
 /**
@@ -135,11 +131,11 @@ export const searchByNameOrTicker = (list: MappedAsset[], nameOrTicker: string)
       elem.ticker.toLowerCase().includes(nameOrTicker.toLowerCase()),
   );
 
-export const getTokenOrCryptoCurrencyById = (id: string): CryptoOrTokenCurrency => {
+export const getTokenOrCryptoCurrencyById = async (id: string): Promise<CryptoOrTokenCurrency> => {
   if (hasCryptoCurrencyId(id)) {
     return getCryptoCurrencyById(id);
   }
-  const token = findTokenById(id);
+  const token = await getCryptoAssetsStore().findTokenById(id);
   if (!token) {
     throw new Error(`token with id "${id}" not found`);
   }

package/src/domain/getTokensWithFunds.test.ts

@@ -3,6 +3,10 @@ import { getCryptoCurrencyById } from "../currencies/index";
 import { Account } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
 import { getTokensWithFunds } from "./getTokensWithFunds";
+import { initializeLegacyTokens } from "@ledgerhq/cryptoassets/legacy/legacy-data";
+import { addTokens } from "@ledgerhq/cryptoassets/legacy/legacy-utils";
+
+initializeLegacyTokens(addTokens);
 
 const ETH = getCryptoCurrencyById("ethereum");
 

package/src/e2e/data/deviceLabelsData.ts

@@ -40,9 +40,10 @@ const TOUCHSCREEN_DEVICE_CONFIG: LabelConfig = {
     [AppInfos.BNB_CHAIN.name]: DeviceLabels.VERIFY_BSC,
     [AppInfos.COSMOS.name]: DeviceLabels.VERIFY_COSMOS,
     [AppInfos.ETHEREUM.name]: DeviceLabels.VERIFY_ETHEREUM,
-    [AppInfos.POLKADOT.name]: DeviceLabels.PLEASE_REVIEW,
+    [AppInfos.POLKADOT.name]: DeviceLabels.VERIFY_POLKADOT,
     [AppInfos.POLYGON.name]: DeviceLabels.VERIFY_POLYGON,
     [AppInfos.SOLANA.name]: DeviceLabels.VERIFY_SOLANA_ADDRESS,
+    [AppInfos.SUI.name]: DeviceLabels.PROVIDE_PUBLIC_KEY,
     default: DeviceLabels.ADDRESS,
   },
   receiveConfirm: {

package/src/e2e/enum/DeviceLabels.ts

@@ -61,6 +61,7 @@ export enum DeviceLabels {
   VERIFY_ETHEREUM = "Verify Ethereum",
   VERIFY_POLYGON = "Verify Polygon",
   VERIFY_COSMOS = "Verify Cosmos",
+  VERIFY_POLKADOT = "Verify Polkadot",
   VERIFY_SOLANA_ADDRESS = "Verify Solana address",
   VIEW_ACTION = "View action",
   VIEW_HEADER = "View Header",
@@ -68,4 +69,7 @@ export enum DeviceLabels {
   CONFIRM_HEADER = "Confirm header",
   CONFIRM_CHANGE = "Confirm change",
   TAP_TO_CONTINUE = "Tap to continue",
+  PROVIDE_PUBLIC_KEY = "Provide Public Key",
+  YES_REJECT = "Yes, reject",
+  CONTINUE_ANYWAY = "Continue anyway",
 }

package/src/e2e/speculos.ts

@@ -887,19 +887,40 @@ export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
   }
 }
 
-export async function verifyAmountsAndAcceptSwapForDifferentSeed(swap: Swap, amount: string) {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+export async function verifyAmountsAndAcceptSwapForDifferentSeed(
+  swap: Swap,
+  amount: string,
+  errorMessage: string | null,
+) {
+  if (errorMessage === null && isTouchDevice()) {
+    await waitFor(DeviceLabels.RECEIVE_ADDRESS_DOES_NOT_BELONG);
+    await pressAndRelease(DeviceLabels.CONTINUE_ANYWAY);
+  } else {
+    await waitFor(DeviceLabels.REVIEW_TRANSACTION);
+  }
   const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
   verifySwapData(swap, events, amount);
-  await pressBoth();
+  if (isTouchDevice()) {
+    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+  } else {
+    await pressBoth();
+  }
 }
 
 export async function verifyAmountsAndRejectSwap(swap: Swap, amount: string) {
   await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  const events = await pressUntilTextFound(DeviceLabels.REJECT);
+  let events: string[] = [];
+  if (isTouchDevice()) {
+    events = await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
+  } else {
+    events = await pressUntilTextFound(DeviceLabels.REJECT);
+  }
+
   verifySwapData(swap, events, amount);
   if (isTouchDevice()) {
-    await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
+    await pressAndRelease(DeviceLabels.REJECT);
+    await waitFor(DeviceLabels.YES_REJECT);
+    await pressAndRelease(DeviceLabels.YES_REJECT);
   } else {
     await pressBoth();
   }
@@ -911,7 +932,6 @@ function verifySwapData(swap: Swap, events: string[], amount: string) {
   if (getSpeculosModel() !== DeviceModelId.nanoS) {
     expectDeviceScreenContains(swapPair, events, "Swap pair not found on the device screen");
   }
-
   expectDeviceScreenContains(amount, events, `Amount ${amount} not found on the device screen`);
 }
 

package/src/e2e/speculosAppVersion.ts

@@ -16,6 +16,7 @@ export function getSpeculosModel(): DeviceModelId {
     case CryptoWallet.STAX.name:
       return DeviceModelId.stax;
     case CryptoWallet.FLEX.name:
+    case DeviceModelId.europa:
       return DeviceModelId.europa;
     case CryptoWallet.LNSP.name:
     default:

package/src/families/aptos/__snapshots__/bridge.integration.test.ts.snap

@@ -97,7 +97,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
       ],
-      "transactionSequenceNumber": 10,
+      "transactionSequenceNumber": "10",
       "type": "IN",
       "value": "100000",
     },
@@ -118,7 +118,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
       ],
-      "transactionSequenceNumber": 9,
+      "transactionSequenceNumber": "9",
       "type": "IN",
       "value": "20000",
     },
@@ -139,7 +139,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
       ],
-      "transactionSequenceNumber": 7,
+      "transactionSequenceNumber": "7",
       "type": "IN",
       "value": "20000",
     },
@@ -160,7 +160,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0x445fa0013887abd1a0c14acdec6e48090e0ad3fed3e08202aac15ca14f3be26b",
       ],
-      "transactionSequenceNumber": 1,
+      "transactionSequenceNumber": "1",
       "type": "OUT",
       "value": "30100",
     },
@@ -181,7 +181,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
       ],
-      "transactionSequenceNumber": 8,
+      "transactionSequenceNumber": "8",
       "type": "IN",
       "value": "10000",
     },
@@ -202,7 +202,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
       ],
-      "transactionSequenceNumber": 86,
+      "transactionSequenceNumber": "86",
       "type": "IN",
       "value": "20000000",
     },
@@ -223,7 +223,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0x445fa0013887abd1a0c14acdec6e48090e0ad3fed3e08202aac15ca14f3be26b",
       ],
-      "transactionSequenceNumber": 0,
+      "transactionSequenceNumber": "0",
       "type": "OUT",
       "value": "119900",
     },
@@ -246,7 +246,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xb69a68cc64f7aa193705193f4dd598320a0a74baf7e4b50c9980c5bd60a82390",
       ],
-      "transactionSequenceNumber": 179,
+      "transactionSequenceNumber": "179",
       "type": "IN",
       "value": "10000",
     },
@@ -267,7 +267,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
       ],
-      "transactionSequenceNumber": 87,
+      "transactionSequenceNumber": "87",
       "type": "IN",
       "value": "20000000",
     },
@@ -288,7 +288,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xb69a68cc64f7aa193705193f4dd598320a0a74baf7e4b50c9980c5bd60a82390",
       ],
-      "transactionSequenceNumber": 182,
+      "transactionSequenceNumber": "182",
       "type": "IN",
       "value": "10000",
     },
@@ -309,7 +309,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0xb69a68cc64f7aa193705193f4dd598320a0a74baf7e4b50c9980c5bd60a82390",
       ],
-      "transactionSequenceNumber": 181,
+      "transactionSequenceNumber": "181",
       "type": "IN",
       "value": "10000",
     },
@@ -330,7 +330,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "senders": [
         "0x445fa0013887abd1a0c14acdec6e48090e0ad3fed3e08202aac15ca14f3be26b",
       ],
-      "transactionSequenceNumber": 0,
+      "transactionSequenceNumber": "0",
       "type": "IN",
       "value": "20000",
     },