@onekeyfe/hd-core 1.2.2-alpha.8 → 1.2.3-alpha.1

package/dist/index.js

@@ -13203,7 +13203,8 @@ var nested$2 = {
 	},
 	SolanaOffChainMessageVersion: {
 		values: {
-			MESSAGE_VERSION_0: 0
+			MESSAGE_VERSION_0: 0,
+			MESSAGE_VERSION_1: 1
 		}
 	},
 	SolanaOffChainMessageFormat: {
@@ -13236,14 +13237,16 @@ var nested$2 = {
 			},
 			message_format: {
 				type: "SolanaOffChainMessageFormat",
-				id: 4,
-				options: {
-					"default": "V0_RESTRICTED_ASCII"
-				}
+				id: 4
 			},
 			application_domain: {
 				type: "bytes",
 				id: 5
+			},
+			required_signers: {
+				rule: "repeated",
+				type: "bytes",
+				id: 7
 			}
 		}
 	},
@@ -31499,10 +31502,6 @@ var nested = {
 			request_id: {
 				type: "bytes",
 				id: 5
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 6
 			}
 		}
 	},
@@ -31758,10 +31757,6 @@ var nested = {
 			expected_address: {
 				type: "bytes",
 				id: 12
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 13
 			}
 		}
 	},
@@ -31846,10 +31841,6 @@ var nested = {
 			expected_address: {
 				type: "bytes",
 				id: 12
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 13
 			}
 		}
 	},
@@ -31997,7 +31988,29 @@ var nested = {
 				type: "EthereumAuthorizationSignature",
 				id: 10
 			}
-		}
+		},
+		reserved: [
+			[
+				5,
+				5
+			],
+			[
+				6,
+				6
+			],
+			[
+				7,
+				7
+			],
+			[
+				8,
+				8
+			],
+			[
+				9,
+				9
+			]
+		]
 	},
 	EthereumTxAckOneKey: {
 		fields: {
@@ -32026,10 +32039,6 @@ var nested = {
 			chain_id: {
 				type: "uint64",
 				id: 3
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 4
 			}
 		}
 	},
@@ -36027,7 +36036,8 @@ var nested = {
 	},
 	SolanaOffChainMessageVersion: {
 		values: {
-			MESSAGE_VERSION_0: 0
+			MESSAGE_VERSION_0: 0,
+			MESSAGE_VERSION_1: 1
 		}
 	},
 	SolanaOffChainMessageFormat: {
@@ -36075,10 +36085,6 @@ var nested = {
 				rule: "required",
 				type: "bytes",
 				id: 2
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 3
 			}
 		}
 	},
@@ -36115,17 +36121,15 @@ var nested = {
 			},
 			message_format: {
 				type: "SolanaOffChainMessageFormat",
-				id: 4,
-				options: {
-					"default": "V0_RESTRICTED_ASCII"
-				}
+				id: 4
 			},
 			application_domain: {
 				type: "bytes",
 				id: 5
 			},
-			source_fingerprint: {
-				type: "uint32",
+			required_signers: {
+				rule: "repeated",
+				type: "bytes",
 				id: 6
 			}
 		}
@@ -36144,10 +36148,6 @@ var nested = {
 				rule: "required",
 				type: "bytes",
 				id: 2
-			},
-			source_fingerprint: {
-				type: "uint32",
-				id: 3
 			}
 		}
 	},
@@ -38963,6 +38963,10 @@ var nested = {
 			manufacture_time: {
 				type: "DeviceFactoryInfoManufactureTime",
 				id: 5
+			},
+			data: {
+				type: "bytes",
+				id: 100
 			}
 		}
 	},
@@ -38972,11 +38976,19 @@ var nested = {
 				rule: "required",
 				type: "DeviceFactoryInfo",
 				id: 1
+			},
+			full_data: {
+				type: "bool",
+				id: 2
 			}
 		}
 	},
 	DeviceFactoryInfoGet: {
 		fields: {
+			full_data: {
+				type: "bool",
+				id: 1
+			}
 		}
 	},
 	DeviceFactoryPermanentLock: {
@@ -41663,61 +41675,13 @@ const LogBlockEvent = new Set([
     UI_RESPONSE.RECEIVE_PIN,
     UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
-const LogLabelMethod = new Set([
-    'openWalletSession',
+const LogPayloadBlockMethod = new Set([
     'deviceUploadNft',
     'deviceUploadWallpaper',
     'uploadPortfolio',
     'fileWrite',
     'fileRead',
 ]);
-const LogPayloadBlockMethod = new Set([
-    'deviceUploadNft',
-    'deviceUploadWallpaper',
-    'uploadPortfolio',
-]);
-const SensitiveLogKeys = new Set([
-    'devicestate',
-    'entropy',
-    'expectedpassphrasestate',
-    'mnemonic',
-    'passphrase',
-    'passphrasestate',
-    'password',
-    'pin',
-    'privatekey',
-    'seed',
-    'session',
-    'sessionid',
-    'walletsessionid',
-    'xprv',
-]);
-const normalizeLogKey = (key) => key.replace(/[_-]/g, '').toLowerCase();
-const isSigningMethod = (methodName) => /sign/i.test(methodName);
-const redactLogValue = (value, seen) => {
-    if (ArrayBuffer.isView(value)) {
-        return `[BINARY:${value.byteLength}]`;
-    }
-    if (value instanceof ArrayBuffer) {
-        return `[BINARY:${value.byteLength}]`;
-    }
-    if (Array.isArray(value)) {
-        return value.map(item => redactLogValue(item, seen));
-    }
-    if (!value || typeof value !== 'object')
-        return value;
-    if (seen.has(value))
-        return '[CIRCULAR]';
-    seen.add(value);
-    const redacted = Object.fromEntries(Object.entries(value).map(([key, item]) => [
-        key,
-        SensitiveLogKeys.has(normalizeLogKey(key)) && item !== null && item !== undefined
-            ? '[REDACTED]'
-            : redactLogValue(item, seen),
-    ]));
-    seen.delete(value);
-    return redacted;
-};
 function getLogBlockLabel(message) {
     if (!message || typeof message !== 'object')
         return undefined;
@@ -41726,26 +41690,16 @@ function getLogBlockLabel(message) {
         return type;
     }
     const methodName = method !== null && method !== void 0 ? method : payload === null || payload === void 0 ? void 0 : payload.method;
-    if (methodName && (LogLabelMethod.has(methodName) || isSigningMethod(methodName))) {
+    if (methodName && LogPayloadBlockMethod.has(methodName)) {
         return methodName;
     }
     return undefined;
 }
 function getSafeLogPayload(value, blockLabel) {
-    if (blockLabel &&
-        (LogBlockEvent.has(blockLabel) ||
-            LogPayloadBlockMethod.has(blockLabel) ||
-            isSigningMethod(blockLabel))) {
+    if (blockLabel) {
         return { method: blockLabel, payload: '[REDACTED]' };
     }
-    const redactedValue = redactLogValue(value, new WeakSet());
-    if (blockLabel &&
-        redactedValue &&
-        typeof redactedValue === 'object' &&
-        !Array.isArray(redactedValue)) {
-        return Object.assign(Object.assign({}, redactedValue), { method: blockLabel });
-    }
-    return redactedValue;
+    return value;
 }
 function formatLogMethodLabel(label, methodName) {
     return methodName ? `${label} [${methodName}]` : label;
@@ -41869,7 +41823,7 @@ const selectDeviceSession = (device, expectedPassphraseState, deriveCardano, onS
     return getDeviceSession(device, buildDeviceSessionGetRequest());
 });
 function getProtocolV2WalletSession(device, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     return __awaiter(this, void 0, void 0, function* () {
         const forceWalletSelection = (options === null || options === void 0 ? void 0 : options.forceWalletSelection) === true || (options === null || options === void 0 ? void 0 : options.initSession) === true;
         const readCurrentAttachPinSession = (options === null || options === void 0 ? void 0 : options.readCurrentAttachPinSession) === true;
@@ -41909,6 +41863,10 @@ function getProtocolV2WalletSession(device, options) {
         const markWalletStatusRefreshed = () => {
             walletStatusRefreshed = true;
         };
+        if ((options === null || options === void 0 ? void 0 : options.onlyMainPin) && options.mainPinSelected !== true) {
+            yield refreshProtocolV2DeviceStatus(device);
+            markWalletStatusRefreshed();
+        }
         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 &&
@@ -41936,7 +41894,7 @@ function getProtocolV2WalletSession(device, options) {
             return keepAttachPin ? Object.assign(session, { viaAttachPin: true }) : session;
         });
         const rejectMismatchedAttachPinWallet = () => __awaiter(this, void 0, void 0, function* () {
-            var _m;
+            var _o;
             const features = yield refreshProtocolV2DeviceStatus(device);
             markWalletStatusRefreshed();
             if (features.unlockedAttachPin !== true) {
@@ -41945,10 +41903,10 @@ function getProtocolV2WalletSession(device, options) {
             try {
                 yield device.lockDevice();
             }
-            catch (_o) {
+            catch (_p) {
             }
             if (options === null || options === void 0 ? void 0 : options.rejectAttachPinForMainWallet) {
-                (_m = device.clearStandardInternalState) === null || _m === void 0 ? void 0 : _m.call(device);
+                (_o = device.clearStandardInternalState) === null || _o === void 0 ? void 0 : _o.call(device);
                 device.clearInternalState();
             }
             else {
@@ -41957,11 +41915,11 @@ function getProtocolV2WalletSession(device, options) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
         });
         const lockAttachPinBeforePassphraseSelection = () => __awaiter(this, void 0, void 0, function* () {
-            var _p;
+            var _q;
             if (readCurrentAttachPinSession || (options === null || options === void 0 ? void 0 : options.onlyMainPin)) {
                 return;
             }
-            if (((_p = device.features) === null || _p === void 0 ? void 0 : _p.unlockedAttachPin) !== true) {
+            if (((_q = device.features) === null || _q === void 0 ? void 0 : _q.unlockedAttachPin) !== true) {
                 return;
             }
             yield rejectMismatchedAttachPinWallet();
@@ -41982,8 +41940,8 @@ function getProtocolV2WalletSession(device, options) {
             }
         });
         const selectStandardWallet = (forceMainPin = false) => __awaiter(this, void 0, void 0, function* () {
-            var _q;
-            if (((_q = device.features) === null || _q === void 0 ? void 0 : _q.passphraseProtection) === true) {
+            var _r;
+            if (((_r = device.features) === null || _r === void 0 ? void 0 : _r.passphraseProtection) === true) {
                 yield selectMainPin();
                 yield askDevicePassphrase(device, {
                     passphrase: '',
@@ -42048,6 +42006,9 @@ function getProtocolV2WalletSession(device, options) {
                     throw error;
                 }
                 resumed = false;
+                if (((_g = device.features) === null || _g === void 0 ? void 0 : _g.unlockedAttachPin) === true) {
+                    response = yield getDeviceSession(device, sessionGetRequest());
+                }
             }
         }
         else if (expectedPassphraseState) {
@@ -42076,7 +42037,7 @@ function getProtocolV2WalletSession(device, options) {
         }
         catch (error) {
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                (_g = device.clearStandardInternalState) === null || _g === void 0 ? void 0 : _g.call(device);
+                (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
             }
             else {
                 device.clearInternalState();
@@ -42091,7 +42052,7 @@ function getProtocolV2WalletSession(device, options) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
+                (_j = device.clearStandardInternalState) === null || _j === void 0 ? void 0 : _j.call(device);
                 yield selectStandardWallet(true);
                 response = yield getDeviceSession(device, sessionGetRequest());
             }
@@ -42106,7 +42067,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                    (_j = device.clearStandardInternalState) === null || _j === void 0 ? void 0 : _j.call(device);
+                    (_k = device.clearStandardInternalState) === null || _k === void 0 ? void 0 : _k.call(device);
                 }
                 else {
                     device.clearInternalState();
@@ -42129,7 +42090,7 @@ function getProtocolV2WalletSession(device, options) {
             if (sessionIsAttachPinWallet(response)) {
                 response = yield askEmptyPassphraseAndGet({ deriveCardano: true, keepAttachPin: true });
             }
-            else if (((_k = device.features) === null || _k === void 0 ? void 0 : _k.passphraseProtection) === false) {
+            else if (((_l = device.features) === null || _l === void 0 ? void 0 : _l.passphraseProtection) === false) {
                 response = yield getDeviceSession(device, buildDeviceSessionGetRequest());
             }
             else if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
@@ -42146,7 +42107,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                    (_l = device.clearStandardInternalState) === null || _l === void 0 ? void 0 : _l.call(device);
+                    (_m = device.clearStandardInternalState) === null || _m === void 0 ? void 0 : _m.call(device);
                 }
                 else {
                     device.clearInternalState();
@@ -43951,6 +43912,7 @@ class DeviceCommands {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.disposed = true;
+            this.disposalToken = {};
             yield ((_b = (_a = this.transport).cancel) === null || _b === void 0 ? void 0 : _b.call(_a));
         });
     }
@@ -44124,7 +44086,24 @@ class DeviceCommands {
     }
     _commonCall(type, msg, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const resp = yield this.call(type, msg, options);
+            const { disposalToken } = this;
+            let resp = yield this.call(type, msg, options);
+            for (let retry = 0; retry < 3 &&
+                this.device.isProtocolV2() &&
+                DEVICE_SESSION_CALLS.has(type) &&
+                resp.type === 'Failure' &&
+                resp.message.code === 'Failure_ProcessError' &&
+                resp.message.subcode === hdTransport.DeviceSessionErrorCode.DeviceSessionError_Busy; retry += 1) {
+                yield wait(100);
+                if (this.device.wasInterruptedByUser()) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInterruptedFromUser);
+                }
+                this.checkDisposed();
+                if (this.disposalToken !== disposalToken) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'DeviceCommands lifecycle changed');
+                }
+                resp = yield this.call(type, msg, options);
+            }
             return this._filterCommonTypes(resp, type, options);
         });
     }
@@ -52646,6 +52625,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.protocolV2InstallDisconnectObserved = false;
         this.protocolV2InstallTerminalSuccessObserved = false;
         this.protocolV2LastTransferProgressAt = 0;
+        this.protocolV2LastTransferredBytes = 0;
     }
     getSupportedProtocols() {
         return ['V2'];
@@ -53808,6 +53788,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.postTipMessage(exports.FirmwareUpdateTipMessage.StartTransferData);
             this.protocolV2LastTransferProgress = undefined;
             this.protocolV2LastTransferProgressAt = 0;
+            this.protocolV2LastTransferredBytes = 0;
             const transferStartedAt = Date.now();
             let processedSize = 0;
             for (const resource of resourcesToSync) {
@@ -53890,13 +53871,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             const now = Date.now();
                             const elapsedMs = Math.max(now - transferStartedAt, 0);
                             const progress = Math.min(Math.ceil((transferredBytes / totalSize) * 100), 99);
-                            const shouldPostProgress = progress !== this.protocolV2LastTransferProgress ||
-                                now - this.protocolV2LastTransferProgressAt >=
-                                    PROTOCOL_V2_TRANSFER_PROGRESS_HEARTBEAT_MS ||
-                                chunkEnd === source.size;
+                            const shouldPostProgress = transferredBytes >= this.protocolV2LastTransferredBytes &&
+                                (progress !== this.protocolV2LastTransferProgress ||
+                                    now - this.protocolV2LastTransferProgressAt >=
+                                        PROTOCOL_V2_TRANSFER_PROGRESS_HEARTBEAT_MS ||
+                                    chunkEnd === source.size);
                             if (shouldPostProgress) {
                                 this.protocolV2LastTransferProgress = progress;
                                 this.protocolV2LastTransferProgressAt = now;
+                                this.protocolV2LastTransferredBytes = transferredBytes;
                                 this.postProgressMessage(progress, 'transferData', {
                                     transferredBytes,
                                     totalBytes: totalSize,
@@ -55455,16 +55438,16 @@ const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 class UploadPortfolio extends FileWrite {
     init() {
-        const { packageBase64, timeoutMs } = this.payload;
+        const { packageBase64, timeoutMs, uiMode = 'silent' } = this.payload;
         const packageBytes = decodeCanonicalBase64({
             value: packageBase64,
             parameterName: 'packageBase64',
             maxBytes: PORTFOLIO_PACKAGE_MAX_BYTES,
         });
-        this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, emitProgress: false, timeoutMs });
+        this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, emitProgress: uiMode === 'progress', timeoutMs });
         super.init();
         this.unlockPolicy = 'none';
-        this.protocolV2UiMode = 'none';
+        this.protocolV2UiMode = uiMode === 'progress' ? 'auto' : 'none';
     }
     run() {
         const _super = Object.create(null, {
@@ -59510,6 +59493,23 @@ class SolSignTransaction extends BaseMethod {
     }
 }
 
+const SOLANA_PUBLIC_KEY_LENGTH = 32;
+const SOLANA_APPLICATION_DOMAIN_LENGTH = 32;
+const normalizeRequiredSigners = (requiredSigners = []) => {
+    const normalized = requiredSigners.map((signer, index) => {
+        if (typeof signer !== 'string' ||
+            !isHexString(addHexPrefix(signer), SOLANA_PUBLIC_KEY_LENGTH)) {
+            throw invalidParameter(`Parameter [requiredSigners][${index}] must be a ${SOLANA_PUBLIC_KEY_LENGTH}-byte hex public key.`);
+        }
+        return stripHexPrefix(signer).toLowerCase();
+    });
+    for (let index = 1; index < normalized.length; index += 1) {
+        if (normalized[index - 1] >= normalized[index]) {
+            throw invalidParameter('Parameter [requiredSigners] must be strictly sorted and unique.');
+        }
+    }
+    return normalized;
+};
 class SolSignOffchainMessage extends BaseMethod {
     getSupportedProtocols() {
         return ['V1', 'V2'];
@@ -59524,15 +59524,21 @@ class SolSignOffchainMessage extends BaseMethod {
             { name: 'messageVersion', type: 'number', required: false },
             { name: 'messageFormat', type: 'number', required: false },
             { name: 'applicationDomainHex', type: 'hexString', required: false },
+            { name: 'requiredSigners', type: 'array', required: false, allowEmpty: true },
         ]);
-        const { path, messageHex, messageVersion, messageFormat, applicationDomainHex } = this.payload;
+        const { path, messageHex, messageVersion, messageFormat, applicationDomainHex, requiredSigners, } = this.payload;
         const addressN = validatePath(path, 3);
+        if (applicationDomainHex !== undefined &&
+            !isHexString(addHexPrefix(applicationDomainHex), SOLANA_APPLICATION_DOMAIN_LENGTH)) {
+            throw invalidParameter('Parameter [applicationDomainHex] must be 32 bytes.');
+        }
         this.params = {
             address_n: addressN,
             message: stripHexPrefix(messageHex),
             message_version: messageVersion !== null && messageVersion !== void 0 ? messageVersion : undefined,
             message_format: messageFormat !== null && messageFormat !== void 0 ? messageFormat : undefined,
-            application_domain: applicationDomainHex !== null && applicationDomainHex !== void 0 ? applicationDomainHex : undefined,
+            application_domain: applicationDomainHex ? stripHexPrefix(applicationDomainHex) : undefined,
+            required_signers: normalizeRequiredSigners(requiredSigners),
         };
     }
     getVersionRange() {
@@ -65591,10 +65597,17 @@ class RequestQueue {
         }
         return false;
     }
+    isRequestForConnectId(request, connectId) {
+        var _a, _b;
+        const { method } = request;
+        return (method.connectId === connectId ||
+            ((_a = method.device) === null || _a === void 0 ? void 0 : _a.mainId) === connectId ||
+            ((_b = method.device) === null || _b === void 0 ? void 0 : _b.getConnectId()) === connectId);
+    }
     abortRequestsByConnectId(connectId) {
         let count = 0;
         this.requestQueue.forEach((request, _) => {
-            if (request.abortController && request.method.connectId === connectId) {
+            if (request.abortController && this.isRequestForConnectId(request, connectId)) {
                 request.abortController.abort();
                 request.abortController = undefined;
                 count++;
@@ -65602,6 +65615,11 @@ class RequestQueue {
         });
         return count;
     }
+    getRequestTasksIdByConnectId(connectId) {
+        return Array.from(this.requestQueue.values())
+            .filter(request => this.isRequestForConnectId(request, connectId))
+            .map(request => request.id);
+    }
     abortAllRequests() {
         let count = 0;
         this.requestQueue.forEach(request => {
@@ -66364,11 +66382,15 @@ function isRetryableBleProtocolV2ProbeError(method, error) {
         message.includes('did not respond to expected protocol'));
 }
 function isRetryableBleConnectionError(method, error) {
-    var _a;
+    var _a, _b;
     if ((_a = method.device) === null || _a === void 0 ? void 0 : _a.wasInterruptedByUser()) {
         return false;
     }
     const typedError = error;
+    if ((typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError &&
+        ((_b = typedError.params) === null || _b === void 0 ? void 0 : _b.acquireDeadlineExceeded) === true) {
+        return false;
+    }
     return ((typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError ||
         (typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.BleConnectedError ||
         isRetryableBleProtocolV2ProbeError(method, error) ||
@@ -66381,10 +66403,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);
+function isTerminalBleStaleBondError(error) {
+    return hdShared.isBleStaleBondHardwareError(error);
+}
+function isDeviceIdentityMismatchError(error) {
+    return ((error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.DeviceCheckDeviceIdError);
 }
 const BLE_ACQUIRE_DEADLINE_MS = 60 * 1000;
 function raceBleAcquire(acquirePromise, abortSignal) {
@@ -66399,7 +66422,7 @@ function raceBleAcquire(acquirePromise, abortSignal) {
             fn();
         };
         const onAbort = () => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled)));
-        const deadline = setTimeout(() => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`))), BLE_ACQUIRE_DEADLINE_MS);
+        const deadline = setTimeout(() => settle(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleTimeoutError, `BLE acquire exceeded ${BLE_ACQUIRE_DEADLINE_MS}ms deadline`, { acquireDeadlineExceeded: true }))), BLE_ACQUIRE_DEADLINE_MS);
         acquirePromise.then(value => settle(() => resolve(value)), error => settle(() => reject(error)));
         if (abortSignal) {
             if (abortSignal.aborted) {
@@ -66616,7 +66639,8 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     hdShared.HardwareErrorCode.DeviceInterruptedFromUser,
                     hdShared.HardwareErrorCode.CallQueueActionCancelled,
                 ].includes(error.errorCode) ||
-                    isProtocolV2PeerRemovedPairingError(method, error)) {
+                    isTerminalBleStaleBondError(error) ||
+                    isDeviceIdentityMismatchError(error)) {
                     reject(error);
                     return;
                 }
@@ -66644,14 +66668,14 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
     return poll();
 });
 const cancel = (context, connectId) => {
-    var _a, _b, _c;
+    var _a, _b;
     const { requestQueue, setPrePendingCallPromise } = context;
     if (connectId) {
         try {
             requestQueue.cancelCallbackTasks(connectId);
-            const requestIds = requestQueue.getRequestTasksId();
+            const requestIds = requestQueue.getRequestTasksIdByConnectId(connectId);
             Log.debug(`Cancel Api connect requestQueues: length:${requestIds.length} requestIds:${requestIds.join(',')}`);
-            requestQueue.abortAllRequests();
+            requestQueue.abortRequestsByConnectId(connectId);
             const canceledDevices = [];
             const interruptDevice = (device, deviceConnectId) => {
                 if (!device || canceledDevices.includes(device)) {
@@ -66664,7 +66688,7 @@ const cancel = (context, connectId) => {
                 const task = requestQueue.getTask(requestId);
                 Log.debug('Cancel Api connect task: ', task);
                 if (task) {
-                    interruptDevice((_a = task.method) === null || _a === void 0 ? void 0 : _a.device, (_b = task.method.connectId) !== null && _b !== void 0 ? _b : connectId);
+                    interruptDevice((_a = task.method) === null || _a === void 0 ? void 0 : _a.device, connectId);
                     interruptDevice(deviceCacheMap.get(connectId), connectId);
                     requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled));
                 }
@@ -66678,9 +66702,9 @@ const cancel = (context, connectId) => {
     }
     else {
         const env = DataManager.getSettings('env');
+        requestQueue.abortAllRequests();
         if (DataManager.isBleConnect(env)) {
             Log.debug('Cancel Api all _deviceList: ');
-            requestQueue.abortAllRequests();
             const canceledDevices = [];
             const interruptDevice = (device) => {
                 if (!device || canceledDevices.includes(device)) {
@@ -66693,7 +66717,7 @@ const cancel = (context, connectId) => {
                 const task = requestQueue.getTask(requestId);
                 Log.debug('Cancel Api connect task: ', task);
                 if (task) {
-                    interruptDevice((_c = task.method) === null || _c === void 0 ? void 0 : _c.device);
+                    interruptDevice((_b = task.method) === null || _b === void 0 ? void 0 : _b.device);
                     if (task.method.connectId) {
                         interruptDevice(deviceCacheMap.get(task.method.connectId));
                         pollingManager.stop(task.method.connectId);
@@ -66716,8 +66740,10 @@ const cancel = (context, connectId) => {
             });
         }
     }
-    cleanup();
-    closePopup();
+    cleanup(connectId);
+    if (!connectId || _uiPromises.length === 0) {
+        closePopup();
+    }
 };
 const checkPassphraseEnableState = (method, features) => {
     if (!method.useDevicePassphraseState)
@@ -66747,9 +66773,13 @@ const shouldCheckPassphraseState = (method, device) => {
     }
     return device.hasUsePassphrase();
 };
-const cleanup = () => {
-    const pendingUiPromises = _uiPromises;
-    _uiPromises = [];
+const cleanup = (connectId) => {
+    const pendingUiPromises = connectId
+        ? _uiPromises.filter(uiPromise => { var _a, _b; return ((_a = uiPromise.data) === null || _a === void 0 ? void 0 : _a.mainId) === connectId || ((_b = uiPromise.data) === null || _b === void 0 ? void 0 : _b.getConnectId()) === connectId; })
+        : _uiPromises;
+    _uiPromises = connectId
+        ? _uiPromises.filter(uiPromise => !pendingUiPromises.includes(uiPromise))
+        : [];
     rejectUiPromises(pendingUiPromises, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled, 'UI request was cancelled'));
 };
 const removeDeviceListener = (device) => {