@ledgerhq/live-common 34.47.0-nightly.1 → 34.47.0-nightly.3

package/src/bridge/crypto-assets/index.test.ts

@@ -2,8 +2,22 @@ import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { getCryptoAssetsStore, setCryptoAssetsStore } from ".";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import * as calIntegration from "./cal-integration";
 
 describe("Testing CryptoAssetStore", () => {
+  let isCALIntegrationEnabledSpy: jest.SpyInstance;
+  let getCALStoreSpy: jest.SpyInstance;
+
+  beforeEach(() => {
+    isCALIntegrationEnabledSpy = jest
+      .spyOn(calIntegration, "isCALIntegrationEnabled")
+      .mockReturnValue(false);
+    getCALStoreSpy = jest.spyOn(calIntegration, "getCALStore");
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
   it("should return the default methods from cryptoassets libs when feature flag does not exists", () => {
     LiveConfig.setConfig({
       some_other_feature: {
@@ -68,4 +82,37 @@ describe("Testing CryptoAssetStore", () => {
     const store = getCryptoAssetsStore();
     expect(store).toBe(newStore);
   });
+
+  it("should return CAL store when CAL integration is enabled", () => {
+    isCALIntegrationEnabledSpy.mockReturnValue(true);
+
+    const mockCALStore = {} as unknown as CryptoAssetsStore;
+    getCALStoreSpy.mockReturnValue(mockCALStore);
+
+    const store = getCryptoAssetsStore();
+
+    expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
+    expect(getCALStoreSpy).toHaveBeenCalled();
+    expect(store).toBe(mockCALStore);
+  });
+
+  it("should prioritize CAL integration over feature flags", () => {
+    isCALIntegrationEnabledSpy.mockReturnValue(true);
+
+    LiveConfig.setConfig({
+      feature_cal_lazy_loading: {
+        type: "boolean",
+        default: true,
+      },
+    });
+
+    const mockCALStore = {} as unknown as CryptoAssetsStore;
+    getCALStoreSpy.mockReturnValue(mockCALStore);
+
+    const store = getCryptoAssetsStore();
+
+    expect(store).toBe(mockCALStore);
+    expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
+    expect(getCALStoreSpy).toHaveBeenCalled();
+  });
 });

package/src/bridge/crypto-assets/index.ts

@@ -1,6 +1,7 @@
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { isCALIntegrationEnabled, getCALStore } from "./cal-integration";
 
 const legacyStore: CryptoAssetsStore = {
   findTokenByAddress: legacy.findTokenByAddress,
@@ -17,6 +18,10 @@ export function setCryptoAssetsStore(store: CryptoAssetsStore) {
 }
 
 export function getCryptoAssetsStore(): CryptoAssetsStore {
+  if (isCALIntegrationEnabled()) {
+    return getCALStore();
+  }
+
   const featureEnabled =
     LiveConfig.isConfigSet() && LiveConfig.getValueByKey("feature_cal_lazy_loading");
   if (!featureEnabled) {

package/src/bridge/generic-alpaca/alpaca/network/network-alpaca.ts

@@ -134,7 +134,7 @@ const buildGetSequence = (networkFamily: string) =>
 const buildListOperations = networkFamily =>
   async function listOperations(
     address: string,
-    pagination: Pagination = { minHeight: 0 },
+    pagination: Pagination = { minHeight: 0, order: "asc" },
   ): Promise<[Operation<any>[], string]> {
     const { data } = await network<{ operations: Operation<any>[] }, unknown>({
       method: "GET",

package/src/bridge/generic-alpaca/buildSubAccounts.ts

@@ -5,7 +5,6 @@ import type { Operation, SyncConfig, TokenAccount } from "@ledgerhq/types-live";
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import { listTokensForCryptoCurrency } from "@ledgerhq/cryptoassets";
 import { AssetInfo, Balance } from "@ledgerhq/coin-framework/api/types";
-import { findTokenById } from "@ledgerhq/cryptoassets/tokens";
 
 export interface OperationCommon extends Operation {
   extra: Record<string, any>;
@@ -13,11 +12,6 @@ export interface OperationCommon extends Operation {
 
 export const getAssetIdFromTokenId = (tokenId: string): string => tokenId.split("/")[2];
 
-export const getAssetIdFromAsset = (asset: AssetInfo) =>
-  asset.type !== "native" && "assetReference" in asset && "assetOwner" in asset
-    ? `${asset.assetReference}:${asset.assetOwner}`
-    : "";
-
 function buildTokenAccount({
   parentAccountId,
   assetBalance,
@@ -68,12 +62,14 @@ export function buildSubAccounts({
   assetsBalance,
   syncConfig,
   operations,
+  getTokenFromAsset,
 }: {
   currency: CryptoCurrency;
   accountId: string;
   assetsBalance: Balance[];
   syncConfig: SyncConfig;
   operations: OperationCommon[];
+  getTokenFromAsset?: (asset: AssetInfo) => TokenCurrency | undefined;
 }): TokenAccount[] | undefined {
   const { blacklistedTokenIds = [] } = syncConfig;
   const allTokens = listTokensForCryptoCurrency(currency);
@@ -85,7 +81,7 @@ export function buildSubAccounts({
   assetsBalance
     .filter(b => b.asset.type !== "native") // NOTE: this could be removed, keeping here while fixing things up
     .map(balance => {
-      const token = findToken(currency, balance);
+      const token = getTokenFromAsset && getTokenFromAsset(balance.asset);
       // NOTE: for future tokens, will need to check over currencyName/standard(erc20,trc10,trc20, etc)/id
       if (token && !blacklistedTokenIds.includes(token.id)) {
         tokenAccounts.push(
@@ -104,7 +100,3 @@ export function buildSubAccounts({
     });
   return tokenAccounts;
 }
-
-export function findToken(currency: CryptoCurrency, balance: Balance): TokenCurrency | undefined {
-  return findTokenById(`${currency.family}/asset/${getAssetIdFromAsset(balance.asset)}`);
-}

package/src/bridge/generic-alpaca/getAccountShape.ts

@@ -4,7 +4,6 @@ import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
 import { inferSubOperations } from "@ledgerhq/coin-framework/serialization";
-import { findToken } from "./buildSubAccounts";
 import { buildSubAccounts, OperationCommon } from "./buildSubAccounts";
 
 export function genericGetAccountShape(network: string, kind: string): GetAccountShape {
@@ -33,8 +32,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
 
     const assetsBalance = balanceRes
       .filter(b => b.asset.type !== "native")
-      .filter(b => findToken(currency, b));
-
+      .filter(b => alpacaApi.getTokenFromAsset && alpacaApi.getTokenFromAsset(b.asset));
     const nativeBalance = BigInt(nativeAsset?.value ?? "0");
 
     const spendableBalance = BigInt(nativeBalance - BigInt(nativeAsset?.locked ?? "0"));
@@ -43,7 +41,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
     const lastPagingToken = oldOps[0]?.extra?.pagingToken || "";
 
     const blockHeight = oldOps.length ? (oldOps[0].blockHeight ?? 0) + 1 : 0;
-    const paginationParams: any = { minHeight: blockHeight };
+    const paginationParams: any = { minHeight: blockHeight, order: "asc" };
     if (lastPagingToken) {
       paginationParams.lastPagingToken = lastPagingToken;
     }
@@ -72,6 +70,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
         assetsBalance,
         syncConfig,
         operations: assetOperations,
+        getTokenFromAsset: alpacaApi.getTokenFromAsset,
       }) || [];
 
     const operationsWithSubs = mergedOps.map(op => {

package/src/e2e/enum/DeviceLabels.ts

@@ -6,6 +6,7 @@ export enum DeviceLabels {
   SIGN = "Sign",
   APPROVE = "Approve",
   ACCEPT = "Accept",
+  ACCEPT_RISK = "Accept risk",
   TRANSFER = "Transfer",
   RECIPIENT = "Recipient",
   DEST = "Dest",

package/src/e2e/families/tezos.ts

@@ -3,6 +3,8 @@ import { DeviceLabels } from "../enum/DeviceLabels";
 
 export async function delegateTezos() {
   await waitFor(DeviceLabels.REVIEW_OPERATION);
+  await pressUntilTextFound(DeviceLabels.ACCEPT_RISK);
+  await pressBoth();
   await pressUntilTextFound(DeviceLabels.ACCEPT);
   await pressBoth();
 }

package/src/exchange/platform/transfer/completeExchange.ts

@@ -1,4 +1,4 @@
-import secp256k1 from "secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1";
 import { firstValueFrom, from, Observable } from "rxjs";
 import { TransportStatusError, WrongDeviceForAccount } from "@ledgerhq/errors";
 
@@ -187,7 +187,8 @@ function convertSignature(signature: string, exchangeType: ExchangeTypes): Buffe
     return Buffer.from(base64Signature, "base64");
   }
   if (exchangeType === ExchangeTypes.Sell) return Buffer.from(signature, "hex");
-  return <Buffer>secp256k1.signatureExport(Buffer.from(signature, "hex"));
+  const sig = secp256k1.Signature.fromCompact(Buffer.from(signature, "hex"));
+  return Buffer.from(sig.toDERRawBytes());
 }
 
 export default completeExchange;

package/src/exchange/swap/completeExchange.ts

@@ -14,7 +14,7 @@ import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
 import { log } from "@ledgerhq/logs";
 import BigNumber from "bignumber.js";
 import { Observable } from "rxjs";
-import secp256k1 from "secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1";
 import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
@@ -271,7 +271,10 @@ const completeExchange = (
 function convertSignature(signature: string, exchangeType: ExchangeTypes): Buffer {
   return exchangeType === ExchangeTypes.SwapNg
     ? base64UrlDecode(signature)
-    : <Buffer>secp256k1.signatureExport(Buffer.from(signature, "hex"));
+    : (() => {
+        const sig = secp256k1.Signature.fromCompact(Buffer.from(signature, "hex"));
+        return Buffer.from(sig.toDERRawBytes());
+      })();
 }
 
 function base64UrlDecode(base64Url: string): Buffer {

package/src/exchange/swap/initSwap.ts

@@ -14,7 +14,7 @@ import { log } from "@ledgerhq/logs";
 import { BigNumber } from "bignumber.js";
 import invariant from "invariant";
 import { firstValueFrom, from, Observable } from "rxjs";
-import secp256k1 from "secp256k1";
+import { secp256k1 } from "@noble/curves/secp256k1";
 import { getCurrencyExchangeConfig } from "../";
 import { getAccountCurrency, getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
@@ -184,9 +184,10 @@ const initSwap = (input: InitSwapInput): Observable<SwapRequestEvent> => {
 
         await swap.processTransaction(Buffer.from(swapResult.binaryPayload, "hex"), estimatedFees);
         if (unsubscribed) return;
-        const goodSign = <Buffer>(
-          secp256k1.signatureExport(Buffer.from(swapResult.signature, "hex"))
-        );
+        const goodSign = <Buffer>(() => {
+          const sig = secp256k1.Signature.fromCompact(Buffer.from(swapResult.signature, "hex"));
+          return Buffer.from(sig.toDERRawBytes());
+        })();
         await swap.checkTransactionSignature(goodSign);
         if (unsubscribed) return;
         const mainPayoutCurrency = getAccountCurrency(payoutAccount);

package/src/families/solana/setup.ts

@@ -19,6 +19,8 @@ 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";
 
 const createSigner: CreateSigner<SolanaSigner> = (transport: Transport) =>
@@ -28,6 +30,13 @@ const getCurrencyConfig = () => {
   return getCurrencyConfiguration<SolanaCoinConfig>(getCryptoCurrencyById("solana"));
 };
 
+try {
+  const isCALLazyLoadingEnabled = LiveConfig.getValueByKey("feature_cal_lazy_loading");
+  setShouldSkipTokenLoading(Boolean(isCALLazyLoadingEnabled));
+} catch (error) {
+  setShouldSkipTokenLoading(false);
+}
+
 const bridge: Bridge<Transaction, SolanaAccount, TransactionStatus> = createBridges(
   executeWithSigner(createSigner),
   getCurrencyConfig,

package/src/featureFlags/defaultFeatures.ts

@@ -108,6 +108,7 @@ export const DEFAULT_FEATURES: Features = {
   postOnboardingAssetsTransfer: DEFAULT_FEATURE,
   counterValue: DEFAULT_FEATURE,
   mockFeature: DEFAULT_FEATURE,
+  calLedgerService: DEFAULT_FEATURE,
   ptxServiceCtaExchangeDrawer: DEFAULT_FEATURE,
   ptxServiceCtaScreens: DEFAULT_FEATURE,
   ptxSwapReceiveTRC20WithoutTrx: DEFAULT_FEATURE,
@@ -625,7 +626,6 @@ export const DEFAULT_FEATURES: Features = {
     },
   },
   lldModularDrawerBackendData: DEFAULT_FEATURE,
-  llmModularDrawerBackendData: DEFAULT_FEATURE,
   llmModularDrawer: {
     ...DEFAULT_FEATURE,
     params: {