@ledgerhq/live-common 34.52.0-nightly.1 → 34.52.0-nightly.11

package/src/e2e/families/cardano.ts

@@ -10,6 +10,7 @@ import {
 } from "../deviceInteraction/TouchDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { DeviceModelId } from "@ledgerhq/types-devices";
+import { isTouchDevice } from "../speculosAppVersion";
 
 type ActionType = "both" | "right" | "tap" | "swipe" | "confirm" | "hold";
 
@@ -20,7 +21,7 @@ function validateTransactionData(tx: Transaction, events: string[]) {
   expect(isAmountCorrect).toBeTruthy();
 }
 
-async function sendCardanoStax(tx: Transaction) {
+async function sendCardanoTouchDevices(tx: Transaction) {
   await waitFor(DeviceLabels.REVIEW_TRANSACTION);
   const events = await pressUntilTextFound(DeviceLabels.TO);
   validateTransactionData(tx, events);
@@ -60,8 +61,8 @@ async function sendCardanoButtonDevice(tx: Transaction) {
 
 export async function sendCardano(tx: Transaction) {
   const speculosModel = getSpeculosModel();
-  if (speculosModel === DeviceModelId.stax) {
-    return sendCardanoStax(tx);
+  if (isTouchDevice()) {
+    return sendCardanoTouchDevices(tx);
   }
   if (speculosModel === DeviceModelId.nanoS) {
     return sendCardanoNanoS(tx);
@@ -70,7 +71,7 @@ export async function sendCardano(tx: Transaction) {
 }
 
 const DELEGATE_STEPS_CONFIG = {
-  [DeviceModelId.stax]: [
+  [DeviceModelId.stax || DeviceModelId.europa]: [
     [DeviceLabels.REVIEW_TRANSACTION, "swipe"],
     [DeviceLabels.TAP_TO_CONTINUE, "tap"],
     [DeviceLabels.REGISTER, "swipe"],
@@ -107,7 +108,7 @@ const DELEGATE_STEPS_CONFIG = {
   ] as const,
 };
 
-async function delegateStaxAction(label: DeviceLabels) {
+async function delegateTouchDevicesAction(label: DeviceLabels) {
   const CONFIRM_BUTTON_COORDS = { x: 139, y: 532 };
   await waitFor(label);
   switch (label) {
@@ -135,14 +136,10 @@ async function delegateNanoAction(label: DeviceLabels, action: ActionType) {
   }
 }
 
-async function executeDelegateStep(
-  label: DeviceLabels,
-  action: ActionType,
-  speculosModel: DeviceModelId,
-) {
+async function executeDelegateStep(label: DeviceLabels, action: ActionType) {
   try {
-    if (speculosModel === DeviceModelId.stax) {
-      await delegateStaxAction(label);
+    if (isTouchDevice()) {
+      await delegateTouchDevicesAction(label);
     } else {
       await delegateNanoAction(label, action);
     }
@@ -156,13 +153,13 @@ async function executeDelegateStep(
 export async function delegateCardano() {
   const speculosModel = getSpeculosModel();
   const steps =
-    speculosModel === DeviceModelId.stax
-      ? DELEGATE_STEPS_CONFIG[DeviceModelId.stax]
+    speculosModel === DeviceModelId.stax || speculosModel === DeviceModelId.europa
+      ? DELEGATE_STEPS_CONFIG[speculosModel]
       : speculosModel === DeviceModelId.nanoS
         ? DELEGATE_STEPS_CONFIG[DeviceModelId.nanoS]
         : DELEGATE_STEPS_CONFIG.default;
 
   for (const [label, action] of steps) {
-    await executeDelegateStep(label, action, speculosModel);
+    await executeDelegateStep(label, action);
   }
 }

package/src/e2e/families/evm.ts

@@ -7,6 +7,7 @@ import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { DeviceModelId } from "@ledgerhq/types-devices";
+import { isTouchDevice } from "../speculosAppVersion";
 
 function validateTransactionData(tx: Transaction, events: string[]) {
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
@@ -20,7 +21,7 @@ function validateTransactionData(tx: Transaction, events: string[]) {
   }
 }
 
-async function sendEvmStax(tx: Transaction) {
+async function sendEvmTouchDevices(tx: Transaction) {
   const events = await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
   validateTransactionData(tx, events);
   await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
@@ -40,8 +41,8 @@ async function sendEvmNanoS(tx: Transaction) {
 
 export async function sendEVM(tx: Transaction) {
   const speculosModel = getSpeculosModel();
-  if (speculosModel === DeviceModelId.stax) {
-    return sendEvmStax(tx);
+  if (isTouchDevice()) {
+    return sendEvmTouchDevices(tx);
   }
   if (speculosModel === DeviceModelId.nanoS) {
     return sendEvmNanoS(tx);

package/src/e2e/families/solana.ts

@@ -22,10 +22,7 @@ export async function sendSolana(tx: Transaction) {
   const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
   expect(isAmountCorrect).toBeTruthy();
   if (process.env.SPECULOS_DEVICE !== Device.LNS.name) {
-    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

@@ -69,6 +69,8 @@ export type Dependency = { name: string; appVersion?: string };
 export type SpeculosDevice = {
   id: string;
   port: number;
+  appName?: string;
+  appVersion?: string;
 };
 
 export function setExchangeDependencies(dependencies: Dependency[]) {
@@ -418,7 +420,12 @@ export async function startSpeculos(
       ? 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 {
+            id: device.id,
+            port: device.ports.apiPort,
+            appName: appCandidate.appName,
+            appVersion: appCandidate.appVersion,
+          };
         });
   } catch (e: unknown) {
     console.error(e);
@@ -654,7 +661,12 @@ export async function activateLedgerSync() {
 export async function activateExpertMode() {
   if (isTouchDevice()) {
     await goToSettings();
-    await pressAndRelease(DeviceLabels.SETTINGS_TOGGLE_1);
+    const SettingsToggle1Coordinates = { x: 344, y: 136 };
+    await pressAndRelease(
+      DeviceLabels.SETTINGS_TOGGLE_1,
+      SettingsToggle1Coordinates.x,
+      SettingsToggle1Coordinates.y,
+    );
   } else {
     await pressUntilTextFound(DeviceLabels.EXPERT_MODE);
     await pressBoth();
@@ -670,7 +682,12 @@ export async function activateContractData() {
 
 export async function goToSettings() {
   if (isTouchDevice()) {
-    await pressAndRelease(DeviceLabels.SETTINGS);
+    const SettingsCogwheelCoordinates = { x: 400, y: 75 };
+    await pressAndRelease(
+      DeviceLabels.SETTINGS,
+      SettingsCogwheelCoordinates.x,
+      SettingsCogwheelCoordinates.y,
+    );
   } else {
     await pressUntilTextFound(DeviceLabels.SETTINGS);
     await pressBoth();
@@ -723,26 +740,23 @@ export function getDeviceLabels(appInfo: AppInfos): DeviceLabelsReturn {
 export async function expectValidAddressDevice(account: Account, addressDisplayed: string) {
   if (account.currency === Currency.SUI_USDC) {
     providePublicKey();
+  }
+  const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(account.currency.speculosApp);
+  await waitFor(receiveVerifyLabel);
+  if (isTouchDevice()) {
+    const events = await pressUntilTextFound(receiveConfirmLabel);
+    const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
+    expect(isAddressCorrect).toBeTruthy();
+    await pressAndRelease(DeviceLabels.CONFIRM);
   } else {
     const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(
       account.currency.speculosApp,
     );
     await waitFor(receiveVerifyLabel);
-    if (isTouchDevice()) {
-      const events = await pressUntilTextFound(receiveConfirmLabel);
-      const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
-      expect(isAddressCorrect).toBeTruthy();
-      await pressAndRelease(DeviceLabels.CONFIRM);
-    } else {
-      const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(
-        account.currency.speculosApp,
-      );
-      await waitFor(receiveVerifyLabel);
-      const events = await pressUntilTextFound(receiveConfirmLabel);
-      const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
-      expect(isAddressCorrect).toBeTruthy();
-      await pressBoth();
-    }
+    const events = await pressUntilTextFound(receiveConfirmLabel);
+    const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
+    expect(isAddressCorrect).toBeTruthy();
+    await pressBoth();
   }
 }
 

package/src/e2e/speculosAppVersion.ts

@@ -1,5 +1,5 @@
 import { HttpManagerApiRepository, ApplicationV2Entity } from "@ledgerhq/device-core";
-import { version } from "@ledgerhq/device-core/package.json";
+import { version } from "../../package.json";
 import { getEnv } from "@ledgerhq/live-env";
 import { DeviceModelId } from "@ledgerhq/devices";
 import { Device as CryptoWallet } from "./enum/Device";
@@ -15,6 +15,8 @@ export function getSpeculosModel(): DeviceModelId {
       return DeviceModelId.nanoX;
     case CryptoWallet.STAX.name:
       return DeviceModelId.stax;
+    case CryptoWallet.FLEX.name:
+      return DeviceModelId.europa;
     case CryptoWallet.LNSP.name:
     default:
       return DeviceModelId.nanoSP;
@@ -23,7 +25,7 @@ export function getSpeculosModel(): DeviceModelId {
 
 export function isTouchDevice(): boolean {
   const model = getSpeculosModel();
-  return model === DeviceModelId.stax;
+  return model === DeviceModelId.stax || model === DeviceModelId.europa;
 }
 
 function getDeviceTargetId(device: DeviceModelId): number {
@@ -32,6 +34,7 @@ function getDeviceTargetId(device: DeviceModelId): number {
     [DeviceModelId.nanoX]: CryptoWallet.LNX.targetId,
     [DeviceModelId.nanoSP]: CryptoWallet.LNSP.targetId,
     [DeviceModelId.stax]: CryptoWallet.STAX.targetId,
+    [DeviceModelId.europa]: CryptoWallet.FLEX.targetId,
   };
   return modelToTargetIdMap[device];
 }

package/src/e2e/speculosCI.ts

@@ -171,6 +171,8 @@ export async function createSpeculosDeviceCI(
     return {
       id: runId,
       port: speculosPort,
+      appName: deviceParams.appName,
+      appVersion: deviceParams.appVersion,
     };
   } catch (e: unknown) {
     console.warn(
@@ -179,6 +181,8 @@ export async function createSpeculosDeviceCI(
     return {
       id: runId,
       port: 0,
+      appName: deviceParams.appName,
+      appVersion: deviceParams.appVersion,
     };
   }
 }

package/src/exchange/swap/getIncompatibleCurrencyKeys.ts

@@ -79,6 +79,10 @@ const INCOMPATIBLE_NANO_S_CURRENCY_KEYS: Keys = {
     title: "swap.incompatibility.kaspa_title",
     description: "swap.incompatibility.kaspa_description",
   },
+  celo: {
+    title: "swap.incompatibility.celo_title",
+    description: "swap.incompatibility.celo_description",
+  },
 };
 
 export const getIncompatibleCurrencyKeys = (exchange: ExchangeSwap) => {

package/src/exchange/swap/transactionStrategies.ts

@@ -237,6 +237,21 @@ export function cosmosTransaction({
   };
 }
 
+export function hederaTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+  payinExtraId,
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "hedera" }>> {
+  return {
+    family: "hedera",
+    amount,
+    recipient,
+    ...customFeeConfig,
+    memo: payinExtraId ?? undefined,
+  };
+}
+
 export type TransactionWithCustomFee = TransactionCommon & {
   customFeeConfig: {
     [key: string]: BigNumber;
@@ -266,7 +281,7 @@ export const transactionStrategy: {
   cosmos: cosmosTransaction,
   evm: evmTransaction,
   filecoin: defaultTransaction,
-  hedera: defaultTransaction,
+  hedera: hederaTransaction,
   icon: defaultTransaction,
   internet_computer: defaultTransaction,
   mina: defaultTransaction,

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

@@ -236,6 +236,7 @@ describe("editSatStackConfig", () => {
   setCryptoAssetsStoreForCoinFramework({
     findTokenById: (_: string) => undefined,
     findTokenByAddressInCurrency: (_: string, __: string) => undefined,
+    getTokensSyncHash: (_: string) => Promise.resolve("0"),
   } as CryptoAssetsStore);
   const config = {
     node: { ...mockConfig, tls: false },

package/src/families/canton/bridge/mock.ts

@@ -1,6 +1,6 @@
 import { makeLRUCache, minutes } from "@ledgerhq/live-network/cache";
 import { createApi } from "@ledgerhq/coin-canton/api/index";
-import { Transaction as CantonTransaction } from "@ledgerhq/coin-canton/types";
+import { Transaction as CantonTransaction, CantonAccount } from "@ledgerhq/coin-canton/types";
 import type { AccountBridge } from "@ledgerhq/types-live";
 import { BigNumber } from "bignumber.js";
 
@@ -51,12 +51,12 @@ const getTransactionStatus = async (): Promise<any> => {
   };
 };
 
-const estimateMaxSpendable = ({ account }: { account: any }): Promise<BigNumber> => {
+const estimateMaxSpendable = ({ account }: { account: CantonAccount }): Promise<BigNumber> => {
   return Promise.resolve(account.balance || new BigNumber(0));
 };
 
 const prepareTransaction = async (
-  _account: any,
+  _account: CantonAccount,
   transaction: CantonTransaction,
 ): Promise<CantonTransaction> => {
   return {
@@ -65,17 +65,17 @@ const prepareTransaction = async (
   };
 };
 
-const sync = (_initialAccount: any): any => {
+const sync = (_initialAccount: CantonAccount): any => {
   return {
     subscribe: (observer: any) => {
-      observer.next((acc: any) => acc);
+      observer.next((acc: CantonAccount) => acc);
       observer.complete();
       return { unsubscribe: () => {} };
     },
   };
 };
 
-const receive = (_account: any, _opts: { deviceId: string }): any => {
+const receive = (_account: CantonAccount, _opts: { deviceId: string }): any => {
   return {
     subscribe: (observer: any) => {
       observer.next({
@@ -144,6 +144,9 @@ const scanAccounts = (): any => {
           lastSyncDate: new Date(),
           operations: [],
           pendingOperations: [],
+          cantonResources: {
+            instrumentUtxoCounts: {},
+          },
         },
       });
       observer.complete();
@@ -156,7 +159,7 @@ const getSerializedAddressParameters = (): Buffer => {
   return Buffer.from("mock-address-params");
 };
 
-const accountBridge: AccountBridge<CantonTransaction> = {
+const accountBridge: AccountBridge<CantonTransaction, CantonAccount> = {
   createTransaction,
   updateTransaction,
   getTransactionStatus,

package/src/families/canton/config.ts

@@ -14,6 +14,7 @@ export const cantonConfig: Record<string, ConfigInfo> = {
       useGateway: true,
       networkType: "mainnet",
       nativeInstrumentId: "Amulet",
+      fee: 0,
     },
   },
   config_currency_canton_network_devnet: {
@@ -29,6 +30,7 @@ export const cantonConfig: Record<string, ConfigInfo> = {
       useGateway: true,
       networkType: "devnet",
       nativeInstrumentId: "Amulet",
+      fee: 0,
     },
   },
   config_currency_canton_network_testnet: {
@@ -44,6 +46,7 @@ export const cantonConfig: Record<string, ConfigInfo> = {
       nativeInstrumentId: "Amulet",
       useGateway: true,
       networkType: "testnet",
+      fee: 0,
     },
   },
 };

package/src/families/canton/setup.ts

@@ -5,10 +5,10 @@ import { getEnv } from "@ledgerhq/live-env";
 import Transport from "@ledgerhq/hw-transport";
 import { CantonSigner } from "@ledgerhq/coin-canton";
 import cantonResolver from "@ledgerhq/coin-canton/signer";
-import type { Account, Bridge } from "@ledgerhq/types-live";
+import type { Bridge } from "@ledgerhq/types-live";
 import makeCliTools from "@ledgerhq/coin-canton/test/cli";
 import { CantonCoinConfig } from "@ledgerhq/coin-canton/config";
-import { TransactionStatus, Transaction } from "@ledgerhq/coin-canton/types";
+import { TransactionStatus, Transaction, CantonAccount } from "@ledgerhq/coin-canton/types";
 import { LegacySignerCanton } from "@ledgerhq/live-signer-canton";
 import { CreateSigner, createResolver, executeWithSigner } from "../../bridge/setup";
 import cantonBridgeMock from "./bridge/mock";
@@ -27,7 +27,7 @@ const getCurrencyConfig = (currency?: CryptoCurrency) => {
   return getCurrencyConfiguration<CantonCoinConfig>(currency);
 };
 
-const bridge: Bridge<Transaction, Account, TransactionStatus> = getEnv("MOCK")
+const bridge: Bridge<Transaction, CantonAccount, TransactionStatus> = getEnv("MOCK")
   ? cantonBridgeMock
   : createBridges(executeWithSigner(createSigner), getCurrencyConfig);
 

package/src/families/evm/config.ts

@@ -704,7 +704,7 @@ const evmConfig: CurrencyLiveConfigDefinition = {
       },
       node: {
         type: "external",
-        uri: "https://developer-access-mainnet.base.org",
+        uri: "https://base-rpc.publicnode.com",
       },
       explorer: {
         type: "etherscan",
@@ -925,6 +925,23 @@ const evmConfig: CurrencyLiveConfigDefinition = {
       showNfts: false,
     },
   },
+  config_currency_monad: {
+    type: "object",
+    default: {
+      status: {
+        type: "active",
+      },
+      node: {
+        type: "external",
+        uri: "https://rpc.monad.xyz",
+      },
+      explorer: {
+        type: "etherscan",
+        uri: "https://proxyetherscan.api.live.ledger.com/v2/api/143",
+      },
+      showNfts: false,
+    },
+  },
 };
 
 export { evmConfig };