@ledgerhq/live-common 34.46.0-nightly.5 → 34.46.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.46.0-nightly.5",
+  "version": "34.46.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -111,8 +111,7 @@
     "@ledgerhq/wallet-api-client": "^1.9.1",
     "@ledgerhq/wallet-api-core": "^1.21.1",
     "@ledgerhq/wallet-api-server": "^1.10.1",
-    "@reduxjs/toolkit": "2.8.2",
-    "@stellar/stellar-sdk": "^14.0.0",
+    "@stellar/stellar-sdk": "^11.3.0",
     "@stricahq/typhonjs": "^3.0.0",
     "@taquito/ledger-signer": "^22.0.0",
     "@ton-community/ton-ledger": "^7.2.0",
@@ -130,7 +129,7 @@
     "@zondax/ledger-mina-js": "0.0.2",
     "@zondax/ledger-stacks": "^1.0.2",
     "async": "^3.2.3",
-    "axios": "1.11.0",
+    "axios": "1.7.7",
     "bech32": "^1.1.3",
     "bignumber.js": "^9.1.2",
     "bip32": "^2.0.6",
@@ -139,7 +138,6 @@
     "date-fns": "^2.23.0",
     "expect": "^27.4.6",
     "fuse.js": "^6.6.2",
-    "i18next": "20.6.1",
     "invariant": "^2.2.2",
     "isomorphic-ws": "^4.0.1",
     "jotai": "2.12.4",
@@ -165,76 +163,76 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.9.18-nightly.2",
-    "@ledgerhq/coin-aptos": "^3.1.1-nightly.2",
-    "@ledgerhq/coin-bitcoin": "^0.21.0-nightly.2",
-    "@ledgerhq/coin-canton": "^0.2.2-nightly.2",
-    "@ledgerhq/coin-cardano": "^0.11.2-nightly.2",
-    "@ledgerhq/coin-casper": "^2.0.9-nightly.2",
-    "@ledgerhq/coin-celo": "^1.2.1-nightly.4",
-    "@ledgerhq/coin-cosmos": "^0.16.7-nightly.2",
-    "@ledgerhq/coin-evm": "^2.28.0-nightly.4",
-    "@ledgerhq/coin-filecoin": "^1.10.1-nightly.2",
-    "@ledgerhq/coin-framework": "^6.2.0-nightly.2",
-    "@ledgerhq/coin-hedera": "^1.11.0-nightly.2",
-    "@ledgerhq/coin-icon": "^0.11.5-nightly.2",
-    "@ledgerhq/coin-internet_computer": "^1.7.18-nightly.2",
-    "@ledgerhq/coin-mina": "^1.1.17-nightly.2",
-    "@ledgerhq/coin-multiversx": "^0.4.18-nightly.2",
-    "@ledgerhq/coin-near": "^0.12.1-nightly.2",
-    "@ledgerhq/coin-polkadot": "^6.7.1-nightly.2",
-    "@ledgerhq/coin-solana": "^0.32.0-nightly.2",
-    "@ledgerhq/coin-stacks": "^0.8.18-nightly.2",
-    "@ledgerhq/coin-stellar": "^6.2.0-nightly.2",
-    "@ledgerhq/coin-sui": "^0.10.1-nightly.2",
-    "@ledgerhq/coin-tezos": "^6.1.1-nightly.2",
-    "@ledgerhq/coin-ton": "^0.13.7-nightly.2",
-    "@ledgerhq/coin-tron": "^5.1.1-nightly.2",
-    "@ledgerhq/coin-vechain": "^2.8.2-nightly.2",
-    "@ledgerhq/coin-xrp": "^7.2.0-nightly.2",
-    "@ledgerhq/crypto-icons-ui": "^1.18.0-nightly.0",
-    "@ledgerhq/cryptoassets": "^13.26.0-nightly.1",
-    "@ledgerhq/device-core": "^0.6.1-nightly.2",
-    "@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-nightly.2",
-    "@ledgerhq/hw-app-cosmos": "^6.32.6-nightly.0",
-    "@ledgerhq/hw-app-eth": "^6.45.16-nightly.2",
-    "@ledgerhq/hw-app-exchange": "^0.12.1-nightly.0",
-    "@ledgerhq/hw-app-hedera": "^1.2.6-nightly.0",
-    "@ledgerhq/hw-app-icon": "^1.3.6-nightly.0",
-    "@ledgerhq/hw-app-multiversx": "^6.25.1-nightly.0",
-    "@ledgerhq/hw-app-near": "^6.31.6-nightly.0",
-    "@ledgerhq/hw-app-polkadot": "^6.34.6-nightly.0",
-    "@ledgerhq/hw-app-str": "^7.2.6-nightly.0",
-    "@ledgerhq/hw-app-sui": "^1.3.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-nightly.1",
-    "@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/live-config": "^3.2.0-nightly.0",
-    "@ledgerhq/live-countervalues": "^0.7.0-nightly.2",
-    "@ledgerhq/live-countervalues-react": "^0.4.1-nightly.2",
-    "@ledgerhq/live-dmk-shared": "^0.12.1-nightly.0",
-    "@ledgerhq/live-env": "^2.15.0-nightly.1",
+    "@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.11.0",
+    "@ledgerhq/coin-tezos": "^6.2.0",
+    "@ledgerhq/coin-ton": "^0.13.7",
+    "@ledgerhq/coin-tron": "^5.2.0",
+    "@ledgerhq/coin-vechain": "^2.8.2",
+    "@ledgerhq/coin-xrp": "^7.2.0",
+    "@ledgerhq/crypto-icons-ui": "^1.17.0",
+    "@ledgerhq/cryptoassets": "^13.26.0",
+    "@ledgerhq/device-core": "^0.6.1",
+    "@ledgerhq/devices": "8.5.0",
+    "@ledgerhq/errors": "^6.24.0",
+    "@ledgerhq/hw-app-algorand": "^6.31.5",
+    "@ledgerhq/hw-app-aptos": "^6.34.5",
+    "@ledgerhq/hw-app-btc": "^10.10.1",
+    "@ledgerhq/hw-app-celo": "^6.34.1",
+    "@ledgerhq/hw-app-cosmos": "^6.32.5",
+    "@ledgerhq/hw-app-eth": "^6.45.16",
+    "@ledgerhq/hw-app-exchange": "^0.13.0",
+    "@ledgerhq/hw-app-hedera": "^1.2.5",
+    "@ledgerhq/hw-app-icon": "^1.3.5",
+    "@ledgerhq/hw-app-multiversx": "^6.25.0",
+    "@ledgerhq/hw-app-near": "^6.31.5",
+    "@ledgerhq/hw-app-polkadot": "^6.34.5",
+    "@ledgerhq/hw-app-str": "^7.2.5",
+    "@ledgerhq/hw-app-sui": "^1.3.0",
+    "@ledgerhq/hw-app-tezos": "^6.31.5",
+    "@ledgerhq/hw-app-trx": "^6.31.5",
+    "@ledgerhq/hw-app-vet": "^0.5.14",
+    "@ledgerhq/hw-app-xrp": "^6.32.3",
+    "@ledgerhq/hw-transport": "^6.31.9",
+    "@ledgerhq/hw-transport-mocker": "^6.29.9",
+    "@ledgerhq/ledger-cal-service": "^1.3.0",
+    "@ledgerhq/live-config": "^3.1.0",
+    "@ledgerhq/live-countervalues": "^0.6.2",
+    "@ledgerhq/live-countervalues-react": "^0.5.0",
+    "@ledgerhq/live-dmk-shared": "^0.12.1",
+    "@ledgerhq/live-env": "^2.14.0",
     "@ledgerhq/live-hooks": "0.1.0",
-    "@ledgerhq/live-network": "^2.0.16-nightly.1",
-    "@ledgerhq/live-nft": "^0.8.18-nightly.2",
+    "@ledgerhq/live-network": "^2.0.15",
+    "@ledgerhq/live-nft": "^0.8.18",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.2.2-nightly.2",
-    "@ledgerhq/live-signer-evm": "^0.7.1-nightly.4",
-    "@ledgerhq/live-signer-solana": "^0.5.3-nightly.2",
-    "@ledgerhq/live-wallet": "^0.13.0-nightly.2",
+    "@ledgerhq/live-signer-evm": "^0.7.1",
+    "@ledgerhq/live-signer-solana": "^0.5.3",
+    "@ledgerhq/live-signer-canton": "^0.2.2",
+    "@ledgerhq/live-wallet": "^0.12.2",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.9-nightly.1",
+    "@ledgerhq/speculos-transport": "^0.2.8",
     "@ledgerhq/wallet-api-acre-module": "^0.6.0",
-    "@ledgerhq/wallet-api-exchange-module": "^0.16.0-nightly.0"
+    "@ledgerhq/wallet-api-exchange-module": "^0.15.0"
   },
   "devDependencies": {
     "@solana/web3.js": "1.95.4",
@@ -282,10 +280,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.2.42-nightly.2",
-    "@ledgerhq/types-cryptoassets": "^7.26.0-nightly.0",
-    "@ledgerhq/types-devices": "^6.26.0",
-    "@ledgerhq/types-live": "^6.82.0-nightly.2"
+    "@ledgerhq/device-react": "^0.2.42",
+    "@ledgerhq/types-cryptoassets": "^7.25.0",
+    "@ledgerhq/types-devices": "^6.27.0",
+    "@ledgerhq/types-live": "^6.82.0"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",
@@ -307,6 +305,6 @@
     "test-bridge-update": "UPDATE_BACKEND_MOCKS=1 env-cmd -f .ci.integration.env pnpm jest --ci --updateSnapshot --passWithNoTests",
     "test-account-migration": "tsx src/__tests__/migration/account-migration.ts",
     "unimported": "unimported",
-    "coverage": "env-cmd -f .ci.unit.env pnpm jest --coverage --ci --updateSnapshot"
+    "coverage": "env-cmd -f .ci.unit.env pnpm jest --coverage --ci --updateSnapshot && git diff --exit-code src"
   }
 }

package/src/DataModel.test.ts

@@ -7,7 +7,7 @@ import { accountRawToAccountUserData } from "@ledgerhq/live-wallet/store";
 import { createDataModel } from "./DataModel";
 import { fromAccountRaw, toAccountRaw } from "./account";
 import { getCurrencyConfiguration } from "./config";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 import { setCryptoAssetsStore as setCryptoAssetsStoreForCoinFramework } from "@ledgerhq/coin-framework/crypto-assets/index";
 
 jest.mock("./config", () => ({

package/src/__tests__/accounts/groupPerDay.ts

@@ -2,7 +2,7 @@ import flatMap from "lodash/flatMap";
 import { fromAccountRaw, groupAccountOperationsByDay } from "../../account";
 import { TezosAccountRaw } from "../../families/tezos/types";
 import { setSupportedCurrencies } from "../../currencies";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 import { setup } from "../../bridge/impl";
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 setSupportedCurrencies(["tezos"]);

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

@@ -1,5 +1,5 @@
 import { setCryptoAssetsStore as setCryptoAssetsStoreForCoinFramework } from "@ledgerhq/coin-framework/crypto-assets/index";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 import "./environment";
 import BigNumber from "bignumber.js";
 

package/src/account/serialization.test.ts

@@ -4,7 +4,7 @@ import { toAccountRaw, fromAccountRaw } from "./serialization";
 import { setWalletAPIVersion } from "../wallet-api/version";
 import { WALLET_API_VERSION } from "../wallet-api/constants";
 import { setCryptoAssetsStore as setCryptoAssetsStoreForCoinFramework } from "@ledgerhq/coin-framework/crypto-assets/index";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 import solanaSplTokenData from "../__fixtures__/solana-spl-epjfwdd5aufqssqem2qn1xzybapc8g4weggkzwytdt1v.json";
 import { TokenCurrency } from "@ledgerhq/types-cryptoassets";
 

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

@@ -1,7 +1,7 @@
 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 { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 
 describe("Testing CryptoAssetStore", () => {
   it("should return the default methods from cryptoassets libs when feature flag does not exists", () => {

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

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

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

@@ -19,24 +19,18 @@ export function genericEstimateMaxSpendable(
       ...transaction,
       amount: mainAccount.spendableBalance,
       useAllAmount: true,
+      fees: transaction?.fees ? BigInt(transaction.fees.toString()) : 0n,
     };
-
-    let fees = transaction?.fees;
-    if (transaction?.fees === null || transaction?.fees === undefined) {
-      fees = (
-        await getAlpacaApi(network, kind).estimateFees(
-          transactionToIntent(mainAccount, draftTransaction),
-        )
-      ).value;
-    }
+    const fees = await getAlpacaApi(network, kind).estimateFees(
+      transactionToIntent(mainAccount, draftTransaction),
+    );
     const { amount } = await getAlpacaApi(network, kind).validateIntent(
       transactionToIntent(account, { ...draftTransaction }),
-      { value: transaction?.fees ? BigInt(transaction.fees.toString()) : 0n },
     );
     if (network === "stellar") {
       return amount > 0 ? new BigNumber(amount.toString()) : new BigNumber(0);
     }
-    const bnFee = BigNumber(fees.toString());
+    const bnFee = BigNumber(fees.value.toString());
     return BigNumber.max(0, account.spendableBalance.minus(bnFee));
   };
 }

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

@@ -3,7 +3,6 @@ import { AccountAwaitingSendPendingOperations } from "@ledgerhq/errors";
 import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
-// import { FeeEstimation } from "@ledgerhq/coin-framework/api/types";
 
 // => alpaca validateIntent
 export function genericGetTransactionStatus(
@@ -27,6 +26,7 @@ export function genericGetTransactionStatus(
       mode: transaction?.mode,
       recipient: transaction.recipient,
       amount: transaction.amount ?? new BigNumber(0),
+      fees: transaction.fees ? BigInt(transaction.fees.toString()) : 0n,
       useAllAmount: !!transaction.useAllAmount,
       assetReference: transaction.assetReference || "",
       assetOwner: transaction.assetOwner || "",
@@ -46,7 +46,6 @@ export function genericGetTransactionStatus(
 
     const { errors, warnings, estimatedFees, amount, totalSpent } = await alpacaApi.validateIntent(
       transactionToIntent(account, draftTransaction),
-      { value: transaction.fees ? BigInt(transaction.fees.toString()) : 0n },
     );
 
     return Promise.resolve({

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

@@ -2,7 +2,7 @@ import { Account, AccountBridge, TransactionCommon } from "@ledgerhq/types-live"
 import { getAlpacaApi } from "./alpaca";
 import { transactionToIntent } from "./utils";
 import BigNumber from "bignumber.js";
-import { FeeEstimation } from "@ledgerhq/coin-framework/api/types";
+import { NetworkInfo } from "./createTransaction";
 
 function bnEq(a: BigNumber | null | undefined, b: BigNumber | null | undefined): boolean {
   return !a && !b ? true : !a || !b ? false : a.eq(b);
@@ -16,35 +16,31 @@ export function genericPrepareTransaction(
     account,
     transaction: TransactionCommon & {
       fees: BigNumber | null | undefined;
-      customFees?: FeeEstimation;
       assetReference?: string;
       assetOwner?: string;
       subAccountId?: string;
+      networkInfo?: NetworkInfo | null;
     },
   ) => {
     const [assetReference, assetOwner] = getAssetInfos(transaction);
-
-    let fees = transaction.customFees?.parameters?.fees || null;
-    if (fees === null) {
-      fees = (
-        await getAlpacaApi(network, kind).estimateFees(
-          transactionToIntent(account, {
-            ...transaction,
-          }),
-        )
-      ).value;
-    }
-
-    if (!bnEq(transaction.fees, new BigNumber(fees.toString()))) {
+    const fees = await getAlpacaApi(network, kind).estimateFees(
+      transactionToIntent(account, {
+        ...transaction,
+        fees: transaction.fees ? BigInt(transaction.fees.toString()) : 0n,
+      }),
+    );
+    // NOTE: this is problematic, we should maybe have a method / object that lists what field warrant an update per chain
+    // for reference, stellar checked this:
+    // transaction.networkInfo !== networkInfo ||
+    // transaction.baseReserve !== baseReserve
+    if (!bnEq(transaction.fees, new BigNumber(fees.value.toString()))) {
       return {
         ...transaction,
-        fees: new BigNumber(fees.toString()),
+        fees: new BigNumber(fees.value.toString()),
         assetReference,
         assetOwner,
-        customFees: {
-          parameters: {
-            fees: new BigNumber(fees.toString()),
-          },
+        networkInfo: {
+          fees: new BigNumber(fees.value.toString()),
         },
       };
     }

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

@@ -95,6 +95,7 @@ export const genericSignOperation =
           const draftTransaction = {
             recipient: transaction.recipient,
             amount: transaction.amount ?? 0,
+            fees: fees,
             useAllAmount: !!transaction.useAllAmount,
             assetReference: transaction?.["assetReference"] || "",
             assetOwner: transaction?.["assetOwner"] || "",
@@ -102,7 +103,6 @@ export const genericSignOperation =
           };
           const { amount } = await getAlpacaApi(network, kind).validateIntent(
             transactionToIntent(account, draftTransaction),
-            { value: fees },
           );
           transaction.amount = new BigNumber(amount.toString());
         }
@@ -110,7 +110,7 @@ export const genericSignOperation =
           const derivationPath = account.freshAddressPath;
           const { publicKey } = (await signer.getAddress(derivationPath)) as Result;
 
-          let transactionIntent = transactionToIntent(account, { ...transaction });
+          let transactionIntent = transactionToIntent(account, { ...transaction, fees });
           transactionIntent.senderPublicKey = publicKey;
 
           // Enrich with memo and asset information
@@ -125,7 +125,6 @@ export const genericSignOperation =
           /* Craft unsigned blob via Alpaca */
           const unsigned: string = await getAlpacaApi(network, kind).craftTransaction(
             transactionIntent,
-            { value: fees },
           );
 
           /* Notify UI that the device is now showing the tx */

package/src/bridge/generic-alpaca/tests/prepareTransaction.test.ts

@@ -47,7 +47,7 @@ describe("genericPrepareTransaction", () => {
     expect((result as any).fees.toString()).toBe(newFee.toString());
     expect(transactionToIntent).toHaveBeenCalledWith(
       account,
-      expect.objectContaining(baseTransaction),
+      expect.objectContaining({ ...baseTransaction, fees: 500n }),
     );
   });
 

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

@@ -94,6 +94,7 @@ export function transactionToIntent(
     assetOwner?: string;
     assetReference?: string;
     mode?: string;
+    fees?: bigint | null | undefined;
     memoType?: string;
     memoValue?: string;
     useAllAmount?: boolean;
@@ -113,6 +114,7 @@ export function transactionToIntent(
     }
   }
   const res: TransactionIntent & { memo?: { type: string; value?: string } } = {
+    fees: transaction?.fees ? transaction.fees : null,
     type: transactionType,
     sender: account.freshAddress,
     recipient: transaction.recipient,

package/src/bridge/impl.ts

@@ -20,7 +20,7 @@ import {
 import { getAlpacaAccountBridge } from "./generic-alpaca/accountBridge";
 import { getAlpacaCurrencyBridge } from "./generic-alpaca/currencyBridge";
 import { AddressesSanctionedError } from "@ledgerhq/coin-framework/sanction/errors";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 import { setCryptoAssetsStore as setCryptoAssetsStoreForCoinFramework } from "@ledgerhq/coin-framework/crypto-assets/index";
 import { getCryptoAssetsStore, setCryptoAssetsStore } from "./crypto-assets";
 

package/src/currencies/index.ts

@@ -28,6 +28,7 @@ export {
   sanitizeValueString,
   formatCurrencyUnit,
   type formatCurrencyUnitOptions,
+  findCurrencyByTicker,
   parseCurrencyUnit,
   toLocaleString,
   isCurrencySupported,

package/src/currencies/sortByMarketcap.test.ts

@@ -1,10 +1,9 @@
 import { sortCurrenciesByIds } from "./sortByMarketcap";
-import { listCryptoCurrencies, listTokens } from ".";
+import { findCurrencyByTicker, listCryptoCurrencies, listTokens } from ".";
 import { getBTCValues } from "@ledgerhq/live-countervalues/mock";
 import { CURRENCIES_LIST, IDS } from "./mock";
 import { setCryptoAssetsStore as setCryptoAssetsStoreForCoinFramework } from "@ledgerhq/coin-framework/crypto-assets/index";
-import type { CryptoAssetsStore } from "@ledgerhq/types-live";
-import { findCurrencyByTicker } from "@ledgerhq/live-countervalues/findCurrencyByTicker";
+import { CryptoAssetsStore } from "@ledgerhq/coin-framework/crypto-assets/type";
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
 setCryptoAssetsStoreForCoinFramework({

package/src/domain/getTokensWithFunds.test.ts

@@ -1,5 +1,5 @@
 import { genAccount } from "@ledgerhq/coin-framework/lib/mocks/account";
-import { getCryptoCurrencyById } from "../currencies/index";
+import { getCryptoCurrencyById } from "@ledgerhq/live-common/currencies/index";
 import { Account } from "@ledgerhq/types-live";
 import BigNumber from "bignumber.js";
 import { getTokensWithFunds } from "./getTokensWithFunds";

package/src/e2e/enum/AppInfos.ts

@@ -1,4 +1,4 @@
-export type SpeculosAppType = AppInfos;
+export type AppInfosType = AppInfos;
 
 export class AppInfos {
   constructor(public readonly name: string) {}

package/src/e2e/enum/DeviceLabels.ts

@@ -8,6 +8,7 @@ export enum DeviceLabels {
   ACCEPT = "Accept",
   TRANSFER = "Transfer",
   RECIPIENT = "Recipient",
+  PUBKEY = "Pubkey",
   DEST = "Dest",
   CAPS_APPROVE = "APPROVE",
   CAPS_REJECT = "REJECT",
@@ -52,6 +53,4 @@ export enum DeviceLabels {
   VERIFY_BSC = "Verify BSC",
   SIGN_TRANSACTION = "Sign transaction",
   VERIFY_POLYGON = "Verify Polygon",
-  VERIFY_SOLANA_ADDRESS = "Verify Solana address",
-  REVIEW_TRANSACTION = "Review transaction",
 }

package/src/e2e/enum/Provider.ts

@@ -16,8 +16,8 @@ export class Provider {
   static readonly LIFI = new Provider("lifi", "LI.FI", false, true, false);
   static readonly CIC = new Provider("cic", "CIC", false, true, true);
   static readonly COINBASE = new Provider("coinbase", "Coinbase", false, true, true);
-  static readonly KILN = new Provider("kiln_pooling", "Kiln staking Pool", false, true, true);
-  static readonly STADER_LABS = new Provider("stader-eth", "Stader Labs", false, true, true);
+  static readonly KILN = new Provider("kiln", "Kiln staking Pool", false, true, true);
+  static readonly STADER_LABS = new Provider("stader", "Stader Labs", false, true, true);
   static readonly LIDO = new Provider("lido", "Lido", false, true, true);
   static readonly TRANSAK = new Provider("transak", "Transak", false, true, true);
 

package/src/e2e/families/solana.ts

@@ -5,20 +5,17 @@ import { Device } from "../enum/Device";
 import { Transaction } from "../models/Transaction";
 
 export async function delegateSolana() {
-  await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+  await waitFor(DeviceLabels.DELEGATE_FROM);
+  await pressUntilTextFound(DeviceLabels.APPROVE);
   await pressBoth();
 }
 
 export async function sendSolana(tx: Transaction) {
-  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+  const events = await pressUntilTextFound(DeviceLabels.APPROVE);
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
   if (process.env.SPECULOS_DEVICE !== Device.LNS) {
-    const isAddressCorrect = containsSubstringInEvent(
-      tx.accountToCredit.parentAccount?.address ?? tx.accountToCredit.address,
-      events,
-    );
+    const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
     expect(isAddressCorrect).toBeTruthy();
   }
 

package/src/e2e/speculos.ts

@@ -14,13 +14,13 @@ import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import axios, { AxiosError, AxiosResponse } from "axios";
 import { getEnv } from "@ledgerhq/live-env";
 import { getCryptoCurrencyById } from "../currencies";
-import { DeviceLabels } from "./enum/DeviceLabels";
+import { DeviceLabels } from "../e2e/enum/DeviceLabels";
 import { Account } from "./enum/Account";
 import { Device as CryptoWallet } from "./enum/Device";
 import { Currency } from "./enum/Currency";
 import expect from "expect";
 import { sendBTCBasedCoin } from "./families/bitcoin";
-import { sendEVM, sendEvmNFT } from "./families/evm";
+import { sendEVM, sendEvmNFT } from ".//families/evm";
 import { sendPolkadot } from "./families/polkadot";
 import { sendAlgorand } from "./families/algorand";
 import { sendTron } from "./families/tron";
@@ -385,12 +385,13 @@ export async function startSpeculos(
     onSpeculosDeviceCreated,
   };
   try {
-    return isSpeculosRemote
+    const device = isSpeculosRemote
       ? await createSpeculosDeviceCI(deviceParams)
       : await createSpeculosDevice(deviceParams).then(device => {
           invariant(device.ports.apiPort, "[E2E] Speculos apiPort is not defined");
           return { id: device.id, port: device.ports.apiPort };
         });
+    return device;
   } catch (e: unknown) {
     console.error(e);
     log("engine", `test ${testName} failed with ${String(e)}`);
@@ -621,7 +622,7 @@ const APP_LABEL_MAP = new Map<AppInfos, [string, string]>([
   [AppInfos.ETHEREUM, [DeviceLabels.VERIFY_ETHEREUM, DeviceLabels.CONFIRM]],
   [AppInfos.BNB_CHAIN, [DeviceLabels.VERIFY_BSC, DeviceLabels.CONFIRM]],
   [AppInfos.POLYGON, [DeviceLabels.VERIFY_POLYGON, DeviceLabels.CONFIRM]],
-  [AppInfos.SOLANA, [DeviceLabels.VERIFY_SOLANA_ADDRESS, DeviceLabels.CONFIRM]],
+  [AppInfos.SOLANA, [DeviceLabels.PUBKEY, DeviceLabels.APPROVE]],
   [AppInfos.POLKADOT, [DeviceLabels.PLEASE_REVIEW, DeviceLabels.CAPS_APPROVE]],
   [AppInfos.COSMOS, [DeviceLabels.PLEASE_REVIEW, DeviceLabels.CAPS_APPROVE]],
   [AppInfos.BITCOIN, [DeviceLabels.ADDRESS, DeviceLabels.CONFIRM]],