@ledgerhq/live-common 34.53.0-nightly.20251119110540 → 34.53.0-nightly.20251120135143

package/src/families/hedera/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-hedera/test/index";
 

package/src/families/icon/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-icon/test/bridge.dataset";
 

package/src/families/internet_computer/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-internet_computer/test/index";
 

package/src/families/kaspa/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-kaspa/test/index";
 

package/src/families/mina/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-mina/test/index";
 

package/src/families/multiversx/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-multiversx/test/bridge.dataset";
 

package/src/families/multiversx/synchronisation.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { reduce } from "rxjs/operators";
 import { fromAccountRaw, getAccountCurrency } from "../../account";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";

package/src/families/near/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-near/test/bridge.dataset";
 

package/src/families/polkadot/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-polkadot/test/index";
 

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

@@ -24,18 +24,6 @@ exports[`solana currency bridge scanAccounts solana seed 1 1`] = `
     "syncHash": undefined,
     "used": true,
   },
-  {
-    "balance": "7960720",
-    "id": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain+8RtwWeqdFz4EFuZU3MAadfYMWSdRMamjFrfq6BXkHuNN",
-    "operationsCount": 1,
-    "parentId": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain",
-    "pendingOperations": [],
-    "spendableBalance": "7960720",
-    "state": "initialized",
-    "swapHistory": [],
-    "tokenId": "solana/spl/so11111111111111111111111111111111111111112",
-    "type": "TokenAccountRaw",
-  },
   {
     "balance": "0",
     "currencyId": "solana",
@@ -66,22 +54,18 @@ exports[`solana currency bridge scanAccounts solana seed 1 2`] = `
   [
     {
       "accountId": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain",
-      "blockHash": "4NSL4VrfWd2eUccMD95dLQsdy5UGz8yhokpfH1et1R2c",
+      "blockHash": "3oH1tGs3X6HkK2XQZ7LGhRP8F45jy5zgF8H3jFtaCgHC",
       "blockHeight": 108520722,
       "extra": {},
       "fee": "0",
       "hasFailed": false,
       "hash": "25KWBvKtVgKR3yoRmozTY6wmiW8atwrnzAnTXdsms8jqg5aR8GnCDxdJzWXtzMZPvbsE6SUuBkGFXudy2mrcTYna",
-      "id": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain-25KWBvKtVgKR3yoRmozTY6wmiW8atwrnzAnTXdsms8jqg5aR8GnCDxdJzWXtzMZPvbsE6SUuBkGFXudy2mrcTYna-IN",
-      "recipients": [
-        "AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh",
-      ],
-      "senders": [
-        "7CZgkK494jMdoY8xpXY3ViLjpDGMbNikCzMtAT5cAjKk",
-      ],
+      "id": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain-25KWBvKtVgKR3yoRmozTY6wmiW8atwrnzAnTXdsms8jqg5aR8GnCDxdJzWXtzMZPvbsE6SUuBkGFXudy2mrcTYna-NONE",
+      "recipients": [],
+      "senders": [],
       "transactionSequenceNumber": "1",
-      "type": "IN",
-      "value": "93394840",
+      "type": "NONE",
+      "value": "0",
     },
     {
       "accountId": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain",
@@ -104,36 +88,22 @@ exports[`solana currency bridge scanAccounts solana seed 1 2`] = `
     },
     {
       "accountId": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain",
-      "blockHash": "3oH1tGs3X6HkK2XQZ7LGhRP8F45jy5zgF8H3jFtaCgHC",
+      "blockHash": "4NSL4VrfWd2eUccMD95dLQsdy5UGz8yhokpfH1et1R2c",
       "blockHeight": 246186040,
       "extra": {},
       "fee": "0",
       "hasFailed": false,
       "hash": "Y2U5SCQpi9YYukbAL4YSzGosVgff512HcbiDDfMag5dZYow5zT6ytbJaWEDdCZkNLCkQYuAHJ9fBjV7wKqgMTi4",
-      "id": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain-Y2U5SCQpi9YYukbAL4YSzGosVgff512HcbiDDfMag5dZYow5zT6ytbJaWEDdCZkNLCkQYuAHJ9fBjV7wKqgMTi4-NONE",
-      "recipients": [],
-      "senders": [],
-      "transactionSequenceNumber": "3",
-      "type": "NONE",
-      "value": "0",
-    },
-  ],
-  [
-    {
-      "accountId": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain+8RtwWeqdFz4EFuZU3MAadfYMWSdRMamjFrfq6BXkHuNN",
-      "blockHash": "9tPbgLaETEenufCt5SzXMuWijgFJj549W9j5cJLbaogn",
-      "blockHeight": 108521109,
-      "extra": {},
-      "fee": "5000",
-      "hasFailed": false,
-      "hash": "A29zPnK1jPr2tGziTnaAvSnadYR2kLCv9sPywj9FJsaEFjtpwmUonspN3WJgz4u6XWmjtVpoFsDrygEnvW51cgk",
-      "id": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain+8RtwWeqdFz4EFuZU3MAadfYMWSdRMamjFrfq6BXkHuNN-A29zPnK1jPr2tGziTnaAvSnadYR2kLCv9sPywj9FJsaEFjtpwmUonspN3WJgz4u6XWmjtVpoFsDrygEnvW51cgk-IN",
+      "id": "js:2:solana:AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh:solanaMain-Y2U5SCQpi9YYukbAL4YSzGosVgff512HcbiDDfMag5dZYow5zT6ytbJaWEDdCZkNLCkQYuAHJ9fBjV7wKqgMTi4-IN",
       "recipients": [
-        "8RtwWeqdFz4EFuZU3MAadfYMWSdRMamjFrfq6BXkHuNN",
+        "AQbkEagmPgmsdAfS4X8V8UyJnXXjVPMvjeD15etqQ3Jh",
       ],
-      "senders": [],
+      "senders": [
+        "7CZgkK494jMdoY8xpXY3ViLjpDGMbNikCzMtAT5cAjKk",
+      ],
+      "transactionSequenceNumber": "3",
       "type": "IN",
-      "value": "7960720",
+      "value": "93394840",
     },
   ],
   [],

package/src/families/solana/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-solana/test/bridge.dataset";
 

package/src/families/solana/setup.ts

@@ -7,47 +7,60 @@ import { createBridges } from "@ledgerhq/coin-solana/bridge/js";
 import makeCliTools from "@ledgerhq/coin-solana/cli-transaction";
 import solanaResolver from "@ledgerhq/coin-solana/hw-getAddress";
 import { SolanaAccount, Transaction, TransactionStatus } from "@ledgerhq/coin-solana/types";
-import {
-  CreateSigner,
-  createMessageSigner,
-  createResolver,
-  executeWithSigner,
-} from "../../bridge/setup";
+import { createMessageSigner, createResolver, executeWithSigner } from "../../bridge/setup";
 import type { Resolver } from "../../hw/getAddress/types";
 import { getCurrencyConfiguration } from "../../config";
 import { SolanaCoinConfig } from "@ledgerhq/coin-solana/config";
 import { getCryptoCurrencyById } from "../../currencies";
 import { signMessage } from "@ledgerhq/coin-solana/hw-signMessage";
-import { LegacySignerSolana } from "@ledgerhq/live-signer-solana";
-import { setShouldSkipTokenLoading } from "@ledgerhq/coin-solana/preload";
-import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
-import { getCryptoAssetsStore } from "../../bridge/crypto-assets";
+import { LegacySignerSolana, DmkSignerSol } from "@ledgerhq/live-signer-solana";
+import { DeviceManagementKit } from "@ledgerhq/device-management-kit";
 
-const createSigner: CreateSigner<SolanaSigner> = (transport: Transport) =>
-  new LegacySignerSolana(transport);
+let _solanaLdmkFFEnabled: boolean = false;
 
-const getCurrencyConfig = () => {
-  return getCurrencyConfiguration<SolanaCoinConfig>(getCryptoCurrencyById("solana"));
-};
+let _dmkSignerInstance: DmkSignerSol | null = null;
 
-try {
-  const isCALLazyLoadingEnabled = LiveConfig.getValueByKey("feature_cal_lazy_loading");
-  setShouldSkipTokenLoading(Boolean(isCALLazyLoadingEnabled));
-} catch (error) {
-  setShouldSkipTokenLoading(false);
+// temporary solution to dynamically enable/disable the Solana DMK signer,
+// waiting for LIVE-20250 to be implemented
+// to be removed together with useFeature("ldmkSolanaSigner")
+export function setSolanaLdmkEnabled(enabled: boolean): void {
+  _solanaLdmkFFEnabled = enabled;
 }
 
+const canDMKSignerBeUsed = (
+  transport: Transport & Partial<{ dmk: DeviceManagementKit; sessionId: string }>,
+): transport is Transport & { dmk: DeviceManagementKit; sessionId: string } =>
+  _solanaLdmkFFEnabled &&
+  transport.dmk instanceof DeviceManagementKit &&
+  typeof transport.sessionId === "string";
+
+// get the same instance if FF gets flipped
+export function getSolanaSignerInstance(
+  transport: Transport & Partial<{ dmk: DeviceManagementKit; sessionId: string }>,
+): SolanaSigner {
+  if (canDMKSignerBeUsed(transport)) {
+    if (!_dmkSignerInstance) {
+      _dmkSignerInstance = new DmkSignerSol(transport.dmk, transport.sessionId);
+    }
+    return _dmkSignerInstance;
+  } else {
+    return new LegacySignerSolana(transport);
+  }
+}
+
+const getCurrencyConfig = () =>
+  getCurrencyConfiguration<SolanaCoinConfig>(getCryptoCurrencyById("solana"));
+
 const bridge: Bridge<Transaction, SolanaAccount, TransactionStatus> = createBridges(
-  executeWithSigner(createSigner),
+  executeWithSigner(getSolanaSignerInstance),
   getCurrencyConfig,
-  getCryptoAssetsStore,
 );
 
 const messageSigner = {
-  signMessage: createMessageSigner(createSigner, signMessage),
+  signMessage: createMessageSigner(getSolanaSignerInstance, signMessage),
 };
 
-const resolver: Resolver = createResolver(createSigner, solanaResolver);
+const resolver: Resolver = createResolver(getSolanaSignerInstance, solanaResolver);
 
 const cliTools = makeCliTools();
 

package/src/families/stacks/__tests__/sync.integration.test.ts

@@ -1,7 +1,7 @@
 import { mapTxToOps } from "@ledgerhq/coin-stacks/bridge/utils/misc";
 import { fetchFullTxs } from "@ledgerhq/coin-stacks/network/api";
 import flatMap from "lodash/flatMap";
-import "../../../__tests__/test-helpers/setup";
+import "../../../__tests__/test-helpers/setup.integration";
 import { encodeAccountId } from "../../../account";
 
 describe("sync for token transfers", () => {

package/src/families/stacks/bridge.integration.test.ts

@@ -1,5 +1,5 @@
 import { dataset } from "@ledgerhq/coin-stacks/test/index";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 
 testBridge(dataset);

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

@@ -31,7 +31,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "operationsCount": 43,
     "pendingOperations": [],
     "seedIdentifier": "27c586f8499294c64d57f8d7956eef4431de58ab20e1c88001f6cf131c97d6f3",
-    "spendableBalance": "79999760",
+    "spendableBalance": "79999759",
     "subAccounts": [],
     "swapHistory": [],
     "syncHash": "0x1431ef5f",
@@ -49,7 +49,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "operationsCount": 38,
     "pendingOperations": [],
     "seedIdentifier": "27c586f8499294c64d57f8d7956eef4431de58ab20e1c88001f6cf131c97d6f3",
-    "spendableBalance": "44999262",
+    "spendableBalance": "44999261",
     "subAccounts": [],
     "swapHistory": [],
     "syncHash": "0x1431ef5f",
@@ -67,7 +67,7 @@ exports[`stellar currency bridge scanAccounts stellar seed 1 1`] = `
     "operationsCount": 17,
     "pendingOperations": [],
     "seedIdentifier": "27c586f8499294c64d57f8d7956eef4431de58ab20e1c88001f6cf131c97d6f3",
-    "spendableBalance": "10145721",
+    "spendableBalance": "10145720",
     "subAccounts": [],
     "swapHistory": [],
     "syncHash": "0x1431ef5f",

package/src/families/stellar/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-stellar/test/index";
 

package/src/families/sui/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-sui/test/bridge.dataset";
 

package/src/families/tezos/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-tezos/test/index";
 

package/src/families/ton/bridge.integration.test.ts

@@ -1,6 +1,6 @@
 import { dataset } from "@ledgerhq/coin-ton/test/bridge.dataset";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 
 // FIXME: Disabled due to TypeError in Send max transaction (ts.amount undefined)
 describe.skip("ton integration", () => {

package/src/families/tron/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-tron/test/index";
 

package/src/families/tron/data.mock.ts

@@ -1,18 +1,14 @@
 import { fromAccountRaw } from "../../account/serialization";
 import { TronAccount } from "@ledgerhq/coin-tron/types/index";
-import { setCryptoAssetsStore as setCryptoAssetsStoreForCoinFramework } from "@ledgerhq/coin-framework/crypto-assets/index";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { setupMockCryptoAssetsStore } from "@ledgerhq/cryptoassets/cal-client/test-helpers";
 
 export const __NEXT_REWARD_DATE__ = new Date(Date.now() - 6 * 60 * 60 * 1000);
 
 export const __LAST_VOTING_DATE__ = new Date(Date.now() - 6 * 60 * 60 * 1000);
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-setCryptoAssetsStoreForCoinFramework({
-  findTokenById: (_: string) => undefined,
-  findTokenByAddressInCurrency: (_: string, __: string) => undefined,
-  getTokensSyncHash: (_: string) => Promise.resolve("test_hash"),
-} as unknown as CryptoAssetsStore);
+setupMockCryptoAssetsStore({
+  getTokensSyncHash: async () => "test_hash",
+});
 
 const mockAccountRaw = {
   id: "js:2:tron:TRON_ID:",

package/src/families/vechain/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { dataset } from "@ledgerhq/coin-vechain/test/index";
 

package/src/families/xrp/bridge.integration.test.ts

@@ -1,4 +1,4 @@
-import "../../__tests__/test-helpers/setup";
+import "../../__tests__/test-helpers/setup.integration";
 import { newAddress1, dataset } from "@ledgerhq/coin-xrp/test/index";
 import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { addNotCreatedRippleMockAddress } from "./bridge/mock";

package/src/featureFlags/defaultFeatures.ts

@@ -664,6 +664,7 @@ export const DEFAULT_FEATURES: Features = {
     },
   },
   ldmkConnectApp: DEFAULT_FEATURE,
+  ldmkSolanaSigner: DEFAULT_FEATURE,
   lldNetworkBasedAddAccount: DEFAULT_FEATURE,
   llmDatadog: {
     ...DEFAULT_FEATURE,
@@ -700,12 +701,14 @@ export const DEFAULT_FEATURES: Features = {
   lldSyncOnboardingIncr1: DEFAULT_FEATURE,
   noah: DEFAULT_FEATURE,
   newSendFlow: DEFAULT_FEATURE,
+  cantonSkipPreapprovalStep: DEFAULT_FEATURE,
   lldSessionReplay: {
     ...DEFAULT_FEATURE,
     params: {
       sampling: 100,
     },
   },
+  zcashShielded: DEFAULT_FEATURE,
 };
 
 // Firebase SDK treat JSON values as strings

package/src/test-helpers/cryptoAssetsStore.ts

@@ -0,0 +1,5 @@
+export {
+  setupCalClientStore,
+  setupMockCryptoAssetsStore,
+  createMockCryptoAssetsStore,
+} from "@ledgerhq/cryptoassets/cal-client/test-helpers";

package/src/utils/__tests__/getAccountTuplesForCurrency.test.ts

@@ -3,10 +3,10 @@ import { genAccount } from "../../mock/account";
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import type { Account, TokenAccount } from "@ledgerhq/types-live";
 import { getAccountTuplesForCurrency } from "../getAccountTuplesForCurrency";
-import { initializeLegacyTokens } from "@ledgerhq/cryptoassets/legacy/legacy-data";
-import { addTokens } from "@ledgerhq/cryptoassets/legacy/legacy-utils";
+import { setupMockCryptoAssetsStore } from "@ledgerhq/cryptoassets/cal-client/test-helpers";
 
-initializeLegacyTokens(addTokens);
+// Setup mock store for unit tests
+setupMockCryptoAssetsStore();
 
 function* accountGenerator(currency: CryptoCurrency): Generator<Account> {
   let id = 0;

package/src/wallet-api/ACRE/server.test.ts

@@ -3,6 +3,7 @@ import { Account } from "@ledgerhq/types-live";
 import { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import BigNumber from "bignumber.js";
 import { AppPlatform, AppBranch, Visibility } from "../types";
+import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
 
 // Mock dependencies
 jest.mock("@ledgerhq/wallet-api-server", () => ({
@@ -14,7 +15,7 @@ jest.mock("@ledgerhq/cryptoassets", () => ({
   getCryptoCurrencyById: jest.fn(),
 }));
 
-jest.mock("../../bridge/crypto-assets/index", () => ({
+jest.mock("@ledgerhq/cryptoassets/state", () => ({
   getCryptoAssetsStore: jest.fn(),
 }));
 
@@ -150,12 +151,10 @@ describe("ACRE Server Handlers", () => {
   let mockUiHooks: any;
   let serverHandlers: any;
 
-  const { getCryptoAssetsStore } = jest.requireMock("../../bridge/crypto-assets/index");
-
   beforeEach(() => {
     jest.clearAllMocks();
 
-    getCryptoAssetsStore.mockReturnValue({
+    (getCryptoAssetsStore as jest.Mock).mockReturnValue({
       findTokenByAddressInCurrency: jest.fn().mockResolvedValue(mockTokenCurrency),
       findTokenById: jest.fn().mockResolvedValue(mockTokenCurrency),
     });

package/src/wallet-api/ACRE/server.ts

@@ -8,7 +8,7 @@ import {
   isTokenAccount,
 } from "@ledgerhq/coin-framework/account/index";
 import { Account, AccountLike, AnyMessage, Operation, SignedOperation } from "@ledgerhq/types-live";
-import { getCryptoAssetsStore } from "../../bridge/crypto-assets/index";
+import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
 import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import {
   MessageSignParams,

package/src/wallet-api/Exchange/server.ts

@@ -4,7 +4,7 @@ import {
   getParentAccount,
   makeEmptyTokenAccount,
 } from "@ledgerhq/coin-framework/account/index";
-import { getCryptoAssetsStore } from "../../bridge/crypto-assets/index";
+import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
 import { decodeSwapPayload } from "@ledgerhq/hw-app-exchange";
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { Account, AccountLike, getCurrencyForAccount, TokenAccount } from "@ledgerhq/types-live";

package/src/wallet-api/logic.test.ts

@@ -26,10 +26,10 @@ import { TrackingAPI } from "./tracking";
 import { cryptocurrenciesById } from "@ledgerhq/cryptoassets/currencies";
 import { setSupportedCurrencies } from "../currencies";
 import { initialState as walletState } from "@ledgerhq/live-wallet/store";
-import { initializeLegacyTokens } from "@ledgerhq/cryptoassets/legacy/legacy-data";
-import { addTokens } from "@ledgerhq/cryptoassets/legacy/legacy-utils";
+import { setupMockCryptoAssetsStore } from "@ledgerhq/cryptoassets/cal-client/test-helpers";
 
-initializeLegacyTokens(addTokens);
+// Setup mock store for unit tests
+setupMockCryptoAssetsStore();
 
 describe("receiveOnAccountLogic", () => {
   // Given

package/src/wallet-api/logic.ts

@@ -24,7 +24,7 @@ import { Transaction } from "../generated/types";
 import { prepareMessageToSign } from "../hw/signMessage/index";
 import { getAccountBridge } from "../bridge";
 import { Exchange } from "../exchange/types";
-import { getCryptoAssetsStore } from "../bridge/crypto-assets/index";
+import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
 import { WalletState } from "@ledgerhq/live-wallet/store";
 import { getWalletAccount } from "@ledgerhq/coin-bitcoin/wallet-btc/index";
 import { CryptoOrTokenCurrency } from "@ledgerhq/types-cryptoassets";

package/src/wallet-api/react.ts

@@ -32,7 +32,7 @@ import { isWalletAPISupportedCurrency } from "./helpers";
 import { WalletAPICurrency, AppManifest, WalletAPIAccount, WalletAPICustomHandlers } from "./types";
 import { getMainAccount, getParentAccount } from "../account";
 import { listSupportedCurrencies } from "../currencies";
-import { getCryptoAssetsStore } from "../bridge/crypto-assets";
+import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
 import { TrackingAPI } from "./tracking";
 import {
   bitcoinFamilyAccountGetXPubLogic,
@@ -370,6 +370,8 @@ export function useWalletAPIServer({
             // Pattern like "ethereum/**" or "solana/**" - include tokens for this family
             const family = id.slice(0, -3);
             tokenFamilies.add(family);
+            // Additionally include the parent currency itself
+            specificCurrencies.add(family);
           } else if (id.includes("/")) {
             // Specific token ID like "ethereum/erc20/usd__coin"
             specificTokenIds.add(id);

package/src/wallet-api/useDappLogic.ts

@@ -16,7 +16,7 @@ import { SmartWebsocket } from "./SmartWebsocket";
 import { stripHexPrefix } from "./helpers";
 import { getTxType } from "./utils/txTrackingHelper";
 import { Transaction as EvmTransaction } from "@ledgerhq/coin-evm/types/transaction";
-import { getCryptoAssetsStore } from "../bridge/crypto-assets";
+import { getCryptoAssetsStore } from "@ledgerhq/cryptoassets/state";
 
 type MessageId = number | string | null;
 

package/lib/__tests__/test-helpers/setup.d.ts

@@ -1,2 +0,0 @@
-import "./environment";
-//# sourceMappingURL=setup.d.ts.map

package/lib/__tests__/test-helpers/setup.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/__tests__/test-helpers/setup.ts"],"names":[],"mappings":"AAIA,OAAO,eAAe,CAAC"}

package/lib/__tests__/test-helpers/setup.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/__tests__/test-helpers/setup.ts"],"names":[],"mappings":";;;;;AAAA,wEAA4H;AAC5H,6EAAqF;AACrF,2EAAmF;AACnF,6EAAuE;AACvE,yBAAuB;AACvB,gEAAqC;AAErC,IAAA,oCAAsB,EAAC,wBAAS,CAAC,CAAC;AAElC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;AAExB,MAAM,CAAC,MAAM,CAAC;IACZ,aAAa,CAAC,KAAK;QACjB,MAAM,IAAI,GAAG,sBAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,KAAK,iBAAiB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,KAAK,qBAAqB,CAAC;QAE7F,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF,CAAC,CAAC;AAEH,2EAA2E;AAC3E,IAAA,4BAAoC,EAAC,sCAAuB,CAAC,CAAC"}

package/lib/bridge/crypto-assets/index.d.ts

@@ -1,4 +0,0 @@
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
-export declare function setCryptoAssetsStore(store: CryptoAssetsStore): void;
-export declare function getCryptoAssetsStore(): CryptoAssetsStore;
-//# sourceMappingURL=index.d.ts.map

package/lib/bridge/crypto-assets/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAK9D,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,QAE5D;AAED,wBAAgB,oBAAoB,IAAI,iBAAiB,CAYxD"}

package/lib/bridge/crypto-assets/index.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCryptoAssetsStore = exports.setCryptoAssetsStore = void 0;
-const LiveConfig_1 = require("@ledgerhq/live-config/LiveConfig");
-const legacy_store_1 = require("@ledgerhq/cryptoassets/legacy/legacy-store");
-let cryptoAssetsStore = undefined;
-function setCryptoAssetsStore(store) {
-    cryptoAssetsStore = store;
-}
-exports.setCryptoAssetsStore = setCryptoAssetsStore;
-function getCryptoAssetsStore() {
-    const featureEnabled = LiveConfig_1.LiveConfig.isConfigSet() && LiveConfig_1.LiveConfig.getValueByKey("feature_cal_lazy_loading");
-    if (!featureEnabled) {
-        return legacy_store_1.legacyCryptoAssetsStore;
-    }
-    if (!cryptoAssetsStore) {
-        throw new Error("CryptoAssetsStore is not set. Please call setCryptoAssetsStore first.");
-    }
-    return cryptoAssetsStore;
-}
-exports.getCryptoAssetsStore = getCryptoAssetsStore;
-//# sourceMappingURL=index.js.map

package/lib/bridge/crypto-assets/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/bridge/crypto-assets/index.ts"],"names":[],"mappings":";;;AAAA,iEAA8D;AAE9D,6EAAqF;AAErF,IAAI,iBAAiB,GAAkC,SAAS,CAAC;AAEjE,SAAgB,oBAAoB,CAAC,KAAwB;IAC3D,iBAAiB,GAAG,KAAK,CAAC;AAC5B,CAAC;AAFD,oDAEC;AAED,SAAgB,oBAAoB;IAClC,MAAM,cAAc,GAClB,uBAAU,CAAC,WAAW,EAAE,IAAI,uBAAU,CAAC,aAAa,CAAC,0BAA0B,CAAC,CAAC;IACnF,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO,sCAAuB,CAAC;KAChC;IAED,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;KAC1F;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAZD,oDAYC"}

package/lib/e2e/deviceInteraction/ButtonDeviceSimulator.d.ts

@@ -1,3 +0,0 @@
-export declare function pressBoth(): Promise<void>;
-export declare function pressRightButton(): Promise<void>;
-//# sourceMappingURL=ButtonDeviceSimulator.d.ts.map

package/lib/e2e/deviceInteraction/ButtonDeviceSimulator.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ButtonDeviceSimulator.d.ts","sourceRoot":"","sources":["../../../src/e2e/deviceInteraction/ButtonDeviceSimulator.ts"],"names":[],"mappings":"AAIA,wBAAsB,SAAS,kBAQ9B;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAQtD"}

package/lib/e2e/deviceInteraction/ButtonDeviceSimulator.js

@@ -1,26 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pressRightButton = exports.pressBoth = void 0;
-const live_env_1 = require("@ledgerhq/live-env");
-const speculos_1 = require("../speculos");
-const axios_1 = __importDefault(require("axios"));
-async function pressBoth() {
-    const speculosApiPort = (0, live_env_1.getEnv)("SPECULOS_API_PORT");
-    const speculosAddress = (0, speculos_1.getSpeculosAddress)();
-    await (0, speculos_1.retryAxiosRequest)(() => axios_1.default.post(`${speculosAddress}:${speculosApiPort}/button/both`, {
-        action: "press-and-release",
-    }));
-}
-exports.pressBoth = pressBoth;
-async function pressRightButton() {
-    const speculosApiPort = (0, live_env_1.getEnv)("SPECULOS_API_PORT");
-    const speculosAddress = (0, speculos_1.getSpeculosAddress)();
-    await (0, speculos_1.retryAxiosRequest)(() => axios_1.default.post(`${speculosAddress}:${speculosApiPort}/button/right`, {
-        action: "press-and-release",
-    }));
-}
-exports.pressRightButton = pressRightButton;
-//# sourceMappingURL=ButtonDeviceSimulator.js.map

package/lib/e2e/deviceInteraction/ButtonDeviceSimulator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ButtonDeviceSimulator.js","sourceRoot":"","sources":["../../../src/e2e/deviceInteraction/ButtonDeviceSimulator.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA4C;AAC5C,0CAAoE;AACpE,kDAA0B;AAEnB,KAAK,UAAU,SAAS;IAC7B,MAAM,eAAe,GAAG,IAAA,iBAAM,EAAC,mBAAmB,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,IAAA,6BAAkB,GAAE,CAAC;IAC7C,MAAM,IAAA,4BAAiB,EAAC,GAAG,EAAE,CAC3B,eAAK,CAAC,IAAI,CAAC,GAAG,eAAe,IAAI,eAAe,cAAc,EAAE;QAC9D,MAAM,EAAE,mBAAmB;KAC5B,CAAC,CACH,CAAC;AACJ,CAAC;AARD,8BAQC;AAEM,KAAK,UAAU,gBAAgB;IACpC,MAAM,eAAe,GAAG,IAAA,iBAAM,EAAC,mBAAmB,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,IAAA,6BAAkB,GAAE,CAAC;IAC7C,MAAM,IAAA,4BAAiB,EAAC,GAAG,EAAE,CAC3B,eAAK,CAAC,IAAI,CAAC,GAAG,eAAe,IAAI,eAAe,eAAe,EAAE;QAC/D,MAAM,EAAE,mBAAmB;KAC5B,CAAC,CACH,CAAC;AACJ,CAAC;AARD,4CAQC"}

package/lib-es/__tests__/test-helpers/setup.d.ts

@@ -1,2 +0,0 @@
-import "./environment";
-//# sourceMappingURL=setup.d.ts.map