@onekeyfe/hd-core 1.2.0-alpha.183 → 1.2.0-alpha.184

package/dist/index.js

@@ -41579,11 +41579,12 @@ const buildDeviceSessionGetRequest = ({ sessionId, expectedPassphraseState, deri
             hdTransport.DeviceSessionSeedDomain.SeedDomain_Standard,
             ...(deriveCardano ? [hdTransport.DeviceSessionSeedDomain.SeedDomain_Cardano] : []),
         ] }));
-const askDevicePassphrase = (device, requestPayload) => __awaiter(void 0, void 0, void 0, function* () {
+const askDevicePassphrase = (device, requestPayload, onStatusRefreshed) => __awaiter(void 0, void 0, void 0, function* () {
     yield device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', requestPayload);
     yield refreshProtocolV2DeviceStatus(device);
+    onStatusRefreshed === null || onStatusRefreshed === void 0 ? void 0 : onStatusRefreshed();
 });
-const selectDeviceSession = (device, expectedPassphraseState, deriveCardano) => __awaiter(void 0, void 0, void 0, function* () {
+const selectDeviceSession = (device, expectedPassphraseState, deriveCardano, onStatusRefreshed) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d;
     const existsAttachPinUser = ((_a = device.features) === null || _a === void 0 ? void 0 : _a.attachToPinEnabled) === true;
     const metadata = Object.assign({ source: 'wallet-session-coordinator', reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet' }, (expectedPassphraseState ? { expectedPassphraseState } : {}));
@@ -41616,18 +41617,19 @@ const selectDeviceSession = (device, expectedPassphraseState, deriveCardano) =>
             emitUiEvent: false,
             interaction: attachPinInteraction,
         });
+        onStatusRefreshed === null || onStatusRefreshed === void 0 ? void 0 : onStatusRefreshed();
         return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
     }
     if (hasHostPassphrase) {
         yield askDevicePassphrase(device, {
             passphrase: hostPassphrase,
             on_device: false,
-        });
+        }, onStatusRefreshed);
         return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
     }
     const passphraseOnDeviceInteraction = (_d = device.createProtocolV2UiPhaseMetadata) === null || _d === void 0 ? void 0 : _d.call(device, 'passphrase-on-device', 'start');
     device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, Object.assign(Object.assign({}, metadata), (passphraseOnDeviceInteraction ? { interaction: passphraseOnDeviceInteraction } : {})));
-    yield askDevicePassphrase(device, { on_device: true });
+    yield askDevicePassphrase(device, { on_device: true }, onStatusRefreshed);
     return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
 });
 function getProtocolV2WalletSession(device, options) {
@@ -41661,9 +41663,15 @@ function getProtocolV2WalletSession(device, options) {
             : undefined;
         let response;
         let resumed = false;
-        let mainPinSelected = (options === null || options === void 0 ? void 0 : options.onlyMainPin) === true &&
-            ((_d = device.features) === null || _d === void 0 ? void 0 : _d.unlocked) === true &&
-            ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlockedAttachPin) === false;
+        let walletStatusRefreshed = false;
+        const markWalletStatusRefreshed = () => {
+            walletStatusRefreshed = true;
+        };
+        let mainPinAuthenticated = (options === null || options === void 0 ? void 0 : options.mainPinSelected) === true ||
+            ((options === null || options === void 0 ? void 0 : options.onlyMainPin) === true &&
+                ((_d = device.features) === null || _d === void 0 ? void 0 : _d.unlocked) === true &&
+                ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlockedAttachPin) === false);
+        let standardWalletSelected = (options === null || options === void 0 ? void 0 : options.mainPinSelected) === true;
         const clearCurrentWalletSession = () => {
             var _a;
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
@@ -41676,6 +41684,7 @@ function getProtocolV2WalletSession(device, options) {
         const rejectMismatchedAttachPinWallet = () => __awaiter(this, void 0, void 0, function* () {
             var _k;
             const features = yield refreshProtocolV2DeviceStatus(device);
+            markWalletStatusRefreshed();
             if (features.unlockedAttachPin !== true) {
                 return;
             }
@@ -41697,28 +41706,35 @@ function getProtocolV2WalletSession(device, options) {
             yield rejectMismatchedAttachPinWallet();
         }
         const selectMainPin = (force = false) => __awaiter(this, void 0, void 0, function* () {
-            if (force || !mainPinSelected) {
+            if (force || !mainPinAuthenticated) {
                 yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
                     source: 'wallet-session-coordinator',
                     reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
                     deviceOnly: true,
                 });
-                mainPinSelected = true;
+                markWalletStatusRefreshed();
+                mainPinAuthenticated = true;
+                standardWalletSelected = true;
             }
         });
         const selectStandardWallet = () => __awaiter(this, void 0, void 0, function* () {
             var _m;
-            yield selectMainPin();
             if (((_m = device.features) === null || _m === void 0 ? void 0 : _m.passphraseProtection) === true) {
+                yield selectMainPin();
                 yield askDevicePassphrase(device, {
                     passphrase: '',
                     on_device: false,
-                });
+                }, markWalletStatusRefreshed);
+                standardWalletSelected = true;
+            }
+            else if (!standardWalletSelected) {
+                yield selectMainPin(true);
             }
         });
         if (readCurrentAttachPinSession) {
             const status = yield requestProtocolV2DeviceStatus$1(device);
             device.updateProtocolV2Status(status);
+            markWalletStatusRefreshed();
             if (status.unlocked !== true ||
                 status.passphrase_enabled !== true ||
                 status.unlocked_by_attach_to_pin !== true) {
@@ -41789,7 +41805,7 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
-            response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
+            response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano, markWalletStatusRefreshed);
         }
         let { message } = response;
         try {
@@ -41818,7 +41834,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             else {
                 device.clearInternalState();
-                response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
+                response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano, markWalletStatusRefreshed);
             }
             message = response.message;
             try {
@@ -41856,7 +41872,7 @@ function getProtocolV2WalletSession(device, options) {
         if (readCurrentAttachPinSession) {
             unlockedAttachPin = true;
         }
-        else if (mainPinSelected) {
+        else if (mainPinAuthenticated) {
             unlockedAttachPin = false;
         }
         return {
@@ -41864,6 +41880,7 @@ function getProtocolV2WalletSession(device, options) {
             newSession: message.session_id,
             unlockedAttachPin,
             resumed,
+            walletStatusRefreshed,
         };
     });
 }
@@ -41931,6 +41948,7 @@ const getPassphraseStateWithRefreshDeviceInfo = (device, options) => __awaiter(v
             onlyMainPin: options === null || options === void 0 ? void 0 : options.onlyMainPin,
             deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
             rejectAttachPinForMainWallet: options === null || options === void 0 ? void 0 : options.rejectAttachPinForMainWallet,
+            mainPinSelected: options === null || options === void 0 ? void 0 : options.mainPinSelected,
         });
     }
     const { features } = device;
@@ -41976,6 +41994,7 @@ const getPassphraseState = (device, options) => __awaiter(void 0, void 0, void 0
             onlyMainPin: options === null || options === void 0 ? void 0 : options.onlyMainPin,
             deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
             rejectAttachPinForMainWallet: options === null || options === void 0 ? void 0 : options.rejectAttachPinForMainWallet,
+            mainPinSelected: options === null || options === void 0 ? void 0 : options.mainPinSelected,
         });
     }
     const supportAttachPinCapability = existCapability(features, hdTransport.Enum_Capability.Capability_AttachToPin);
@@ -46460,7 +46479,7 @@ class Device extends events.exports {
             return Promise.resolve(features);
         });
     }
-    checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck, deriveCardano) {
+    checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck, deriveCardano, mainPinSelected) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isUnacquired())
                 return false;
@@ -46470,6 +46489,7 @@ class Device extends events.exports {
                 onlyMainPin: useEmptyPassphrase,
                 deriveCardano,
                 rejectAttachPinForMainWallet: useEmptyPassphrase === true,
+                mainPinSelected,
             });
             const mainWalletUseAttachPin = unlockedAttachPin && useEmptyPassphrase;
             const useErrorAttachPin = unlockedAttachPin &&
@@ -47294,6 +47314,10 @@ const wasResumed = (session) => !!session &&
     typeof session === 'object' &&
     'resumed' in session &&
     session.resumed === true;
+const wasWalletStatusRefreshed = (session) => !!session &&
+    typeof session === 'object' &&
+    'walletStatusRefreshed' in session &&
+    session.walletStatusRefreshed === true;
 const requireHiddenWalletResponse = (session) => {
     if (!session.passphraseState) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Hidden wallet response is missing passphraseState');
@@ -47336,12 +47360,20 @@ class OpenWalletSession extends BaseMethod {
         this.unlockPolicy = 'unlock-before-run';
         this.skipForceUpdateCheck = true;
         this.params = normalizeParams(this.payload);
+        this.protocolV2PreUnlockPinType =
+            this.params.mode === OpenWalletSessionMode.SelectHidden
+                ? hdTransport.DeviceSessionPinType.Any
+                : hdTransport.DeviceSessionPinType.Main;
         this.payload.useEmptyPassphrase = this.params.mode === OpenWalletSessionMode.Standard;
     }
     run() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const isProtocolV2 = this.device.isProtocolV2();
-            let state = yield this.device.getDeviceState({ refreshSections: ['status'] });
+            const reusePreflightStatus = isProtocolV2 && ((_a = this.protocolV2UnlockContext) === null || _a === void 0 ? void 0 : _a.preflightStatusRefreshed) === true;
+            let state = reusePreflightStatus
+                ? yield this.device.getDeviceState()
+                : yield this.device.getDeviceState({ refreshSections: ['status'] });
             let currentDeviceId = state.identity.deviceId;
             const hasAuthoritativeProtocolV2WalletStatus = (candidate) => candidate.status.unlocked === true &&
                 typeof candidate.status.passphraseProtection === 'boolean' &&
@@ -47363,9 +47395,18 @@ class OpenWalletSession extends BaseMethod {
                 currentDeviceId = state.identity.deviceId;
                 return state;
             });
+            const resolveProtocolV2DeviceStateAfterSession = (session) => __awaiter(this, void 0, void 0, function* () {
+                if (!wasWalletStatusRefreshed(session)) {
+                    return refreshProtocolV2DeviceState();
+                }
+                state = yield this.device.getDeviceState();
+                currentDeviceId = state.identity.deviceId;
+                return state;
+            });
             const ensureProtocolV2WalletStatus = () => __awaiter(this, void 0, void 0, function* () {
+                var _d;
                 if (isProtocolV2 && !hasAuthoritativeProtocolV2WalletStatus(state)) {
-                    yield this.device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
+                    yield this.device.unlockDevice((_d = this.protocolV2PreUnlockPinType) !== null && _d !== void 0 ? _d : hdTransport.DeviceSessionPinType.Main, {
                         source: 'unlock-coordinator',
                         reason: 'device-locked',
                         deviceOnly: true,
@@ -47384,13 +47425,14 @@ class OpenWalletSession extends BaseMethod {
                         deriveCardano: this.payload.deriveCardano,
                         selectMainWalletBeforeRestore: !hasAuthoritativeProtocolV2WalletStatus(state) ||
                             state.status.unlockedAttachPin === true,
+                        mainPinSelected: (_b = this.protocolV2UnlockContext) === null || _b === void 0 ? void 0 : _b.preflightMainPinSelected,
                     })
                     : yield getPassphraseStateWithRefreshDeviceInfo(this.device, {
                         onlyMainPin: true,
                         initSession: this.payload.initSession,
                     });
                 const refreshedState = isProtocolV2
-                    ? requireAuthoritativeProtocolV2WalletStatus(yield refreshProtocolV2DeviceState())
+                    ? requireAuthoritativeProtocolV2WalletStatus(yield resolveProtocolV2DeviceStateAfterSession(session))
                     : state;
                 const deviceId = requireDeviceId();
                 if (session.unlockedAttachPin ||
@@ -47398,7 +47440,7 @@ class OpenWalletSession extends BaseMethod {
                     try {
                         yield this.device.lockDevice();
                     }
-                    catch (_a) {
+                    catch (_c) {
                     }
                     this.device.clearInternalState();
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
@@ -47462,7 +47504,7 @@ class OpenWalletSession extends BaseMethod {
                     : { forceWalletSelection: true })), { deriveCardano: this.payload.deriveCardano }))
                 : yield getPassphraseStateWithRefreshDeviceInfo(this.device, { initSession: true });
             const refreshedState = isProtocolV2
-                ? requireAuthoritativeProtocolV2WalletStatus(yield refreshProtocolV2DeviceState())
+                ? requireAuthoritativeProtocolV2WalletStatus(yield resolveProtocolV2DeviceStateAfterSession(session))
                 : state;
             const deviceId = requireDeviceId();
             if (isProtocolV2 && refreshedState.status.passphraseProtection !== true) {
@@ -51871,11 +51913,12 @@ 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.FirmwareVerificationFailed ||
-            ((_a = error.params) === null || _a === void 0 ? void 0 : _a.firmwareUpdateCode) === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE);
+    return hdShared.isBleStaleBondHardwareError(error) ||
+        (error instanceof hdShared.HardwareError &&
+            (error.errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
+                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));
 };
 const isProtocolV2TargetStatusFinished = (status) => normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_FINISHED;
 const isProtocolV2TargetStatusInProgress = (status) => normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_PENDING ||
@@ -52949,6 +52992,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 return true;
             }
             catch (error) {
+                if (hdShared.isBleStaleBondHardwareError(error)) {
+                    throw error;
+                }
                 Log$7.log(`[FirmwareUpdateV4] RESC bundle ${bundle.name} header check failed: `, error);
                 return false;
             }
@@ -53033,7 +53079,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     lastError = new Error('Protocol V2 device is reachable but is not in bootloader mode');
                 }
                 catch (error) {
-                    if (this.isProtocolV2ReconnectIdentityError(error)) {
+                    if (hdShared.isBleStaleBondHardwareError(error) || this.isProtocolV2ReconnectIdentityError(error)) {
                         throw error;
                     }
                     shouldReconnect = true;
@@ -53236,6 +53282,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     return processedSize + source.size;
                 }
                 catch (error) {
+                    if (hdShared.isBleStaleBondHardwareError(error)) {
+                        throw error;
+                    }
                     lastError = error;
                     if (attempt < PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
                         yield this.recoverProtocolV2FileTransfer();
@@ -53589,6 +53638,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 }
             }
             catch (error) {
+                if (hdShared.isBleStaleBondHardwareError(error)) {
+                    throw error;
+                }
                 Log$7.log('[FirmwareUpdateV4] unable to confirm App mode before Normal reboot: ', error);
             }
             yield this.protocolV2Reboot(hdTransport.DeviceRebootType.Normal);
@@ -53663,7 +53715,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     lastError = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, 'Protocol V2 device is still in bootloader mode');
                 }
                 catch (error) {
-                    if (this.isProtocolV2ReconnectIdentityError(error)) {
+                    if (hdShared.isBleStaleBondHardwareError(error) || this.isProtocolV2ReconnectIdentityError(error)) {
                         throw error;
                     }
                     shouldReconnect = true;
@@ -54861,6 +54913,8 @@ class ProtocolV2UiInteractionCoordinator {
 const Log$3 = getLogger(exports.LoggerNames.Core);
 const createProtocolV2UnlockContext = () => ({
     preflightCompleted: false,
+    preflightStatusRefreshed: false,
+    preflightMainPinSelected: false,
 });
 const resolvePreUnlockPinType = (method) => {
     var _a, _b;
@@ -54893,10 +54947,11 @@ function runMethodWithUnlockPolicy(method, device, options = {}) {
             }
             yield (afterStatusBeforeUnlock === null || afterStatusBeforeUnlock === void 0 ? void 0 : afterStatusBeforeUnlock());
             if (!status.unlocked) {
+                const preUnlockPinType = resolvePreUnlockPinType(method);
                 const unlockInteraction = shouldCoordinateUi
                     ? uiCoordinator.enterUnlockInteraction(method.name)
                     : undefined;
-                const unlockedStatus = yield device.unlockDevice(resolvePreUnlockPinType(method), shouldCoordinateUi
+                const unlockedStatus = yield device.unlockDevice(preUnlockPinType, shouldCoordinateUi
                     ? { emitUiEvent: false, interaction: unlockInteraction }
                     : {
                         source: 'unlock-coordinator',
@@ -54907,8 +54962,10 @@ function runMethodWithUnlockPolicy(method, device, options = {}) {
                 if ((unlockedStatus === null || unlockedStatus === void 0 ? void 0 : unlockedStatus.unlocked) !== true) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device remained locked after the unlock flow.');
                 }
+                context.preflightMainPinSelected = preUnlockPinType === hdTransport.DeviceSessionPinType.Main;
                 Log$3.debug('Protocol V2 pre-unlock completed', { method: method.name });
             }
+            context.preflightStatusRefreshed = true;
             context.preflightCompleted = true;
         }
         yield (prepare === null || prepare === void 0 ? void 0 : prepare());
@@ -55197,6 +55254,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
                 const response = yield runMethodWithUnlockPolicy(method, this.device, {
                     context: this.protocolV2UnlockContext,
                     prepare: () => __awaiter(this, void 0, void 0, function* () {
+                        var _d;
                         if (this.temporarySafetyCheckPrompted) {
                             method.temporarySafetyCheckPrompted = true;
                         }
@@ -55210,7 +55268,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
                         const deriveCardano = method.name.startsWith('cardano');
                         const shouldResumeWalletSession = useEmptyPassphrase || !!this.payload.passphraseState;
                         if (this.device.isProtocolV2() && shouldResumeWalletSession) {
-                            const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, useEmptyPassphrase, this.payload.skipPassphraseCheck, deriveCardano);
+                            const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, useEmptyPassphrase, this.payload.skipPassphraseCheck, deriveCardano, (_d = this.protocolV2UnlockContext) === null || _d === void 0 ? void 0 : _d.preflightMainPinSelected);
                             if (!passphraseStateSafety) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
                             }
@@ -65307,7 +65365,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         }
                     },
                     prepare: () => __awaiter(void 0, void 0, void 0, function* () {
-                        var _o, _p, _q, _r, _s;
+                        var _o, _p, _q, _r, _s, _t;
                         if (method.deviceId && method.checkDeviceId && !deviceIdCheckedDuringUnlockPreflight) {
                             const isSameDeviceID = yield checkLiveDeviceId(device, method.deviceId);
                             if (!isSameDeviceID) {
@@ -65327,7 +65385,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                     require: support.require,
                                 });
                             }
-                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_o = method.payload) === null || _o === void 0 ? void 0 : _o.passphraseState, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.useEmptyPassphrase, (_q = method.payload) === null || _q === void 0 ? void 0 : _q.skipPassphraseCheck, hasDeriveCardano(method));
+                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_o = method.payload) === null || _o === void 0 ? void 0 : _o.passphraseState, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.useEmptyPassphrase, (_q = method.payload) === null || _q === void 0 ? void 0 : _q.skipPassphraseCheck, hasDeriveCardano(method), (_r = method.protocolV2UnlockContext) === null || _r === void 0 ? void 0 : _r.preflightMainPinSelected);
                             checkPassphraseEnableState(method, device.features);
                             if (!passphraseStateSafety) {
                                 DevicePool.clearDeviceCache(method.payload.connectId);
@@ -65345,7 +65403,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                 ? e
                                 : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                         }
-                        (_s = (_r = method.device) === null || _r === void 0 ? void 0 : _r.commands) === null || _s === void 0 ? void 0 : _s.checkDisposed();
+                        (_t = (_s = method.device) === null || _s === void 0 ? void 0 : _s.commands) === null || _t === void 0 ? void 0 : _t.checkDisposed();
                     }),
                 });
                 messageResponse = createResponseMessage(method.responseID, true, response);
@@ -65561,6 +65619,11 @@ function isMissingDetectedProtocolV2Error(method, error) {
         typeof typedError.message === 'string' &&
         typedError.message.includes('Device protocol has not been detected'));
 }
+function isProtocolV2PeerRemovedPairingError(method, error) {
+    return (method.payload.connectProtocol === 'V2' &&
+        (error === null || error === void 0 ? void 0 : error.errorCode) ===
+            hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation);
+}
 const BLE_ACQUIRE_DEADLINE_MS = 60 * 1000;
 function raceBleAcquire(acquirePromise, abortSignal) {
     return new Promise((resolve, reject) => {
@@ -65672,7 +65735,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
     Log.debug(`EnsureConnected function start, MAX_RETRY_COUNT=${MAX_RETRY_COUNT}, POLL_INTERVAL_TIME=${POLL_INTERVAL_TIME}  `);
     const poll = (time = POLL_INTERVAL_TIME) => __awaiter(void 0, void 0, void 0, function* () {
         return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-            var _t;
+            var _u;
             const abort = () => {
                 if (abortSignal && abortSignal.aborted) {
                     if (timer) {
@@ -65782,7 +65845,8 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     hdShared.HardwareErrorCode.BridgeNeedsPermission,
                     hdShared.HardwareErrorCode.DeviceInterruptedFromUser,
                     hdShared.HardwareErrorCode.CallQueueActionCancelled,
-                ].includes(error.errorCode)) {
+                ].includes(error.errorCode) ||
+                    isProtocolV2PeerRemovedPairingError(method, error)) {
                     reject(error);
                     return;
                 }
@@ -65792,7 +65856,7 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     clearTimeout(timer);
                 }
                 Log.debug('EnsureConnected get to max try count, will return: ', tryCount);
-                if (DataManager.isBrowserWebUsb(env) && !((_t = method.payload) === null || _t === void 0 ? void 0 : _t.skipWebDevicePrompt)) {
+                if (DataManager.isBrowserWebUsb(env) && !((_u = method.payload) === null || _u === void 0 ? void 0 : _u.skipWebDevicePrompt)) {
                     postMessage(createUiMessage(UI_REQUEST.WEB_DEVICE_PROMPT_ACCESS_PERMISSION));
                     reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission));
                 }
@@ -65905,8 +65969,12 @@ const checkPassphraseEnableState = (method, features) => {
     }
 };
 const shouldCheckPassphraseState = (method, device) => {
+    var _a;
     if (!method.useDevicePassphraseState)
         return false;
+    if (device.isProtocolV2() && ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.useEmptyPassphrase) === true) {
+        return true;
+    }
     return device.hasUsePassphrase();
 };
 const cleanup = () => {

package/dist/protocols/protocol-v2/unlockPolicyRunner.d.ts

@@ -3,6 +3,8 @@ import type { Device } from '../../device/Device';
 import type { ProtocolV2UiInteractionCoordinator } from './uiInteraction';
 export type ProtocolV2UnlockContext = {
     preflightCompleted: boolean;
+    preflightStatusRefreshed?: boolean;
+    preflightMainPinSelected?: boolean;
 };
 export declare const createProtocolV2UnlockContext: () => ProtocolV2UnlockContext;
 type RunnableMethod = Pick<BaseMethod, 'run' | 'unlockPolicy' | 'useDevicePassphraseState' | 'protocolV2UiInteraction' | 'protocolV2UiMode' | 'protocolV2PreUnlockPinType' | 'params' | 'payload'> & {

package/dist/protocols/protocol-v2/unlockPolicyRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unlockPolicyRunner.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockPolicyRunner.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,uBAE/C,CAAC;AAEH,KAAK,cAAc,GAAG,IAAI,CACxB,UAAU,EACR,KAAK,GACL,cAAc,GACd,0BAA0B,GAC1B,yBAAyB,GACzB,kBAAkB,GAClB,4BAA4B,GAC5B,QAAQ,GACR,SAAS,CACZ,GAAG;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD,CAAC;AAEF,KAAK,wBAAwB,GAAG,IAAI,CAClC,kCAAkC,EAClC,wBAAwB,GAAG,wBAAwB,CACpD,CAAC;AAEF,KAAK,gCAAgC,CAAC,CAAC,IAAI;IACzC,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,uBAAuB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;CACxB,CAAC;AAkBF,wBAAsB,yBAAyB,CAAC,CAAC,GAAG,OAAO,EACzD,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,gCAAgC,CAAC,CAAC,CAAM,GAChD,OAAO,CAAC,CAAC,CAAC,CAiEZ"}
+{"version":3,"file":"unlockPolicyRunner.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockPolicyRunner.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,uBAI/C,CAAC;AAEH,KAAK,cAAc,GAAG,IAAI,CACxB,UAAU,EACR,KAAK,GACL,cAAc,GACd,0BAA0B,GAC1B,yBAAyB,GACzB,kBAAkB,GAClB,4BAA4B,GAC5B,QAAQ,GACR,SAAS,CACZ,GAAG;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD,CAAC;AAEF,KAAK,wBAAwB,GAAG,IAAI,CAClC,kCAAkC,EAClC,wBAAwB,GAAG,wBAAwB,CACpD,CAAC;AAEF,KAAK,gCAAgC,CAAC,CAAC,IAAI;IACzC,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,uBAAuB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;CACxB,CAAC;AAkBF,wBAAsB,yBAAyB,CAAC,CAAC,GAAG,OAAO,EACzD,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,gCAAgC,CAAC,CAAC,CAAM,GAChD,OAAO,CAAC,CAAC,CAAC,CAoEZ"}

package/dist/protocols/protocol-v2/walletSession.d.ts

@@ -12,16 +12,19 @@ export declare function getProtocolV2WalletSession(device: Device, options?: {
     resumeOnly?: boolean;
     deriveCardano?: boolean;
     readCurrentAttachPinSession?: boolean;
+    mainPinSelected?: boolean;
 }): Promise<{
     passphraseState: string;
     newSession: string;
     unlockedAttachPin: boolean | undefined;
     resumed: boolean;
+    walletStatusRefreshed: boolean;
 }>;
 export declare function restoreProtocolV2WalletSession(device: Device, expectedPassphraseState: string, deriveCardano?: boolean): Promise<{
     passphraseState: string;
     newSession: string;
     unlockedAttachPin: boolean | undefined;
     resumed: boolean;
+    walletStatusRefreshed: boolean;
 }>;
 //# sourceMappingURL=walletSession.d.ts.map

package/dist/protocols/protocol-v2/walletSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AA0HD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC;;;;;GAiQF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;GAOxB"}
+{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AAqID,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,2BAA2B,CAAC,EAAE,OAAO,CAAC;IAEtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;GA+RF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;;GAOxB"}

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -14,11 +14,13 @@ export declare const getPassphraseStateWithRefreshDeviceInfo: (device: Device, o
     initSession?: boolean;
     deriveCardano?: boolean;
     rejectAttachPinForMainWallet?: boolean;
+    mainPinSelected?: boolean;
 }) => Promise<{
     passphraseState: string;
     newSession: string;
     unlockedAttachPin: boolean | undefined;
     resumed: boolean;
+    walletStatusRefreshed: boolean;
 } | {
     passphraseState: string | undefined;
     newSession: string | undefined;
@@ -30,6 +32,7 @@ export declare const getPassphraseState: (device: Device, options?: {
     initSession?: boolean;
     deriveCardano?: boolean;
     rejectAttachPinForMainWallet?: boolean;
+    mainPinSelected?: boolean;
 }) => Promise<{
     passphraseState: string | undefined;
     newSession: string | undefined;

package/dist/utils/deviceFeaturesUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,aAAa,EAA6B,MAAM,qBAAqB,CAAC;AAKjG,OAAoB,EAClB,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC7B,MAAM,6BAA6B,CAAC;AAOrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAe,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE1E,eAAO,MAAM,iCAAiC,aAClC,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,uBAAuB,EAAE,uBAAuB,CAAA;CA6CpE,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAAe,QAAQ,KAAG,kBAe/D,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,QAAQ,KAAG,kBAgB1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAC1C,MAAM,YACJ;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC;;;;;;;;;EAsEF,CAAC;AAMF,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACJ;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4BAA4B,CAAC,EAAE,OAAO,CAAC;CACxC,KACA,QAAQ;IACT,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;CACxC,CAmEA,CAAC;AAKF,eAAO,MAAM,uBAAuB,cAAe,QAAQ,KAAG,kBAU7D,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAAmB,aAAa,KAAG,cAKrE,CAAC;AAKF,eAAO,MAAM,sBAAsB;cAMvB,QAAQ;gBACN,UAAU,GAAG,KAAK;;kBAEhB,aAAa;MACzB,KAAK,GAAG,cA6BX,CAAC;AAMF,eAAO,MAAM,2BAA2B,aAC5B,QAAQ,cACN,UAAU,GAAG,KAAK,GAAG,YAAY,KAC5C,CAAC,KAAK,GAAG,cAAc,CAAC,EAsC1B,CAAC;AAEF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,UASzC;AAED,eAAO,MAAM,0BAA0B,aAAc,QAAQ,KAAG,QAU/D,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,KAAK,aAAa,EAA6B,MAAM,qBAAqB,CAAC;AAKjG,OAAoB,EAClB,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC7B,MAAM,6BAA6B,CAAC;AAOrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAe,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE1E,eAAO,MAAM,iCAAiC,aAClC,QAAQ,GAAG,SAAS,KAC7B;IAAE,QAAQ,EAAE,IAAI,CAAC;IAAC,uBAAuB,EAAE,uBAAuB,CAAA;CA6CpE,CAAC;AAEF,eAAO,MAAM,yBAAyB,cAAe,QAAQ,KAAG,kBAe/D,CAAC;AAEF,eAAO,MAAM,oBAAoB,cAAe,QAAQ,KAAG,kBAgB1D,CAAC;AAEF,eAAO,MAAM,uCAAuC,WAC1C,MAAM,YACJ;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;;;;;;;;;;EAuEF,CAAC;AAMF,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACJ;IACR,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,KACA,QAAQ;IACT,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,iBAAiB,EAAE,OAAO,GAAG,SAAS,CAAC;CACxC,CAoEA,CAAC;AAKF,eAAO,MAAM,uBAAuB,cAAe,QAAQ,KAAG,kBAU7D,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAAmB,aAAa,KAAG,cAKrE,CAAC;AAKF,eAAO,MAAM,sBAAsB;cAMvB,QAAQ;gBACN,UAAU,GAAG,KAAK;;kBAEhB,aAAa;MACzB,KAAK,GAAG,cA6BX,CAAC;AAMF,eAAO,MAAM,2BAA2B,aAC5B,QAAQ,cACN,UAAU,GAAG,KAAK,GAAG,YAAY,KAC5C,CAAC,KAAK,GAAG,cAAc,CAAC,EAsC1B,CAAC;AAEF,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,UASzC;AAED,eAAO,MAAM,0BAA0B,aAAc,QAAQ,KAAG,QAU/D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.183",
+  "version": "1.2.0-alpha.184",
   "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.183",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.183",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.184",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.184",
     "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": "fd9b6e749495b0144e734dbe32c57cf483547349"
+  "gitHead": "833ce30a921a49ca0ed60cfc491062c26f5b90ae"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -1,4 +1,11 @@
-import { EDeviceType, ERRORS, HardwareError, HardwareErrorCode, wait } from '@onekeyfe/hd-shared';
+import {
+  EDeviceType,
+  ERRORS,
+  HardwareError,
+  HardwareErrorCode,
+  isBleStaleBondHardwareError,
+  wait,
+} from '@onekeyfe/hd-shared';
 import JSZip from 'jszip';
 import {
   DeviceRebootType,
@@ -360,11 +367,12 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error: unknown) => {
 };
 
 const isProtocolV2TerminalInstallStatusError = (error: unknown) =>
-  error instanceof HardwareError &&
-  (error.errorCode === HardwareErrorCode.ActionCancelled ||
-    error.errorCode === HardwareErrorCode.FirmwareError ||
-    error.errorCode === HardwareErrorCode.FirmwareVerificationFailed ||
-    error.params?.firmwareUpdateCode === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE);
+  isBleStaleBondHardwareError(error) ||
+  (error instanceof HardwareError &&
+    (error.errorCode === HardwareErrorCode.ActionCancelled ||
+      error.errorCode === HardwareErrorCode.FirmwareError ||
+      error.errorCode === HardwareErrorCode.FirmwareVerificationFailed ||
+      error.params?.firmwareUpdateCode === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE));
 
 const isProtocolV2TargetStatusFinished = (status: ProtocolV2FirmwareUpdateStatusTarget['status']) =>
   normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_FINISHED;
@@ -1812,6 +1820,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       if (!expectedHeaderHash || header.headerHash !== expectedHeaderHash) return false;
       return true;
     } catch (error) {
+      if (isBleStaleBondHardwareError(error)) {
+        throw error;
+      }
       Log.log(`[FirmwareUpdateV4] RESC bundle ${bundle.name} header check failed: `, error);
       return false;
     }
@@ -1905,7 +1916,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         }
         lastError = new Error('Protocol V2 device is reachable but is not in bootloader mode');
       } catch (error) {
-        if (this.isProtocolV2ReconnectIdentityError(error)) {
+        if (isBleStaleBondHardwareError(error) || this.isProtocolV2ReconnectIdentityError(error)) {
           throw error;
         }
         shouldReconnect = true;
@@ -2187,6 +2198,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         });
         return processedSize + source.size;
       } catch (error) {
+        if (isBleStaleBondHardwareError(error)) {
+          throw error;
+        }
         lastError = error;
         if (attempt < PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
           await this.recoverProtocolV2FileTransfer();
@@ -2683,6 +2697,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         return;
       }
     } catch (error) {
+      if (isBleStaleBondHardwareError(error)) {
+        throw error;
+      }
       Log.log('[FirmwareUpdateV4] unable to confirm App mode before Normal reboot: ', error);
     }
     await this.protocolV2Reboot(DeviceRebootType.Normal);
@@ -2774,7 +2791,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           'Protocol V2 device is still in bootloader mode'
         );
       } catch (error) {
-        if (this.isProtocolV2ReconnectIdentityError(error)) {
+        if (isBleStaleBondHardwareError(error) || this.isProtocolV2ReconnectIdentityError(error)) {
           throw error;
         }
         shouldReconnect = true;