@ledgerhq/live-common 34.42.2-nightly.0 → 34.43.0-nightly.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.42.2-nightly.0",
+  "version": "34.43.0-nightly.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -162,73 +162,73 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.9.15-nightly.0",
-    "@ledgerhq/coin-aptos": "^2.6.1-nightly.0",
-    "@ledgerhq/coin-bitcoin": "^0.18.1-nightly.0",
-    "@ledgerhq/coin-cardano": "^0.10.1-nightly.0",
-    "@ledgerhq/coin-casper": "^2.0.6-nightly.0",
-    "@ledgerhq/coin-celo": "^1.1.13-nightly.0",
-    "@ledgerhq/coin-cosmos": "^0.16.4-nightly.0",
-    "@ledgerhq/coin-evm": "^2.24.1-nightly.0",
-    "@ledgerhq/coin-filecoin": "^1.9.15-nightly.0",
-    "@ledgerhq/coin-framework": "^5.7.1-nightly.0",
-    "@ledgerhq/coin-hedera": "^1.9.1-nightly.0",
-    "@ledgerhq/coin-icon": "^0.11.2-nightly.0",
-    "@ledgerhq/coin-internet_computer": "^1.7.15-nightly.0",
-    "@ledgerhq/coin-mina": "^1.1.14-nightly.0",
-    "@ledgerhq/coin-multiversx": "^0.4.15-nightly.0",
-    "@ledgerhq/coin-near": "^0.11.15-nightly.0",
-    "@ledgerhq/coin-polkadot": "^6.4.1-nightly.0",
-    "@ledgerhq/coin-solana": "^0.28.1-nightly.0",
-    "@ledgerhq/coin-stacks": "^0.8.15-nightly.0",
-    "@ledgerhq/coin-stellar": "^5.3.3-nightly.0",
-    "@ledgerhq/coin-sui": "^0.7.1-nightly.0",
-    "@ledgerhq/coin-tezos": "^5.6.2-nightly.0",
-    "@ledgerhq/coin-ton": "^0.13.4-nightly.0",
-    "@ledgerhq/coin-tron": "^4.4.3-nightly.0",
-    "@ledgerhq/coin-vechain": "^2.7.15-nightly.0",
-    "@ledgerhq/coin-xrp": "^6.4.2-nightly.0",
+    "@ledgerhq/coin-algorand": "^0.9.15-nightly.2",
+    "@ledgerhq/coin-aptos": "^2.7.0-nightly.2",
+    "@ledgerhq/coin-bitcoin": "^0.18.1-nightly.2",
+    "@ledgerhq/coin-cardano": "^0.10.1-nightly.2",
+    "@ledgerhq/coin-casper": "^2.0.6-nightly.2",
+    "@ledgerhq/coin-celo": "^1.1.13-nightly.2",
+    "@ledgerhq/coin-cosmos": "^0.16.4-nightly.2",
+    "@ledgerhq/coin-filecoin": "^1.9.15-nightly.2",
+    "@ledgerhq/coin-evm": "^2.25.0-nightly.2",
+    "@ledgerhq/coin-framework": "^5.8.0-nightly.2",
+    "@ledgerhq/coin-icon": "^0.11.2-nightly.2",
+    "@ledgerhq/coin-hedera": "^1.9.1-nightly.2",
+    "@ledgerhq/coin-internet_computer": "^1.7.15-nightly.2",
+    "@ledgerhq/coin-mina": "^1.1.14-nightly.2",
+    "@ledgerhq/coin-multiversx": "^0.4.15-nightly.2",
+    "@ledgerhq/coin-near": "^0.11.15-nightly.2",
+    "@ledgerhq/coin-polkadot": "^6.5.0-nightly.2",
+    "@ledgerhq/coin-solana": "^0.29.0-nightly.2",
+    "@ledgerhq/coin-stacks": "^0.8.15-nightly.2",
+    "@ledgerhq/coin-stellar": "^5.4.0-nightly.2",
+    "@ledgerhq/coin-tezos": "^5.7.0-nightly.2",
+    "@ledgerhq/coin-sui": "^0.8.0-nightly.2",
+    "@ledgerhq/coin-ton": "^0.13.4-nightly.2",
+    "@ledgerhq/coin-tron": "^4.5.0-nightly.2",
     "@ledgerhq/crypto-icons-ui": "^1.16.0",
-    "@ledgerhq/cryptoassets": "^13.22.0",
-    "@ledgerhq/device-core": "^0.5.4-nightly.0",
+    "@ledgerhq/cryptoassets": "^13.23.0-nightly.1",
+    "@ledgerhq/coin-xrp": "^6.5.0-nightly.2",
+    "@ledgerhq/device-core": "^0.5.4-nightly.1",
     "@ledgerhq/devices": "8.4.8",
     "@ledgerhq/errors": "^6.23.0",
+    "@ledgerhq/coin-vechain": "^2.8.0-nightly.2",
     "@ledgerhq/hw-app-algorand": "^6.31.4",
     "@ledgerhq/hw-app-aptos": "^6.34.4",
+    "@ledgerhq/hw-app-celo": "^6.33.11-nightly.1",
     "@ledgerhq/hw-app-btc": "^10.10.0",
-    "@ledgerhq/hw-app-celo": "^6.33.11-nightly.0",
-    "@ledgerhq/hw-app-cosmos": "^6.32.4",
-    "@ledgerhq/hw-app-eth": "^6.45.13-nightly.0",
     "@ledgerhq/hw-app-exchange": "^0.10.4",
+    "@ledgerhq/hw-app-cosmos": "^6.32.4",
     "@ledgerhq/hw-app-hedera": "^1.2.4",
     "@ledgerhq/hw-app-icon": "^1.3.4",
     "@ledgerhq/hw-app-multiversx": "^6.24.4",
     "@ledgerhq/hw-app-near": "^6.31.4",
     "@ledgerhq/hw-app-polkadot": "^6.34.4",
     "@ledgerhq/hw-app-str": "^7.2.4",
-    "@ledgerhq/hw-app-sui": "^1.2.0",
-    "@ledgerhq/hw-app-tezos": "^6.31.4",
     "@ledgerhq/hw-app-trx": "^6.31.4",
-    "@ledgerhq/hw-app-vet": "^0.5.10",
+    "@ledgerhq/hw-app-tezos": "^6.31.4",
+    "@ledgerhq/hw-app-vet": "^0.5.11-nightly.1",
+    "@ledgerhq/hw-app-sui": "^1.2.0",
     "@ledgerhq/hw-app-xrp": "^6.32.2",
     "@ledgerhq/hw-transport": "^6.31.8",
     "@ledgerhq/hw-transport-mocker": "^6.29.8",
-    "@ledgerhq/ledger-cal-service": "^1.2.1",
+    "@ledgerhq/ledger-cal-service": "^1.2.2-nightly.0",
     "@ledgerhq/live-config": "^3.1.0",
-    "@ledgerhq/live-countervalues": "^0.5.15-nightly.0",
-    "@ledgerhq/live-countervalues-react": "^0.2.44-nightly.0",
+    "@ledgerhq/hw-app-eth": "^6.45.13-nightly.1",
+    "@ledgerhq/live-countervalues": "^0.5.15-nightly.2",
+    "@ledgerhq/live-countervalues-react": "^0.2.44-nightly.2",
     "@ledgerhq/live-dmk-shared": "^0.11.1",
-    "@ledgerhq/live-env": "^2.12.0",
+    "@ledgerhq/live-network": "^2.0.14-nightly.0",
     "@ledgerhq/live-hooks": "0.1.0",
-    "@ledgerhq/live-network": "^2.0.13",
-    "@ledgerhq/live-nft": "^0.8.15-nightly.0",
+    "@ledgerhq/live-nft": "^0.8.15-nightly.2",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-evm": "^0.6.2-nightly.0",
-    "@ledgerhq/live-signer-solana": "^0.5.0-nightly.0",
-    "@ledgerhq/live-wallet": "^0.11.6-nightly.0",
+    "@ledgerhq/live-env": "^2.13.0-nightly.0",
+    "@ledgerhq/live-signer-evm": "^0.6.2-nightly.2",
+    "@ledgerhq/live-signer-solana": "^0.5.0-nightly.2",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.6",
+    "@ledgerhq/live-wallet": "^0.11.6-nightly.2",
     "@ledgerhq/wallet-api-acre-module": "^0.5.0",
+    "@ledgerhq/speculos-transport": "^0.2.7-nightly.0",
     "@ledgerhq/wallet-api-exchange-module": "^0.14.0"
   },
   "devDependencies": {
@@ -277,7 +277,7 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.2.39-nightly.0",
+    "@ledgerhq/device-react": "^0.2.39-nightly.1",
     "@ledgerhq/types-cryptoassets": "^7.24.0-nightly.0",
     "@ledgerhq/types-devices": "^6.25.3",
     "@ledgerhq/types-live": "^6.78.1-nightly.0"

package/src/appSupportsQuitApp.test.ts

@@ -1,4 +1,5 @@
-import appSupportsQuitApp from "./appSupportsQuitApp";
+import appSupportsQuitApp, { minAppVersion } from "./appSupportsQuitApp";
+
 test("appSupportsQuitApp - Apps that are listed fail if version is lt", () => {
   expect(
     appSupportsQuitApp({
@@ -26,3 +27,8 @@ test("appSupportsQuitApp - Apps that are not listed pass the test", () => {
     }),
   ).toBeTruthy();
 });
+test("minAppVersion - Sonic and Ethereum have the same min app version", () => {
+  expect(minAppVersion["Sonic"]).toBeDefined();
+  expect(minAppVersion["Ethereum"]).toBeDefined();
+  expect(minAppVersion["Sonic"]).toBe(minAppVersion["Ethereum"]);
+});

package/src/appSupportsQuitApp.ts

@@ -122,6 +122,7 @@ export const minAppVersion = {
   "SSH/PGP Agent": "0.0.7",
   Sia: "0.4.2",
   Solana: "1.0.1",
+  Sonic: "1.4.0",
   Stacks: "0.0.0",
   Stellar: "3.2.2",
   Stratis: "1.5.0",

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

@@ -5,16 +5,16 @@ import { getNetworkAlpacaApi } from "./network/network-alpaca";
 import { Api } from "@ledgerhq/coin-framework/api/types";
 import { XrpCoinConfig } from "@ledgerhq/coin-xrp/config";
 
-export function getAlpacaApi(network: string, kind: "local" | "remote"): Api<any, any> {
+export function getAlpacaApi(network: string, kind: "local" | "remote"): Api<any> {
   if (kind === "local") {
     switch (network) {
       case "ripple":
       case "xrp":
         return createXrpApi(
           getCurrencyConfiguration<XrpCoinConfig>(getCryptoCurrencyById("ripple")),
-        ) as Api<any, any>;
+        ) as Api<any>;
       // as unknown as Api<any>; // FIXME: createXrpApi returns a strongly typed Api<XrpSender>, fix Api<any> to allow it
     }
   }
-  return getNetworkAlpacaApi(network) satisfies Partial<Api<any, any>> as Api<any, any>;
+  return getNetworkAlpacaApi(network) satisfies Partial<Api<any>> as Api<any>;
 }

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

@@ -107,14 +107,9 @@ const buildValidateIntent = (networkFamily: string) =>
     return data;
   };
 
-// FIXME: shouldn't hardcode
-type AssetInfo = {
-  type: "native"; // or "token" if applicable
-};
-
 const buildGetBalance = (networkFamily: string) =>
-  async function getBalance(address: string): Promise<Balance<AssetInfo>[]> {
-    const { data } = await network<Balance<AssetInfo>, unknown>({
+  async function getBalance(address: string): Promise<Balance[]> {
+    const { data } = await network<Balance, unknown>({
       method: "GET",
       url: `${ALPACA_URL}/${networkFamily}/account/${address}/balance`,
     });
@@ -191,7 +186,7 @@ export const getNetworkAlpacaApi = (networkFamily: string) =>
     listOperations: buildListOperations(networkFamily),
     lastBlock: buildLastBlock(networkFamily),
     craftTransaction: buildCraftTransaction(networkFamily),
-    getBlock(_height): Promise<Block<any>> {
+    getBlock(_height): Promise<Block> {
       throw new Error("getBlock is not supported");
     },
     getBlockInfo(_height: number): Promise<BlockInfo> {

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

@@ -40,7 +40,7 @@ export const genericSignOperation =
           const transactionIntent = transactionToIntent(account, transaction);
           transactionIntent.senderPublicKey = publicKey;
           // NOTE: is setting the memo here instead of transactionToIntent sensible?
-          const txWithMemo = transactionIntent as TransactionIntent<any, MapMemo<string, string>>;
+          const txWithMemo = transactionIntent as TransactionIntent<MapMemo<string, string>>;
           if (transaction["tag"]) {
             const txMemo = String(transaction["tag"]);
             txWithMemo.memo = {

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

@@ -1,17 +1,10 @@
 import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import { Account, Operation, OperationType, TransactionCommon } from "@ledgerhq/types-live";
-import {
-  Operation as CoreOperation,
-  Asset,
-  TransactionIntent,
-} from "@ledgerhq/coin-framework/api/types";
+import { Operation as CoreOperation, TransactionIntent } from "@ledgerhq/coin-framework/api/types";
 import BigNumber from "bignumber.js";
 import { fromBigNumberToBigInt } from "@ledgerhq/coin-framework/utils";
 
-export function adaptCoreOperationToLiveOperation(
-  accountId: string,
-  op: CoreOperation<Asset>,
-): Operation {
+export function adaptCoreOperationToLiveOperation(accountId: string, op: CoreOperation): Operation {
   return {
     id: encodeOperationId(accountId, op.tx.hash, op.type),
     hash: op.tx.hash,
@@ -38,7 +31,7 @@ export function transactionToIntent(
     sender: account.freshAddress,
     recipient: transaction.recipient,
     amount: fromBigNumberToBigInt(transaction.amount, BigInt(0)),
-    asset: null,
+    asset: { type: "native" },
   };
 }
 

package/src/e2e/speculos.ts

@@ -11,7 +11,7 @@ import { createSpeculosDeviceCI, releaseSpeculosDeviceCI } from "./speculosCI";
 import type { AppCandidate } from "@ledgerhq/coin-framework/bot/types";
 import { DeviceModelId } from "@ledgerhq/devices";
 import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
-import axios from "axios";
+import axios, { AxiosError, AxiosResponse } from "axios";
 import { getEnv } from "@ledgerhq/live-env";
 import { getCryptoCurrencyById } from "../currencies";
 import { DeviceLabels } from "../e2e/enum/DeviceLabels";
@@ -415,13 +415,59 @@ interface ResponseData {
   events: Event[];
 }
 
+function getSpeculosAddress(): string {
+  const speculosAddress = process.env.SPECULOS_ADDRESS;
+  return speculosAddress || "http://127.0.0.1";
+}
+
+async function retryAxiosRequest<T>(
+  requestFn: () => Promise<AxiosResponse<T>>,
+  maxRetries: number = 5,
+  baseDelay: number = 1000,
+  retryableStatusCodes: number[] = [500, 502, 503, 504],
+): Promise<AxiosResponse<T>> {
+  let lastError: AxiosError | Error;
+
+  for (let attempt = 0; attempt <= maxRetries; attempt++) {
+    try {
+      return await requestFn();
+    } catch (error) {
+      lastError = error as AxiosError | Error;
+
+      const isRetryable =
+        axios.isAxiosError(error) &&
+        error.response &&
+        retryableStatusCodes.includes(error.response.status);
+
+      const isNetworkError = axios.isAxiosError(error) && !error.response;
+
+      if ((isRetryable || isNetworkError) && attempt < maxRetries) {
+        const delay = baseDelay * (attempt + 1);
+        console.warn(
+          `Axios request failed (attempt ${attempt + 1}/${maxRetries + 1}), retrying in ${delay}ms...`,
+          {
+            status: axios.isAxiosError(error) ? error.response?.status : "network error",
+            message: error.message,
+          },
+        );
+        await new Promise(resolve => setTimeout(resolve, delay));
+        continue;
+      }
+
+      throw lastError;
+    }
+  }
+
+  throw lastError!;
+}
+
 export async function waitFor(text: string, maxAttempts = 15): Promise<string[]> {
   const port = getEnv("SPECULOS_API_PORT");
-  const address = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
+  const address = getSpeculosAddress();
   const url = `${address}:${port}/events?stream=false&currentscreenonly=true`;
 
   for (let attempt = 0; attempt < maxAttempts; attempt++) {
-    const { data } = await axios.get<ResponseData>(url);
+    const { data } = await retryAxiosRequest(() => axios.get<ResponseData>(url));
     const texts = data.events.map(event => event.text);
 
     if (texts?.some(t => t?.toLowerCase().includes(text.toLowerCase()))) {
@@ -436,10 +482,12 @@ export async function waitFor(text: string, maxAttempts = 15): Promise<string[]>
 
 export async function pressBoth() {
   const speculosApiPort = getEnv("SPECULOS_API_PORT");
-  const speculosAddress = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
-  await axios.post(`${speculosAddress}:${speculosApiPort}/button/both`, {
-    action: "press-and-release",
-  });
+  const speculosAddress = getSpeculosAddress();
+  await retryAxiosRequest(() =>
+    axios.post(`${speculosAddress}:${speculosApiPort}/button/both`, {
+      action: "press-and-release",
+    }),
+  );
 }
 
 export async function pressUntilTextFound(
@@ -465,27 +513,33 @@ export async function pressUntilTextFound(
 }
 
 async function fetchCurrentScreenTexts(speculosApiPort: number): Promise<string> {
-  const speculosAddress = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
-  const response = await axios.get<ResponseData>(
-    `${speculosAddress}:${speculosApiPort}/events?stream=false&currentscreenonly=true`,
+  const speculosAddress = getSpeculosAddress();
+  const response = await retryAxiosRequest(() =>
+    axios.get<ResponseData>(
+      `${speculosAddress}:${speculosApiPort}/events?stream=false&currentscreenonly=true`,
+    ),
   );
   return response.data.events.map(event => event.text).join("");
 }
 
 async function fetchAllEvents(speculosApiPort: number): Promise<string[]> {
-  const speculosAddress = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
-  const response = await axios.get<ResponseData>(
-    `${speculosAddress}:${speculosApiPort}/events?stream=false&currentscreenonly=false`,
+  const speculosAddress = getSpeculosAddress();
+  const response = await retryAxiosRequest(() =>
+    axios.get<ResponseData>(
+      `${speculosAddress}:${speculosApiPort}/events?stream=false&currentscreenonly=false`,
+    ),
   );
   return response.data.events.map(event => event.text);
 }
 
 export async function pressRightButton(): Promise<void> {
   const speculosApiPort = getEnv("SPECULOS_API_PORT");
-  const speculosAddress = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
-  await axios.post(`${speculosAddress}:${speculosApiPort}/button/right`, {
-    action: "press-and-release",
-  });
+  const speculosAddress = getSpeculosAddress();
+  await retryAxiosRequest(() =>
+    axios.post(`${speculosAddress}:${speculosApiPort}/button/right`, {
+      action: "press-and-release",
+    }),
+  );
 }
 
 export function containsSubstringInEvent(targetString: string, events: string[]): boolean {
@@ -503,12 +557,14 @@ export function containsSubstringInEvent(targetString: string, events: string[])
 }
 
 export async function takeScreenshot(port?: number): Promise<Buffer | undefined> {
-  const speculosAddress = process.env.SPECULOS_ADDRESS || "http://127.0.0.1";
+  const speculosAddress = getSpeculosAddress();
   const speculosApiPort = port ?? getEnv("SPECULOS_API_PORT");
   try {
-    const response = await axios.get(`${speculosAddress}:${speculosApiPort}/screenshot`, {
-      responseType: "arraybuffer",
-    });
+    const response = await retryAxiosRequest(() =>
+      axios.get(`${speculosAddress}:${speculosApiPort}/screenshot`, {
+        responseType: "arraybuffer",
+      }),
+    );
     return response.data;
   } catch (error) {
     console.error("Error downloading speculos screenshot:", error);

package/src/e2e/speculosCI.ts

@@ -61,22 +61,44 @@ async function githubApiRequest<T = unknown>({
 function waitForSpeculosReady(url: string, { interval = 2000, timeout = 300_000 } = {}) {
   return new Promise((resolve, reject) => {
     const startTime = Date.now();
+    let currentRequest: ReturnType<typeof https.get> | null = null;
+
+    function cleanup() {
+      if (currentRequest) {
+        currentRequest.destroy();
+        currentRequest = null;
+      }
+    }
 
     function check() {
-      https
-        .get(url, res => {
-          if (res.statusCode && res.statusCode >= 200 && res.statusCode < 400) {
-            process.env.SPECULOS_ADDRESS = url;
-            resolve(true);
-          } else {
-            retry();
-          }
-        })
-        .on("error", retry);
+      cleanup();
+
+      currentRequest = https.get(url, { timeout: 10000 }, res => {
+        if (res.statusCode && res.statusCode >= 200 && res.statusCode < 400) {
+          process.env.SPECULOS_ADDRESS = url;
+          cleanup();
+          console.warn(`Speculos is ready at ${url}`);
+          resolve(true);
+        } else {
+          console.warn(`Speculos not ready yet, status: ${res.statusCode}`);
+          retry();
+        }
+      });
+
+      currentRequest.on("error", error => {
+        console.error(`Request error: ${error.message}`);
+        retry();
+      });
+
+      currentRequest.on("timeout", () => {
+        console.error("Request timeout");
+        retry();
+      });
     }
 
     function retry() {
       if (Date.now() - startTime >= timeout) {
+        cleanup();
         reject(new Error(`Timeout: ${url} did not become available within ${timeout}ms`));
       } else {
         setTimeout(check, interval);