@ledgerhq/live-common 34.47.0-nightly.0 → 34.47.0-nightly.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.47.0-nightly.0",
+  "version": "34.47.0-nightly.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -154,7 +154,7 @@
     "reselect": "^4.1.5",
     "rlp": "^3.0.0",
     "rxjs": "^7.8.1",
-    "secp256k1": "^4.0.3",
+    "@noble/curves": "^1.9.7",
     "semver": "^7.3.5",
     "sha.js": "^2.4.11",
     "triple-beam": "^1.3.0",
@@ -165,44 +165,44 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.9.18",
-    "@ledgerhq/coin-aptos": "^3.1.1",
-    "@ledgerhq/coin-bitcoin": "^0.20.2",
-    "@ledgerhq/coin-canton": "^0.3.0",
-    "@ledgerhq/coin-cardano": "^0.11.2",
-    "@ledgerhq/coin-casper": "^2.0.9",
-    "@ledgerhq/coin-celo": "^1.2.1",
-    "@ledgerhq/coin-cosmos": "^0.16.7",
-    "@ledgerhq/coin-evm": "^2.28.0",
-    "@ledgerhq/coin-filecoin": "^1.10.1",
-    "@ledgerhq/coin-framework": "^6.2.0",
-    "@ledgerhq/coin-hedera": "^1.10.1",
-    "@ledgerhq/coin-icon": "^0.11.5",
-    "@ledgerhq/coin-internet_computer": "^1.7.18",
-    "@ledgerhq/coin-mina": "^1.1.17",
-    "@ledgerhq/coin-multiversx": "^0.4.18",
-    "@ledgerhq/coin-near": "^0.12.1",
-    "@ledgerhq/coin-polkadot": "^6.8.0",
-    "@ledgerhq/coin-solana": "^0.31.1",
-    "@ledgerhq/coin-stacks": "^0.8.18",
-    "@ledgerhq/coin-stellar": "^6.2.0",
-    "@ledgerhq/coin-sui": "^0.12.0-nightly.0",
-    "@ledgerhq/coin-tezos": "^6.2.0",
-    "@ledgerhq/coin-ton": "^0.13.8-nightly.0",
-    "@ledgerhq/coin-tron": "^5.3.0-nightly.0",
-    "@ledgerhq/coin-vechain": "^2.8.2",
-    "@ledgerhq/coin-xrp": "^7.2.0",
+    "@ledgerhq/coin-algorand": "^0.9.19-nightly.1",
+    "@ledgerhq/coin-aptos": "^3.2.0-nightly.1",
+    "@ledgerhq/coin-bitcoin": "^0.21.0-nightly.1",
+    "@ledgerhq/coin-canton": "^0.4.0-nightly.1",
+    "@ledgerhq/coin-cardano": "^0.11.3-nightly.1",
+    "@ledgerhq/coin-casper": "^2.0.10-nightly.1",
+    "@ledgerhq/coin-celo": "^1.2.2-nightly.1",
+    "@ledgerhq/coin-cosmos": "^0.16.8-nightly.1",
+    "@ledgerhq/coin-evm": "^2.29.0-nightly.1",
+    "@ledgerhq/coin-filecoin": "^1.10.2-nightly.1",
+    "@ledgerhq/coin-framework": "^6.3.0-nightly.1",
+    "@ledgerhq/coin-hedera": "^1.10.2-nightly.1",
+    "@ledgerhq/coin-icon": "^0.11.6-nightly.1",
+    "@ledgerhq/coin-internet_computer": "^1.7.19-nightly.1",
+    "@ledgerhq/coin-mina": "^1.1.18-nightly.1",
+    "@ledgerhq/coin-multiversx": "^0.4.19-nightly.1",
+    "@ledgerhq/coin-polkadot": "^6.9.0-nightly.1",
+    "@ledgerhq/coin-near": "^0.12.2-nightly.1",
+    "@ledgerhq/coin-solana": "^0.31.2-nightly.1",
+    "@ledgerhq/coin-stacks": "^0.8.19-nightly.1",
+    "@ledgerhq/coin-stellar": "^6.3.0-nightly.1",
+    "@ledgerhq/coin-sui": "^0.12.0-nightly.2",
+    "@ledgerhq/coin-tezos": "^6.3.0-nightly.1",
+    "@ledgerhq/coin-ton": "^0.13.8-nightly.2",
+    "@ledgerhq/coin-tron": "^5.3.0-nightly.2",
+    "@ledgerhq/coin-vechain": "^2.8.3-nightly.1",
+    "@ledgerhq/coin-xrp": "^7.3.0-nightly.1",
     "@ledgerhq/crypto-icons-ui": "^1.18.0-nightly.0",
-    "@ledgerhq/cryptoassets": "^13.26.0",
-    "@ledgerhq/device-core": "^0.6.1",
+    "@ledgerhq/cryptoassets": "^13.27.0-nightly.0",
+    "@ledgerhq/device-core": "^0.6.2-nightly.0",
     "@ledgerhq/devices": "8.5.1-nightly.0",
     "@ledgerhq/errors": "^6.25.0-nightly.0",
     "@ledgerhq/hw-app-algorand": "^6.31.6-nightly.0",
     "@ledgerhq/hw-app-aptos": "^6.34.6-nightly.0",
-    "@ledgerhq/hw-app-btc": "^10.10.2-nightly.0",
-    "@ledgerhq/hw-app-celo": "^6.34.1",
+    "@ledgerhq/hw-app-btc": "^10.11.0-nightly.1",
+    "@ledgerhq/hw-app-celo": "^6.34.2-nightly.0",
     "@ledgerhq/hw-app-cosmos": "^6.32.6-nightly.0",
-    "@ledgerhq/hw-app-eth": "^6.45.16",
+    "@ledgerhq/hw-app-eth": "^6.45.17-nightly.0",
     "@ledgerhq/hw-app-exchange": "^0.13.0",
     "@ledgerhq/hw-app-hedera": "^1.2.6-nightly.0",
     "@ledgerhq/hw-app-icon": "^1.3.6-nightly.0",
@@ -213,28 +213,28 @@
     "@ledgerhq/hw-app-sui": "^1.4.0-nightly.0",
     "@ledgerhq/hw-app-tezos": "^6.31.6-nightly.0",
     "@ledgerhq/hw-app-trx": "^6.31.6-nightly.0",
-    "@ledgerhq/hw-app-vet": "^0.5.14",
+    "@ledgerhq/hw-app-vet": "^0.5.15-nightly.0",
     "@ledgerhq/hw-app-xrp": "^6.32.4-nightly.0",
     "@ledgerhq/hw-transport": "^6.31.10-nightly.0",
     "@ledgerhq/hw-transport-mocker": "^6.29.10-nightly.0",
-    "@ledgerhq/ledger-cal-service": "^1.3.1-nightly.1",
+    "@ledgerhq/ledger-cal-service": "^1.4.0-nightly.2",
     "@ledgerhq/live-config": "^3.2.0-nightly.0",
-    "@ledgerhq/live-countervalues": "^0.6.2",
-    "@ledgerhq/live-countervalues-react": "^0.5.0",
+    "@ledgerhq/live-countervalues-react": "^0.6.0-nightly.1",
     "@ledgerhq/live-dmk-shared": "^0.12.1",
     "@ledgerhq/live-env": "^2.15.0-nightly.1",
     "@ledgerhq/live-hooks": "0.1.0",
     "@ledgerhq/live-network": "^2.0.16-nightly.1",
-    "@ledgerhq/live-nft": "^0.8.18",
+    "@ledgerhq/live-nft": "^0.8.19-nightly.1",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.2.3-nightly.0",
-    "@ledgerhq/live-signer-evm": "^0.7.1",
-    "@ledgerhq/live-signer-solana": "^0.5.3",
-    "@ledgerhq/live-wallet": "^0.12.2",
+    "@ledgerhq/live-signer-canton": "^0.2.3-nightly.2",
+    "@ledgerhq/live-signer-evm": "^0.7.2-nightly.1",
+    "@ledgerhq/live-signer-solana": "^0.5.4-nightly.1",
+    "@ledgerhq/live-wallet": "^0.12.3-nightly.1",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.9-nightly.1",
+    "@ledgerhq/speculos-transport": "^0.2.9-nightly.2",
     "@ledgerhq/wallet-api-acre-module": "^0.6.0",
-    "@ledgerhq/wallet-api-exchange-module": "^0.16.0-nightly.1"
+    "@ledgerhq/wallet-api-exchange-module": "^0.16.0-nightly.1",
+    "@ledgerhq/live-countervalues": "^0.6.3-nightly.1"
   },
   "devDependencies": {
     "@solana/web3.js": "1.95.4",
@@ -282,10 +282,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.2.42",
-    "@ledgerhq/types-cryptoassets": "^7.26.0-nightly.0",
+    "@ledgerhq/device-react": "^0.2.43-nightly.0",
+    "@ledgerhq/types-cryptoassets": "^7.26.0-nightly.1",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.82.0"
+    "@ledgerhq/types-live": "^6.83.0-nightly.0"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/__tests__/test-helpers/environment.ts

@@ -117,6 +117,8 @@ setSupportedCurrencies([
   "mina",
   "babylon",
   "canton_network",
+  "canton_network_devnet",
+  "canton_network_localnet",
 ]);
 LiveConfig.setConfig(liveConfig);
 

package/src/bridge/crypto-assets/cal-integration.test.ts

@@ -0,0 +1,53 @@
+import { isCALIntegrationEnabled, getCALStore } from "./cal-integration";
+import { CALStore } from "./cal-store";
+import { isFeature } from "../../featureFlags/firebaseFeatureFlags";
+
+jest.mock("../../featureFlags/firebaseFeatureFlags", () => ({
+  isFeature: jest.fn(),
+}));
+
+const mockIsFeature = jest.mocked(isFeature);
+
+describe("CAL Integration", () => {
+  beforeEach(() => {
+    mockIsFeature.mockClear();
+  });
+
+  describe("isCALIntegrationEnabled", () => {
+    it("should return false when feature flag is disabled", () => {
+      mockIsFeature.mockReturnValue(false);
+
+      expect(isCALIntegrationEnabled()).toBe(false);
+      expect(mockIsFeature).toHaveBeenCalledWith("calLedgerService");
+    });
+
+    it("should return true when feature flag is enabled (assuming MOCK is false)", () => {
+      mockIsFeature.mockReturnValue(true);
+
+      const result = isCALIntegrationEnabled();
+      expect(mockIsFeature).toHaveBeenCalledWith("calLedgerService");
+      expect(result).toEqual(true);
+    });
+
+    it("should return false when feature check throws", () => {
+      mockIsFeature.mockImplementation(() => {
+        throw new Error("Feature check error");
+      });
+
+      expect(isCALIntegrationEnabled()).toBe(false);
+    });
+  });
+
+  describe("getCALStore", () => {
+    it("should return a CALStore instance", () => {
+      const store = getCALStore();
+      expect(store).toBeInstanceOf(CALStore);
+    });
+
+    it("should return the same instance on multiple calls", () => {
+      const store1 = getCALStore();
+      const store2 = getCALStore();
+      expect(store1).toBe(store2);
+    });
+  });
+});

package/src/bridge/crypto-assets/cal-integration.ts

@@ -0,0 +1,23 @@
+import { getEnv } from "@ledgerhq/live-env";
+import { log } from "@ledgerhq/logs";
+import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { CALStore } from "./cal-store";
+import { isFeature } from "../../featureFlags/firebaseFeatureFlags";
+
+let calStoreInstance: CALStore | undefined;
+
+export function isCALIntegrationEnabled(): boolean {
+  try {
+    return !getEnv("MOCK") && isFeature("calLedgerService");
+  } catch (error) {
+    log("cal", "Error checking CAL integration:", error);
+    return false;
+  }
+}
+
+export function getCALStore(): CryptoAssetsStore {
+  if (!calStoreInstance) {
+    calStoreInstance = new CALStore();
+  }
+  return calStoreInstance;
+}

package/src/bridge/crypto-assets/cal-store.test.ts

@@ -0,0 +1,93 @@
+import { CALStore } from "./cal-store";
+import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
+
+describe("CALStore", () => {
+  let store: CALStore;
+
+  beforeEach(() => {
+    store = new CALStore();
+  });
+
+  describe("Token cache operations", () => {
+    const token = {
+      id: "ethereum/erc20/usdt",
+      name: "Tether USD",
+      ticker: "USDT",
+      contractAddress: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+      parentCurrency: { id: "ethereum" },
+      type: "TokenCurrency",
+      units: [
+        {
+          name: "USDT",
+          code: "USDT",
+          magnitude: 6,
+        },
+      ],
+    } as TokenCurrency;
+
+    it("should store and retrieve tokens by ID", () => {
+      store.addTokens([token]);
+
+      const foundToken = store.findTokenById("ethereum/erc20/usdt");
+      expect(foundToken).toEqual(token);
+    });
+
+    it("should store and retrieve tokens by address", () => {
+      store.addTokens([token]);
+
+      const foundToken = store.findTokenByAddress("0xdAC17F958D2ee523a2206206994597C13D831ec7");
+      expect(foundToken).toEqual(token);
+    });
+
+    it("should store and retrieve tokens by ticker", () => {
+      store.addTokens([token]);
+
+      const foundToken = store.findTokenByTicker("USDT");
+      expect(foundToken).toEqual(token);
+    });
+
+    it("should find token by address in specific currency", () => {
+      store.addTokens([token]);
+
+      const foundToken = store.findTokenByAddressInCurrency(
+        "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+        "ethereum",
+      );
+      expect(foundToken).toEqual(token);
+    });
+
+    it("should not find token by address in different currency", () => {
+      store.addTokens([token]);
+
+      const foundToken = store.findTokenByAddressInCurrency(
+        "0xdAC17F958D2ee523a2206206994597C13D831ec7",
+        "polygon",
+      );
+      expect(foundToken).toBeUndefined();
+    });
+
+    it("should return undefined for non-existent address in findTokenByAddressInCurrency", () => {
+      store.addTokens([token]);
+
+      const foundToken = store.findTokenByAddressInCurrency("0xNONEXISTENT", "ethereum");
+      expect(foundToken).toBeUndefined();
+    });
+
+    it("should return undefined for non-existent tokens", () => {
+      expect(store.findTokenById("non-existent")).toBeUndefined();
+      expect(store.findTokenByAddress("0x0000")).toBeUndefined();
+      expect(store.findTokenByTicker("FAKE")).toBeUndefined();
+    });
+
+    it("should throw error when getting non-existent token by ID", () => {
+      expect(() => store.getTokenById("non-existent")).toThrow("Token not found: non-existent");
+    });
+
+    it("should get existing token by ID", () => {
+      store.addTokens([token]);
+
+      const foundToken = store.getTokenById("ethereum/erc20/usdt");
+      expect(foundToken).toEqual(token);
+    });
+  });
+});

package/src/bridge/crypto-assets/cal-store.ts

@@ -0,0 +1,46 @@
+import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
+
+export class CALStore implements CryptoAssetsStore {
+  private tokenCache = new Map<string, TokenCurrency>();
+  private addressCache = new Map<string, TokenCurrency>();
+  private tickerCache = new Map<string, TokenCurrency>();
+
+  addTokens(tokens: TokenCurrency[]) {
+    tokens.forEach(token => {
+      this.tokenCache.set(token.id, token);
+      if (token.contractAddress) {
+        this.addressCache.set(token.contractAddress, token);
+      }
+      this.tickerCache.set(token.ticker, token);
+    });
+  }
+
+  findTokenByAddress(address: string): TokenCurrency | undefined {
+    return this.addressCache.get(address);
+  }
+
+  getTokenById(id: string): TokenCurrency {
+    const token = this.tokenCache.get(id);
+    if (!token) {
+      throw new Error(`Token not found: ${id}`);
+    }
+    return token;
+  }
+
+  findTokenById(id: string): TokenCurrency | undefined {
+    return this.tokenCache.get(id);
+  }
+
+  findTokenByAddressInCurrency(address: string, currencyId: string): TokenCurrency | undefined {
+    const token = this.addressCache.get(address);
+    if (token && token.parentCurrency.id === currencyId) {
+      return token;
+    }
+    return undefined;
+  }
+
+  findTokenByTicker(ticker: string): TokenCurrency | undefined {
+    return this.tickerCache.get(ticker);
+  }
+}

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