@ledgerhq/live-common 34.55.0-nightly.20251216024112 → 34.55.0-nightly.20251217023943

package/src/hw/actions/app.ts

@@ -20,6 +20,7 @@ import { shouldUpgrade } from "../../apps";
 import { AppOp, SkippedAppOp } from "../../apps/types";
 import perFamilyAccount from "../../generated/account";
 import type { Account, DeviceInfo, FirmwareUpdateContext } from "@ledgerhq/types-live";
+import { DeviceId } from "@ledgerhq/client-ids/ids";
 import type { CryptoCurrency, TokenCurrency } from "@ledgerhq/types-cryptoassets";
 import { getImplementation, ImplementationType } from "./implementations";
 import { getDefaultAccountName } from "@ledgerhq/live-wallet/accountName";
@@ -44,6 +45,7 @@ export type State = {
   allowManagerGranted: boolean;
   device: Device | null | undefined;
   deviceInfo?: DeviceInfo | null | undefined;
+  deviceId: DeviceId | null | undefined;
   latestFirmware?: FirmwareUpdateContext | null | undefined;
   error: Error | null | undefined;
   derivation:
@@ -144,6 +146,7 @@ const getInitialState = (device?: Device | null | undefined, request?: AppReques
   allowManagerGranted: false,
   device: null,
   deviceInfo: null,
+  deviceId: null,
   latestFirmware: null,
   opened: false,
   appAndVersion: null,
@@ -311,6 +314,12 @@ const reducer = (state: State, e: Event): State => {
         listedApps: state.listedApps,
       };
 
+    case "device-id":
+      return {
+        ...state,
+        deviceId: e.deviceId,
+      };
+
     case "app-not-installed":
       return {
         ...getInitialState(state.device, state.request),
@@ -460,9 +469,9 @@ export const createAction = (
       () => inferCommandParams(appRequest), // for now i don't have better
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [
-        appRequest.appName, // eslint-disable-next-line react-hooks/exhaustive-deps
-        appRequest.account && appRequest.account.id, // eslint-disable-next-line react-hooks/exhaustive-deps
-        appRequest.currency && appRequest.currency.id,
+        appRequest.appName,
+        appRequest.account?.id,
+        appRequest.currency?.id,
         appRequest.dependencies,
       ],
     );

package/src/hw/actions/manager.ts

@@ -10,6 +10,7 @@ import type { Action, Device } from "./types";
 import { currentMode } from "./app";
 import { getImplementation } from "./implementations";
 import { getLatestFirmwareForDeviceUseCase } from "../../device/use-cases/getLatestFirmwareForDeviceUseCase";
+import { DeviceId } from "@ledgerhq/client-ids/ids";
 
 type State = {
   isLoading: boolean;
@@ -19,6 +20,7 @@ type State = {
   allowManagerGranted: boolean;
   device: Device | null | undefined;
   deviceInfo: DeviceInfo | null | undefined;
+  deviceId: DeviceId | null | undefined;
   result: ListAppsResult | null | undefined;
   error: Error | null | undefined;
   isLocked: boolean;
@@ -62,6 +64,10 @@ type Event =
   | {
       type: "deviceChange";
       device: Device | null | undefined;
+    }
+  | {
+      type: "device-id";
+      deviceId: DeviceId;
     };
 
 const mapResult = ({ deviceInfo, device, result }): Result | null | undefined =>
@@ -82,6 +88,7 @@ const getInitialState = (device?: Device | null | undefined): State => ({
   allowManagerGranted: false,
   device,
   deviceInfo: null,
+  deviceId: null,
   result: null,
   error: null,
 });
@@ -151,6 +158,12 @@ const reducer = (state: State, e: Event): State => {
         allowManagerGranted: true,
       };
 
+    case "device-id":
+      return {
+        ...state,
+        deviceId: e.deviceId,
+      };
+
     case "result":
       return {
         ...state,

package/src/hw/connectApp.ts

@@ -39,6 +39,7 @@ import {
 } from "@ledgerhq/device-management-kit";
 import { ConnectAppDeviceAction } from "@ledgerhq/live-dmk-shared";
 import { ConnectAppEventMapper } from "./connectAppEventMapper";
+import { DeviceId } from "@ledgerhq/client-ids/ids";
 
 export type RequiresDerivation = {
   currencyId: string;
@@ -84,6 +85,10 @@ export type ConnectAppEvent =
   | {
       type: "device-permission-granted";
     }
+  | {
+      type: "device-id";
+      deviceId: DeviceId;
+    }
   | {
       type: "app-not-installed";
       appNames: string[];

package/src/hw/connectAppEventMapper.ts

@@ -28,6 +28,7 @@ import {
   LatestFirmwareVersionRequired,
   UnsupportedFeatureError,
 } from "@ledgerhq/errors";
+import { DeviceId } from "@ledgerhq/client-ids/ids";
 
 import type { SkippedAppOp } from "../apps/types";
 import { SkipReason } from "../apps/types";
@@ -40,6 +41,7 @@ export class ConnectAppEventMapper {
   private permissionRequested: boolean = false;
   private lastSeenDeviceSent: boolean = false;
   private installPlan: InstallPlan | null = null;
+  private deviceId: string | undefined = undefined;
   private eventSubject = new Subject<ConnectAppEvent>();
 
   constructor(
@@ -162,6 +164,16 @@ export class ConnectAppEventMapper {
         if (intermediateValue.installPlan !== null) {
           this.handleInstallPlan(intermediateValue.installPlan);
         }
+        if (intermediateValue.deviceId) {
+          const deviceIdString = Buffer.from(intermediateValue.deviceId).toString("hex");
+          if (deviceIdString !== this.deviceId) {
+            this.deviceId = deviceIdString;
+            this.eventSubject.next({
+              type: "device-id",
+              deviceId: DeviceId.fromString(deviceIdString),
+            });
+          }
+        }
         break;
     }
   }

package/src/modularDrawer/utils/getLoadingStatus.ts

@@ -1,6 +1,6 @@
 import { LoadingStatus } from "../../deposit/type";
 import { SerializedError } from "@reduxjs/toolkit";
-import { FetchBaseQueryError } from "@reduxjs/toolkit/query";
+import { FetchBaseQueryError } from "@reduxjs/toolkit/query/react";
 
 export const getLoadingStatus = ({
   isLoading,

package/src/platform/react.ts

@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from "react";
 import { useDispatch } from "react-redux";
 import { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";
-import { InfiniteData } from "@reduxjs/toolkit/query";
+import { InfiniteData } from "@reduxjs/toolkit/query/react";
 import { AccountLike } from "@ledgerhq/types-live";
 import { makeRe } from "minimatch";
 import type {

package/src/socket/index.ts

@@ -14,6 +14,8 @@ import {
 import { cancelDeviceAction } from "../hw/deviceAccess";
 import { getEnv } from "@ledgerhq/live-env";
 import type { SocketEvent } from "@ledgerhq/types-live";
+import { sha3_256 } from "@noble/hashes/sha3";
+import { DeviceId } from "@ledgerhq/client-ids/ids";
 
 const LOG_TYPE = "socket";
 const ALLOW_SECURE_CHANNEL_DELAY = 500;
@@ -51,6 +53,7 @@ export function createDeviceSocket(
     let correctlyFinished = false; // the socket logic reach a normal termination
     let inBulkMode = false; // we have an array of apdus to exchange, without the need of more WS messages.
     let allowSecureChannelTimeout: NodeJS.Timeout | null = null; // allows to delay/cancel the user confirmation event
+    let deviceIdCaptured = false; // track if we've already captured the device id
     const ws = new WS(url);
 
     ws.onopen = () => {
@@ -127,6 +130,10 @@ export function createDeviceSocket(
               }, ALLOW_SECURE_CHANNEL_DELAY);
             }
 
+            // Detect GetCertificate APDU to extract device ID
+            const shouldCaptureDeviceId =
+              !deviceIdCaptured && apdu.slice(0, 2).toString("hex") === "e052";
+
             const r = await transport.exchange(apdu);
 
             if (allowSecureChannelTimeout) {
@@ -170,6 +177,34 @@ export function createDeviceSocket(
               });
             }
 
+            // Extract device ID from GetCertificate response
+            if (shouldCaptureDeviceId && status === StatusCodes.OK) {
+              try {
+                const responseData = r.slice(0, r.length - 2);
+                const headerLength = responseData[0];
+                const publicKeyLengthOffset = 1 + headerLength;
+                const publicKeyLength = responseData[publicKeyLengthOffset];
+                const publicKeyOffset = publicKeyLengthOffset + 1;
+                const publicKey = responseData.slice(
+                  publicKeyOffset,
+                  publicKeyOffset + publicKeyLength,
+                );
+
+                // Compute device ID as SHA3-256 hash of the public key
+                const deviceIdHash = sha3_256(publicKey);
+                const deviceIdString = Buffer.from(deviceIdHash).toString("hex");
+                const deviceId = DeviceId.fromString(deviceIdString);
+                deviceIdCaptured = true;
+
+                o.next({
+                  type: "device-id",
+                  deviceId,
+                });
+              } catch (err) {
+                tracer.trace("Failed to extract device ID from GetCertificate response", { err });
+              }
+            }
+
             const data = r.slice(0, r.length - 2);
             o.next({
               type: "exchange",

package/src/wallet-api/react.ts

@@ -16,7 +16,7 @@ import { UserRefusedOnDevice } from "@ledgerhq/errors";
 import { WalletState } from "@ledgerhq/live-wallet/store";
 import { endpoints as calEndpoints } from "@ledgerhq/cryptoassets/cal-client/state-manager/api";
 import { ThunkDispatch, UnknownAction } from "@reduxjs/toolkit";
-import { InfiniteData } from "@reduxjs/toolkit/query";
+import { InfiniteData } from "@reduxjs/toolkit/query/react";
 import type {
   TokensDataWithPagination,
   PageParam,