@ledgerhq/live-cli 24.30.0-nightly.20251215120904 → 24.30.0-nightly.20251217023943

package/lib/cli.js

@@ -543744,7 +543744,7 @@ var require_package8 = __commonJS({
     module2.exports = {
       name: "@ledgerhq/live-common",
       description: "Common ground for the Ledger Live apps",
-      version: "34.55.0-nightly.20251215120904",
+      version: "34.55.0-nightly.20251217023943",
       repository: {
         type: "git",
         url: "https://github.com/LedgerHQ/ledger-live.git"
@@ -543853,7 +543853,7 @@ var require_package8 = __commonJS({
         react: ">=16",
         "react-dom": ">=16",
         "react-native": ">=0.65.1",
-        "react-redux": "catalog:",
+        "react-redux": "^7.2.9 || ^9.0.0",
         "redux-actions": "2.6.5"
       },
       peerDependenciesMeta: {
@@ -543935,6 +543935,7 @@ var require_package8 = __commonJS({
         "@ledgerhq/hw-bolos": "workspace:^",
         "@ledgerhq/hw-transport": "workspace:*",
         "@ledgerhq/hw-transport-mocker": "workspace:^",
+        "@ledgerhq/client-ids": "workspace:^",
         "@ledgerhq/ledger-cal-service": "workspace:^",
         "@ledgerhq/ledger-trust-service": "workspace:^",
         "@ledgerhq/live-app-sdk": "^0.8.1",
@@ -544000,7 +544001,6 @@ var require_package8 = __commonJS({
         "performance-now": "^2.1.0",
         prando: "^6.0.1",
         qs: "^6.10.1",
-        "react-redux": "catalog:",
         reselect: "^4.1.5",
         rlp: "^3.0.0",
         rxjs: "catalog:",
@@ -544032,7 +544032,6 @@ var require_package8 = __commonJS({
         "@types/lodash": "^4.14.179",
         "@types/node": "^22.10.10",
         "@types/react": "^18.2.21",
-        "@types/react-redux": "^7.1.33",
         "@types/uuid": "^8.3.4",
         benchmark: "^2.1.4",
         buffer: "6.0.3",
@@ -544055,6 +544054,7 @@ var require_package8 = __commonJS({
         "react-dom": "catalog:",
         "react-native": "catalog:",
         "react-test-renderer": "catalog:",
+        "react-redux": "catalog:",
         "redux-actions": "2.6.5",
         timemachine: "^0.3.2",
         "ts-jest": "^29.1.1",
@@ -544081,7 +544081,7 @@ var require_package9 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ledgerhq/live-cli",
-      version: "24.30.0-nightly.20251215120904",
+      version: "24.30.0-nightly.20251217023943",
       description: "ledger-live CLI version",
       repository: {
         type: "git",
@@ -549547,6 +549547,12 @@ var envDefinitions = {
     parser: stringParser,
     desc: "Cryptoassets list service url (staging)"
   },
+  PUSH_DEVICES_SERVICE_URL: {
+    def: "",
+    // FIXME LIVE-23878: need to set the final endpoint
+    parser: stringParser,
+    desc: "Push Devices Service url for device tracking"
+  },
   FEATURE_FLAGS: {
     def: "{}",
     parser: jsonParser,
@@ -589425,19 +589431,19 @@ function getCoinAndAmounts(tx, address3) {
   const stakingTx = !!tx.events.find((event) => STAKING_EVENTS.includes(event.type));
   if (stakingTx) {
     tx.events.forEach((event) => {
-      if (ADD_STAKE_EVENTS.includes(event.type) && tx.sender === address3 && amount_out.isZero()) {
+      if (ADD_STAKE_EVENTS.includes(event.type) && compareAddress(tx.sender, address3) && amount_out.isZero()) {
         coin_id = APTOS_ASSET_ID;
         type4 = OP_TYPE.STAKE;
         amount_out = amount_out.plus(event.data.amount_added || event.data.amount);
-      } else if (REACTIVATE_STAKE_EVENTS.includes(event.type) && tx.sender === address3 && amount_out.isZero()) {
+      } else if (REACTIVATE_STAKE_EVENTS.includes(event.type) && compareAddress(tx.sender, address3) && amount_out.isZero()) {
         coin_id = APTOS_ASSET_ID;
         type4 = OP_TYPE.STAKE;
         amount_out = amount_out.plus(event.data.amount_reactivated || event.data.amount);
-      } else if (UNLOCK_STAKE_EVENTS.includes(event.type) && tx.sender === address3 && amount_in.isZero()) {
+      } else if (UNLOCK_STAKE_EVENTS.includes(event.type) && compareAddress(tx.sender, address3) && amount_in.isZero()) {
         coin_id = APTOS_ASSET_ID;
         type4 = OP_TYPE.UNSTAKE;
         amount_in = amount_in.plus(event.data.amount_unlocked || event.data.amount);
-      } else if (WITHDRAW_STAKE_EVENTS.includes(event.type) && tx.sender === address3 && amount_in.isZero()) {
+      } else if (WITHDRAW_STAKE_EVENTS.includes(event.type) && compareAddress(tx.sender, address3) && amount_in.isZero()) {
         coin_id = APTOS_ASSET_ID;
         type4 = OP_TYPE.WITHDRAW;
         amount_in = amount_in.plus(event.data.amount_withdrawn || event.data.amount);
@@ -878542,6 +878548,39 @@ init_lib_es2();
 var import_isomorphic_ws5 = __toESM(require_node8());
 var import_rxjs199 = require("rxjs");
 init_lib_es();
+init_sha3();
+
+// ../../libs/client-ids/lib-es/ids/DeviceId.js
+var DEVICE_ID_SYMBOL = Symbol("deviceId");
+var DeviceId = class _DeviceId {
+  [DEVICE_ID_SYMBOL];
+  static fromString(id5) {
+    return new _DeviceId(id5);
+  }
+  constructor(id5) {
+    if (!id5 || typeof id5 !== "string" || id5.trim().length === 0) {
+      throw new Error("DeviceId must be a non-empty string");
+    }
+    this[DEVICE_ID_SYMBOL] = id5;
+  }
+  toString() {
+    return "[DeviceId:REDACTED]";
+  }
+  toJSON() {
+    return "[DeviceId:REDACTED]";
+  }
+  exportDeviceIdForPushDevicesService() {
+    return this[DEVICE_ID_SYMBOL];
+  }
+  exportDeviceIdForPersistence() {
+    return this[DEVICE_ID_SYMBOL];
+  }
+  equals(other) {
+    return this[DEVICE_ID_SYMBOL] === other[DEVICE_ID_SYMBOL];
+  }
+};
+
+// ../../libs/ledger-live-common/lib-es/socket/index.js
 var LOG_TYPE3 = "socket";
 var ALLOW_SECURE_CHANNEL_DELAY = 500;
 var warningsSubject = new import_rxjs199.Subject();
@@ -878560,6 +878599,7 @@ function createDeviceSocket(transport, { url: url5, unresponsiveExpectedDuringBu
     let correctlyFinished = false;
     let inBulkMode = false;
     let allowSecureChannelTimeout = null;
+    let deviceIdCaptured = false;
     const ws3 = new import_isomorphic_ws5.default(url5);
     ws3.onopen = () => {
       tracer2.trace("Socket opened", { url: url5 });
@@ -878621,6 +878661,7 @@ function createDeviceSocket(transport, { url: url5, unresponsiveExpectedDuringBu
                 });
               }, ALLOW_SECURE_CHANNEL_DELAY);
             }
+            const shouldCaptureDeviceId = !deviceIdCaptured && apdu.slice(0, 2).toString("hex") === "e052";
             const r87 = await transport.exchange(apdu);
             if (allowSecureChannelTimeout) {
               clearTimeout(allowSecureChannelTimeout);
@@ -878653,6 +878694,26 @@ function createDeviceSocket(transport, { url: url5, unresponsiveExpectedDuringBu
                 type: "device-permission-granted"
               });
             }
+            if (shouldCaptureDeviceId && status === StatusCodes.OK) {
+              try {
+                const responseData = r87.slice(0, r87.length - 2);
+                const headerLength = responseData[0];
+                const publicKeyLengthOffset = 1 + headerLength;
+                const publicKeyLength = responseData[publicKeyLengthOffset];
+                const publicKeyOffset = publicKeyLengthOffset + 1;
+                const publicKey4 = responseData.slice(publicKeyOffset, publicKeyOffset + publicKeyLength);
+                const deviceIdHash = sha3_256(publicKey4);
+                const deviceIdString = Buffer.from(deviceIdHash).toString("hex");
+                const deviceId = DeviceId.fromString(deviceIdString);
+                deviceIdCaptured = true;
+                o93.next({
+                  type: "device-id",
+                  deviceId
+                });
+              } catch (err) {
+                tracer2.trace("Failed to extract device ID from GetCertificate response", { err });
+              }
+            }
             const data6 = r87.slice(0, r87.length - 2);
             o93.next({
               type: "exchange",
@@ -879514,6 +879575,14 @@ var listApps2 = ({ transport, deviceInfo, deviceProxyModel, managerDevModeEnable
                 case "device-permission-requested":
                   o93.next(e95);
                   break;
+                case "device-id": {
+                  const deviceIdValue = typeof e95.deviceId === "string" ? DeviceId.fromString(e95.deviceId) : e95.deviceId;
+                  o93.next({
+                    type: "device-id",
+                    deviceId: deviceIdValue
+                  });
+                  break;
+                }
               }
             },
             error: reject
@@ -888280,11 +888349,19 @@ var getOnboardingStatePolling = ({
   // Nb Empirical value
   allowedErrorChecks = []
 }) => {
+  let hasQuitAppAlreadyRun = false;
   const getOnboardingStateOnce = () => {
     return withDevice(deviceId, {
       openTimeoutMs: transportAbortTimeoutMs,
       matchDeviceByName: deviceName ?? void 0
-    })((t110) => (0, import_rxjs276.from)(getVersion(t110, { abortTimeoutMs: transportAbortTimeoutMs }))).pipe(
+    })((t110) => {
+      const getVersionObs = (0, import_rxjs276.from)(getVersion(t110, { abortTimeoutMs: transportAbortTimeoutMs }));
+      if (hasQuitAppAlreadyRun) {
+        return getVersionObs;
+      }
+      hasQuitAppAlreadyRun = true;
+      return quitApp(t110).pipe((0, import_operators90.switchMap)(() => getVersionObs));
+    }).pipe(
       (0, import_operators90.timeout)(safeGuardTimeoutMs),
       // Throws a TimeoutError
       (0, import_operators90.first)(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.30.0-nightly.20251215120904",
+  "version": "24.30.0-nightly.20251217023943",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",
@@ -58,8 +58,8 @@
     "ts-node": "10.9.2",
     "tsup": "7.3.0",
     "yaml": "2.8.1",
-    "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251215120904",
-    "@ledgerhq/types-live": "^6.91.0-nightly.20251215120904"
+    "@ledgerhq/types-cryptoassets": "^7.31.0-nightly.20251217023943",
+    "@ledgerhq/types-live": "^6.91.0-nightly.20251217023943"
   },
   "publishConfig": {
     "directory": "dist"