@ledgerhq/live-common 34.3.0-nightly.9 → 35.0.0-next.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.3.0-nightly.9",
+  "version": "35.0.0-next.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -123,7 +123,7 @@
     "@stacks/transactions": "6.11.0",
     "@stellar/stellar-sdk": "^11.3.0",
     "@stricahq/typhonjs": "^1.2.6",
-    "@taquito/ledger-signer": "^13.0.1",
+    "@taquito/ledger-signer": "^20.0.0",
     "@types/bchaddrjs": "^0.4.0",
     "@types/bs58check": "^2.1.0",
     "@types/pako": "^2.0.0",
@@ -184,48 +184,48 @@
     "xstate": "4.38.3",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.5.0-nightly.6",
-    "@ledgerhq/coin-bitcoin": "^0.6.0-nightly.6",
-    "@ledgerhq/coin-cardano": "^0.1.0-nightly.2",
-    "@ledgerhq/coin-evm": "^2.1.0-nightly.6",
-    "@ledgerhq/coin-framework": "^0.14.0-nightly.6",
-    "@ledgerhq/coin-near": "^0.5.0-nightly.6",
-    "@ledgerhq/coin-polkadot": "^0.7.0-nightly.6",
-    "@ledgerhq/coin-solana": "^0.7.0-nightly.11",
-    "@ledgerhq/coin-tezos": "^0.4.0-nightly.5",
-    "@ledgerhq/coin-xrp": "^0.2.0-nightly.6",
-    "@ledgerhq/crypto-icons-ui": "^1.2.0-nightly.0",
-    "@ledgerhq/cryptoassets": "^13.1.0-nightly.3",
-    "@ledgerhq/device-core": "^0.2.0-nightly.3",
-    "@ledgerhq/devices": "^8.4.0-nightly.1",
-    "@ledgerhq/hw-app-algorand": "^6.29.0-nightly.1",
-    "@ledgerhq/errors": "^6.17.0-nightly.1",
-    "@ledgerhq/hw-app-btc": "^10.3.0-nightly.1",
-    "@ledgerhq/hw-app-cosmos": "^6.30.0-nightly.1",
-    "@ledgerhq/hw-app-eth": "^6.37.0-nightly.5",
-    "@ledgerhq/hw-app-exchange": "^0.5.0-nightly.1",
-    "@ledgerhq/hw-app-near": "^6.29.0-nightly.1",
-    "@ledgerhq/hw-app-polkadot": "^6.29.0-nightly.1",
-    "@ledgerhq/hw-app-solana": "^7.2.0-nightly.1",
-    "@ledgerhq/hw-app-str": "^6.29.0-nightly.1",
-    "@ledgerhq/hw-app-tezos": "^6.29.0-nightly.1",
-    "@ledgerhq/hw-app-trx": "^6.29.0-nightly.2",
-    "@ledgerhq/hw-app-vet": "^0.2.0-nightly.4",
-    "@ledgerhq/hw-app-xrp": "^6.29.0-nightly.1",
-    "@ledgerhq/hw-transport": "^6.31.0-nightly.1",
-    "@ledgerhq/hw-transport-mocker": "^6.29.0-nightly.1",
+    "@ledgerhq/coin-algorand": "^0.5.0-next.2",
+    "@ledgerhq/coin-bitcoin": "^0.6.0-next.2",
+    "@ledgerhq/coin-cardano": "^0.1.0-next.2",
+    "@ledgerhq/coin-evm": "^2.1.0-next.2",
+    "@ledgerhq/coin-framework": "^0.14.0-next.2",
+    "@ledgerhq/coin-near": "^0.5.0-next.2",
+    "@ledgerhq/coin-polkadot": "^0.7.0-next.2",
+    "@ledgerhq/coin-solana": "^0.7.0-next.2",
+    "@ledgerhq/coin-tezos": "^0.4.0-next.2",
+    "@ledgerhq/coin-xrp": "^0.2.0-next.2",
+    "@ledgerhq/crypto-icons-ui": "^1.2.0-next.0",
+    "@ledgerhq/cryptoassets": "^13.1.0-next.2",
+    "@ledgerhq/device-core": "^0.2.0-next.0",
+    "@ledgerhq/devices": "^8.4.0-next.0",
+    "@ledgerhq/errors": "^6.17.0-next.0",
+    "@ledgerhq/hw-app-algorand": "^6.29.0-next.0",
+    "@ledgerhq/hw-app-btc": "^10.3.0-next.0",
+    "@ledgerhq/hw-app-cosmos": "^6.30.0-next.0",
+    "@ledgerhq/hw-app-eth": "^6.37.0-next.2",
+    "@ledgerhq/hw-app-exchange": "^0.5.0-next.0",
+    "@ledgerhq/hw-app-near": "^6.29.0-next.0",
+    "@ledgerhq/hw-app-polkadot": "^6.29.0-next.0",
+    "@ledgerhq/hw-app-solana": "^7.2.0-next.0",
+    "@ledgerhq/hw-app-str": "^6.29.0-next.0",
+    "@ledgerhq/hw-app-tezos": "^6.29.0-next.0",
+    "@ledgerhq/hw-app-trx": "^6.29.0-next.0",
+    "@ledgerhq/hw-app-vet": "^0.2.0-next.2",
+    "@ledgerhq/hw-app-xrp": "^6.29.0-next.0",
+    "@ledgerhq/hw-transport": "^6.31.0-next.0",
+    "@ledgerhq/hw-transport-mocker": "^6.29.0-next.0",
     "@ledgerhq/live-config": "^3.0.0",
-    "@ledgerhq/live-countervalues": "^0.2.0-nightly.6",
-    "@ledgerhq/live-countervalues-react": "^0.2.0-nightly.6",
-    "@ledgerhq/live-env": "^2.1.0-nightly.2",
+    "@ledgerhq/live-countervalues": "^0.2.0-next.2",
+    "@ledgerhq/live-countervalues-react": "^0.2.0-next.2",
+    "@ledgerhq/live-env": "^2.1.0-next.0",
     "@ledgerhq/live-hooks": "0.1.0",
-    "@ledgerhq/live-network": "^1.3.0-nightly.2",
-    "@ledgerhq/live-nft": "^0.4.0-nightly.6",
-    "@ledgerhq/live-promise": "^0.1.0-nightly.0",
-    "@ledgerhq/live-wallet": "^0.1.1-nightly.9",
+    "@ledgerhq/live-network": "^1.3.0-next.0",
+    "@ledgerhq/live-nft": "^0.4.0-next.2",
+    "@ledgerhq/live-promise": "^0.1.0-next.0",
+    "@ledgerhq/live-wallet": "^0.2.0-next.3",
     "@ledgerhq/logs": "^6.12.0",
-    "@ledgerhq/speculos-transport": "^0.1.1-nightly.0",
-    "@ledgerhq/wallet-api-exchange-module": "^0.7.0-nightly.0"
+    "@ledgerhq/speculos-transport": "^0.1.1-next.0",
+    "@ledgerhq/wallet-api-exchange-module": "^0.7.0-next.0"
   },
   "devDependencies": {
     "@solana/web3.js": "1.77.3",
@@ -269,10 +269,10 @@
     "typescript": "5.1.3",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.2.0-nightly.3",
-    "@ledgerhq/types-cryptoassets": "^7.13.0-nightly.0",
-    "@ledgerhq/types-devices": "^6.25.0-nightly.0",
-    "@ledgerhq/types-live": "^6.48.0-nightly.1"
+    "@ledgerhq/device-react": "^0.2.0-next.0",
+    "@ledgerhq/types-cryptoassets": "^7.13.0-next.0",
+    "@ledgerhq/types-devices": "^6.25.0-next.0",
+    "@ledgerhq/types-live": "^6.48.0-next.0"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

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

@@ -98,6 +98,10 @@ setSupportedCurrencies([
   "lukso",
   "linea",
   "linea_sepolia",
+  "blast",
+  "blast_sepolia",
+  "scroll",
+  "scroll_sepolia",
 ]);
 LiveConfig.setConfig(liveConfig);
 

package/src/apps/listApps/v2.test.ts

@@ -13,6 +13,7 @@ import { DeviceModel } from "@ledgerhq/devices";
 import customLockScreenFetchSize from "../../hw/customLockScreenFetchSize";
 import { getDeviceName } from "../../device/use-cases/getDeviceNameUseCase";
 import { currenciesByMarketcap, listCryptoCurrencies } from "../../currencies";
+import { makeAppV2Mock } from "../mock";
 
 jest.useFakeTimers();
 jest.mock("../../hw/customLockScreenFetchSize");
@@ -58,6 +59,7 @@ describe("listApps v2", () => {
     const deviceInfo = aDeviceInfoBuilder({ isOSU: true, isBootloader: false });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -80,6 +82,7 @@ describe("listApps v2", () => {
     const deviceInfo = aDeviceInfoBuilder({ isOSU: false, isBootloader: true });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -102,6 +105,7 @@ describe("listApps v2", () => {
     const deviceInfo = aDeviceInfoBuilder({ isOSU: false, isBootloader: false, targetId: 0 });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -129,6 +133,7 @@ describe("listApps v2", () => {
     });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -158,6 +163,7 @@ describe("listApps v2", () => {
     });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -183,6 +189,7 @@ describe("listApps v2", () => {
     });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -214,6 +221,7 @@ describe("listApps v2", () => {
     });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -247,6 +255,7 @@ describe("listApps v2", () => {
     });
 
     listApps({
+      managerDevModeEnabled: false,
       transport,
       deviceInfo,
       managerApiRepository: mockedManagerApiRepository,
@@ -279,6 +288,7 @@ describe("listApps v2", () => {
       let gotResult = false;
 
       listApps({
+        managerDevModeEnabled: false,
         transport,
         deviceInfo,
         managerApiRepository: mockedManagerApiRepository,
@@ -308,4 +318,145 @@ describe("listApps v2", () => {
       jest.advanceTimersByTime(1);
     });
   });
+
+  it("should keep apps with isDevTools if managerDevModeEnabled is true", done => {
+    const transport = aTransportBuilder();
+    const deviceInfo = aDeviceInfoBuilder({
+      isOSU: false,
+      isBootloader: false,
+      managerAllowed: true,
+      targetId: 0x33200000,
+    });
+
+    mockedManagerApiRepository = {
+      ...new StubManagerApiRepository(),
+      catalogForDevice: () =>
+        Promise.resolve([
+          makeAppV2Mock({ versionName: "Mocked dev app", isDevTools: true }),
+          makeAppV2Mock({ versionName: "Another non dev app", isDevTools: false }),
+        ]),
+    };
+
+    listApps({
+      managerDevModeEnabled: true,
+      transport,
+      deviceInfo,
+      managerApiRepository: mockedManagerApiRepository,
+      forceProvider: 1,
+    }).subscribe({
+      next: listAppsEvent => {
+        if (listAppsEvent.type === "result") {
+          const {
+            result: { appsListNames },
+          } = listAppsEvent;
+          try {
+            expect(appsListNames).toEqual(["Mocked dev app", "Another non dev app"]);
+            done();
+          } catch (e) {
+            done(e);
+          }
+        }
+      },
+    });
+
+    jest.advanceTimersByTime(1);
+  });
+
+  it("should not keep apps with isDevTools if managerDevModeEnabled is false", done => {
+    const transport = aTransportBuilder();
+    const deviceInfo = aDeviceInfoBuilder({
+      isOSU: false,
+      isBootloader: false,
+      managerAllowed: true,
+      targetId: 0x33200000,
+    });
+
+    mockedManagerApiRepository = {
+      ...new StubManagerApiRepository(),
+      catalogForDevice: () =>
+        Promise.resolve([
+          makeAppV2Mock({ versionName: "Mocked dev app", isDevTools: true }),
+          makeAppV2Mock({ versionName: "Another non dev app", isDevTools: false }),
+        ]),
+    };
+
+    listApps({
+      managerDevModeEnabled: false,
+      transport,
+      deviceInfo,
+      managerApiRepository: mockedManagerApiRepository,
+      forceProvider: 1,
+    }).subscribe({
+      next: listAppsEvent => {
+        if (listAppsEvent.type === "result") {
+          const {
+            result: { appsListNames },
+          } = listAppsEvent;
+          try {
+            expect(appsListNames).toEqual(["Another non dev app"]);
+            done();
+          } catch (e) {
+            done(e);
+          }
+        }
+      },
+    });
+
+    jest.advanceTimersByTime(1);
+  });
+
+  it("should keep apps with isDevTools if managerDevModeEnabled is disabled but those apps are installed", done => {
+    const transport = aTransportBuilder();
+    const deviceInfo = aDeviceInfoBuilder({
+      isOSU: false,
+      isBootloader: false,
+      managerAllowed: true,
+      targetId: 0x33200000,
+    });
+
+    mockedManagerApiRepository = {
+      ...new StubManagerApiRepository(),
+      catalogForDevice: () =>
+        Promise.resolve([
+          makeAppV2Mock({ versionName: "Mocked dev app", isDevTools: true }),
+          makeAppV2Mock({ versionName: "Another non dev app", isDevTools: false }),
+        ]),
+      getAppsByHash(hashes) {
+        const hashToApp = {
+          hash1: makeAppV2Mock({ versionName: "Mocked dev app", isDevTools: true }),
+          hash2: makeAppV2Mock({ versionName: "Another non dev app", isDevTools: false }),
+        };
+        return Promise.resolve(hashes.map(hash => hashToApp[hash]));
+      },
+    };
+
+    listAppsCommandSpy.mockResolvedValue([
+      { hash: "hash1", name: "Mocked dev app" },
+      { hash: "hash2", name: "Another non dev app" },
+    ]);
+
+    listApps({
+      managerDevModeEnabled: false,
+      transport,
+      deviceInfo,
+      managerApiRepository: mockedManagerApiRepository,
+      forceProvider: 1,
+    }).subscribe({
+      next: listAppsEvent => {
+        if (listAppsEvent.type === "result") {
+          const {
+            result: { appsListNames },
+          } = listAppsEvent;
+          try {
+            expect(appsListNames).toEqual(["Mocked dev app", "Another non dev app"]);
+            done();
+          } catch (e) {
+            done(e);
+          }
+        }
+      },
+    });
+
+    jest.advanceTimersByTime(1);
+  });
 });

package/src/apps/listApps/v2.ts

@@ -31,10 +31,10 @@ const emptyHashData = "0".repeat(64);
 type ListAppsParams = {
   transport: Transport;
   deviceInfo: DeviceInfo;
-  deviceProxyModel?: DeviceModelId;
-  managerDevModeEnabled?: boolean;
+  managerDevModeEnabled: boolean;
   forceProvider: number;
   managerApiRepository: ManagerApiRepository;
+  deviceProxyModel?: DeviceModelId;
 };
 
 export const listApps = ({

package/src/apps/mock.ts

@@ -5,7 +5,7 @@ import { findCryptoCurrency } from "../currencies";
 import type { ListAppsResult, AppOp, Exec, InstalledItem } from "./types";
 import { getBTCValues } from "@ledgerhq/live-countervalues/mock";
 import { DeviceModelId, identifyTargetId } from "@ledgerhq/devices";
-import { App, DeviceInfo, FinalFirmware } from "@ledgerhq/types-live";
+import { App, AppType, ApplicationV2, DeviceInfo, FinalFirmware } from "@ledgerhq/types-live";
 
 export const deviceInfo155 = {
   version: "1.5.5",
@@ -245,3 +245,32 @@ export const mockExecWithInstalledContext = (installedInitial: InstalledItem[]):
     );
   };
 };
+
+export function makeAppV2Mock(props: Partial<ApplicationV2>): ApplicationV2 {
+  return {
+    versionId: 1,
+    versionName: "Bitcoin",
+    versionDisplayName: "Bitcoin",
+    version: "1.0.0",
+    currencyId: "bitcoin",
+    description: "Bitcoin app",
+    applicationType: AppType.currency,
+    dateModified: "2021-01-01",
+    icon: "icon",
+    authorName: "Ledger",
+    supportURL: "https://support.ledger.com",
+    contactURL: "https://contact.ledger.com",
+    sourceURL: "https://source.ledger.com",
+    hash: "hash",
+    perso: "perso",
+    parentName: null,
+    firmware: "firmware",
+    firmwareKey: "firmwareKey",
+    delete: "delete",
+    deleteKey: "deleteKey",
+    bytes: 100,
+    warning: null,
+    isDevTools: false,
+    ...props,
+  };
+}

package/src/apps/react.test.ts

@@ -52,6 +52,7 @@ test("Apps hooks - useAppUninstallNeedsDeps - Expect dep apps", () => {
     useAppUninstallNeedsDeps(mockedState, mockedState.appByName["Ethereum"]),
   );
   expect(result.current.dependents.map(({ name }) => name)).toEqual([
+    "Ethereum Classic",
     "Aave",
     "Polygon",
     "Binance Smart Chain",