@ledgerhq/live-common 34.48.1 → 34.49.0-nightly.0

package/src/e2e/speculos.ts

@@ -30,6 +30,7 @@ import { sendXRP } from "./families/xrp";
 import { delegateAptos, sendAptos } from "./families/aptos";
 import { delegateNear } from "./families/near";
 import { delegateCosmos, sendCosmos } from "./families/cosmos";
+import { sendKaspa } from "./families/kaspa";
 import { delegateSolana, sendSolana } from "./families/solana";
 import { delegateTezos } from "./families/tezos";
 import { delegateCelo } from "./families/celo";
@@ -39,6 +40,7 @@ import { Delegate } from "./models/Delegate";
 import { Swap } from "./models/Swap";
 import { delegateOsmosis } from "./families/osmosis";
 import { AppInfos } from "./enum/AppInfos";
+import { DEVICE_LABELS_CONFIG } from "./data/deviceLabelsData";
 
 const isSpeculosRemote = process.env.REMOTE_SPECULOS === "true";
 
@@ -325,6 +327,14 @@ export const specs: Specs = {
     },
     dependency: "",
   },
+  Kaspa: {
+    currency: getCryptoCurrencyById("kaspa"),
+    appQuery: {
+      model: getSpeculosModel(),
+      appName: "Kaspa",
+    },
+    dependency: "",
+  },
 };
 
 export async function startSpeculos(
@@ -460,23 +470,22 @@ async function retryAxiosRequest<T>(
   throw lastError!;
 }
 
-export async function waitFor(text: string, maxAttempts = 60): Promise<string[]> {
+export async function waitFor(text: string, maxAttempts = 60): Promise<string> {
   const port = getEnv("SPECULOS_API_PORT");
-  const address = getSpeculosAddress();
-  const url = `${address}:${port}/events?stream=false&currentscreenonly=true`;
-
+  let texts = "";
   for (let attempt = 0; attempt < maxAttempts; attempt++) {
-    const { data } = await retryAxiosRequest(() => axios.get<ResponseData>(url));
-    const texts = data.events.map(event => event.text);
+    texts = await fetchCurrentScreenTexts(port);
 
-    if (texts?.some(t => t?.toLowerCase().includes(text.toLowerCase()))) {
+    if (texts.toLowerCase().includes(text.toLowerCase())) {
       return texts;
     }
 
     await waitForTimeOut(500);
   }
 
-  throw new Error(`Text "${text}" not found on device screen after ${maxAttempts} attempts.`);
+  throw new Error(
+    `Text "${text}" not found on device screen after ${maxAttempts} attempts. Last screen text: "${texts}"`,
+  );
 }
 
 export async function pressBoth() {
@@ -493,7 +502,7 @@ export async function pressUntilTextFound(
   targetText: string,
   strictMatch: boolean = false,
 ): Promise<string[]> {
-  const maxAttempts = 15;
+  const maxAttempts = 18;
   const speculosApiPort = getEnv("SPECULOS_API_PORT");
 
   for (let attempts = 0; attempts < maxAttempts; attempts++) {
@@ -518,7 +527,7 @@ async function fetchCurrentScreenTexts(speculosApiPort: number): Promise<string>
       `${speculosAddress}:${speculosApiPort}/events?stream=false&currentscreenonly=true`,
     ),
   );
-  return response.data.events.map(event => event.text).join("");
+  return response.data.events.map(event => event.text).join(" ");
 }
 
 async function fetchAllEvents(speculosApiPort: number): Promise<string[]> {
@@ -614,24 +623,38 @@ export async function goToSettings() {
   await pressBoth();
 }
 
-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.POLKADOT, [DeviceLabels.PLEASE_REVIEW, DeviceLabels.CAPS_APPROVE]],
-  [AppInfos.COSMOS, [DeviceLabels.PLEASE_REVIEW, DeviceLabels.CAPS_APPROVE]],
-  [AppInfos.BITCOIN, [DeviceLabels.ADDRESS, DeviceLabels.CONFIRM]],
-]);
+type DeviceLabelsReturn = {
+  delegateConfirmLabel: string;
+  delegateVerifyLabel: string;
+  receiveConfirmLabel: string;
+  receiveVerifyLabel: string;
+};
+
+function getDeviceLabels(appInfo: AppInfos): DeviceLabelsReturn {
+  const deviceModel = getSpeculosModel();
+  const deviceConfig = DEVICE_LABELS_CONFIG[deviceModel] ?? DEVICE_LABELS_CONFIG.default;
 
-const DEFAULT_LABELS: [string, string] = [DeviceLabels.ADDRESS, DeviceLabels.APPROVE];
+  if (!deviceConfig) {
+    throw new Error(`No device configuration found for ${deviceModel}`);
+  }
+
+  const receiveVerifyLabel =
+    deviceConfig.receiveVerify[appInfo.name] ?? deviceConfig.receiveVerify.default;
+  const receiveConfirmLabel =
+    deviceConfig.receiveConfirm[appInfo.name] ?? deviceConfig.receiveConfirm.default;
+  const delegateVerifyLabel =
+    deviceConfig.delegateVerify[appInfo.name] ?? deviceConfig.delegateVerify.default;
+  const delegateConfirmLabel =
+    deviceConfig.delegateConfirm[appInfo.name] ?? deviceConfig.delegateConfirm.default;
+
+  return { receiveVerifyLabel, receiveConfirmLabel, delegateVerifyLabel, delegateConfirmLabel };
+}
 
 export async function expectValidAddressDevice(account: Account, addressDisplayed: string) {
-  const labels = APP_LABEL_MAP.get(account.currency.speculosApp) ?? DEFAULT_LABELS;
-  const [firstLabel, confirmLabel] = labels;
+  const { receiveVerifyLabel, receiveConfirmLabel } = getDeviceLabels(account.currency.speculosApp);
 
-  await waitFor(firstLabel);
-  const events = await pressUntilTextFound(confirmLabel);
+  await waitFor(receiveVerifyLabel);
+  const events = await pressUntilTextFound(receiveConfirmLabel);
   const isAddressCorrect = containsSubstringInEvent(addressDisplayed, events);
   expect(isAddressCorrect).toBeTruthy();
   await pressBoth();
@@ -677,6 +700,9 @@ export async function signSendTransaction(tx: Transaction) {
     case Currency.APT:
       await sendAptos();
       break;
+    case Currency.KAS:
+      await sendKaspa();
+      break;
     default:
       throw new Error(`Unsupported currency: ${currencyName.ticker}`);
   }
@@ -695,7 +721,7 @@ export async function signDelegationTransaction(delegatingAccount: Delegate) {
   const currencyName = delegatingAccount.account.currency.name;
   switch (currencyName) {
     case Account.SOL_1.currency.name:
-      await delegateSolana();
+      await delegateSolana(delegatingAccount);
       break;
     case Account.NEAR_1.currency.name:
       await delegateNear(delegatingAccount);
@@ -708,13 +734,13 @@ export async function signDelegationTransaction(delegatingAccount: Delegate) {
       await delegateOsmosis(delegatingAccount);
       break;
     case Account.MULTIVERS_X_1.currency.name:
-      await delegateMultiversX();
+      await delegateMultiversX(delegatingAccount);
       break;
     case Account.ADA_1.currency.name:
       await delegateCardano();
       break;
     case Account.XTZ_1.currency.name:
-      await delegateTezos();
+      await delegateTezos(delegatingAccount);
       break;
     case Account.CELO_1.currency.name:
       await delegateCelo(delegatingAccount);
@@ -727,14 +753,27 @@ export async function signDelegationTransaction(delegatingAccount: Delegate) {
   }
 }
 
+export async function getDelegateEvents(delegatingAccount: Delegate): Promise<string[]> {
+  const { delegateVerifyLabel, delegateConfirmLabel } = getDeviceLabels(
+    delegatingAccount.account.currency.speculosApp,
+  );
+
+  await waitFor(delegateVerifyLabel);
+  return await pressUntilTextFound(delegateConfirmLabel);
+}
+
 export async function verifyAmountsAndAcceptSwap(swap: Swap, amount: string) {
   await waitFor(DeviceLabels.REVIEW_TRANSACTION);
-  const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
+  const events =
+    getSpeculosModel() === DeviceModelId.nanoS
+      ? await pressUntilTextFound(DeviceLabels.ACCEPT_AND_SEND)
+      : await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
   await verifySwapData(swap, events, amount);
   await pressBoth();
 }
 
 export async function verifyAmountsAndAcceptSwapForDifferentSeed(swap: Swap, amount: string) {
+  await waitFor(DeviceLabels.RECEIVE_ADDRESS_DOES_NOT_BELONG);
   await pressUntilTextFound(DeviceLabels.I_UNDERSTAND);
   await pressBoth();
   const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);

package/src/exchange/providers/swap.ts

@@ -173,6 +173,27 @@ const DEFAULT_SWAP_PROVIDERS: Record<string, ProviderConfig & Partial<Additional
       "hex",
     ),
   },
+  nearintents: {
+    type: "CEX",
+    name: "NEAR Intents",
+    needsBearerToken: false,
+    termsOfUseUrl: "https://docs.thorswap.finance/thorswap/resources/terms-of-service",
+    supportUrl: "https://ledgerhelp.swapkit.dev/",
+    mainUrl: "https://www.thorswap.finance/",
+    needsKYC: false,
+    version: 2,
+    publicKey: {
+      curve: "secp256r1",
+      data: Buffer.from(
+        "0480a453a91e728c5f622d966b90d15de6fdb6c267bb8147dd0e0d4e1c730d631594e724aaf2b2f526600f3713ce6bc2adbfdbaafd2121bfee64fce93fd59a9050",
+        "hex",
+      ),
+    },
+    signature: Buffer.from(
+      "30440220331fca95bc6b8cf2264d72a0da9d791888c4ead9ed02bee4f6525f7e512911ca02204a78d416baa7b3fc8d6a82abbadda2e096abcbfa9a57769a8a20260d3e553b7d",
+      "hex",
+    ),
+  },
   lifi: {
     type: "CEX",
     name: "lifi",

package/src/exchange/swap/transactionStrategies.ts

@@ -1,16 +1,7 @@
 import { BigNumber } from "bignumber.js";
 
-import {
-  CosmosTransaction,
-  ElrondTransaction,
-  RippleTransaction,
-  SolanaTransaction,
-  StellarTransaction,
-  TonTransaction,
-  Transaction,
-  TransactionCommon,
-} from "@ledgerhq/wallet-api-client";
-
+import { Transaction } from "../../generated/types";
+import { TransactionCommon } from "@ledgerhq/types-live";
 export type { SwapLiveError } from "@ledgerhq/wallet-api-exchange-module";
 
 export function defaultTransaction({
@@ -18,35 +9,81 @@ export function defaultTransaction({
   amount,
   recipient,
   customFeeConfig,
-}: TransactionWithCustomFee): Transaction {
-  return <Transaction>{
+}: TransactionWithCustomFee): Partial<Transaction> {
+  // Type assertion needed because each Transaction family has different required properties
+  // This function provides base properties that are then extended by family-specific functions
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return {
     family,
     amount,
     recipient,
     ...customFeeConfig,
+  } as Partial<Transaction>;
+}
+
+export function cardanoTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "cardano" }>> {
+  return {
+    family: "cardano",
+    amount,
+    recipient,
+    mode: "send",
+    ...customFeeConfig,
   };
 }
 
-export function modeSendTransaction({
-  family,
+export function nearTransaction({
   amount,
   recipient,
   customFeeConfig,
-}: TransactionWithCustomFee): Transaction {
+}: TransactionWithCustomFee): Extract<Transaction, { family: "near" }> {
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+    family: "near",
+    amount,
+    recipient,
     mode: "send",
+    ...customFeeConfig,
+  };
+}
+
+export function tezosTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "tezos" }>> {
+  return {
+    family: "tezos",
+    amount,
+    recipient,
+    mode: "send",
+    ...customFeeConfig,
+  };
+}
+
+export function tronTransaction({
+  amount,
+  recipient,
+  customFeeConfig,
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "tron" }>> {
+  return {
+    family: "tron",
+    amount,
+    recipient,
+    mode: "send",
+    ...customFeeConfig,
   };
 }
 
 export function stellarTransaction({
-  family,
   amount,
   recipient,
   customFeeConfig,
   payinExtraId,
   customErrorType,
-}: TransactionWithCustomFee): StellarTransaction {
+}: TransactionWithCustomFee): Extract<Transaction, { family: "stellar" }> {
   if (!payinExtraId)
     throw {
       error: new Error("Missing payinExtraId"),
@@ -55,8 +92,11 @@ export function stellarTransaction({
     };
 
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
     family: "stellar",
+    mode: "send",
+    amount,
+    recipient,
+    ...customFeeConfig,
     memoValue: payinExtraId,
     memoType: "MEMO_TEXT",
   };
@@ -68,7 +108,7 @@ export function rippleTransaction({
   customFeeConfig,
   payinExtraId,
   customErrorType,
-}: TransactionWithCustomFee): RippleTransaction {
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "xrp" }>> {
   if (!payinExtraId)
     throw {
       error: new Error("Missing payinExtraId"),
@@ -76,38 +116,40 @@ export function rippleTransaction({
       customErrorType,
     };
 
-  const transaction: RippleTransaction = {
-    family: "ripple",
+  return {
+    family: "xrp",
     amount,
     recipient,
     ...customFeeConfig,
     tag: new BigNumber(payinExtraId).toNumber(),
   };
-  return transaction;
 }
 
-// Function to remove gasLimit from customFeeConfig for Ethereum or Bitcoin
-export function withoutGasLimitTransaction({
-  family,
+export function evmTransaction({
   amount,
   recipient,
   customFeeConfig,
   extraTransactionParameters,
-}: TransactionWithCustomFee): Transaction {
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "evm" }>> {
   if (customFeeConfig?.gasLimit) {
     delete customFeeConfig.gasLimit;
   }
 
   if (extraTransactionParameters) {
-    return <Transaction>{
-      family,
+    return {
+      family: "evm" as const,
       amount,
       recipient,
       ...customFeeConfig,
       data: Buffer.from(extraTransactionParameters, "hex"),
     };
   }
-  return defaultTransaction({ family, amount, recipient, customFeeConfig });
+  return {
+    family: "evm" as const,
+    amount,
+    recipient,
+    ...customFeeConfig,
+  };
 }
 
 export function bitcoinTransaction({
@@ -115,33 +157,33 @@ export function bitcoinTransaction({
   recipient,
   customFeeConfig,
   extraTransactionParameters,
-}: TransactionWithCustomFee): Transaction {
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "bitcoin" }>> {
+  const baseTransaction = {
+    family: "bitcoin" as const,
+    amount,
+    recipient,
+    ...customFeeConfig,
+  };
+
   if (extraTransactionParameters) {
     return {
-      family: "bitcoin",
-      amount,
-      recipient,
-      ...customFeeConfig,
+      ...baseTransaction,
       opReturnData: Buffer.from(extraTransactionParameters, "utf-8"),
     };
   }
-  return {
-    family: "bitcoin",
-    amount,
-    recipient,
-    ...customFeeConfig,
-  };
+
+  return baseTransaction;
 }
 
 export function solanaTransaction({
-  family,
   amount,
   recipient,
-  customFeeConfig,
-}: TransactionWithCustomFee): SolanaTransaction {
+  customFeeConfig: _customFeeConfig,
+}: TransactionWithCustomFee): Extract<Transaction, { family: "solana" }> {
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
     family: "solana",
+    amount,
+    recipient,
     model: { kind: "transfer", uiState: {} },
   };
 }
@@ -150,43 +192,44 @@ export function elrondTransaction({
   amount,
   recipient,
   customFeeConfig,
-}: TransactionWithCustomFee): ElrondTransaction {
-  const transaction: ElrondTransaction = {
-    family: "elrond",
+}: TransactionWithCustomFee): Extract<Transaction, { family: "multiversx" }> {
+  return {
+    family: "multiversx",
     amount,
     recipient,
     mode: "send",
-    ...customFeeConfig,
-    gasLimit: 0, // FIXME: Placeholder, adjust as needed
+    fees: customFeeConfig.fees || null,
+    gasLimit: customFeeConfig.gasLimit ? Number(customFeeConfig.gasLimit) : 0,
   };
-  return transaction;
 }
 
 function tonTransaction({
-  family,
   amount,
   recipient,
-  customFeeConfig,
-}: TransactionWithCustomFee): TonTransaction {
+  customFeeConfig: _customFeeConfig,
+}: TransactionWithCustomFee): Extract<Transaction, { family: "ton" }> {
   return {
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
     family: "ton",
+    amount,
+    recipient,
     comment: { isEncrypted: false, text: "" },
     fees: new BigNumber(0), // Set default value as completeExchange call prepareTransaction, which set again fees.
   };
 }
 
 export function cosmosTransaction({
-  family,
   amount,
   recipient,
   customFeeConfig,
   payinExtraId,
-}: TransactionWithCustomFee): CosmosTransaction {
-  return <CosmosTransaction>{
-    ...defaultTransaction({ family, amount, recipient, customFeeConfig }),
+}: TransactionWithCustomFee): Partial<Extract<Transaction, { family: "cosmos" }>> {
+  return {
     family: "cosmos",
+    amount,
+    recipient,
     mode: "send",
+    networkInfo: null,
+    ...customFeeConfig,
     memo: payinExtraId ?? undefined,
   };
 }
@@ -198,10 +241,13 @@ export type TransactionWithCustomFee = TransactionCommon & {
   payinExtraId?: string;
   customErrorType?: "swap";
   extraTransactionParameters?: string;
+  family: string;
 };
 
 // Define a specific type for the strategy functions, assuming they might need parameters
-export type TransactionStrategyFunction = (params: TransactionWithCustomFee) => Transaction;
+export type TransactionStrategyFunction = (
+  params: TransactionWithCustomFee,
+) => Partial<Transaction>;
 
 export const transactionStrategy: {
   [K in Transaction["family"]]: TransactionStrategyFunction;
@@ -209,26 +255,28 @@ export const transactionStrategy: {
   algorand: defaultTransaction,
   aptos: defaultTransaction,
   bitcoin: bitcoinTransaction,
-  cardano: modeSendTransaction,
+  canton: defaultTransaction,
+  cardano: cardanoTransaction,
+  casper: defaultTransaction,
   celo: defaultTransaction,
   cosmos: cosmosTransaction,
-  crypto_org: defaultTransaction,
-  elrond: elrondTransaction,
-  ethereum: withoutGasLimitTransaction,
+  evm: evmTransaction,
   filecoin: defaultTransaction,
   hedera: defaultTransaction,
-  near: modeSendTransaction,
-  neo: defaultTransaction,
+  icon: defaultTransaction,
+  internet_computer: defaultTransaction,
+  mina: defaultTransaction,
+  multiversx: elrondTransaction,
+  near: nearTransaction,
   polkadot: defaultTransaction,
-  ripple: rippleTransaction,
   solana: solanaTransaction,
   stacks: defaultTransaction,
   stellar: stellarTransaction,
-  tezos: modeSendTransaction,
+  sui: defaultTransaction,
+  tezos: tezosTransaction,
   ton: tonTransaction,
-  tron: modeSendTransaction,
+  tron: tronTransaction,
   vechain: defaultTransaction,
-  casper: defaultTransaction,
-  sui: defaultTransaction,
-  internet_computer: defaultTransaction,
+  kaspa: defaultTransaction,
+  xrp: rippleTransaction,
 };

package/src/families/canton/config.ts

@@ -7,10 +7,8 @@ export const cantonConfig: Record<string, ConfigInfo> = {
       status: {
         type: "active",
       },
-      // TBC
-      nodeUrl: "https://wallet-validator-canton.ledger.com",
-      nodeId: "figment",
-      // TBC
+      nodeUrl: "https://canton-gateway.api.live.ledger.com/v1/node/ledger-mainnet-prd",
+      nodeId: "ledger-live-mainnet-prd",
       gatewayUrl: "https://canton-gateway.api.live.ledger.com",
       minReserve: 0,
       useGateway: true,
@@ -29,8 +27,7 @@ export const cantonConfig: Record<string, ConfigInfo> = {
       minReserve: 0,
       useGateway: true,
       networkType: "devnet",
-      nativeInstrumentId:
-        "6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0c990c:Splice.Amulet:Amulet",
+      nativeInstrumentId: "Amulet",
     },
   },
   config_currency_canton_network_localnet: {

package/src/families/canton/setup.ts

@@ -14,16 +14,17 @@ import { CreateSigner, createResolver, executeWithSigner } from "../../bridge/se
 import cantonBridgeMock from "./bridge/mock";
 import { Resolver } from "../../hw/getAddress/types";
 import { getCurrencyConfiguration } from "../../config";
-import { getCryptoCurrencyById } from "../../currencies";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
 
 const createSigner: CreateSigner<CantonSigner> = (transport: Transport) => {
   return new LegacySignerCanton(transport);
 };
 
-const getCurrencyConfig = () => {
-  // Use devnet for development/testing
-  const currencyId = getEnv("MOCK") ? "canton_network_devnet" : "canton_network_devnet";
-  return getCurrencyConfiguration<CantonCoinConfig>(getCryptoCurrencyById(currencyId));
+const getCurrencyConfig = (currency?: CryptoCurrency) => {
+  if (!currency) {
+    throw new Error("currency not defined");
+  }
+  return getCurrencyConfiguration<CantonCoinConfig>(currency);
 };
 
 const bridge: Bridge<Transaction, Account, TransactionStatus> = getEnv("MOCK")

package/src/families/evm/config.ts

@@ -674,8 +674,8 @@ const evmConfig: CurrencyLiveConfigDefinition = {
         uri: "https://zkevm-rpc.com",
       },
       explorer: {
-        type: "blockscout",
-        uri: "https://explorer-ui.cardona.zkevm-rpc.com/api",
+        type: "etherscan",
+        uri: "https://proxyetherscan.api.live.ledger.com/v2/api/1101",
       },
       showNfts: false,
     },