@onekeyfe/hd-core 1.2.0-alpha.135 → 1.2.0-alpha.136

package/dist/index.js

@@ -43538,7 +43538,7 @@ const DEVICE_CONTROL_CALLS = new Set([
     'DeviceCertificateSign',
     'DeviceMiscUsbMscControl',
 ]);
-const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|update cancel(?:led|ed)|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
+const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
 function shouldReduceDebugForCall(type) {
     return HIGH_VOLUME_DEBUG_CALLS.has(type);
 }
@@ -45617,15 +45617,6 @@ class Device extends events.exports {
                     yield TransportManager.reconfigure(this.features);
                 });
                 const expectedDeviceId = options === null || options === void 0 ? void 0 : options.deviceId;
-                if (expectedDeviceId) {
-                    this.passphraseState = undefined;
-                    const { message } = yield this.commands.typedCall('GetFeatures', 'Features', {});
-                    this._updateFeatures(message);
-                    yield TransportManager.reconfigure(this.features);
-                    if (!this.checkDeviceId(expectedDeviceId)) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckDeviceIdError);
-                    }
-                }
                 this.passphraseState = options === null || options === void 0 ? void 0 : options.passphraseState;
                 if (options === null || options === void 0 ? void 0 : options.initSession) {
                     this.clearInternalState(options === null || options === void 0 ? void 0 : options.deviceId);
@@ -45641,7 +45632,23 @@ class Device extends events.exports {
                 if (options === null || options === void 0 ? void 0 : options.deriveCardano) {
                     payload.derive_cardano = true;
                 }
-                yield callInitialize(payload, options === null || options === void 0 ? void 0 : options.initSession);
+                if (this.features) {
+                    yield TransportManager.reconfigure(this.features);
+                }
+                const assertExpectedDeviceIdentity = () => {
+                    if (expectedDeviceId && !this.checkDeviceId(expectedDeviceId)) {
+                        this.clearInternalState();
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckDeviceIdError);
+                    }
+                };
+                try {
+                    yield callInitialize(payload, options === null || options === void 0 ? void 0 : options.initSession);
+                }
+                catch (error) {
+                    assertExpectedDeviceIdentity();
+                    throw error;
+                }
+                assertExpectedDeviceIdentity();
             }
             catch (error) {
                 Log$h.error('Initialization failed:', error);
@@ -46115,17 +46122,14 @@ class Device extends events.exports {
             const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInterruptedFromUser);
             const cleanupPromise = this.runCleanupPromise;
             const { cancelableAction } = this;
-            const env = DataManager.getSettings('env');
             if (cancelableAction) {
                 yield cancelableAction(error);
             }
             else if (this.isProtocolV2() &&
-                (DataManager.isBleConnect(env) ||
-                    DataManager.isBrowserWebUsb(env) ||
-                    DataManager.isDesktopWebUsb(env)) &&
+                DataManager.isBleConnect(DataManager.getSettings('env')) &&
                 this.hasDeviceAcquire()) {
                 yield ((_b = (_a = this.commands) === null || _a === void 0 ? void 0 : _a.cancelDevice) === null || _b === void 0 ? void 0 : _b.call(_a).catch(cancelError => {
-                    Log$h.debug('Protocol V2 fallback cancel error', cancelError);
+                    Log$h.debug('Protocol V2 BLE fallback cancel error', cancelError);
                 }));
             }
             yield ((_c = this.commands) === null || _c === void 0 ? void 0 : _c.cancel());
@@ -48180,7 +48184,6 @@ class DeviceChangePin extends BaseMethod {
     }
     init() {
         this.unlockPolicy = 'unlock-before-run';
-        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         validateParams(this.payload, [{ name: 'remove', type: 'boolean' }]);
         this.params = {
@@ -48790,12 +48793,7 @@ class DeviceSupportFeatures extends BaseMethod {
 }
 
 class DeviceVerify extends BaseMethod {
-    getSupportedProtocols() {
-        return ['V1', 'V2'];
-    }
     init() {
-        this.unlockPolicy = 'unlock-before-run';
-        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         validateParams(this.payload, [{ name: 'dataHex', type: 'hexString' }]);
         this.params = {
@@ -48834,7 +48832,6 @@ class DeviceWipe extends BaseMethod {
     }
     init() {
         this.unlockPolicy = 'unlock-before-run';
-        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         this.protocolV2UiInteraction = {
             request: 'button',
@@ -51722,8 +51719,9 @@ const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
 const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
-const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
+const PROTOCOL_V2_INSTALL_TIMEOUT = 8 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
+const PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
@@ -51737,8 +51735,6 @@ const PROTOCOL_V2_CONNECT_SINGLE_TIMEOUT = 75 * 1000;
 const PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT = 3;
 const PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE = 'FirmwareInstallStatusConflict';
-const PROTOCOL_V2_INSTALL_FAILED_CODE = 'FirmwareInstallFailed';
-const PROTOCOL_V2_INSTALL_TIMEOUT_CODE = 'FirmwareInstallTimeout';
 const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
@@ -51894,8 +51890,7 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error) => {
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
     return error instanceof hdShared.HardwareError &&
-        (error.errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
-            error.errorCode === hdShared.HardwareErrorCode.FirmwareError ||
+        (error.errorCode === hdShared.HardwareErrorCode.FirmwareError ||
             error.errorCode === hdShared.HardwareErrorCode.FirmwareVerificationFailed ||
             ((_a = error.params) === null || _a === void 0 ? void 0 : _a.firmwareUpdateCode) === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE);
 };
@@ -52037,7 +52032,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
         this.requireDeviceMode = [];
         this.unlockPolicy = 'unlock-before-run';
-        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         this.skipForceUpdateCheck = true;
         const { payload } = this;
@@ -52771,9 +52765,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 ? visibleVersions[target]
                 : `${Math.floor(statusVersion / 0x10000) % 0x100}.${Math.floor(statusVersion / 0x100) % 0x100}.${statusVersion % 0x100}`;
             if (!observedVersion) {
-                const isUnobservableApplicationSlot = applicationTargets.length > 1 && (target === 'app_v1' || target === 'app_v2');
-                if (this.protocolV2FinalStatusVerified || isUnobservableApplicationSlot) {
-                    Log$7.warn(`Protocol V2 target ${target} has no observable final version; install completion is authoritative`);
+                if (this.protocolV2FinalStatusVerified) {
+                    Log$7.warn(`Protocol V2 target ${target} has no observable final version; completed target status is authoritative`);
                 }
                 else {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareVerificationFailed, `Protocol V2 target ${target} has no observable final version after status fallback`);
@@ -53443,6 +53436,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths = new Map()) {
+        var _a, _b, _c;
         Log$7.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`);
         const failedTarget = statusTargets.find(target => {
             var _a;
@@ -53457,9 +53451,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 path: failedTarget.path,
             });
             Log$7.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
-                firmwareUpdateCode: PROTOCOL_V2_INSTALL_FAILED_CODE,
-            });
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware target failed: target=${failedTarget.target_id} status=${(_a = failedTarget.status) !== null && _a !== void 0 ? _a : 'unknown'} payloadVersion=${(_b = failedTarget.payload_version) !== null && _b !== void 0 ? _b : 'unknown'} path=${(_c = failedTarget.path) !== null && _c !== void 0 ? _c : 'unknown'}`);
         }
         const matchingTargets = statusTargets.filter(target => { var _a; return expectedTargetIds.has((_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1); });
         const seenTargetIds = new Set();
@@ -53468,8 +53460,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (targetId === undefined ||
                 seenTargetIds.has(targetId) ||
                 (target.path && expectedPaths.get(targetId) && target.path !== expectedPaths.get(targetId))) {
-                Log$7.error(`[FirmwareUpdateV4] install status conflicts with target=${target.target_id}`);
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 install status conflicts with target ${target.target_id}`, {
                     firmwareUpdateCode: PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE,
                 });
             }
@@ -53562,8 +53553,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let lastError;
             let shouldReconnect = false;
             let deviceInfo;
+            let missingTargetStatusSince;
+            let missingTargetStatusKey;
+            let normalModeWithoutInstallEvidenceSince;
             let installEvidenceObserved = false;
             let currentInstallStatusObserved = false;
+            const resetMissingTargetStatusGrace = () => {
+                missingTargetStatusSince = undefined;
+                missingTargetStatusKey = undefined;
+            };
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
                 this.throwIfAborted();
                 try {
@@ -53583,6 +53581,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
                         if (statusResponse.type === 'Success') {
                             installEvidenceObserved = true;
+                            resetMissingTargetStatusGrace();
                             lastError = new Error('Protocol V2 firmware install acknowledged; waiting for target status');
                         }
                         const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
@@ -53604,6 +53603,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         if (hasMatchingTargetStatus &&
                             (!requireCurrentInstallStatus || currentInstallStatusObserved)) {
                             installEvidenceObserved = true;
+                            normalModeWithoutInstallEvidenceSince = undefined;
                         }
                         const matchingStatusTargets = statusTargets.filter(target => {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53631,6 +53631,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             }
                         }
                         if (statusTargets.length === 0) {
+                            resetMissingTargetStatusGrace();
                             if (statusResponse.type !== 'Success') {
                                 lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
                             }
@@ -53638,10 +53639,23 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         else {
                             const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
                             if (missingTargetIds.length > 0) {
+                                const now = Date.now();
                                 const missingKey = missingTargetIds.join(',');
+                                if (missingTargetStatusSince === undefined || missingTargetStatusKey !== missingKey) {
+                                    missingTargetStatusSince = now;
+                                    missingTargetStatusKey = missingKey;
+                                }
+                                else if (now - missingTargetStatusSince >=
+                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
+                                    const reportedTargetIds = statusTargets
+                                        .map(target => normalizeProtocolV2TargetId(target.target_id))
+                                        .filter((targetId) => targetId !== undefined);
+                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware status is missing requested records: targetIds=${missingKey} reportedTargetIds=${reportedTargetIds.join(',')}`);
+                                }
                                 lastError = new Error(`Protocol V2 firmware status is temporarily missing targetIds=${missingKey}`);
                             }
                             else {
+                                resetMissingTargetStatusGrace();
                                 lastError = new Error('Protocol V2 firmware targets are still installing');
                             }
                         }
@@ -53650,6 +53664,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         if (isProtocolV2TerminalInstallStatusError(error)) {
                             throw error;
                         }
+                        resetMissingTargetStatusGrace();
                         if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
                             if (!currentDeviceInfo) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
@@ -53663,9 +53678,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                                 return;
                             }
                             if (isNormalMode) {
+                                const now = Date.now();
+                                normalModeWithoutInstallEvidenceSince !== null && normalModeWithoutInstallEvidenceSince !== void 0 ? normalModeWithoutInstallEvidenceSince : (normalModeWithoutInstallEvidenceSince = now);
+                                if (now - normalModeWithoutInstallEvidenceSince >=
+                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
+                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 device returned to normal mode without install ACK, target status, or version change');
+                                }
                                 lastError = new Error('Protocol V2 device is in normal mode but installation is not yet confirmed');
                             }
                             else {
+                                normalModeWithoutInstallEvidenceSince = undefined;
                                 lastError = new Error('Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode');
                             }
                         }
@@ -53691,14 +53713,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     shouldReconnect = true;
                     deviceInfo = undefined;
+                    resetMissingTargetStatusGrace();
                     Log$7.log('Protocol V2 firmware install device readiness probe failed: ', error);
                 }
                 yield hdShared.wait(1000);
             }
-            Log$7.error(`[FirmwareUpdateV4] install timed out after ${PROTOCOL_V2_INSTALL_TIMEOUT / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
-                firmwareUpdateCode: PROTOCOL_V2_INSTALL_TIMEOUT_CODE,
-            });
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 firmware update status not complete within ${PROTOCOL_V2_INSTALL_TIMEOUT / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
         });
     }
     exitProtocolV2BootloaderToNormal() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.135",
+  "version": "1.2.0-alpha.136",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.135",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.135",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.136",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.136",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "321e900381de2c1a9c583e90e8abfc2f8dab8266"
+  "gitHead": "92945bc4aae3d6602dd44c2e028e902e6bce7b55"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -2,7 +2,6 @@ import { EDeviceType, ERRORS, HardwareError, HardwareErrorCode, wait } from '@on
 import JSZip from 'jszip';
 import {
   DeviceRebootType,
-  DeviceSessionPinType,
   PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
   PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE,
   PROTOCOL_V2_BLE_FIRMWARE_FILE_CHUNK_SIZE,
@@ -91,8 +90,9 @@ const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
 const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
-const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
+const PROTOCOL_V2_INSTALL_TIMEOUT = 8 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
+const PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
@@ -106,8 +106,6 @@ const PROTOCOL_V2_CONNECT_SINGLE_TIMEOUT = 75 * 1000;
 const PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT = 3;
 const PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE = 'FirmwareInstallStatusConflict';
-const PROTOCOL_V2_INSTALL_FAILED_CODE = 'FirmwareInstallFailed';
-const PROTOCOL_V2_INSTALL_TIMEOUT_CODE = 'FirmwareInstallTimeout';
 const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
@@ -393,8 +391,7 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error: unknown) => {
 
 const isProtocolV2TerminalInstallStatusError = (error: unknown) =>
   error instanceof HardwareError &&
-  (error.errorCode === HardwareErrorCode.ActionCancelled ||
-    error.errorCode === HardwareErrorCode.FirmwareError ||
+  (error.errorCode === HardwareErrorCode.FirmwareError ||
     error.errorCode === HardwareErrorCode.FirmwareVerificationFailed ||
     error.params?.firmwareUpdateCode === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE);
 
@@ -602,9 +599,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
     this.unlockPolicy = 'unlock-before-run';
-    // Protocol V2 device-management actions are not wallet-scoped, so either
-    // the main PIN or an Attach PIN may authorize them.
-    this.protocolV2PreUnlockPinType = DeviceSessionPinType.Any;
     this.useDevicePassphraseState = false;
     this.skipForceUpdateCheck = true;
 
@@ -1629,11 +1623,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               Math.floor(statusVersion / 0x100) % 0x100
             }.${statusVersion % 0x100}`;
       if (!observedVersion) {
-        const isUnobservableApplicationSlot =
-          applicationTargets.length > 1 && (target === 'app_v1' || target === 'app_v2');
-        if (this.protocolV2FinalStatusVerified || isUnobservableApplicationSlot) {
+        if (this.protocolV2FinalStatusVerified) {
           Log.warn(
-            `Protocol V2 target ${target} has no observable final version; install completion is authoritative`
+            `Protocol V2 target ${target} has no observable final version; completed target status is authoritative`
           );
         } else {
           throw ERRORS.TypedError(
@@ -2507,9 +2499,14 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         path: failedTarget.path,
       });
       Log.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
-      throw ERRORS.TypedError(HardwareErrorCode.FirmwareError, undefined, {
-        firmwareUpdateCode: PROTOCOL_V2_INSTALL_FAILED_CODE,
-      });
+      throw ERRORS.TypedError(
+        HardwareErrorCode.FirmwareError,
+        `Protocol V2 firmware target failed: target=${failedTarget.target_id} status=${
+          failedTarget.status ?? 'unknown'
+        } payloadVersion=${failedTarget.payload_version ?? 'unknown'} path=${
+          failedTarget.path ?? 'unknown'
+        }`
+      );
     }
 
     const matchingTargets = statusTargets.filter(target =>
@@ -2523,10 +2520,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         seenTargetIds.has(targetId) ||
         (target.path && expectedPaths.get(targetId) && target.path !== expectedPaths.get(targetId))
       ) {
-        Log.error(`[FirmwareUpdateV4] install status conflicts with target=${target.target_id}`);
-        throw ERRORS.TypedError(HardwareErrorCode.FirmwareError, undefined, {
-          firmwareUpdateCode: PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE,
-        });
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `Protocol V2 install status conflicts with target ${target.target_id}`,
+          {
+            firmwareUpdateCode: PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE,
+          }
+        );
       }
       seenTargetIds.add(targetId);
     }
@@ -2651,8 +2651,15 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     // Reconnecting here probes DeviceInfo, which loaders reject while installation is active.
     let shouldReconnect = false;
     let deviceInfo: ProtocolV2DeviceInfo | undefined;
+    let missingTargetStatusSince: number | undefined;
+    let missingTargetStatusKey: string | undefined;
+    let normalModeWithoutInstallEvidenceSince: number | undefined;
     let installEvidenceObserved = false;
     let currentInstallStatusObserved = false;
+    const resetMissingTargetStatusGrace = () => {
+      missingTargetStatusSince = undefined;
+      missingTargetStatusKey = undefined;
+    };
 
     while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
       // A transport release caused by an explicit workflow cancellation must not
@@ -2680,6 +2687,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           );
           if (statusResponse.type === 'Success') {
             installEvidenceObserved = true;
+            resetMissingTargetStatusGrace();
             lastError = new Error(
               'Protocol V2 firmware install acknowledged; waiting for target status'
             );
@@ -2708,6 +2716,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             (!requireCurrentInstallStatus || currentInstallStatusObserved)
           ) {
             installEvidenceObserved = true;
+            normalModeWithoutInstallEvidenceSince = undefined;
           }
           const matchingStatusTargets = statusTargets.filter(target => {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -2749,6 +2758,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           }
 
           if (statusTargets.length === 0) {
+            resetMissingTargetStatusGrace();
             if (statusResponse.type !== 'Success') {
               lastError = new Error(
                 'Protocol V2 firmware update is waiting for user confirmation or target status'
@@ -2760,11 +2770,30 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               expectedTargetIds
             );
             if (missingTargetIds.length > 0) {
+              const now = Date.now();
               const missingKey = missingTargetIds.join(',');
+              if (missingTargetStatusSince === undefined || missingTargetStatusKey !== missingKey) {
+                missingTargetStatusSince = now;
+                missingTargetStatusKey = missingKey;
+              } else if (
+                now - missingTargetStatusSince >=
+                PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT
+              ) {
+                const reportedTargetIds = statusTargets
+                  .map(target => normalizeProtocolV2TargetId(target.target_id))
+                  .filter((targetId): targetId is number => targetId !== undefined);
+                throw ERRORS.TypedError(
+                  HardwareErrorCode.FirmwareError,
+                  `Protocol V2 firmware status is missing requested records: targetIds=${missingKey} reportedTargetIds=${reportedTargetIds.join(
+                    ','
+                  )}`
+                );
+              }
               lastError = new Error(
                 `Protocol V2 firmware status is temporarily missing targetIds=${missingKey}`
               );
             } else {
+              resetMissingTargetStatusGrace();
               lastError = new Error('Protocol V2 firmware targets are still installing');
             }
           }
@@ -2772,6 +2801,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           if (isProtocolV2TerminalInstallStatusError(error)) {
             throw error;
           }
+          // Only consecutive full status dumps can prove that a record is absent.
+          // A reboot or transport interruption starts a fresh grace window.
+          resetMissingTargetStatusGrace();
           // App firmware does not register DeviceFirmwareUpdateStatusGet. Treat the
           // missing endpoint as completion only after the runtime probe confirms App mode.
           if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
@@ -2794,10 +2826,22 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               return;
             }
             if (isNormalMode) {
+              const now = Date.now();
+              normalModeWithoutInstallEvidenceSince ??= now;
+              if (
+                now - normalModeWithoutInstallEvidenceSince >=
+                PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT
+              ) {
+                throw ERRORS.TypedError(
+                  HardwareErrorCode.FirmwareError,
+                  'Protocol V2 device returned to normal mode without install ACK, target status, or version change'
+                );
+              }
               lastError = new Error(
                 'Protocol V2 device is in normal mode but installation is not yet confirmed'
               );
             } else {
+              normalModeWithoutInstallEvidenceSince = undefined;
               lastError = new Error(
                 'Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode'
               );
@@ -2828,19 +2872,18 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         }
         shouldReconnect = true;
         deviceInfo = undefined;
+        resetMissingTargetStatusGrace();
         Log.log('Protocol V2 firmware install device readiness probe failed: ', error);
       }
       await wait(1000);
     }
 
-    Log.error(
-      `[FirmwareUpdateV4] install timed out after ${
+    throw ERRORS.TypedError(
+      HardwareErrorCode.RuntimeError,
+      `Protocol V2 firmware update status not complete within ${
         PROTOCOL_V2_INSTALL_TIMEOUT / 1000
       }s: ${this.normalizeErrorMessage(lastError)}`
     );
-    throw ERRORS.TypedError(HardwareErrorCode.FirmwareError, undefined, {
-      firmwareUpdateCode: PROTOCOL_V2_INSTALL_TIMEOUT_CODE,
-    });
   }
 
   private async exitProtocolV2BootloaderToNormal() {

package/src/api/device/DeviceChangePin.ts

@@ -1,4 +1,4 @@
-import { DeviceSessionPinType, DeviceSettingsPage } from '@onekeyfe/hd-transport';
+import { DeviceSettingsPage } from '@onekeyfe/hd-transport';
 
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
@@ -13,9 +13,6 @@ export default class DeviceChangePin extends BaseMethod<ChangePin> {
 
   init() {
     this.unlockPolicy = 'unlock-before-run';
-    // Protocol V2 device-management actions are not wallet-scoped, so either
-    // the main PIN or an Attach PIN may authorize them.
-    this.protocolV2PreUnlockPinType = DeviceSessionPinType.Any;
     this.useDevicePassphraseState = false;
 
     // check payload

package/src/api/device/DeviceVerify.ts

@@ -1,6 +1,5 @@
 import { sha256 } from '@noble/hashes/sha256';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import { DeviceSessionPinType } from '@onekeyfe/hd-transport';
 import { bytesToHex } from '@noble/hashes/utils';
 
 import { formatAnyHex } from '../helpers/hexUtils';
@@ -12,15 +11,7 @@ import type { BixinVerifyDeviceRequest } from '@onekeyfe/hd-transport';
 import type { DeviceVerifySignature } from '../../types';
 
 export default class DeviceVerify extends BaseMethod<BixinVerifyDeviceRequest> {
-  getSupportedProtocols() {
-    return ['V1', 'V2'] as const;
-  }
-
   init() {
-    this.unlockPolicy = 'unlock-before-run';
-    // Protocol V2 device-management actions are not wallet-scoped, so either
-    // the main PIN or an Attach PIN may authorize them.
-    this.protocolV2PreUnlockPinType = DeviceSessionPinType.Any;
     this.useDevicePassphraseState = false;
 
     // check payload

package/src/api/device/DeviceWipe.ts

@@ -1,4 +1,4 @@
-import { DeviceSessionPinType, DeviceSettingsPage } from '@onekeyfe/hd-transport';
+import { DeviceSettingsPage } from '@onekeyfe/hd-transport';
 
 import { BaseMethod } from '../BaseMethod';
 
@@ -11,9 +11,6 @@ export default class DeviceWipe extends BaseMethod<WipeDevice> {
 
   init() {
     this.unlockPolicy = 'unlock-before-run';
-    // Protocol V2 device-management actions are not wallet-scoped, so either
-    // the main PIN or an Attach PIN may authorize them.
-    this.protocolV2PreUnlockPinType = DeviceSessionPinType.Any;
     this.useDevicePassphraseState = false;
     this.protocolV2UiInteraction = {
       request: 'button',