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

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/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/sortByMarketcap.test.ts

@@ -3,7 +3,7 @@ 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 { 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/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/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

@@ -622,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]],

package/src/exchange/swap/api/v5/actions.ts

@@ -19,7 +19,7 @@ export async function retrieveSwapPayload(
     address: data.toAccountAddress,
     refundAddress: data.fromAccountAddress,
     amountFrom: data.amount,
-    amountFromInSmallestDenomination: data.amountInAtomicUnit.toString(),
+    amountFromInSmallestDenomination: Number(data.amountInAtomicUnit),
     rateId: data.quoteId,
   };
 

package/src/exchange/swap/types.ts

@@ -354,7 +354,7 @@ export type SwapPayloadRequestData = {
   fromAccountCurrency: string;
   toAccountCurrency: string;
   amount: string;
-  amountInAtomicUnit: BigNumber;
+  amountInAtomicUnit: number;
   quoteId?: string;
   toNewTokenId?: string;
 };

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

@@ -2646,7 +2646,6 @@ exports[`bitcoin currency bridge scanAccounts bitcoin seed 1 2`] = `
       "senders": [
         "bc1qtc9gkextz267qgaupcmqpz9hl64nwqn6y4t0qk",
       ],
-      "transactionSequenceNumber": 0,
       "type": "OUT",
       "value": "2717",
     },
@@ -15475,7 +15474,6 @@ exports[`decred currency bridge scanAccounts decred seed 1 2`] = `
       "senders": [
         "DskW13e355a7M3kmhBjZrSGrGYTYn9T4dbk",
       ],
-      "transactionSequenceNumber": 0,
       "type": "OUT",
       "value": "621400",
     },
@@ -18431,7 +18429,6 @@ exports[`decred currency bridge scanAccounts decred seed 1 2`] = `
       "senders": [
         "Dshb98SrdLmgDoy3PRouifMYCERdDYuCcEM",
       ],
-      "transactionSequenceNumber": 0,
       "type": "OUT",
       "value": "625888",
     },
@@ -19080,7 +19077,6 @@ exports[`decred currency bridge scanAccounts decred seed 1 2`] = `
       "senders": [
         "DseydKh2Cgzht5dwbSgXBDLLDNdjcSu8Qu2",
       ],
-      "transactionSequenceNumber": 0,
       "type": "OUT",
       "value": "623776",
     },
@@ -21363,7 +21359,6 @@ exports[`dogecoin currency bridge scanAccounts dogecoin seed 1 2`] = `
       "senders": [
         "DCTZJgCwmkTko41GXvWF4BrutEY5NSr1hC",
       ],
-      "transactionSequenceNumber": 0,
       "type": "OUT",
       "value": "4988700000",
     },
@@ -21830,7 +21825,6 @@ exports[`litecoin currency bridge scanAccounts litecoin seed 1 2`] = `
       "senders": [
         "ltc1qmynthzpjrtdwp87anmwqc9mam0wjn0nuskm43r",
       ],
-      "transactionSequenceNumber": 0,
       "type": "OUT",
       "value": "100283",
     },
@@ -22885,7 +22879,6 @@ exports[`litecoin currency bridge scanAccounts litecoin seed 1 2`] = `
       "senders": [
         "MSyowFrsqmk9MjgAQerz5HAQjHAcDGM8aV",
       ],
-      "transactionSequenceNumber": 0,
       "type": "OUT",
       "value": "100323",
     },

package/src/families/bitcoin/satstack.test.ts

@@ -19,7 +19,7 @@ import { setEnv } from "@ledgerhq/live-env";
 import { fromAccountRaw } from "../../account";
 import { setSupportedCurrencies } from "../../currencies";
 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";
 
 setSupportedCurrencies(["bitcoin"]);
 jest.setTimeout(10000);

package/src/families/evm/setup.ts

@@ -19,17 +19,7 @@ import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 import { EvmConfigInfo } from "@ledgerhq/coin-evm/config";
 import { type DeviceManagementKit } from "@ledgerhq/device-management-kit";
 import { DmkSignerEth, LegacySignerEth } from "@ledgerhq/live-signer-evm";
-import { EvmSigner } from "@ledgerhq/coin-evm/types/signer";
-import { getCryptoAssetsStore } from "../../bridge/crypto-assets";
-import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
-import { setShouldSkipTokenLoading } from "@ledgerhq/coin-evm/bridge/preload";
-
-try {
-  const isCALLazyLoadingEnabled = LiveConfig.getValueByKey("feature_cal_lazy_loading") === "true";
-  setShouldSkipTokenLoading(Boolean(isCALLazyLoadingEnabled));
-} catch (error) {
-  setShouldSkipTokenLoading(false);
-}
+import { EvmSigner } from "@ledgerhq/coin-evm/lib/types/signer";
 
 const createSigner: CreateSigner<EvmSigner> = (transport: Transport) => {
   if (isDmkTransport(transport)) {
@@ -57,7 +47,6 @@ const getCurrencyConfig = (currency: CryptoCurrency) => {
 const bridge: Bridge<EvmTransaction> = createBridges(
   executeWithSigner(createSigner),
   getCurrencyConfig,
-  getCryptoAssetsStore,
 );
 
 const messageSigner = {