@ledgerhq/live-common 34.51.0 → 34.52.0-nightly.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.51.0",
+  "version": "34.52.0-nightly.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -103,22 +103,19 @@
   "dependencies": {
     "@blooo/hw-app-acre": "^1.1.1",
     "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.2",
-    "@dfinity/agent": "^0.21.0",
-    "@dfinity/candid": "^0.21.0",
-    "@dfinity/principal": "^0.15.6",
     "@ledgerhq/device-management-kit": "0.9.1",
     "@ledgerhq/live-app-sdk": "^0.8.1",
-    "@ledgerhq/wallet-api-client": "^1.12.1",
-    "@ledgerhq/wallet-api-core": "^1.24.1",
-    "@ledgerhq/wallet-api-server": "^1.13.1",
+    "@ledgerhq/wallet-api-client": "^1.12.3",
+    "@ledgerhq/wallet-api-core": "^1.25.0",
+    "@ledgerhq/wallet-api-server": "^1.13.3",
     "@noble/curves": "^1.9.7",
     "@noble/hashes": "1.8.0",
     "@reduxjs/toolkit": "2.8.2",
     "@stellar/stellar-sdk": "^14.0.0",
     "@stricahq/typhonjs": "^3.0.0",
     "@taquito/ledger-signer": "^23.0.0-RC.0",
-    "@ton-community/ton-ledger": "^7.2.0",
-    "@ton/core": "^0.60.1",
+    "@ton-community/ton-ledger": "^7.3.0",
+    "@ton/core": "^0.62.0",
     "@ton/crypto": "^3.3.0",
     "@types/bchaddrjs": "^0.4.0",
     "@types/pako": "^2.0.0",
@@ -166,75 +163,75 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.11.0",
-    "@ledgerhq/coin-aptos": "^3.4.0",
-    "@ledgerhq/coin-bitcoin": "^0.23.0",
-    "@ledgerhq/coin-canton": "^0.8.0",
-    "@ledgerhq/coin-cardano": "^0.13.0",
-    "@ledgerhq/coin-casper": "^2.2.0",
-    "@ledgerhq/coin-celo": "^1.6.0",
-    "@ledgerhq/coin-cosmos": "^0.18.0",
-    "@ledgerhq/coin-evm": "^2.33.0",
-    "@ledgerhq/coin-filecoin": "^1.13.0",
-    "@ledgerhq/coin-framework": "^6.7.0",
-    "@ledgerhq/coin-hedera": "^1.12.0",
-    "@ledgerhq/coin-icon": "^0.13.0",
-    "@ledgerhq/coin-internet_computer": "^1.9.0",
-    "@ledgerhq/coin-kaspa": "^1.3.0",
-    "@ledgerhq/coin-mina": "^1.3.0",
-    "@ledgerhq/coin-multiversx": "^0.6.0",
-    "@ledgerhq/coin-near": "^0.14.0",
-    "@ledgerhq/coin-polkadot": "^6.11.0",
-    "@ledgerhq/coin-solana": "^0.35.0",
-    "@ledgerhq/coin-stacks": "^0.10.0",
-    "@ledgerhq/coin-stellar": "^6.5.0",
-    "@ledgerhq/coin-sui": "^0.16.0",
-    "@ledgerhq/coin-tezos": "^6.7.0",
-    "@ledgerhq/coin-ton": "^0.15.0",
-    "@ledgerhq/coin-tron": "^5.5.0",
-    "@ledgerhq/coin-vechain": "^2.11.0",
-    "@ledgerhq/coin-xrp": "^7.6.0",
+    "@ledgerhq/coin-algorand": "^0.11.1-nightly.0",
+    "@ledgerhq/coin-aptos": "^3.4.1-nightly.0",
+    "@ledgerhq/coin-bitcoin": "^0.23.1-nightly.0",
+    "@ledgerhq/coin-canton": "^0.8.1-nightly.0",
+    "@ledgerhq/coin-cardano": "^0.13.1-nightly.0",
+    "@ledgerhq/coin-casper": "^2.2.1-nightly.0",
+    "@ledgerhq/coin-celo": "^1.6.1-nightly.1",
+    "@ledgerhq/coin-cosmos": "^0.18.1-nightly.0",
+    "@ledgerhq/coin-evm": "^2.34.0-nightly.1",
+    "@ledgerhq/coin-filecoin": "^1.13.1-nightly.0",
+    "@ledgerhq/coin-framework": "^6.7.1-nightly.0",
+    "@ledgerhq/coin-hedera": "^1.12.1-nightly.0",
+    "@ledgerhq/coin-icon": "^0.13.1-nightly.0",
+    "@ledgerhq/coin-internet_computer": "^1.9.1-nightly.0",
+    "@ledgerhq/coin-kaspa": "^1.3.1-nightly.0",
+    "@ledgerhq/coin-mina": "^1.3.1-nightly.0",
+    "@ledgerhq/coin-multiversx": "^0.6.1-nightly.0",
+    "@ledgerhq/coin-near": "^0.14.1-nightly.0",
+    "@ledgerhq/coin-polkadot": "^6.11.1-nightly.0",
+    "@ledgerhq/coin-solana": "^0.35.1-nightly.0",
+    "@ledgerhq/coin-stacks": "^0.10.1-nightly.0",
+    "@ledgerhq/coin-stellar": "^6.5.1-nightly.0",
+    "@ledgerhq/coin-sui": "^0.16.1-nightly.0",
+    "@ledgerhq/coin-tezos": "^6.7.1-nightly.0",
+    "@ledgerhq/coin-ton": "^0.15.1-nightly.0",
+    "@ledgerhq/coin-tron": "^5.5.1-nightly.0",
+    "@ledgerhq/coin-vechain": "^2.11.1-nightly.0",
+    "@ledgerhq/coin-xrp": "^7.6.1-nightly.0",
     "@ledgerhq/crypto-icons-ui": "^1.21.0",
-    "@ledgerhq/cryptoassets": "^13.31.0",
-    "@ledgerhq/device-core": "^0.6.6",
-    "@ledgerhq/devices": "8.6.1",
-    "@ledgerhq/errors": "^6.26.0",
-    "@ledgerhq/hw-app-algorand": "^6.31.8",
-    "@ledgerhq/hw-app-aptos": "^6.34.8",
-    "@ledgerhq/hw-app-btc": "^10.11.2",
-    "@ledgerhq/hw-app-celo": "^6.35.1",
-    "@ledgerhq/hw-app-cosmos": "^6.32.8",
-    "@ledgerhq/hw-app-eth": "^6.46.1",
+    "@ledgerhq/cryptoassets": "^13.31.1-nightly.0",
+    "@ledgerhq/device-core": "^0.6.7-nightly.0",
+    "@ledgerhq/devices": "8.6.2-nightly.0",
+    "@ledgerhq/errors": "^6.27.0-nightly.0",
+    "@ledgerhq/hw-app-algorand": "^6.31.9-nightly.0",
+    "@ledgerhq/hw-app-aptos": "^6.34.9-nightly.0",
+    "@ledgerhq/hw-app-btc": "^10.11.3-nightly.1",
+    "@ledgerhq/hw-app-celo": "^6.35.2-nightly.0",
+    "@ledgerhq/hw-app-cosmos": "^6.32.9-nightly.0",
+    "@ledgerhq/hw-app-eth": "^6.46.2-nightly.0",
     "@ledgerhq/hw-app-exchange": "^0.16.0",
-    "@ledgerhq/hw-app-hedera": "^1.2.8",
-    "@ledgerhq/hw-app-icon": "^1.3.8",
-    "@ledgerhq/hw-app-kaspa": "^1.3.1",
-    "@ledgerhq/hw-app-multiversx": "^6.25.3",
-    "@ledgerhq/hw-app-near": "^6.31.8",
-    "@ledgerhq/hw-app-polkadot": "^6.34.8",
-    "@ledgerhq/hw-app-str": "^7.2.8",
+    "@ledgerhq/hw-app-hedera": "^1.2.9-nightly.0",
+    "@ledgerhq/hw-app-icon": "^1.3.9-nightly.0",
+    "@ledgerhq/hw-app-kaspa": "^1.3.2-nightly.0",
+    "@ledgerhq/hw-app-multiversx": "^6.25.4-nightly.0",
+    "@ledgerhq/hw-app-near": "^6.31.9-nightly.0",
+    "@ledgerhq/hw-app-polkadot": "^6.34.9-nightly.0",
+    "@ledgerhq/hw-app-str": "^7.2.9-nightly.0",
     "@ledgerhq/hw-app-sui": "^1.4.0",
-    "@ledgerhq/hw-app-tezos": "^6.31.8",
-    "@ledgerhq/hw-app-trx": "^6.31.8",
+    "@ledgerhq/hw-app-tezos": "^6.31.9-nightly.0",
+    "@ledgerhq/hw-app-trx": "^6.31.9-nightly.0",
     "@ledgerhq/hw-app-vet": "^0.6.2",
-    "@ledgerhq/hw-app-xrp": "^6.32.6",
-    "@ledgerhq/hw-bolos": "^6.32.8",
-    "@ledgerhq/hw-transport": "6.31.12",
-    "@ledgerhq/hw-transport-mocker": "^6.29.12",
+    "@ledgerhq/hw-app-xrp": "^6.32.7-nightly.0",
+    "@ledgerhq/hw-bolos": "^6.32.9-nightly.0",
+    "@ledgerhq/hw-transport": "6.31.13-nightly.0",
+    "@ledgerhq/hw-transport-mocker": "^6.29.13-nightly.0",
     "@ledgerhq/ledger-cal-service": "^1.7.0",
     "@ledgerhq/ledger-trust-service": "^0.4.0",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-countervalues": "^0.8.0",
-    "@ledgerhq/live-countervalues-react": "^0.7.0",
+    "@ledgerhq/live-countervalues": "^0.8.1-nightly.0",
+    "@ledgerhq/live-countervalues-react": "^0.7.1-nightly.0",
     "@ledgerhq/live-dmk-shared": "^0.14.0",
     "@ledgerhq/live-env": "^2.19.0",
     "@ledgerhq/live-hooks": "0.2.0",
     "@ledgerhq/live-network": "^2.0.20",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.4.2",
-    "@ledgerhq/live-signer-evm": "^0.9.0",
-    "@ledgerhq/live-signer-solana": "^0.5.8",
-    "@ledgerhq/live-wallet": "^0.14.3",
+    "@ledgerhq/live-signer-canton": "^0.4.3-nightly.0",
+    "@ledgerhq/live-signer-evm": "^0.9.1-nightly.1",
+    "@ledgerhq/live-signer-solana": "^0.5.9-nightly.0",
+    "@ledgerhq/live-wallet": "^0.14.4-nightly.0",
     "@ledgerhq/logs": "^6.13.0",
     "@ledgerhq/speculos-transport": "^0.2.13",
     "@ledgerhq/wallet-api-acre-module": "^0.8.0",
@@ -286,10 +283,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.3.0",
+    "@ledgerhq/device-react": "^0.3.1-nightly.0",
     "@ledgerhq/types-cryptoassets": "^7.29.0",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.87.0"
+    "@ledgerhq/types-live": "^6.88.0-nightly.0"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/account/helpers.test.ts

@@ -0,0 +1,209 @@
+import { loadBlacklistedTokenSections } from "./helpers";
+import { getCryptoAssetsStore } from "../bridge/crypto-assets/index";
+import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+
+jest.mock("../bridge/crypto-assets/index");
+
+const mockGetCryptoAssetsStore = getCryptoAssetsStore as jest.MockedFunction<
+  typeof getCryptoAssetsStore
+>;
+
+const mockEthereumCurrency: CryptoCurrency = {
+  id: "ethereum",
+  name: "Ethereum",
+  ticker: "ETH",
+  type: "CryptoCurrency",
+  managerAppName: "Ethereum",
+  coinType: 60,
+  scheme: "ethereum",
+  color: "#0ebdcd",
+  family: "ethereum",
+  explorerViews: [],
+  units: [
+    {
+      name: "ether",
+      code: "ETH",
+      magnitude: 18,
+    },
+  ],
+};
+
+const mockPolygonCurrency: CryptoCurrency = {
+  id: "polygon",
+  name: "Polygon",
+  ticker: "MATIC",
+  type: "CryptoCurrency",
+  managerAppName: "Polygon",
+  coinType: 60,
+  scheme: "polygon",
+  color: "#8247e5",
+  family: "evm",
+  explorerViews: [],
+  units: [
+    {
+      name: "matic",
+      code: "MATIC",
+      magnitude: 18,
+    },
+  ],
+};
+
+const mockUsdtToken: TokenCurrency = {
+  id: "ethereum/erc20/usdt",
+  type: "TokenCurrency",
+  name: "Tether USD",
+  ticker: "USDT",
+  contractAddress: "0xdac17f958d2ee523a2206206994597c13d831ec7",
+  parentCurrency: mockEthereumCurrency,
+  tokenType: "erc20",
+  units: [
+    {
+      name: "USDT",
+      code: "USDT",
+      magnitude: 6,
+    },
+  ],
+};
+
+const mockUsdcToken: TokenCurrency = {
+  id: "ethereum/erc20/usdc",
+  type: "TokenCurrency",
+  name: "USD Coin",
+  ticker: "USDC",
+  contractAddress: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
+  parentCurrency: mockEthereumCurrency,
+  tokenType: "erc20",
+  units: [
+    {
+      name: "USDC",
+      code: "USDC",
+      magnitude: 6,
+    },
+  ],
+};
+
+const mockMaticUsdtToken: TokenCurrency = {
+  id: "polygon/erc20/usdt",
+  type: "TokenCurrency",
+  name: "Tether USD (Polygon)",
+  ticker: "USDT",
+  contractAddress: "0xc2132d05d31c914a87c6611c10748aeb04b58e8f",
+  parentCurrency: mockPolygonCurrency,
+  tokenType: "erc20",
+  units: [
+    {
+      name: "USDT",
+      code: "USDT",
+      magnitude: 6,
+    },
+  ],
+};
+
+describe("loadBlacklistedTokenSections", () => {
+  let mockFindTokenById: jest.Mock;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockFindTokenById = jest.fn();
+    mockGetCryptoAssetsStore.mockReturnValue({
+      findTokenById: mockFindTokenById,
+    } as any);
+  });
+
+  it("should return empty array for empty token list", async () => {
+    const result = await loadBlacklistedTokenSections([]);
+    expect(result).toEqual([]);
+  });
+
+  it("should create one section for a single token", async () => {
+    mockFindTokenById.mockResolvedValueOnce(mockUsdtToken);
+
+    const result = await loadBlacklistedTokenSections(["ethereum/erc20/usdt"]);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].parentCurrency).toBe(mockEthereumCurrency);
+    expect(result[0].tokens).toEqual([mockUsdtToken]);
+  });
+
+  it("should group multiple tokens from the same parent currency", async () => {
+    mockFindTokenById.mockResolvedValueOnce(mockUsdtToken);
+    mockFindTokenById.mockResolvedValueOnce(mockUsdcToken);
+
+    const result = await loadBlacklistedTokenSections([
+      "ethereum/erc20/usdt",
+      "ethereum/erc20/usdc",
+    ]);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].parentCurrency).toBe(mockEthereumCurrency);
+    expect(result[0].tokens).toHaveLength(2);
+    expect(result[0].tokens).toEqual([mockUsdtToken, mockUsdcToken]);
+  });
+
+  it("should create separate sections for different parent currencies", async () => {
+    mockFindTokenById.mockResolvedValueOnce(mockUsdtToken);
+    mockFindTokenById.mockResolvedValueOnce(mockMaticUsdtToken);
+
+    const result = await loadBlacklistedTokenSections([
+      "ethereum/erc20/usdt",
+      "polygon/erc20/usdt",
+    ]);
+
+    expect(result).toHaveLength(2);
+    expect(result[0].parentCurrency).toBe(mockEthereumCurrency);
+    expect(result[0].tokens).toEqual([mockUsdtToken]);
+    expect(result[1].parentCurrency).toBe(mockPolygonCurrency);
+    expect(result[1].tokens).toEqual([mockMaticUsdtToken]);
+  });
+
+  it("should filter out null/undefined tokens", async () => {
+    mockFindTokenById.mockResolvedValueOnce(mockUsdtToken);
+    mockFindTokenById.mockResolvedValueOnce(null);
+    mockFindTokenById.mockResolvedValueOnce(mockUsdcToken);
+
+    const result = await loadBlacklistedTokenSections([
+      "ethereum/erc20/usdt",
+      "invalid/token/id",
+      "ethereum/erc20/usdc",
+    ]);
+
+    expect(result).toHaveLength(1);
+    expect(result[0].parentCurrency).toBe(mockEthereumCurrency);
+    expect(result[0].tokens).toHaveLength(2);
+    expect(result[0].tokens).toEqual([mockUsdtToken, mockUsdcToken]);
+  });
+
+  it("should handle complex scenario with mixed parent currencies and null tokens", async () => {
+    mockFindTokenById.mockResolvedValueOnce(mockUsdtToken);
+    mockFindTokenById.mockResolvedValueOnce(mockMaticUsdtToken);
+    mockFindTokenById.mockResolvedValueOnce(null);
+    mockFindTokenById.mockResolvedValueOnce(mockUsdcToken);
+
+    const result = await loadBlacklistedTokenSections([
+      "ethereum/erc20/usdt",
+      "polygon/erc20/usdt",
+      "invalid/token",
+      "ethereum/erc20/usdc",
+    ]);
+
+    expect(result).toHaveLength(2);
+    expect(result[0].parentCurrency).toBe(mockEthereumCurrency);
+    expect(result[0].tokens).toHaveLength(2);
+    expect(result[0].tokens).toEqual([mockUsdtToken, mockUsdcToken]);
+    expect(result[1].parentCurrency).toBe(mockPolygonCurrency);
+    expect(result[1].tokens).toHaveLength(1);
+    expect(result[1].tokens).toEqual([mockMaticUsdtToken]);
+  });
+
+  it("should call findTokenById for all token IDs in parallel", async () => {
+    mockFindTokenById.mockResolvedValue(mockUsdtToken);
+
+    await loadBlacklistedTokenSections(["token1", "token2", "token3"]);
+
+    // All calls should be made immediately (Promise.all)
+    expect(mockFindTokenById).toHaveBeenCalledTimes(3);
+    expect(mockFindTokenById).toHaveBeenCalledWith("token1");
+    expect(mockFindTokenById).toHaveBeenCalledWith("token2");
+    expect(mockFindTokenById).toHaveBeenCalledWith("token3");
+  });
+});

package/src/account/helpers.ts

@@ -14,6 +14,8 @@ import {
 import { isAccountEmpty as isVechainAccountEmpty } from "@ledgerhq/coin-vechain/index";
 import type { Account, AccountLike } from "@ledgerhq/types-live";
 import { isAccountDelegating } from "../families/tezos/staking";
+import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
+import { getCryptoAssetsStore } from "../bridge/crypto-assets/index";
 
 // TODO: remove this export and prefer import from root file.
 export {
@@ -105,3 +107,35 @@ export const getVotesCount = (
       return 0;
   }
 };
+
+/**
+ * Load blacklisted tokens and organize them into sections by parent currency
+ * @param tokenIds - Array of token IDs to load
+ * @returns Array of sections with parent currency and tokens
+ */
+export async function loadBlacklistedTokenSections(
+  tokenIds: string[],
+): Promise<Array<{ parentCurrency: CryptoCurrency; tokens: TokenCurrency[] }>> {
+  const tokens = await Promise.all(
+    tokenIds.map(tokenId => getCryptoAssetsStore().findTokenById(tokenId)),
+  );
+
+  const sections: Array<{ parentCurrency: CryptoCurrency; tokens: TokenCurrency[] }> = [];
+
+  for (const token of tokens) {
+    if (token) {
+      const parentCurrency = token.parentCurrency;
+      const index = sections.findIndex(s => s.parentCurrency === parentCurrency);
+      if (index < 0) {
+        sections.push({
+          parentCurrency,
+          tokens: [token],
+        });
+      } else {
+        sections[index].tokens.push(token);
+      }
+    }
+  }
+
+  return sections;
+}

package/src/bridge/cache.test.ts

@@ -28,7 +28,7 @@ describe("Bridge Cache", () => {
 
     await prepareCurrency(getCryptoCurrencyById("solana"));
     expect(makeLRUCache).toHaveBeenCalledTimes(1);
-  });
+  }, 10000);
 
   it("forces the LRU cache to be re-generated", async () => {
     const makeLRUCache = jest.spyOn(cacheModule, "makeLRUCache");
@@ -42,5 +42,5 @@ describe("Bridge Cache", () => {
 
     await prepareCurrency(getCryptoCurrencyById("solana"), { forceUpdate: true });
     expect(makeLRUCache).toHaveBeenCalledTimes(2);
-  });
+  }, 10000);
 });