@onekeyfe/hd-core 1.2.0-alpha.32 → 1.2.0-alpha.34

package/dist/index.js

@@ -1473,10 +1473,14 @@ const resolveDeviceBleName = (features) => {
     return ((_a = firstNonEmptyString(compatible.bleName, compatible.onekey_ble_name, compatible.ble_name)) !== null && _a !== void 0 ? _a : null);
 };
 const resolveDeviceFirmwareVersion = (features) => {
+    var _a;
     if (!features)
         return null;
     const compatible = asCompatibleFeatures(features);
-    return firstMeaningfulVersion$1(compatible.firmwareVersion, compatible.onekey_firmware_version, compatible.onekey_version, versionFromParts(compatible.major_version, compatible.minor_version, compatible.patch_version));
+    const bootloaderMode = (_a = compatible.bootloaderMode) !== null && _a !== void 0 ? _a : compatible.bootloader_mode;
+    return firstMeaningfulVersion$1(compatible.firmwareVersion, compatible.onekey_firmware_version, compatible.onekey_version, bootloaderMode
+        ? null
+        : versionFromParts(compatible.major_version, compatible.minor_version, compatible.patch_version));
 };
 const resolveDeviceBootloaderVersion = (features) => {
     var _a;
@@ -40047,9 +40051,60 @@ const createFirmwareMessage = (type, payload) => ({
 });
 
 const LogBlockEvent = new Set([
+    UI_REQUEST.REQUEST_PASSPHRASE,
+    UI_REQUEST.REQUEST_PASSPHRASE_ON_DEVICE,
     UI_RESPONSE.RECEIVE_PIN,
     UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
+const LogLabelMethod = new Set([
+    'openWalletSession',
+    'deviceUploadWallpaper',
+    'uploadPortfolio',
+    'fileWrite',
+    'fileRead',
+]);
+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;
@@ -40058,7 +40113,26 @@ function getLogBlockLabel(message) {
         return type;
     }
     const methodName = method !== null && method !== void 0 ? method : payload === null || payload === void 0 ? void 0 : payload.method;
-    return methodName;
+    if (methodName && (LogLabelMethod.has(methodName) || isSigningMethod(methodName))) {
+        return methodName;
+    }
+    return undefined;
+}
+function getSafeLogPayload(value, blockLabel) {
+    if (blockLabel && (LogBlockEvent.has(blockLabel) || isSigningMethod(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;
+}
+function formatLogMethodLabel(label, methodName) {
+    return methodName ? `${label} [${methodName}]` : label;
 }
 
 function assertCompleteDeviceSession(message) {
@@ -40066,7 +40140,7 @@ function assertCompleteDeviceSession(message) {
         !message.session_id ||
         typeof message.btc_test_address !== 'string' ||
         !message.btc_test_address) {
-        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'DeviceSessionGet returned an incomplete DeviceSession response.');
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device returned an incomplete DeviceSession response.');
     }
 }
 
@@ -40077,6 +40151,37 @@ function isDeviceLockedError(error) {
         error.errorCode === hdShared.HardwareErrorCode.DeviceLocked);
 }
 
+const HOST_PASSPHRASE_MAX_BYTES = 50;
+const utf8ByteLength = (value) => {
+    var _a;
+    let length = 0;
+    for (const character of value) {
+        const codePoint = (_a = character.codePointAt(0)) !== null && _a !== void 0 ? _a : 0;
+        if (codePoint >= 0xd800 && codePoint <= 0xdfff)
+            return undefined;
+        if (codePoint <= 0x7f)
+            length += 1;
+        else if (codePoint <= 0x7ff)
+            length += 2;
+        else if (codePoint <= 0xffff)
+            length += 3;
+        else
+            length += 4;
+    }
+    return length;
+};
+function requestProtocolV2DeviceStatus$1(device) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { message } = yield device.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
+        return message;
+    });
+}
+function refreshProtocolV2DeviceStatus(device) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const status = yield requestProtocolV2DeviceStatus$1(device);
+        return device.updateProtocolV2Status(status);
+    });
+}
 const negotiateEventlessWalletSession = (device) => __awaiter(void 0, void 0, void 0, function* () {
     yield device.commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {
         eventless_wallet_session: true,
@@ -40087,7 +40192,7 @@ const getDeviceSession = (device, request) => __awaiter(void 0, void 0, void 0,
         return yield device.commands.typedCall('DeviceSessionGet', 'DeviceSession', request);
     }
     catch (error) {
-        if (!isDeviceLockedError(error)) {
+        if (!isDeviceLockedError(error) || !request.session_id) {
             throw error;
         }
         yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main);
@@ -40097,25 +40202,31 @@ const getDeviceSession = (device, request) => __awaiter(void 0, void 0, void 0,
 const askDevicePassphrase = (device, passphrase) => __awaiter(void 0, void 0, void 0, function* () {
     const request = () => device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', passphrase ? { passphrase, on_device: false } : { on_device: true });
     try {
-        return yield request();
+        yield request();
     }
     catch (error) {
         if (!isDeviceLockedError(error)) {
             throw error;
         }
         yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main);
-        return request();
+        yield request();
     }
+    yield refreshProtocolV2DeviceStatus(device);
 });
-const selectDeviceSession = (device) => __awaiter(void 0, void 0, void 0, function* () {
+const selectDeviceSession = (device, expectedPassphraseState) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const existsAttachPinUser = ((_a = device.features) === null || _a === void 0 ? void 0 : _a.attachToPinEnabled) === true;
-    const metadata = {
-        source: 'wallet-session-coordinator',
-        reason: 'open-wallet',
-    };
-    const response = yield device.commands.promptPassphrase(Object.assign({ existsAttachPinUser, deviceOnly: true }, metadata), { cancelDeviceOnReject: false });
-    const hasHostPassphrase = typeof response.passphrase === 'string' && response.passphrase.length > 0;
+    const metadata = Object.assign({ source: 'wallet-session-coordinator', reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet' }, (expectedPassphraseState ? { expectedPassphraseState } : {}));
+    const response = yield device.commands.promptPassphrase(Object.assign({ existsAttachPinUser, deviceOnly: false }, metadata), { cancelDeviceOnReject: false });
+    const hostPassphrase = typeof response.passphrase === 'string' ? response.passphrase.normalize('NFKD') : undefined;
+    const hasHostPassphrase = typeof hostPassphrase === 'string' && hostPassphrase.length > 0;
+    const hostPassphraseByteLength = hasHostPassphrase ? utf8ByteLength(hostPassphrase) : undefined;
+    if (hasHostPassphrase &&
+        (hostPassphrase.includes('\0') ||
+            hostPassphraseByteLength === undefined ||
+            hostPassphraseByteLength > HOST_PASSPHRASE_MAX_BYTES)) {
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Host passphrase must contain 1 to ${HOST_PASSPHRASE_MAX_BYTES} valid UTF-8 bytes without NUL.`);
+    }
     const selections = [
         hasHostPassphrase,
         response.passphraseOnDevice === true,
@@ -40133,7 +40244,7 @@ const selectDeviceSession = (device) => __awaiter(void 0, void 0, void 0, functi
         return getDeviceSession(device, {});
     }
     if (hasHostPassphrase) {
-        yield askDevicePassphrase(device, response.passphrase);
+        yield askDevicePassphrase(device, hostPassphrase);
         return getDeviceSession(device, {});
     }
     device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, metadata);
@@ -40141,34 +40252,55 @@ const selectDeviceSession = (device) => __awaiter(void 0, void 0, void 0, functi
     return getDeviceSession(device, {});
 });
 function getProtocolV2WalletSession(device, options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __awaiter(this, void 0, void 0, function* () {
         if (options === null || options === void 0 ? void 0 : options.initSession) {
-            device.clearInternalState();
+            if (options.onlyMainPin) {
+                (_a = device.clearStandardInternalState) === null || _a === void 0 ? void 0 : _a.call(device);
+            }
+            else {
+                device.clearInternalState();
+            }
             device.passphraseState = undefined;
         }
         yield negotiateEventlessWalletSession(device);
         if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
             device.passphraseState = undefined;
         }
-        const expectedPassphraseState = (options === null || options === void 0 ? void 0 : options.onlyMainPin)
+        let expectedPassphraseState = (options === null || options === void 0 ? void 0 : options.onlyMainPin)
             ? undefined
-            : (_a = options === null || options === void 0 ? void 0 : options.expectedPassphraseState) !== null && _a !== void 0 ? _a : device.passphraseState;
-        if (((_b = device.features) === null || _b === void 0 ? void 0 : _b.unlocked) === false) {
-            yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main);
-        }
-        if ((options === null || options === void 0 ? void 0 : options.onlyMainPin) || device.getCurrentPassphraseProtection() === false) {
-            return {
-                passphraseState: undefined,
-                newSession: undefined,
-                unlockedAttachPin: (_d = (_c = device.features) === null || _c === void 0 ? void 0 : _c.unlockedAttachPin) !== null && _d !== void 0 ? _d : false,
-                resumed: false,
-            };
-        }
-        const cachedSessionId = typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+            : (_b = options === null || options === void 0 ? void 0 : options.expectedPassphraseState) !== null && _b !== void 0 ? _b : device.passphraseState;
+        const cachedStandardSession = (options === null || options === void 0 ? void 0 : options.onlyMainPin)
+            ? (_c = device.getStandardInternalState) === null || _c === void 0 ? void 0 : _c.call(device)
+            : undefined;
+        const cachedSessionId = !(options === null || options === void 0 ? void 0 : options.onlyMainPin) && typeof device.getInternalState === 'function'
+            ? device.getInternalState()
+            : undefined;
         let response;
         let resumed = false;
-        if (cachedSessionId && expectedPassphraseState) {
+        if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+            expectedPassphraseState = cachedStandardSession === null || cachedStandardSession === void 0 ? void 0 : cachedStandardSession.passphraseState;
+            if (cachedStandardSession) {
+                try {
+                    if (((_d = device.features) === null || _d === void 0 ? void 0 : _d.unlockedAttachPin) === true) {
+                        yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main);
+                    }
+                    response = yield getDeviceSession(device, {
+                        session_id: cachedStandardSession.sessionId,
+                    });
+                    resumed = true;
+                }
+                catch (error) {
+                    (_e = device.clearStandardInternalState) === null || _e === void 0 ? void 0 : _e.call(device);
+                    throw error;
+                }
+            }
+            if (!response) {
+                yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main);
+                response = yield getDeviceSession(device, {});
+            }
+        }
+        else if (cachedSessionId && expectedPassphraseState) {
             try {
                 response = yield getDeviceSession(device, { session_id: cachedSessionId });
                 resumed = true;
@@ -40183,25 +40315,72 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
-            response = yield selectDeviceSession(device);
+            response = yield selectDeviceSession(device, expectedPassphraseState);
         }
-        const { message } = response;
+        let { message } = response;
         try {
             assertCompleteDeviceSession(message);
         }
         catch (error) {
-            device.clearInternalState();
+            if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+                (_f = device.clearStandardInternalState) === null || _f === void 0 ? void 0 : _f.call(device);
+            }
+            else {
+                device.clearInternalState();
+            }
             throw error;
         }
         if (expectedPassphraseState && expectedPassphraseState !== message.btc_test_address) {
-            device.clearInternalState();
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
+            resumed = false;
+            if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+                (_g = device.clearStandardInternalState) === null || _g === void 0 ? void 0 : _g.call(device);
+                yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main);
+                response = yield getDeviceSession(device, {});
+            }
+            else {
+                device.clearInternalState();
+                response = yield selectDeviceSession(device, expectedPassphraseState);
+            }
+            message = response.message;
+            try {
+                assertCompleteDeviceSession(message);
+            }
+            catch (error) {
+                if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+                    (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
+                }
+                else {
+                    device.clearInternalState();
+                }
+                throw error;
+            }
+            if (expectedPassphraseState !== message.btc_test_address) {
+                if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+                    (_j = device.clearStandardInternalState) === null || _j === void 0 ? void 0 : _j.call(device);
+                }
+                else {
+                    device.clearInternalState();
+                }
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
+            }
+        }
+        const internalStateArgs = [
+            true,
+            message.btc_test_address,
+            device.getCurrentDeviceId(),
+            message.session_id,
+            (options === null || options === void 0 ? void 0 : options.initSession) ? null : cachedSessionId !== null && cachedSessionId !== void 0 ? cachedSessionId : null,
+        ];
+        if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+            device.updateInternalState(...internalStateArgs, 'standard');
+        }
+        else {
+            device.updateInternalState(...internalStateArgs);
         }
-        device.updateInternalState(true, message.btc_test_address, device.getCurrentDeviceId(), message.session_id, (options === null || options === void 0 ? void 0 : options.initSession) ? null : cachedSessionId !== null && cachedSessionId !== void 0 ? cachedSessionId : null);
         return {
             passphraseState: message.btc_test_address,
             newSession: message.session_id,
-            unlockedAttachPin: (_f = (_e = device.features) === null || _e === void 0 ? void 0 : _e.unlockedAttachPin) !== null && _f !== void 0 ? _f : undefined,
+            unlockedAttachPin: (_l = (_k = device.features) === null || _k === void 0 ? void 0 : _k.unlockedAttachPin) !== null && _l !== void 0 ? _l : undefined,
             resumed,
         };
     });
@@ -40849,15 +41028,9 @@ function encodePro2Wallpaper(options) {
         for (let x = 0; x < width; x += 1) {
             const sourceOffset = (y * width + x) * 4;
             const thresholdIndex = ((y & 7) << 3) + (x & 7);
-            let red = Math.min(rgba[sourceOffset] + RED_THRESHOLD[thresholdIndex], 0xff) & 0xf8;
-            let green = Math.min(rgba[sourceOffset + 1] + GREEN_THRESHOLD[thresholdIndex], 0xff) & 0xfc;
-            let blue = Math.min(rgba[sourceOffset + 2] + BLUE_THRESHOLD[thresholdIndex], 0xff) & 0xf8;
-            if (!hasTransparency) {
-                const alpha = rgba[sourceOffset + 3];
-                red = (red * alpha) >> 8;
-                green = (green * alpha) >> 8;
-                blue = (blue * alpha) >> 8;
-            }
+            const red = Math.min(rgba[sourceOffset] + RED_THRESHOLD[thresholdIndex], 0xff) & 0xf8;
+            const green = Math.min(rgba[sourceOffset + 1] + GREEN_THRESHOLD[thresholdIndex], 0xff) & 0xfc;
+            const blue = Math.min(rgba[sourceOffset + 2] + BLUE_THRESHOLD[thresholdIndex], 0xff) & 0xf8;
             const rgb565 = ((red >> 3) << 11) | ((green >> 2) << 5) | (blue >> 3);
             const rgbOffset = 12 + y * stride + x * 2;
             data[rgbOffset] = rgb565 & 0xff;
@@ -41453,9 +41626,12 @@ class DevicePool extends events.exports {
         this.connectedPool = [];
         this.disconnectPool = [];
         this.devicesCache = {};
-        this.emitter.removeAllListeners();
         Log$h.debug('DevicePool state has been reset');
     }
+    static dispose() {
+        this.resetState();
+        this.emitter.removeAllListeners();
+    }
 }
 DevicePool.current = null;
 DevicePool.upcoming = [];
@@ -42159,6 +42335,34 @@ function mergeDeviceFeaturesPatch(previous, patch) {
     return next;
 }
 
+const resolveProtocolV2DeviceIdentity = (deviceType) => {
+    switch (deviceType) {
+        case hdTransport.DeviceType.CLASSIC1:
+        case 'CLASSIC1':
+            return { deviceType: hdShared.EDeviceType.Classic, model: 'classic' };
+        case hdTransport.DeviceType.CLASSIC1S:
+        case 'CLASSIC1S':
+            return { deviceType: hdShared.EDeviceType.Classic1s, model: 'classic1s' };
+        case hdTransport.DeviceType.CLASSIC1S_PURE:
+        case 'CLASSIC1S_PURE':
+            return { deviceType: hdShared.EDeviceType.ClassicPure, model: 'classicpure' };
+        case hdTransport.DeviceType.MINI:
+        case 'MINI':
+            return { deviceType: hdShared.EDeviceType.Mini, model: 'mini' };
+        case hdTransport.DeviceType.TOUCH:
+        case 'TOUCH':
+            return { deviceType: hdShared.EDeviceType.Touch, model: 'touch' };
+        case hdTransport.DeviceType.PRO:
+        case 'PRO':
+            return { deviceType: hdShared.EDeviceType.Pro, model: 'pro' };
+        case hdTransport.DeviceType.PRO2:
+        case 'PRO2':
+            return { deviceType: hdShared.EDeviceType.Pro2, model: 'pro2' };
+        default:
+            return { deviceType: hdShared.EDeviceType.Unknown, model: null };
+    }
+};
+
 const firstMeaningfulVersion = (...versions) => { var _a; return (_a = versions.find(version => Boolean(version && version !== '0.0.0'))) !== null && _a !== void 0 ? _a : null; };
 const getProtocolV1Mode = (features) => {
     if (features.bootloader_mode === true)
@@ -42229,7 +42433,7 @@ const sanitizeRawFeatures = (features) => {
     return raw;
 };
 const imageVersion = (image) => { var _a; return (_a = image === null || image === void 0 ? void 0 : image.version) !== null && _a !== void 0 ? _a : undefined; };
-const bytesToHex$3 = (value) => {
+const bytesToHex$2 = (value) => {
     if (!value)
         return undefined;
     if (typeof value === 'string')
@@ -42242,7 +42446,7 @@ const bytesToHex$3 = (value) => {
     return undefined;
 };
 const imageBuildId = (image) => { var _a; return (_a = image === null || image === void 0 ? void 0 : image.build_id) !== null && _a !== void 0 ? _a : undefined; };
-const imageHash = (image) => bytesToHex$3(image === null || image === void 0 ? void 0 : image.hash);
+const imageHash = (image) => bytesToHex$2(image === null || image === void 0 ? void 0 : image.hash);
 const getFeaturesMode = (features) => {
     if (features.mode !== undefined && features.mode !== null)
         return features.mode;
@@ -42384,18 +42588,19 @@ const mapProtocolV1OnekeyFeaturesToState = (features) => {
         }) }, (Object.keys(verification).length > 0 ? { verification } : {})), { raw: { protocolV1OneKeyFeatures: features } });
 };
 const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20;
     const loader = mode === 'bootloader' || mode === 'romloader';
+    const identity = resolveProtocolV2DeviceIdentity((_a = info.hw) === null || _a === void 0 ? void 0 : _a.Device_type);
     return {
         protocol: 'V2',
         protocolVersion: info.protocol_version,
         identity: definedEntries({
-            deviceType: hdShared.EDeviceType.Pro2,
+            deviceType: identity.deviceType,
             firmwareType: hdShared.EFirmwareType.Universal,
-            model: 'pro2',
+            model: identity.model,
             vendor: 'onekey.so',
-            serialNo: (_a = info.hw) === null || _a === void 0 ? void 0 : _a.serial_no,
-            bleName: (_b = info.coprocessor) === null || _b === void 0 ? void 0 : _b.bt_adv_name,
+            serialNo: (_b = info.hw) === null || _b === void 0 ? void 0 : _b.serial_no,
+            bleName: (_c = info.coprocessor) === null || _c === void 0 ? void 0 : _c.bt_adv_name,
             deviceId: loader ? null : undefined,
         }),
         status: loader
@@ -42415,50 +42620,50 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
             }
             : { mode },
         versions: definedEntries({
-            firmware: imageVersion((_c = info.fw) === null || _c === void 0 ? void 0 : _c.application),
-            applicationP1: imageVersion((_d = info.fw) === null || _d === void 0 ? void 0 : _d.application),
-            applicationP2: imageVersion((_e = info.fw) === null || _e === void 0 ? void 0 : _e.application_data),
-            bootloader: imageVersion((_f = info.fw) === null || _f === void 0 ? void 0 : _f.bootloader),
-            board: imageVersion((_g = info.fw) === null || _g === void 0 ? void 0 : _g.romloader),
-            ble: imageVersion((_h = info.coprocessor) === null || _h === void 0 ? void 0 : _h.application),
-            se01: imageVersion((_j = info.se1) === null || _j === void 0 ? void 0 : _j.application),
-            se02: imageVersion((_k = info.se2) === null || _k === void 0 ? void 0 : _k.application),
-            se03: imageVersion((_l = info.se3) === null || _l === void 0 ? void 0 : _l.application),
-            se04: imageVersion((_m = info.se4) === null || _m === void 0 ? void 0 : _m.application),
-            se01Boot: imageVersion((_o = info.se1) === null || _o === void 0 ? void 0 : _o.bootloader),
-            se02Boot: imageVersion((_p = info.se2) === null || _p === void 0 ? void 0 : _p.bootloader),
-            se03Boot: imageVersion((_q = info.se3) === null || _q === void 0 ? void 0 : _q.bootloader),
-            se04Boot: imageVersion((_r = info.se4) === null || _r === void 0 ? void 0 : _r.bootloader),
+            firmware: imageVersion((_d = info.fw) === null || _d === void 0 ? void 0 : _d.application),
+            applicationP1: imageVersion((_e = info.fw) === null || _e === void 0 ? void 0 : _e.application),
+            applicationP2: imageVersion((_f = info.fw) === null || _f === void 0 ? void 0 : _f.application_data),
+            bootloader: imageVersion((_g = info.fw) === null || _g === void 0 ? void 0 : _g.bootloader),
+            board: imageVersion((_h = info.fw) === null || _h === void 0 ? void 0 : _h.romloader),
+            ble: imageVersion((_j = info.coprocessor) === null || _j === void 0 ? void 0 : _j.application),
+            se01: imageVersion((_k = info.se1) === null || _k === void 0 ? void 0 : _k.application),
+            se02: imageVersion((_l = info.se2) === null || _l === void 0 ? void 0 : _l.application),
+            se03: imageVersion((_m = info.se3) === null || _m === void 0 ? void 0 : _m.application),
+            se04: imageVersion((_o = info.se4) === null || _o === void 0 ? void 0 : _o.application),
+            se01Boot: imageVersion((_p = info.se1) === null || _p === void 0 ? void 0 : _p.bootloader),
+            se02Boot: imageVersion((_q = info.se2) === null || _q === void 0 ? void 0 : _q.bootloader),
+            se03Boot: imageVersion((_r = info.se3) === null || _r === void 0 ? void 0 : _r.bootloader),
+            se04Boot: imageVersion((_s = info.se4) === null || _s === void 0 ? void 0 : _s.bootloader),
         }),
         verification: definedEntries({
-            firmwareBuildId: imageBuildId((_s = info.fw) === null || _s === void 0 ? void 0 : _s.application),
-            firmwareHash: imageHash((_t = info.fw) === null || _t === void 0 ? void 0 : _t.application),
-            applicationP1BuildId: imageBuildId((_u = info.fw) === null || _u === void 0 ? void 0 : _u.application),
-            applicationP1Hash: imageHash((_v = info.fw) === null || _v === void 0 ? void 0 : _v.application),
-            applicationP2BuildId: imageBuildId((_w = info.fw) === null || _w === void 0 ? void 0 : _w.application_data),
-            applicationP2Hash: imageHash((_x = info.fw) === null || _x === void 0 ? void 0 : _x.application_data),
-            bootloaderBuildId: imageBuildId((_y = info.fw) === null || _y === void 0 ? void 0 : _y.bootloader),
-            bootloaderHash: imageHash((_z = info.fw) === null || _z === void 0 ? void 0 : _z.bootloader),
-            boardBuildId: imageBuildId((_0 = info.fw) === null || _0 === void 0 ? void 0 : _0.romloader),
-            boardHash: imageHash((_1 = info.fw) === null || _1 === void 0 ? void 0 : _1.romloader),
-            bleBuildId: imageBuildId((_2 = info.coprocessor) === null || _2 === void 0 ? void 0 : _2.application),
-            bleHash: imageHash((_3 = info.coprocessor) === null || _3 === void 0 ? void 0 : _3.application),
-            se01BuildId: imageBuildId((_4 = info.se1) === null || _4 === void 0 ? void 0 : _4.application),
-            se01Hash: imageHash((_5 = info.se1) === null || _5 === void 0 ? void 0 : _5.application),
-            se02BuildId: imageBuildId((_6 = info.se2) === null || _6 === void 0 ? void 0 : _6.application),
-            se02Hash: imageHash((_7 = info.se2) === null || _7 === void 0 ? void 0 : _7.application),
-            se03BuildId: imageBuildId((_8 = info.se3) === null || _8 === void 0 ? void 0 : _8.application),
-            se03Hash: imageHash((_9 = info.se3) === null || _9 === void 0 ? void 0 : _9.application),
-            se04BuildId: imageBuildId((_10 = info.se4) === null || _10 === void 0 ? void 0 : _10.application),
-            se04Hash: imageHash((_11 = info.se4) === null || _11 === void 0 ? void 0 : _11.application),
-            se01BootBuildId: imageBuildId((_12 = info.se1) === null || _12 === void 0 ? void 0 : _12.bootloader),
-            se01BootHash: imageHash((_13 = info.se1) === null || _13 === void 0 ? void 0 : _13.bootloader),
-            se02BootBuildId: imageBuildId((_14 = info.se2) === null || _14 === void 0 ? void 0 : _14.bootloader),
-            se02BootHash: imageHash((_15 = info.se2) === null || _15 === void 0 ? void 0 : _15.bootloader),
-            se03BootBuildId: imageBuildId((_16 = info.se3) === null || _16 === void 0 ? void 0 : _16.bootloader),
-            se03BootHash: imageHash((_17 = info.se3) === null || _17 === void 0 ? void 0 : _17.bootloader),
-            se04BootBuildId: imageBuildId((_18 = info.se4) === null || _18 === void 0 ? void 0 : _18.bootloader),
-            se04BootHash: imageHash((_19 = info.se4) === null || _19 === void 0 ? void 0 : _19.bootloader),
+            firmwareBuildId: imageBuildId((_t = info.fw) === null || _t === void 0 ? void 0 : _t.application),
+            firmwareHash: imageHash((_u = info.fw) === null || _u === void 0 ? void 0 : _u.application),
+            applicationP1BuildId: imageBuildId((_v = info.fw) === null || _v === void 0 ? void 0 : _v.application),
+            applicationP1Hash: imageHash((_w = info.fw) === null || _w === void 0 ? void 0 : _w.application),
+            applicationP2BuildId: imageBuildId((_x = info.fw) === null || _x === void 0 ? void 0 : _x.application_data),
+            applicationP2Hash: imageHash((_y = info.fw) === null || _y === void 0 ? void 0 : _y.application_data),
+            bootloaderBuildId: imageBuildId((_z = info.fw) === null || _z === void 0 ? void 0 : _z.bootloader),
+            bootloaderHash: imageHash((_0 = info.fw) === null || _0 === void 0 ? void 0 : _0.bootloader),
+            boardBuildId: imageBuildId((_1 = info.fw) === null || _1 === void 0 ? void 0 : _1.romloader),
+            boardHash: imageHash((_2 = info.fw) === null || _2 === void 0 ? void 0 : _2.romloader),
+            bleBuildId: imageBuildId((_3 = info.coprocessor) === null || _3 === void 0 ? void 0 : _3.application),
+            bleHash: imageHash((_4 = info.coprocessor) === null || _4 === void 0 ? void 0 : _4.application),
+            se01BuildId: imageBuildId((_5 = info.se1) === null || _5 === void 0 ? void 0 : _5.application),
+            se01Hash: imageHash((_6 = info.se1) === null || _6 === void 0 ? void 0 : _6.application),
+            se02BuildId: imageBuildId((_7 = info.se2) === null || _7 === void 0 ? void 0 : _7.application),
+            se02Hash: imageHash((_8 = info.se2) === null || _8 === void 0 ? void 0 : _8.application),
+            se03BuildId: imageBuildId((_9 = info.se3) === null || _9 === void 0 ? void 0 : _9.application),
+            se03Hash: imageHash((_10 = info.se3) === null || _10 === void 0 ? void 0 : _10.application),
+            se04BuildId: imageBuildId((_11 = info.se4) === null || _11 === void 0 ? void 0 : _11.application),
+            se04Hash: imageHash((_12 = info.se4) === null || _12 === void 0 ? void 0 : _12.application),
+            se01BootBuildId: imageBuildId((_13 = info.se1) === null || _13 === void 0 ? void 0 : _13.bootloader),
+            se01BootHash: imageHash((_14 = info.se1) === null || _14 === void 0 ? void 0 : _14.bootloader),
+            se02BootBuildId: imageBuildId((_15 = info.se2) === null || _15 === void 0 ? void 0 : _15.bootloader),
+            se02BootHash: imageHash((_16 = info.se2) === null || _16 === void 0 ? void 0 : _16.bootloader),
+            se03BootBuildId: imageBuildId((_17 = info.se3) === null || _17 === void 0 ? void 0 : _17.bootloader),
+            se03BootHash: imageHash((_18 = info.se3) === null || _18 === void 0 ? void 0 : _18.bootloader),
+            se04BootBuildId: imageBuildId((_19 = info.se4) === null || _19 === void 0 ? void 0 : _19.bootloader),
+            se04BootHash: imageHash((_20 = info.se4) === null || _20 === void 0 ? void 0 : _20.bootloader),
         }),
         raw: Object.assign({ protocolV2DeviceInfo: info }, (loader ? { protocolV2DeviceStatus: null } : {})),
     };
@@ -42568,13 +42773,11 @@ const projectFeatures = (state) => {
     delete publicRawFeatures.session_id;
     delete publicRawFeatures.sessionId;
     delete publicRawFeatures.passphraseState;
-    const publicRaw = snapshot.raw
-        ? Object.assign(Object.assign({}, snapshot.raw), { protocolV1Features: publicRawFeatures }) : undefined;
     const rawOneKeyFeatures = (_d = (_c = snapshot.raw) === null || _c === void 0 ? void 0 : _c.protocolV1OneKeyFeatures) !== null && _d !== void 0 ? _d : {};
     const bootloaderMode = snapshot.protocol === 'V1'
         ? (_e = rawFeatures.bootloader_mode) !== null && _e !== void 0 ? _e : null
         : getBootloaderMode(snapshot);
-    return Object.assign(Object.assign(Object.assign({}, publicRawFeatures), rawOneKeyFeatures), { protocol: snapshot.protocol, protocolVersion: (_f = snapshot.protocolVersion) !== null && _f !== void 0 ? _f : (snapshot.protocol === 'V1' ? 1 : null), deviceType: snapshot.identity.deviceType, firmwareType: snapshot.identity.firmwareType, model: snapshot.identity.model, vendor: snapshot.identity.vendor, deviceId: snapshot.identity.deviceId, serialNo: snapshot.identity.serialNo, label: snapshot.identity.label, bleName: snapshot.identity.bleName, capabilities: snapshot.capabilities, mode: snapshot.status.mode, initialized: snapshot.status.initialized, bootloaderMode, unlocked: snapshot.status.unlocked, firmwarePresent: snapshot.status.firmwarePresent, passphraseProtection: snapshot.status.passphraseProtection, pinProtection: snapshot.status.pinProtection, backupRequired: snapshot.status.backupRequired, noBackup: snapshot.status.noBackup, unfinishedBackup: snapshot.status.unfinishedBackup, recoveryMode: snapshot.status.recoveryMode, attachToPinEnabled: snapshot.status.attachToPinEnabled, unlockedAttachPin: (_g = snapshot.status.unlockedAttachPin) !== null && _g !== void 0 ? _g : undefined, language: snapshot.settings.language, bleEnabled: snapshot.settings.bleEnabled, sdCardPresent: snapshot.settings.sdCardPresent, sdProtection: snapshot.settings.sdProtection, wipeCodeProtection: snapshot.settings.wipeCodeProtection, passphraseAlwaysOnDevice: snapshot.settings.passphraseAlwaysOnDevice, safetyChecks: snapshot.settings.safetyChecks, autoLockDelayMs: snapshot.settings.autoLockDelayMs, autoShutdownDelayMs: snapshot.settings.autoShutdownDelayMs, displayRotation: snapshot.settings.displayRotation, experimentalFeatures: snapshot.settings.experimentalFeatures, wallpaperPath: snapshot.settings.wallpaperPath, brightness: snapshot.settings.brightness, animationEnabled: snapshot.settings.animationEnabled, tapToWake: snapshot.settings.tapToWake, hapticFeedback: snapshot.settings.hapticFeedback, deviceNameDisplayEnabled: snapshot.settings.deviceNameDisplayEnabled, airgapMode: snapshot.settings.airgapMode, fidoEnabled: snapshot.settings.fidoEnabled, usbLockEnabled: snapshot.settings.usbLockEnabled, randomKeypad: snapshot.settings.randomKeypad, firmwareVersion: snapshot.versions.firmware, bootloaderVersion: snapshot.versions.bootloader, boardVersion: snapshot.versions.board, bleVersion: snapshot.versions.ble, se01Version: snapshot.versions.se01, se02Version: snapshot.versions.se02, se03Version: snapshot.versions.se03, se04Version: snapshot.versions.se04, se01BootVersion: snapshot.versions.se01Boot, se02BootVersion: snapshot.versions.se02Boot, se03BootVersion: snapshot.versions.se03Boot, se04BootVersion: snapshot.versions.se04Boot, seVersion: (_h = snapshot.versions.se) !== null && _h !== void 0 ? _h : null, verify: snapshot.verification, raw: publicRaw, device_id: (_j = snapshot.identity.deviceId) !== null && _j !== void 0 ? _j : undefined, ble_name: (_k = snapshot.identity.bleName) !== null && _k !== void 0 ? _k : undefined, passphrase_protection: (_l = snapshot.status.passphraseProtection) !== null && _l !== void 0 ? _l : undefined, bootloader_mode: bootloaderMode, sessionId: null, session_id: null });
+    return Object.assign(Object.assign(Object.assign({}, publicRawFeatures), rawOneKeyFeatures), { protocol: snapshot.protocol, protocolVersion: (_f = snapshot.protocolVersion) !== null && _f !== void 0 ? _f : (snapshot.protocol === 'V1' ? 1 : null), deviceType: snapshot.identity.deviceType, firmwareType: snapshot.identity.firmwareType, model: snapshot.identity.model, vendor: snapshot.identity.vendor, deviceId: snapshot.identity.deviceId, serialNo: snapshot.identity.serialNo, label: snapshot.identity.label, bleName: snapshot.identity.bleName, capabilities: snapshot.capabilities, mode: snapshot.status.mode, initialized: snapshot.status.initialized, bootloaderMode, unlocked: snapshot.status.unlocked, firmwarePresent: snapshot.status.firmwarePresent, passphraseProtection: snapshot.status.passphraseProtection, pinProtection: snapshot.status.pinProtection, backupRequired: snapshot.status.backupRequired, noBackup: snapshot.status.noBackup, unfinishedBackup: snapshot.status.unfinishedBackup, recoveryMode: snapshot.status.recoveryMode, attachToPinEnabled: snapshot.status.attachToPinEnabled, unlockedAttachPin: (_g = snapshot.status.unlockedAttachPin) !== null && _g !== void 0 ? _g : undefined, language: snapshot.settings.language, bleEnabled: snapshot.settings.bleEnabled, sdCardPresent: snapshot.settings.sdCardPresent, sdProtection: snapshot.settings.sdProtection, wipeCodeProtection: snapshot.settings.wipeCodeProtection, passphraseAlwaysOnDevice: snapshot.settings.passphraseAlwaysOnDevice, safetyChecks: snapshot.settings.safetyChecks, autoLockDelayMs: snapshot.settings.autoLockDelayMs, autoShutdownDelayMs: snapshot.settings.autoShutdownDelayMs, displayRotation: snapshot.settings.displayRotation, experimentalFeatures: snapshot.settings.experimentalFeatures, wallpaperPath: snapshot.settings.wallpaperPath, brightness: snapshot.settings.brightness, animationEnabled: snapshot.settings.animationEnabled, tapToWake: snapshot.settings.tapToWake, hapticFeedback: snapshot.settings.hapticFeedback, deviceNameDisplayEnabled: snapshot.settings.deviceNameDisplayEnabled, airgapMode: snapshot.settings.airgapMode, fidoEnabled: snapshot.settings.fidoEnabled, usbLockEnabled: snapshot.settings.usbLockEnabled, randomKeypad: snapshot.settings.randomKeypad, firmwareVersion: snapshot.versions.firmware, bootloaderVersion: snapshot.versions.bootloader, boardVersion: snapshot.versions.board, bleVersion: snapshot.versions.ble, se01Version: snapshot.versions.se01, se02Version: snapshot.versions.se02, se03Version: snapshot.versions.se03, se04Version: snapshot.versions.se04, se01BootVersion: snapshot.versions.se01Boot, se02BootVersion: snapshot.versions.se02Boot, se03BootVersion: snapshot.versions.se03Boot, se04BootVersion: snapshot.versions.se04Boot, seVersion: (_h = snapshot.versions.se) !== null && _h !== void 0 ? _h : null, verify: snapshot.verification, device_id: (_j = snapshot.identity.deviceId) !== null && _j !== void 0 ? _j : undefined, ble_name: (_k = snapshot.identity.bleName) !== null && _k !== void 0 ? _k : undefined, passphrase_protection: (_l = snapshot.status.passphraseProtection) !== null && _l !== void 0 ? _l : undefined, bootloader_mode: bootloaderMode, sessionId: null, session_id: null });
 };
 
 function createEmptyDeviceState(identity = {}) {
@@ -42730,6 +42933,7 @@ const createPublicDeviceState = (state) => {
 class DeviceWalletSessionStore {
     constructor() {
         this.walletSessions = new Map();
+        this.standardWalletSessions = new Map();
         this.pendingSessions = new Map();
     }
     get(deviceKey, passphraseState) {
@@ -42739,6 +42943,7 @@ class DeviceWalletSessionStore {
         return (_a = this.walletSessions.get(deviceKey)) === null || _a === void 0 ? void 0 : _a.get(passphraseState);
     }
     set(deviceKey, passphraseState, sessionId) {
+        var _a;
         if (!deviceKey || !passphraseState || !sessionId)
             return;
         let deviceSessions = this.walletSessions.get(deviceKey);
@@ -42746,8 +42951,29 @@ class DeviceWalletSessionStore {
             deviceSessions = new Map();
             this.walletSessions.set(deviceKey, deviceSessions);
         }
+        if (!deviceSessions.has(passphraseState) &&
+            deviceSessions.size >= DeviceWalletSessionStore.MAX_SESSIONS_PER_DEVICE) {
+            const oldestPassphraseState = deviceSessions.keys().next().value;
+            if (oldestPassphraseState) {
+                deviceSessions.delete(oldestPassphraseState);
+                if (((_a = this.standardWalletSessions.get(deviceKey)) === null || _a === void 0 ? void 0 : _a.passphraseState) === oldestPassphraseState) {
+                    this.standardWalletSessions.delete(deviceKey);
+                }
+            }
+        }
         deviceSessions.set(passphraseState, sessionId);
     }
+    getStandard(deviceKey) {
+        if (!deviceKey)
+            return undefined;
+        return this.standardWalletSessions.get(deviceKey);
+    }
+    setStandard(deviceKey, passphraseState, sessionId) {
+        if (!deviceKey || !passphraseState || !sessionId)
+            return;
+        this.set(deviceKey, passphraseState, sessionId);
+        this.standardWalletSessions.set(deviceKey, { passphraseState, sessionId });
+    }
     setPending(deviceKey, sessionId) {
         if (!deviceKey || !sessionId)
             return;
@@ -42761,6 +42987,10 @@ class DeviceWalletSessionStore {
     delete(deviceKey, passphraseState) {
         if (!deviceKey || !passphraseState)
             return;
+        const standardWalletSession = this.standardWalletSessions.get(deviceKey);
+        if ((standardWalletSession === null || standardWalletSession === void 0 ? void 0 : standardWalletSession.passphraseState) === passphraseState) {
+            this.standardWalletSessions.delete(deviceKey);
+        }
         const deviceSessions = this.walletSessions.get(deviceKey);
         if (!deviceSessions)
             return;
@@ -42769,6 +42999,15 @@ class DeviceWalletSessionStore {
             this.walletSessions.delete(deviceKey);
         }
     }
+    deleteStandard(deviceKey) {
+        if (!deviceKey)
+            return;
+        const standardWalletSession = this.standardWalletSessions.get(deviceKey);
+        this.standardWalletSessions.delete(deviceKey);
+        if (standardWalletSession) {
+            this.delete(deviceKey, standardWalletSession.passphraseState);
+        }
+    }
     deletePending(deviceKey) {
         if (!deviceKey)
             return;
@@ -42778,23 +43017,28 @@ class DeviceWalletSessionStore {
         if (!deviceKey)
             return;
         this.walletSessions.delete(deviceKey);
+        this.standardWalletSessions.delete(deviceKey);
         this.pendingSessions.delete(deviceKey);
     }
     migrateTemporaryDeviceKey(from, to) {
-        var _a;
         if (!from || !to || from === to)
             return;
         const sourceSessions = this.walletSessions.get(from);
         if (sourceSessions) {
-            const targetSessions = (_a = this.walletSessions.get(to)) !== null && _a !== void 0 ? _a : new Map();
-            this.walletSessions.set(to, targetSessions);
             sourceSessions.forEach((sessionId, passphraseState) => {
-                if (!targetSessions.has(passphraseState)) {
-                    targetSessions.set(passphraseState, sessionId);
+                if (!this.get(to, passphraseState)) {
+                    this.set(to, passphraseState, sessionId);
                 }
             });
             this.walletSessions.delete(from);
         }
+        const standardWalletSession = this.standardWalletSessions.get(from);
+        if (standardWalletSession &&
+            !this.standardWalletSessions.has(to) &&
+            this.get(to, standardWalletSession.passphraseState) === standardWalletSession.sessionId) {
+            this.standardWalletSessions.set(to, standardWalletSession);
+        }
+        this.standardWalletSessions.delete(from);
         const pendingSession = this.pendingSessions.get(from);
         if (pendingSession && !this.pendingSessions.has(to)) {
             this.pendingSessions.set(to, pendingSession);
@@ -42814,9 +43058,11 @@ class DeviceWalletSessionStore {
     }
     clear() {
         this.walletSessions.clear();
+        this.standardWalletSessions.clear();
         this.pendingSessions.clear();
     }
 }
+DeviceWalletSessionStore.MAX_SESSIONS_PER_DEVICE = 3;
 const deviceWalletSessionStore = new DeviceWalletSessionStore();
 
 const getProtocolV2RuntimeMode = ({ deviceInfo: _deviceInfo, deviceStatusAvailable, }) => {
@@ -42947,7 +43193,7 @@ class Device extends events.exports {
     }
     toMessageObject() {
         var _a;
-        if (this.isUnacquired())
+        if (this.isUnacquired() || !this.features)
             return null;
         const env = DataManager.getSettings('env');
         const deviceType = this.getCurrentDeviceType();
@@ -42960,6 +43206,7 @@ class Device extends events.exports {
         const state = this.state ? createPublicDeviceState(this.state) : undefined;
         return {
             connectId: DataManager.isBleConnect(env) ? this.mainId || null : connectId,
+            connectProtocol: this.originalDescriptor.protocolType,
             serialNo,
             uuid: serialNo,
             commType: this.originalDescriptor.commType,
@@ -43015,21 +43262,21 @@ class Device extends events.exports {
             resolve(false);
         }));
     }
-    acquire(connectProtocol, options) {
+    acquire(expectedProtocol, options) {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
             const env = DataManager.getSettings('env');
             const mainIdKey = DataManager.isBleConnect(env) ? 'id' : 'session';
-            const expectedProtocol = connectProtocol !== null && connectProtocol !== void 0 ? connectProtocol : this.originalDescriptor.protocolType;
+            const protocolHint = expectedProtocol ? undefined : this.originalDescriptor.protocolType;
             try {
                 let acquireResult;
                 if (DataManager.isBleConnect(env)) {
-                    acquireResult = yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id, undefined, true, expectedProtocol));
+                    acquireResult = yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id, undefined, true, expectedProtocol, protocolHint));
                     this.mainId = (_b = acquireResult === null || acquireResult === void 0 ? void 0 : acquireResult.uuid) !== null && _b !== void 0 ? _b : '';
                     Log$e.debug('Expected uuid:', this.mainId);
                 }
                 else {
-                    acquireResult = yield ((_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session, undefined, expectedProtocol));
+                    acquireResult = yield ((_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session, undefined, expectedProtocol, protocolHint));
                     this.mainId = acquireResult;
                     Log$e.debug('Expected session id:', this.mainId);
                 }
@@ -43299,14 +43546,25 @@ class Device extends events.exports {
             return undefined;
         return deviceWalletSessionStore.get(deviceId, this.passphraseState);
     }
-    updateInternalState(enablePassphrase, passphraseState, deviceId, sessionId = null, featuresSessionId = null) {
+    getStandardInternalState(_deviceId) {
+        const deviceId = this.getSessionCacheDeviceKey(_deviceId);
+        if (!deviceId)
+            return undefined;
+        return deviceWalletSessionStore.getStandard(deviceId);
+    }
+    updateInternalState(enablePassphrase, passphraseState, deviceId, sessionId = null, featuresSessionId = null, walletType = 'hidden') {
         Log$e.debug('updateInternalState session param: ', `device_id: ${deviceId}`, `enablePassphrase: ${enablePassphrase}`, `hasPassphraseState: ${Boolean(passphraseState)}`, `hasSessionId: ${Boolean(sessionId)}`, `hasFeaturesSessionId: ${Boolean(featuresSessionId)}`);
         const cacheDeviceKey = this.getSessionCacheDeviceKey(deviceId);
         if (!cacheDeviceKey)
             return;
         if (enablePassphrase) {
             const walletSessionId = sessionId || featuresSessionId || deviceWalletSessionStore.getPending(cacheDeviceKey);
-            deviceWalletSessionStore.set(cacheDeviceKey, passphraseState, walletSessionId !== null && walletSessionId !== void 0 ? walletSessionId : undefined);
+            if (walletType === 'standard') {
+                deviceWalletSessionStore.setStandard(cacheDeviceKey, passphraseState, walletSessionId !== null && walletSessionId !== void 0 ? walletSessionId : undefined);
+            }
+            else {
+                deviceWalletSessionStore.set(cacheDeviceKey, passphraseState, walletSessionId !== null && walletSessionId !== void 0 ? walletSessionId : undefined);
+            }
         }
         deviceWalletSessionStore.deletePending(cacheDeviceKey);
     }
@@ -43334,6 +43592,12 @@ class Device extends events.exports {
             deviceWalletSessionStore.delete(deviceId, this.passphraseState);
         }
     }
+    clearStandardInternalState(_deviceId) {
+        const deviceId = this.getSessionCacheDeviceKey(_deviceId);
+        if (!deviceId)
+            return;
+        deviceWalletSessionStore.deleteStandard(deviceId);
+    }
     initialize(options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isProtocolV2()) {
@@ -43361,7 +43625,9 @@ class Device extends events.exports {
                 const expectedDeviceId = options === null || options === void 0 ? void 0 : options.deviceId;
                 if (expectedDeviceId) {
                     this.passphraseState = undefined;
-                    yield callInitialize({ is_contains_attach: true });
+                    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);
                     }
@@ -44655,8 +44921,7 @@ class GetPassphraseState extends BaseMethod {
                     initSession: this.payload.initSession === true,
                 }
                 : undefined);
-            const passphraseProtection = this.device.getCurrentPassphraseProtection();
-            return Promise.resolve(passphraseProtection === true ? passphraseState : undefined);
+            return passphraseState;
         });
     }
 }
@@ -44697,7 +44962,7 @@ const formatAnyHex = value => {
     return value;
 };
 const hexes = Array.from({ length: 256 }, (_, i) => i.toString(16).padStart(2, '0'));
-function bytesToHex$2(uint8a) {
+function bytesToHex$1(uint8a) {
     if (!(uint8a instanceof Uint8Array))
         throw new Error('Uint8Array expected');
     let hex = '';
@@ -44902,7 +45167,7 @@ class OpenWalletSession extends BaseMethod {
         this.payload.useEmptyPassphrase = this.params.mode === OpenWalletSessionMode.Standard;
     }
     run() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const isProtocolV2 = this.device.isProtocolV2();
             const state = yield this.device.getDeviceState({ refreshSections: ['status'] });
@@ -44932,7 +45197,7 @@ class OpenWalletSession extends BaseMethod {
                     try {
                         yield this.device.lockDevice();
                     }
-                    catch (_b) {
+                    catch (_c) {
                     }
                     this.device.clearInternalState();
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
@@ -44941,13 +45206,13 @@ class OpenWalletSession extends BaseMethod {
                     protocol,
                     walletType: 'standard',
                     deviceId,
-                    passphraseState: null,
+                    passphraseState: (_a = session.passphraseState) !== null && _a !== void 0 ? _a : null,
                     resumed: wasResumed(session),
                 };
             }
             if (this.params.mode === OpenWalletSessionMode.ResumeHidden) {
                 if (isProtocolV2) {
-                    if (((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.unlocked) === false) {
+                    if (((_b = this.device.features) === null || _b === void 0 ? void 0 : _b.unlocked) === false) {
                         yield this.device.unlockDevice();
                     }
                     const refreshedDeviceId = yield refreshProtocolV2DeviceId();
@@ -44978,7 +45243,7 @@ class OpenWalletSession extends BaseMethod {
                         expectPassphraseState: this.params.passphraseState,
                     });
                 const deviceId = requireDeviceId();
-                if (!session.passphraseState) {
+                if (session.passphraseState !== this.params.passphraseState) {
                     this.device.clearInternalState();
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
                 }
@@ -44994,7 +45259,7 @@ class OpenWalletSession extends BaseMethod {
                 deviceId,
                 resumed: wasResumed(session),
             };
-            return this.device.getCurrentPassphraseProtection() === false
+            return !isProtocolV2 && this.device.getCurrentPassphraseProtection() === false
                 ? Object.assign(Object.assign({}, responseBase), { walletType: 'standard', passphraseState: null }) : Object.assign(Object.assign(Object.assign({}, responseBase), { walletType: 'hidden' }), requireHiddenWalletResponse(session));
         });
     }
@@ -45256,41 +45521,10 @@ const CURRENT_HASH_BY_COMPONENT_TARGET = {
     APPLICATION_P1: 'applicationP1Hash',
     APPLICATION_P2: 'applicationP2Hash',
 };
-const PROTOCOL_V2_PACKAGE_METADATA_END = 0x27f;
-const PROTOCOL_V2_PACKAGE_PAYLOAD_HASH_OFFSET = 0x200;
-const PROTOCOL_V2_PACKAGE_PAYLOAD_HASH_SIZE = 64;
-function bytesToHex$1(bytes) {
-    return Array.from(bytes)
-        .map(byte => byte.toString(16).padStart(2, '0'))
-        .join('');
-}
 function normalizeHex(value) {
     const normalized = value === null || value === void 0 ? void 0 : value.replace(/^0x/i, '').toLowerCase();
     return normalized && /^[0-9a-f]+$/.test(normalized) ? normalized : undefined;
 }
-function getRemoteComponentPayloadHash(url) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const binary = yield httpRequest$1(url, 'binary', {
-                headers: { Range: `bytes=0-${PROTOCOL_V2_PACKAGE_METADATA_END}` },
-                connectTimeoutMs: 5000,
-                readTimeoutMs: 5000,
-                overallTimeoutMs: 10000,
-                maxRetries: 1,
-                retryDelayMs: 250,
-            });
-            const bytes = new Uint8Array(binary);
-            if (bytes.byteLength <= PROTOCOL_V2_PACKAGE_METADATA_END ||
-                String.fromCharCode(...bytes.slice(0, 4)) !== 'OKPP') {
-                return null;
-            }
-            return bytesToHex$1(bytes.slice(PROTOCOL_V2_PACKAGE_PAYLOAD_HASH_OFFSET, PROTOCOL_V2_PACKAGE_PAYLOAD_HASH_OFFSET + PROTOCOL_V2_PACKAGE_PAYLOAD_HASH_SIZE));
-        }
-        catch (_a) {
-            return null;
-        }
-    });
-}
 function toVersionString(version) {
     return (version === null || version === void 0 ? void 0 : version.length) ? version.join('.') : null;
 }
@@ -45331,20 +45565,22 @@ function buildComponentRelease({ configKey, component, currentVersions, currentV
         else if (semver__default["default"].gt(currentVersion, targetVersion)) {
             status = 'valid';
         }
-        else if (remotePayloadHash !== undefined) {
+        else {
             const currentHashKey = CURRENT_HASH_BY_COMPONENT_TARGET[componentTarget];
-            const currentHash = normalizeHex(currentHashKey ? currentVerification[currentHashKey] : undefined);
-            const expectedHash = normalizeHex(remotePayloadHash !== null && remotePayloadHash !== void 0 ? remotePayloadHash : undefined);
-            if (currentHash && expectedHash) {
-                status = expectedHash.startsWith(currentHash) ? 'valid' : 'outdated';
+            if (!currentHashKey) {
+                status = 'valid';
             }
             else {
-                status = 'unknown';
+                const currentHash = normalizeHex(currentVerification[currentHashKey]);
+                const expectedHash = normalizeHex(remotePayloadHash !== null && remotePayloadHash !== void 0 ? remotePayloadHash : undefined);
+                if (currentHash && expectedHash) {
+                    status = expectedHash.startsWith(currentHash) ? 'valid' : 'outdated';
+                }
+                else {
+                    status = 'unknown';
+                }
             }
         }
-        else {
-            status = 'valid';
-        }
     }
     return {
         configKey,
@@ -45377,7 +45613,7 @@ function buildProtocolV2FirmwareRelease({ currentVersions, currentVerification =
         currentVerification,
         remotePayloadHash: Object.prototype.hasOwnProperty.call(remotePayloadHashes, configKey)
             ? remotePayloadHashes[configKey]
-            : undefined,
+            : normalizeHex(component.payloadHash),
         releaseRequired: release.required,
     }));
     if (!currentVersions.applicationP2) {
@@ -45492,37 +45728,9 @@ class CheckAllFirmwareRelease extends BaseMethod {
             const { firmwareType: firmwareTypeParam } = this.payload;
             const firmwareType = (_a = firmwareTypeParam !== null && firmwareTypeParam !== void 0 ? firmwareTypeParam : state.identity.firmwareType) !== null && _a !== void 0 ? _a : hdShared.EFirmwareType.Universal;
             const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
-            const remotePayloadHashes = {};
-            if (release) {
-                yield Promise.all(getOrderedComponentEntries(release).map(([configKey, component]) => __awaiter(this, void 0, void 0, function* () {
-                    var _b;
-                    const componentTarget = component.target.toUpperCase();
-                    if (!CURRENT_HASH_BY_COMPONENT_TARGET[componentTarget])
-                        return;
-                    const currentVersionKey = CURRENT_VERSION_BY_COMPONENT_TARGET[componentTarget];
-                    const currentVersion = currentVersionKey
-                        ? (_b = state.versions[currentVersionKey]) !== null && _b !== void 0 ? _b : (componentTarget === 'APPLICATION_P1' ? state.versions.firmware : null)
-                        : null;
-                    const targetVersion = toVersionString(component.version);
-                    if (currentVersion &&
-                        targetVersion &&
-                        semver__default["default"].valid(currentVersion) &&
-                        semver__default["default"].valid(targetVersion) &&
-                        semver__default["default"].eq(currentVersion, targetVersion)) {
-                        const configuredPayloadHash = normalizeHex(component.payloadHash);
-                        if (configuredPayloadHash) {
-                            remotePayloadHashes[configKey] = configuredPayloadHash;
-                        }
-                        else if (component.fingerprint && component.url) {
-                            remotePayloadHashes[configKey] = yield getRemoteComponentPayloadHash(component.url);
-                        }
-                    }
-                })));
-            }
             const plan = buildProtocolV2FirmwareRelease({
                 currentVersions: state.versions,
                 currentVerification: state.verification,
-                remotePayloadHashes,
                 firmwareType,
                 release,
             });
@@ -46012,7 +46220,11 @@ class DeviceSettings extends BaseMethod {
                             page: hdTransport.DeviceSettingsPage.DevicePassphrase,
                         });
                         const updated = yield this.device.getDeviceState({ refreshSections: ['status'] });
-                        if (updated.status.passphraseProtection !== requestedPassphrase) {
+                        const lockedAfterDisabling = requestedPassphrase === false &&
+                            current.status.unlocked === true &&
+                            updated.status.unlocked === false;
+                        if (updated.status.passphraseProtection !== requestedPassphrase &&
+                            !lockedAfterDisabling) {
                             throw hdShared.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 passphrase setting did not reach the requested value.');
                         }
                         return res.message;
@@ -46465,7 +46677,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, r
                 const header = new Uint8Array(payload.slice(0, HEADER_SIZE));
                 try {
                     const headerRes = yield typedCall('UpgradeFileHeader', 'Success', {
-                        data: bytesToHex$2(header),
+                        data: bytesToHex$1(header),
                     });
                     const isUnknownMessage = (_b = (_a = headerRes.message) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnknownMessage');
                     if (headerRes.type !== 'Success' && !isUnknownMessage) {
@@ -46714,8 +46926,8 @@ const processResourceRequest = (typedCall, res, data) => __awaiter(void 0, void
     const payload = new Uint8Array(data.slice(offset, Math.min(offset + data_length, data.byteLength)));
     const digest = blake2s.blake2s(payload);
     const resourceAckParams = {
-        data_chunk: bytesToHex$2(payload),
-        hash: bytesToHex$2(digest),
+        data_chunk: bytesToHex$1(payload),
+        hash: bytesToHex$1(digest),
     };
     const response = yield typedCall('ResourceAck', ['ResourceRequest', 'Success'], Object.assign({}, resourceAckParams));
     return processResourceRequest(typedCall, response, data);
@@ -46726,8 +46938,8 @@ const updateResource = (typedCall, fileName, data, onConfirmAfter) => __awaiter(
     const res = yield typedCall('ResourceUpdate', ['ResourceRequest', 'Success'], {
         file_name: fileName,
         data_length: data.byteLength,
-        initial_data_chunk: bytesToHex$2(chunk),
-        hash: bytesToHex$2(digest),
+        initial_data_chunk: bytesToHex$1(chunk),
+        hash: bytesToHex$1(digest),
     });
     onConfirmAfter === null || onConfirmAfter === void 0 ? void 0 : onConfirmAfter();
     return processResourceRequest(typedCall, res, data);
@@ -48896,7 +49108,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     prepareRemoteProtocolV2Binaries(firmwareType, features) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
             let bootloaderBinary = null;
@@ -48912,10 +49124,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const entries = this.getRemoteComponentEntries(release);
             const targetsToUpdate = new Set((_a = this.params.targetsToUpdate) !== null && _a !== void 0 ? _a : []);
             for (const [key, component] of entries) {
-                const target = this.getRemoteComponentTarget(key, component);
-                const updateTarget = PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(target.targetId);
-                const shouldInstall = updateTarget ? targetsToUpdate.has(updateTarget) : false;
-                if (shouldInstall) {
+                const targetName = (_b = component.target) === null || _b === void 0 ? void 0 : _b.toUpperCase();
+                const target = PROTOCOL_V2_REMOTE_COMPONENT_TARGETS[targetName];
+                const updateTarget = target
+                    ? PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(target.targetId)
+                    : undefined;
+                if (updateTarget && targetsToUpdate.has(updateTarget)) {
                     const remoteBinary = yield this.downloadRemoteProtocolV2Component(key, component);
                     if (remoteBinary.kind === 'bootloader') {
                         bootloaderBinary = remoteBinary.binary;
@@ -49290,7 +49504,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
                 try {
                     yield this.reconnectProtocolV2Device();
-                    yield this.verifyProtocolV2ReconnectIdentity();
+                    const deviceInfo = yield this.verifyProtocolV2ReconnectIdentity();
                     try {
                         const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', {
                             fields: {
@@ -49310,11 +49524,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             throw error;
                         }
                         if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
-                            Log$5.log('[FirmwareUpdateV4] firmware status endpoint unavailable after reboot; continue with normal-mode verification');
-                            return;
+                            if (yield this.probeProtocolV2NormalMode(deviceInfo)) {
+                                Log$5.log('[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot');
+                                return;
+                            }
+                            lastError = new Error('Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode');
+                        }
+                        else {
+                            lastError = error;
+                            Log$5.log('[FirmwareUpdateV4] DeviceFirmwareUpdateStatusGet unavailable during install: ', error);
                         }
-                        lastError = error;
-                        Log$5.log('[FirmwareUpdateV4] DeviceFirmwareUpdateStatusGet unavailable during install: ', error);
                     }
                 }
                 catch (error) {
@@ -49339,6 +49558,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             yield this.protocolV2Reboot(hdTransport.DeviceRebootType.Normal);
         });
     }
+    probeProtocolV2NormalMode(deviceInfo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
+            return features.mode === 'normal' && !features.bootloaderMode;
+        });
+    }
     waitForProtocolV2FinalFeatures() {
         return __awaiter(this, void 0, void 0, function* () {
             const features = yield this.waitForProtocolV2ReconnectAndFeatures(PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT);
@@ -49521,9 +49746,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const env = DataManager.getSettings('env');
             if (DataManager.isBleConnect(env)) {
                 yield hdShared.wait(3000);
-                yield this.acquireProtocolV2BleDevice();
-                yield this.device.initialize();
             }
+            yield this.reconnectProtocolV2Device();
+            yield this.verifyProtocolV2ReconnectIdentity();
+            yield this.device.initialize();
             yield hdShared.wait(2000);
         });
     }
@@ -57431,7 +57657,11 @@ class KaspaSignTransaction extends BaseMethod {
         });
         const outputs = payload.outputs.map(output => {
             var _a;
+            const address = getOutputAddress(output);
             const addressN = getOutputAddressN(output);
+            if (address !== undefined && addressN !== undefined) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'KaspaSignTransaction: outputs must not contain both address and addressN');
+            }
             validateParams(output, [
                 { name: 'satoshis', required: true },
                 { name: 'address', type: 'string' },
@@ -57944,7 +58174,7 @@ class NostrSignEvent extends BaseMethod {
         const addressN = validatePath(payload.path, 5);
         this.params = {
             address_n: addressN,
-            event: bytesToHex$2(Buffer.from(JSON.stringify(payload.event, null, 0), 'utf-8')),
+            event: bytesToHex$1(Buffer.from(JSON.stringify(payload.event, null, 0), 'utf-8')),
         };
     }
     getVersionRange() {
@@ -58135,8 +58365,8 @@ class LnurlAuth1 extends BaseMethod {
             { name: 'k1', type: 'string', required: true },
         ]);
         this.params = {
-            domain: bytesToHex$2(Buffer.from(payload.domain, 'utf-8')),
-            data: bytesToHex$2(Buffer.from(payload.k1, 'hex')),
+            domain: bytesToHex$1(Buffer.from(payload.domain, 'utf-8')),
+            data: bytesToHex$1(Buffer.from(payload.k1, 'hex')),
         };
     }
     getVersionRange() {
@@ -59732,9 +59962,9 @@ class DeviceConnector {
     stop() {
         this.listening = false;
     }
-    acquire(path, session, forceCleanRunPromise, connectProtocol) {
+    acquire(path, session, forceCleanRunPromise, expectedProtocol, protocolHint) {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$3.debug('acquire', path, session, connectProtocol);
+            Log$3.debug('acquire', path, session, expectedProtocol, protocolHint);
             const env = DataManager.getSettings('env');
             try {
                 let res;
@@ -59742,20 +59972,22 @@ class DeviceConnector {
                     res = yield this.transport.acquire({
                         uuid: path,
                         forceCleanRunPromise,
-                        expectedProtocol: connectProtocol,
+                        expectedProtocol,
+                        protocolHint,
                     });
                 }
                 else {
                     res = yield this.transport.acquire({
                         path,
                         previous: session !== null && session !== void 0 ? session : null,
-                        expectedProtocol: connectProtocol,
+                        expectedProtocol,
+                        protocolHint,
                     });
                 }
-                if (connectProtocol) {
+                if (expectedProtocol) {
                     const detectedProtocol = this.transport.getProtocolType(path);
-                    if (detectedProtocol !== connectProtocol) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${connectProtocol}, detected ${detectedProtocol}`);
+                    if (detectedProtocol !== expectedProtocol) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expectedProtocol}, detected ${detectedProtocol}`);
                     }
                 }
                 return res;
@@ -61100,10 +61332,10 @@ class Core extends events.exports {
                 }
                 case IFRAME.CALL: {
                     const logBlockLabel = getLogBlockLabel(message);
-                    Log.log(`[${Date.now()}][CALL_API]`, logBlockLabel ? { method: logBlockLabel, payload: '[REDACTED]' } : message);
+                    Log.log(formatLogMethodLabel(`[${Date.now()}][CALL_API]`, logBlockLabel), getSafeLogPayload(message, logBlockLabel));
                     const response = yield callAPI(this.getCoreContext(), message);
                     const { success, payload } = response;
-                    Log.log(`[${Date.now()}][CALL_API_RESPONSE]`, logBlockLabel ? { method: logBlockLabel, payload: '[REDACTED]' } : response);
+                    Log.log(formatLogMethodLabel(`[${Date.now()}][CALL_API_RESPONSE]`, logBlockLabel), getSafeLogPayload(response, logBlockLabel));
                     if (success) {
                         return response;
                     }
@@ -61149,7 +61381,7 @@ class Core extends events.exports {
             }
             _deviceList = undefined;
             _connector = undefined;
-            DevicePool.resetState();
+            DevicePool.dispose();
             deviceCacheMap.clear();
             preWarmInflight.clear();
             preWarmDoneAt.clear();
@@ -61297,6 +61529,7 @@ exports["default"] = HardwareSdk;
 exports.enableLog = enableLog;
 exports.encodePro2Wallpaper = encodePro2Wallpaper;
 exports.executeCallback = executeCallback;
+exports.formatLogMethodLabel = formatLogMethodLabel;
 exports.formatRequestContext = formatRequestContext;
 exports.generateInstanceId = generateInstanceId;
 exports.generateSdkInstanceId = generateSdkInstanceId;
@@ -61329,6 +61562,7 @@ exports.getLogger = getLogger;
 exports.getMethodVersionRange = getMethodVersionRange;
 exports.getOutputScriptType = getOutputScriptType;
 exports.getSDKVersion = getSDKVersion;
+exports.getSafeLogPayload = getSafeLogPayload;
 exports.getScriptType = getScriptType;
 exports.getTimeStamp = getTimeStamp;
 exports.httpRequest = httpRequest;