@ledgerhq/live-common 34.53.0 → 34.54.0-nightly.20251126160702

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/bridge/mock.ts

@@ -1,16 +1,9 @@
-import {
-  ChainAPI,
-  Config,
-  cached,
-  getChainAPI,
-  logged,
-  queued,
-} from "@ledgerhq/coin-solana/network/index";
+/* eslint-disable @typescript-eslint/consistent-type-assertions */
+import { ChainAPI, Config, getChainAPI, logged } from "@ledgerhq/coin-solana/network/index";
 import { getEnv } from "@ledgerhq/live-env";
 import { Functions } from "@ledgerhq/coin-solana/utils";
 import { makeBridges } from "@ledgerhq/coin-solana/bridge/bridge";
 import { PubKeyDisplayMode, SolanaSigner } from "@ledgerhq/coin-solana/signer";
-import { makeLRUCache, minutes } from "@ledgerhq/live-network/cache";
 import { Message, MessageV0 } from "@solana/web3.js";
 import { flow, isArray, isEqual, isObject, isUndefined, mapValues, omitBy } from "lodash/fp";
 import { getMockedMethods } from "./mock-data";
@@ -33,7 +26,7 @@ function mockChainAPI(config: Config): ChainAPI {
         if (mocks.length === 0) {
           throw new Error(`no mock found for api method: ${method}`);
         }
-        return function (...rawArgs: any[]) {
+        return function (...rawArgs: unknown[]) {
           const args = preprocessArgs(method, rawArgs);
           const mock = mocks.find(({ params: mockArgs }) => isEqual(args)(mockArgs));
           if (mock === undefined) {
@@ -56,7 +49,7 @@ function removeUndefineds(input: unknown): unknown {
     : input;
 }
 
-function preprocessArgs(method: keyof ChainAPI, args: any) {
+function preprocessArgs(method: keyof ChainAPI, args: unknown[]) {
   if (method === "getFeeForMessage") {
     // getFeeForMessage needs some args preprocessing
     if (args.length === 1 && (args[0] instanceof Message || args[0] instanceof MessageV0)) {
@@ -126,16 +119,15 @@ const signerContext = <T>(
 // Uncomment fs module in logged.ts
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 function createMockDataForAPI() {
-  const apiGetter = makeLRUCache(
-    (config: Config) =>
-      Promise.resolve(cached(queued(logged(getChainAPI(config), "/tmp/log"), 100))),
-    config => config.endpoint,
-    minutes(1000),
-  );
+  const chainAPICache = new Map<string, ReturnType<typeof getChainAPI>>();
   return {
-    getAPI: apiGetter,
-    getQueuedAPI: apiGetter,
-    getQueuedAndCachedAPI: apiGetter,
+    getAPI: (config: Config) => {
+      const endpoint = config.endpoint;
+      if (!chainAPICache.has(endpoint)) {
+        chainAPICache.set(endpoint, logged(getChainAPI(config), "/tmp/log"));
+      }
+      return chainAPICache.get(endpoint)!;
+    },
     signerContext,
   };
 }
@@ -143,9 +135,7 @@ function createMockDataForAPI() {
 function getMockedAPIs() {
   const mockedAPI = mockChainAPI({ cluster: "mock" } as any);
   return {
-    getAPI: (_: Config) => Promise.resolve(mockedAPI),
-    getQueuedAPI: (_: Config) => Promise.resolve(mockedAPI),
-    getQueuedAndCachedAPI: (_: Config) => Promise.resolve(mockedAPI),
+    getAPI: (_: Config) => mockedAPI,
     signerContext,
   };
 }

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/config.ts

@@ -9,7 +9,6 @@ export const solanaConfig: CurrencyLiveConfigDefinition = {
         type: "active",
       },
       token2022Enabled: false,
-      queuedInterval: 100,
       legacyOCMSMaxVersion: "1.8.0",
     } satisfies SolanaCoinConfig,
   },

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);