@onekeyfe/hd-core 1.2.0-alpha.35 → 1.2.0-alpha.36

package/dist/index.js

@@ -38049,11 +38049,26 @@ var nested = {
 			DeviceSessionError_Busy: 5
 		}
 	},
+	DeviceSessionSeedDomain: {
+		values: {
+			SeedDomain_Standard: 1,
+			SeedDomain_Cardano: 2
+		}
+	},
 	DeviceSessionGet: {
 		fields: {
 			session_id: {
 				type: "bytes",
 				id: 1
+			},
+			btc_test_address: {
+				type: "string",
+				id: 2
+			},
+			seed_domains: {
+				rule: "repeated",
+				type: "DeviceSessionSeedDomain",
+				id: 3
 			}
 		}
 	},
@@ -39930,6 +39945,8 @@ const DEVICE = {
     LOADING: 'device-loading',
     BUTTON: 'button',
     PIN: 'pin',
+    PIN_ON_DEVICE: 'pin_on_device',
+    PIN_ON_DEVICE_COMPLETE: 'pin_on_device_complete',
     PASSPHRASE: 'passphrase',
     PASSPHRASE_ON_DEVICE: 'passphrase_on_device',
     ATTACH_PIN_ON_DEVICE: 'attach_pin_on_device',
@@ -40086,21 +40103,46 @@ function refreshProtocolV2DeviceStatus(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,
+function ensureProtocolV2WalletSessionUnlocked(device) {
+    var _a, _b, _c;
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!device.isProtocolV2() || ((_a = device.isBootloader) === null || _a === void 0 ? void 0 : _a.call(device)) || ((_b = device.isRomloader) === null || _b === void 0 ? void 0 : _b.call(device))) {
+            return false;
+        }
+        yield refreshProtocolV2DeviceStatus(device);
+        if (((_c = device.state) === null || _c === void 0 ? void 0 : _c.status.unlocked) !== false) {
+            return false;
+        }
+        yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
+            source: 'unlock-coordinator',
+            reason: 'device-locked',
+            deviceOnly: true,
+        });
+        return true;
     });
+}
+const negotiateEventlessWalletSession = (device) => __awaiter(void 0, void 0, void 0, function* () {
+    yield device.ensureProtocolV2RuntimeContext();
+});
+const getDeviceSession = (device, request, deriveCardano) => __awaiter(void 0, void 0, void 0, function* () {
+    const payload = deriveCardano === undefined
+        ? request
+        : Object.assign(Object.assign({}, request), { seed_domains: [
+                hdTransport.DeviceSessionSeedDomain.SeedDomain_Standard,
+                ...(deriveCardano ? [hdTransport.DeviceSessionSeedDomain.SeedDomain_Cardano] : []),
+            ] });
+    return device.commands.typedCall('DeviceSessionGet', 'DeviceSession', payload);
 });
-const getDeviceSession = (device, request) => __awaiter(void 0, void 0, void 0, function* () { return device.commands.typedCall('DeviceSessionGet', 'DeviceSession', request); });
 const askDevicePassphrase = (device, requestPayload) => __awaiter(void 0, void 0, void 0, function* () {
     yield device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', requestPayload);
     yield refreshProtocolV2DeviceStatus(device);
 });
-const selectDeviceSession = (device, expectedPassphraseState) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+const selectDeviceSession = (device, expectedPassphraseState, deriveCardano) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
     const existsAttachPinUser = ((_a = device.features) === null || _a === void 0 ? void 0 : _a.attachToPinEnabled) === true;
     const metadata = Object.assign({ source: 'wallet-session-coordinator', reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet' }, (expectedPassphraseState ? { expectedPassphraseState } : {}));
-    const response = yield device.commands.promptPassphrase(Object.assign({ existsAttachPinUser, deviceOnly: false }, metadata), { cancelDeviceOnReject: false });
+    const passphraseInteraction = (_b = device.createProtocolV2UiPhaseMetadata) === null || _b === void 0 ? void 0 : _b.call(device, 'passphrase', 'start');
+    const response = yield device.commands.promptPassphrase(Object.assign(Object.assign({ existsAttachPinUser, deviceOnly: false }, metadata), (passphraseInteraction ? { interaction: passphraseInteraction } : {})), { 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;
@@ -40122,23 +40164,27 @@ const selectDeviceSession = (device, expectedPassphraseState) => __awaiter(void
         if (!existsAttachPinUser) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Attach PIN wallet selection is unavailable on this device.');
         }
-        device.emit(DEVICE.ATTACH_PIN_ON_DEVICE, device, metadata);
-        yield device.unlockDevice(hdTransport.DeviceSessionPinType.AttachToPin);
-        return getDeviceSession(device, {});
+        const attachPinInteraction = (_c = device.createProtocolV2UiPhaseMetadata) === null || _c === void 0 ? void 0 : _c.call(device, 'pin', 'start');
+        device.emit(DEVICE.ATTACH_PIN_ON_DEVICE, device, Object.assign(Object.assign({}, metadata), (attachPinInteraction ? { interaction: attachPinInteraction } : {})));
+        yield device.unlockDevice(hdTransport.DeviceSessionPinType.AttachToPin, {
+            emitUiEvent: false,
+            interaction: attachPinInteraction,
+        });
+        return getDeviceSession(device, {}, deriveCardano);
     }
     if (hasHostPassphrase) {
         yield askDevicePassphrase(device, {
             passphrase: hostPassphrase,
             on_device: false,
         });
-        return getDeviceSession(device, {});
+        return getDeviceSession(device, {}, deriveCardano);
     }
-    device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, metadata);
+    device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, Object.assign(Object.assign({}, metadata), (passphraseInteraction ? { interaction: passphraseInteraction } : {})));
     yield askDevicePassphrase(device, { on_device: true });
-    return getDeviceSession(device, {});
+    return getDeviceSession(device, {}, deriveCardano);
 });
 function getProtocolV2WalletSession(device, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g;
     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;
         if (forceWalletSelection) {
@@ -40165,20 +40211,54 @@ function getProtocolV2WalletSession(device, options) {
             : undefined;
         let response;
         let resumed = false;
+        let mainWalletSelected = false;
+        const clearCurrentWalletSession = () => {
+            var _a;
+            if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
+                (_a = device.clearStandardInternalState) === null || _a === void 0 ? void 0 : _a.call(device);
+            }
+            else {
+                device.clearInternalState();
+            }
+        };
+        const rejectMismatchedAttachPinWallet = () => __awaiter(this, void 0, void 0, function* () {
+            const features = yield refreshProtocolV2DeviceStatus(device);
+            if (features.unlockedAttachPin !== true) {
+                return;
+            }
+            try {
+                yield device.lockDevice();
+            }
+            catch (_h) {
+            }
+            clearCurrentWalletSession();
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
+        });
+        const selectMainWallet = (force = false) => __awaiter(this, void 0, void 0, function* () {
+            if (force || !mainWalletSelected) {
+                yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
+                    source: 'wallet-session-coordinator',
+                    reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
+                    deviceOnly: true,
+                });
+                mainWalletSelected = true;
+            }
+        });
         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);
+                    if (options === null || options === void 0 ? void 0 : options.selectMainWalletBeforeRestore) {
+                        yield selectMainWallet();
                     }
                     response = yield getDeviceSession(device, {
                         session_id: cachedStandardSession.sessionId,
-                    });
+                        btc_test_address: cachedStandardSession.passphraseState,
+                    }, options === null || options === void 0 ? void 0 : options.deriveCardano);
                     resumed = true;
                 }
                 catch (error) {
-                    (_e = device.clearStandardInternalState) === null || _e === void 0 ? void 0 : _e.call(device);
+                    (_d = device.clearStandardInternalState) === null || _d === void 0 ? void 0 : _d.call(device);
                     if (!isWalletSessionInvalidError(error)) {
                         throw error;
                     }
@@ -40186,13 +40266,16 @@ function getProtocolV2WalletSession(device, options) {
                 }
             }
             if (!response) {
-                yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main);
-                response = yield getDeviceSession(device, {});
+                yield selectMainWallet();
+                response = yield getDeviceSession(device, {}, options === null || options === void 0 ? void 0 : options.deriveCardano);
             }
         }
         else if (cachedSessionId && expectedPassphraseState) {
             try {
-                response = yield getDeviceSession(device, { session_id: cachedSessionId });
+                response = yield getDeviceSession(device, {
+                    session_id: cachedSessionId,
+                    btc_test_address: expectedPassphraseState,
+                }, options === null || options === void 0 ? void 0 : options.deriveCardano);
                 resumed = true;
             }
             catch (error) {
@@ -40203,12 +40286,22 @@ function getProtocolV2WalletSession(device, options) {
                 resumed = false;
             }
         }
+        else if (expectedPassphraseState) {
+            try {
+                response = yield getDeviceSession(device, { btc_test_address: expectedPassphraseState }, options === null || options === void 0 ? void 0 : options.deriveCardano);
+            }
+            catch (error) {
+                if ((options === null || options === void 0 ? void 0 : options.resumeOnly) || !isWalletSessionInvalidError(error)) {
+                    throw error;
+                }
+            }
+        }
         if (!response) {
             if (options === null || options === void 0 ? void 0 : options.resumeOnly) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
-            response = yield selectDeviceSession(device, expectedPassphraseState);
+            response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
         }
         let { message } = response;
         try {
@@ -40216,7 +40309,7 @@ function getProtocolV2WalletSession(device, options) {
         }
         catch (error) {
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                (_f = device.clearStandardInternalState) === null || _f === void 0 ? void 0 : _f.call(device);
+                (_e = device.clearStandardInternalState) === null || _e === void 0 ? void 0 : _e.call(device);
             }
             else {
                 device.clearInternalState();
@@ -40225,18 +40318,19 @@ function getProtocolV2WalletSession(device, options) {
         }
         if (expectedPassphraseState && expectedPassphraseState !== message.btc_test_address) {
             resumed = false;
+            yield rejectMismatchedAttachPinWallet();
             if (options === null || options === void 0 ? void 0 : options.resumeOnly) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
             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, {});
+                (_f = device.clearStandardInternalState) === null || _f === void 0 ? void 0 : _f.call(device);
+                yield selectMainWallet(true);
+                response = yield getDeviceSession(device, {}, options === null || options === void 0 ? void 0 : options.deriveCardano);
             }
             else {
                 device.clearInternalState();
-                response = yield selectDeviceSession(device, expectedPassphraseState);
+                response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
             }
             message = response.message;
             try {
@@ -40244,7 +40338,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                    (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
+                    (_g = device.clearStandardInternalState) === null || _g === void 0 ? void 0 : _g.call(device);
                 }
                 else {
                     device.clearInternalState();
@@ -40252,12 +40346,8 @@ function getProtocolV2WalletSession(device, options) {
                 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();
-                }
+                yield rejectMismatchedAttachPinWallet();
+                clearCurrentWalletSession();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
             }
         }
@@ -40277,16 +40367,17 @@ function getProtocolV2WalletSession(device, options) {
         return {
             passphraseState: message.btc_test_address,
             newSession: message.session_id,
-            unlockedAttachPin: (_l = (_k = device.features) === null || _k === void 0 ? void 0 : _k.unlockedAttachPin) !== null && _l !== void 0 ? _l : undefined,
+            unlockedAttachPin: mainWalletSelected ? false : undefined,
             resumed,
         };
     });
 }
-function restoreProtocolV2WalletSession(device, expectedPassphraseState) {
+function restoreProtocolV2WalletSession(device, expectedPassphraseState, deriveCardano) {
     return __awaiter(this, void 0, void 0, function* () {
         return getProtocolV2WalletSession(device, {
             expectedPassphraseState,
             resumeOnly: true,
+            deriveCardano,
         });
     });
 }
@@ -40351,6 +40442,7 @@ const getPassphraseStateWithRefreshDeviceInfo = (device, options) => __awaiter(v
             initSession: options === null || options === void 0 ? void 0 : options.initSession,
             expectedPassphraseState: options === null || options === void 0 ? void 0 : options.expectPassphraseState,
             onlyMainPin: options === null || options === void 0 ? void 0 : options.onlyMainPin,
+            deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
         });
     }
     const { features } = device;
@@ -40393,6 +40485,7 @@ const getPassphraseState = (device, options) => __awaiter(void 0, void 0, void 0
             initSession: options === null || options === void 0 ? void 0 : options.initSession,
             expectedPassphraseState: options === null || options === void 0 ? void 0 : options.expectPassphraseState,
             onlyMainPin: options === null || options === void 0 ? void 0 : options.onlyMainPin,
+            deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
         });
     }
     const supportAttachPinCapability = existCapability(features, hdTransport.Enum_Capability.Capability_AttachToPin);
@@ -43025,8 +43118,10 @@ const PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS = 10 * 1000;
 function requestProtocolV2ProtocolInfo({ commands, timeoutMs, }) {
     return __awaiter(this, void 0, void 0, function* () {
         const response = timeoutMs === undefined
-            ? yield commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {})
-            : yield commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {}, { timeoutMs });
+            ? yield commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {
+                eventless_wallet_session: true,
+            })
+            : yield commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', { eventless_wallet_session: true }, { timeoutMs });
         return response.message;
     });
 }
@@ -43054,6 +43149,22 @@ const parseRunOptions = (options) => {
     return options;
 };
 const Log$e = getLogger(exports.LoggerNames.Device);
+const isProtocolV2DeviceStatusUnsupportedError = (error) => {
+    var _a, _b, _c;
+    if (error instanceof hdShared.HardwareError) {
+        if (error.errorCode === hdShared.HardwareErrorCode.DeviceNotSupportMethod) {
+            return true;
+        }
+        if (((_a = error.params) === null || _a === void 0 ? void 0 : _a.failureCode) === 'Failure_UnexpectedMessage') {
+            return true;
+        }
+    }
+    const message = error instanceof Error
+        ? error.message
+        : String((_c = (_b = error === null || error === void 0 ? void 0 : error.message) !== null && _b !== void 0 ? _b : error) !== null && _c !== void 0 ? _c : '');
+    return (/^Failure_UnexpectedMessage(?:,|\b)/i.test(message) ||
+        /\b(?:unsupported message|handler not registered|message handler not found)\b/i.test(message));
+};
 function preloadSessionCache(deviceId, passphraseState, sessionId) {
     deviceWalletSessionStore.set(deviceId, passphraseState, sessionId);
 }
@@ -43086,6 +43197,7 @@ class Device extends events.exports {
         this.deviceAcquired = false;
         this.stateStore = new DeviceStateStore();
         this.protocolV2StateNeedsReload = false;
+        this.protocolV2UiInteractionCounter = 0;
         this.externalState = [];
         this.unavailableCapabilities = {};
         this.instance = 0;
@@ -43644,11 +43756,7 @@ class Device extends events.exports {
                     }
                 }
                 if (refresh.has('status') && !initializedWithDeviceInfo) {
-                    const deviceInfo = refreshedDeviceInfo !== null && refreshedDeviceInfo !== void 0 ? refreshedDeviceInfo : (yield requestProtocolV2DeviceInfo({
-                        commands: this.commands,
-                        request: getProtocolV2DeviceInfoRequest(),
-                    }));
-                    yield this.probeProtocolV2RuntimeState(deviceInfo);
+                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo);
                 }
                 if (refresh.has('settings') && ((_c = this.state) === null || _c === void 0 ? void 0 : _c.status.mode) === 'normal') {
                     const { message } = yield this.commands.typedCall('DeviceSettingsGet', 'DeviceSettings', {});
@@ -43708,15 +43816,55 @@ class Device extends events.exports {
         this.updateState(mapFeaturesToState(normalized), source);
         return this.features;
     }
+    ensureProtocolV2RuntimeContext(timeoutMs) {
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            const cachedProtocolInfo = (_a = this.protocolV2RuntimeContext) !== null && _a !== void 0 ? _a : (!this.protocolV2StateNeedsReload
+                ? (_d = (_c = (_b = this.state) === null || _b === void 0 ? void 0 : _b.raw) === null || _c === void 0 ? void 0 : _c.protocolV2ProtocolInfo) !== null && _d !== void 0 ? _d : undefined
+                : undefined);
+            if (cachedProtocolInfo) {
+                this.protocolV2RuntimeContext = cachedProtocolInfo;
+                return cachedProtocolInfo;
+            }
+            if (this.protocolV2RuntimeContextPromise) {
+                return this.protocolV2RuntimeContextPromise;
+            }
+            const requestToken = {};
+            const pendingRequest = (() => __awaiter(this, void 0, void 0, function* () {
+                const protocolInfo = yield requestProtocolV2ProtocolInfo({
+                    commands: this.commands,
+                    timeoutMs,
+                });
+                if (this.protocolV2RuntimeContextRequestToken !== requestToken) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Protocol V2 runtime context was invalidated while loading.');
+                }
+                this.protocolV2RuntimeContext = protocolInfo;
+                return protocolInfo;
+            }))();
+            this.protocolV2RuntimeContextRequestToken = requestToken;
+            this.protocolV2RuntimeContextPromise = pendingRequest;
+            try {
+                return yield pendingRequest;
+            }
+            finally {
+                if (this.protocolV2RuntimeContextPromise === pendingRequest) {
+                    this.protocolV2RuntimeContextPromise = undefined;
+                }
+                if (this.protocolV2RuntimeContextRequestToken === requestToken) {
+                    this.protocolV2RuntimeContextRequestToken = undefined;
+                }
+            }
+        });
+    }
     probeProtocolV2RuntimeState(deviceInfo, timeoutMs) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const protocolInfo = yield requestProtocolV2ProtocolInfo({
-                commands: this.commands,
-                timeoutMs,
-            });
+            const protocolInfo = yield this.ensureProtocolV2RuntimeContext(timeoutMs);
             const runtimeMode = getProtocolV2RuntimeMode(protocolInfo);
-            const protocolV2DeviceType = resolveProtocolV2DeviceIdentity((_a = deviceInfo.hw) === null || _a === void 0 ? void 0 : _a.Device_type).deviceType;
+            const runtimeDeviceInfo = deviceInfo !== null && deviceInfo !== void 0 ? deviceInfo : (_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.raw) === null || _b === void 0 ? void 0 : _b.protocolV2DeviceInfo;
+            const protocolV2DeviceType = runtimeDeviceInfo
+                ? resolveProtocolV2DeviceIdentity((_c = runtimeDeviceInfo.hw) === null || _c === void 0 ? void 0 : _c.Device_type).deviceType
+                : this.getCurrentDeviceType();
             if (runtimeMode === 'romloader' && protocolV2DeviceType !== hdShared.EDeviceType.Pro2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Protocol V2 romloader mode is only supported for Pro2.');
             }
@@ -43730,10 +43878,19 @@ class Device extends events.exports {
                 }
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, `Unknown Protocol V2 build fingerprint without DeviceStatusGet capability: ${protocolInfo.build_fingerprint}`);
             }
-            const deviceStatus = yield requestProtocolV2DeviceStatus({
-                commands: this.commands,
-                timeoutMs,
-            });
+            let deviceStatus;
+            try {
+                deviceStatus = yield requestProtocolV2DeviceStatus({
+                    commands: this.commands,
+                    timeoutMs,
+                });
+            }
+            catch (error) {
+                if (runtimeMode === undefined && isProtocolV2DeviceStatusUnsupportedError(error)) {
+                    return this.updateProtocolV2Features(deviceInfo, null, 'bootloader', protocolInfo);
+                }
+                throw error;
+            }
             return this.updateProtocolV2Features(deviceInfo, deviceStatus, 'normal', protocolInfo);
         });
     }
@@ -43764,6 +43921,9 @@ class Device extends events.exports {
         if (!this.isProtocolV2())
             return;
         this.protocolV2StateNeedsReload = true;
+        this.protocolV2RuntimeContext = undefined;
+        this.protocolV2RuntimeContextPromise = undefined;
+        this.protocolV2RuntimeContextRequestToken = undefined;
         this.clearPreInitialized();
     }
     invalidateAfterWipe() {
@@ -43771,9 +43931,14 @@ class Device extends events.exports {
         if (deviceId) {
             deviceWalletSessionStore.deleteDevice(deviceId);
         }
-        if (this.isProtocolV2() && this.originalDescriptor.path !== deviceId) {
-            deviceWalletSessionStore.deleteDevice(this.originalDescriptor.path);
+        if (this.isProtocolV2()) {
+            if (this.originalDescriptor.path !== deviceId) {
+                deviceWalletSessionStore.deleteDevice(this.originalDescriptor.path);
+            }
             this.protocolV2StateNeedsReload = true;
+            this.protocolV2RuntimeContext = undefined;
+            this.protocolV2RuntimeContextPromise = undefined;
+            this.protocolV2RuntimeContextRequestToken = undefined;
         }
         this.passphraseState = undefined;
         this.stateStore = new DeviceStateStore();
@@ -43784,6 +43949,9 @@ class Device extends events.exports {
         if (!this.isProtocolV2())
             return;
         this.protocolV2StateNeedsReload = true;
+        this.protocolV2RuntimeContext = undefined;
+        this.protocolV2RuntimeContextPromise = undefined;
+        this.protocolV2RuntimeContextRequestToken = undefined;
         this.clearPreInitialized();
         let loaderMode;
         if (rebootType === hdTransport.DeviceRebootType.Bootloader) {
@@ -44082,6 +44250,55 @@ class Device extends events.exports {
             return res.message;
         });
     }
+    beginProtocolV2UiInteraction() {
+        if (!this.isProtocolV2())
+            return;
+        this.protocolV2UiInteraction = {
+            interactionId: `${this.instanceId}:${Date.now()}:${++this.protocolV2UiInteractionCounter}`,
+            phaseCounter: 0,
+            sequence: 0,
+            opened: false,
+        };
+    }
+    createProtocolV2UiPhaseMetadata(phase, transition, options) {
+        var _a;
+        if (!this.isProtocolV2())
+            return undefined;
+        if (!this.protocolV2UiInteraction)
+            this.beginProtocolV2UiInteraction();
+        const interaction = this.protocolV2UiInteraction;
+        if (!interaction)
+            return undefined;
+        const phaseId = (_a = options === null || options === void 0 ? void 0 : options.phaseId) !== null && _a !== void 0 ? _a : `${interaction.interactionId}:phase-${++interaction.phaseCounter}`;
+        interaction.opened = true;
+        interaction.sequence += 1;
+        return Object.assign(Object.assign({ interactionId: interaction.interactionId, phaseId, sequence: interaction.sequence, phase,
+            transition }, ((options === null || options === void 0 ? void 0 : options.outcome) ? { outcome: options.outcome } : {})), { protocol: 'V2' });
+    }
+    completeProtocolV2UiPhase(phase, outcome = 'succeeded') {
+        return this.createProtocolV2UiPhaseMetadata(phase.phase, 'complete', {
+            phaseId: phase.phaseId,
+            outcome,
+        });
+    }
+    finishProtocolV2UiInteraction(outcome = 'succeeded') {
+        const interaction = this.protocolV2UiInteraction;
+        if (!(interaction === null || interaction === void 0 ? void 0 : interaction.opened)) {
+            this.protocolV2UiInteraction = undefined;
+            return undefined;
+        }
+        const phaseId = `${interaction.interactionId}:phase-${Math.max(interaction.phaseCounter, 1)}`;
+        const metadata = this.createProtocolV2UiPhaseMetadata('processing', 'finish', {
+            phaseId,
+            outcome,
+        });
+        this.protocolV2UiInteraction = undefined;
+        return metadata;
+    }
+    hasOpenProtocolV2UiInteraction() {
+        var _a;
+        return ((_a = this.protocolV2UiInteraction) === null || _a === void 0 ? void 0 : _a.opened) === true;
+    }
     supportUnlockVersionRange() {
         return {
             pro: {
@@ -44089,28 +44306,50 @@ class Device extends events.exports {
             },
         };
     }
-    unlockDevice(pinType = hdTransport.DeviceSessionPinType.Main) {
-        var _a, _b, _c, _d;
+    unlockDevice(pinType, options) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isProtocolV2()) {
+                const requestedPinType = pinType !== null && pinType !== void 0 ? pinType : hdTransport.DeviceSessionPinType.Main;
+                const interaction = (_a = options === null || options === void 0 ? void 0 : options.interaction) !== null && _a !== void 0 ? _a : ((options === null || options === void 0 ? void 0 : options.emitUiEvent) === false
+                    ? undefined
+                    : this.createProtocolV2UiPhaseMetadata('pin', 'start'));
+                if ((options === null || options === void 0 ? void 0 : options.emitUiEvent) !== false) {
+                    this.emit(DEVICE.PIN_ON_DEVICE, this, requestedPinType, {
+                        source: (_b = options === null || options === void 0 ? void 0 : options.source) !== null && _b !== void 0 ? _b : 'unlock-coordinator',
+                        reason: (_c = options === null || options === void 0 ? void 0 : options.reason) !== null && _c !== void 0 ? _c : 'device-unlock',
+                        deviceOnly: (_d = options === null || options === void 0 ? void 0 : options.deviceOnly) !== null && _d !== void 0 ? _d : true,
+                        completion: options === null || options === void 0 ? void 0 : options.completion,
+                        method: options === null || options === void 0 ? void 0 : options.method,
+                        page: options === null || options === void 0 ? void 0 : options.page,
+                        operation: options === null || options === void 0 ? void 0 : options.operation,
+                        interaction: (_e = options === null || options === void 0 ? void 0 : options.interaction) !== null && _e !== void 0 ? _e : interaction,
+                    });
+                }
                 try {
-                    yield this.commands.typedCall('DeviceSessionAskPin', 'Success', { type: pinType });
+                    yield this.commands.typedCall('DeviceSessionAskPin', 'Success', {
+                        type: requestedPinType,
+                    });
                 }
                 catch (error) {
                     const errorText = error instanceof Error
                         ? `${error.name} ${error.message}`
-                        : String((_b = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error) !== null && _b !== void 0 ? _b : '');
+                        : String((_g = (_f = error === null || error === void 0 ? void 0 : error.message) !== null && _f !== void 0 ? _f : error) !== null && _g !== void 0 ? _g : '');
                     if (errorText.includes('Failure_UnexpectedMessage')) {
                         throw hdShared.createDeviceNotSupportMethodError('deviceUnlock', this.getCurrentFirmwareType());
                     }
                     throw error;
                 }
+                const completion = interaction ? this.completeProtocolV2UiPhase(interaction) : undefined;
+                if (completion) {
+                    this.emit(DEVICE.PIN_ON_DEVICE_COMPLETE, this, completion);
+                }
                 const status = yield requestProtocolV2DeviceStatus({ commands: this.commands });
                 return this.updateProtocolV2Status(status);
             }
-            const firmwareVersion = (_c = this.getCurrentFirmwareVersionString()) !== null && _c !== void 0 ? _c : '0.0.0';
+            const firmwareVersion = (_h = this.getCurrentFirmwareVersionString()) !== null && _h !== void 0 ? _h : '0.0.0';
             const versionRange = this.getCurrentMethodVersionRange(type => this.supportUnlockVersionRange()[type]);
-            const supportAttachPinCapability = (_d = this.state) === null || _d === void 0 ? void 0 : _d.capabilities.includes(hdTransport.Enum_Capability.Capability_AttachToPin);
+            const supportAttachPinCapability = (_j = this.state) === null || _j === void 0 ? void 0 : _j.capabilities.includes(hdTransport.Enum_Capability.Capability_AttachToPin);
             const supportUnlock = supportAttachPinCapability ||
                 (versionRange &&
                     semver__default["default"].valid(firmwareVersion) &&
@@ -44145,7 +44384,7 @@ class Device extends events.exports {
             return Promise.resolve(features);
         });
     }
-    checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck) {
+    checkPassphraseStateSafety(passphraseState, useEmptyPassphrase, skipPassphraseCheck, deriveCardano) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isUnacquired())
                 return false;
@@ -44153,6 +44392,7 @@ class Device extends events.exports {
             const { passphraseState: newPassphraseState, unlockedAttachPin } = yield getPassphraseStateWithRefreshDeviceInfo(this, {
                 expectPassphraseState: expectedPassphraseState,
                 onlyMainPin: useEmptyPassphrase,
+                deriveCardano,
             });
             const mainWalletUseAttachPin = unlockedAttachPin && useEmptyPassphrase;
             const useErrorAttachPin = unlockedAttachPin &&
@@ -44837,7 +45077,12 @@ class GetPassphraseState extends BaseMethod {
             if (isProtocolV2 && this.payload.useEmptyPassphrase !== true) {
                 const features = yield refreshProtocolV2DeviceStatus(this.device);
                 if (features.unlocked === false) {
-                    yield this.device.unlockDevice();
+                    yield this.device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
+                        source: 'unlock-coordinator',
+                        reason: 'device-locked',
+                        deviceOnly: true,
+                        method: 'getPassphraseState',
+                    });
                 }
             }
             const { passphraseState } = yield getPassphraseStateWithRefreshDeviceInfo(this.device, isProtocolV2
@@ -45112,14 +45357,23 @@ class OpenWalletSession extends BaseMethod {
             });
             const unlockProtocolV2IfLocked = () => __awaiter(this, void 0, void 0, function* () {
                 if (isProtocolV2 && state.status.unlocked === false) {
-                    yield this.device.unlockDevice();
+                    yield this.device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
+                        source: 'unlock-coordinator',
+                        reason: 'device-locked',
+                        deviceOnly: true,
+                        method: 'openWalletSession',
+                    });
                 }
             });
             const protocol = isProtocolV2 ? 'V2' : 'V1';
             if (this.params.mode === OpenWalletSessionMode.Standard) {
                 this.device.passphraseState = undefined;
                 const session = isProtocolV2
-                    ? yield getProtocolV2WalletSession(this.device, { onlyMainPin: true })
+                    ? yield getProtocolV2WalletSession(this.device, {
+                        onlyMainPin: true,
+                        deriveCardano: this.payload.deriveCardano,
+                        selectMainWalletBeforeRestore: state.status.unlocked === false || state.status.unlockedAttachPin === true,
+                    })
                     : yield getPassphraseStateWithRefreshDeviceInfo(this.device, {
                         onlyMainPin: true,
                         initSession: this.payload.initSession,
@@ -45168,6 +45422,7 @@ class OpenWalletSession extends BaseMethod {
                 const session = isProtocolV2
                     ? yield getProtocolV2WalletSession(this.device, {
                         expectedPassphraseState: this.params.passphraseState,
+                        deriveCardano: this.payload.deriveCardano,
                     })
                     : yield getPassphraseStateWithRefreshDeviceInfo(this.device, {
                         expectPassphraseState: this.params.passphraseState,
@@ -45182,7 +45437,10 @@ class OpenWalletSession extends BaseMethod {
             this.device.passphraseState = undefined;
             yield unlockProtocolV2IfLocked();
             const session = isProtocolV2
-                ? yield getProtocolV2WalletSession(this.device, { forceWalletSelection: true })
+                ? yield getProtocolV2WalletSession(this.device, {
+                    forceWalletSelection: true,
+                    deriveCardano: this.payload.deriveCardano,
+                })
                 : yield getPassphraseStateWithRefreshDeviceInfo(this.device, { initSession: true });
             const deviceId = isProtocolV2 ? yield refreshProtocolV2DeviceId() : requireDeviceId();
             if (isProtocolV2 && this.device.getCurrentPassphraseProtection() !== true) {
@@ -47455,7 +47713,7 @@ class DeviceUnlock extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.device.unlockDevice();
+            return this.device.unlockDevice(undefined, { emitUiEvent: false });
         });
     }
 }
@@ -49143,7 +49401,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 if (binary.byteLength === 0) {
                     throw new Error(`Protocol V2 RESC bundle is empty: ${bundle.name}`);
                 }
-                if (downloadedFromRemote && (bundle.version || bundle.payloadHash || bundle.headerHash)) {
+                if (downloadedFromRemote) {
                     const header = parseProtocolV2OkppHeader(toProtocolV2Bytes(binary));
                     if (!header || header.type !== 'RESC') {
                         throw new Error(`Invalid Protocol V2 RESC bundle header: ${bundle.name}`);
@@ -49435,14 +49693,22 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware target failed: target=${failedTarget.target_id} status=${(_a = failedTarget.status) !== null && _a !== void 0 ? _a : 'unknown'} payloadVersion=${(_b = failedTarget.payload_version) !== null && _b !== void 0 ? _b : 'unknown'} path=${(_c = failedTarget.path) !== null && _c !== void 0 ? _c : 'unknown'}`);
         }
         const matchingTargets = statusTargets.filter(target => { var _a; return expectedTargetIds.has((_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1); });
-        const completedTargets = matchingTargets.filter(target => isProtocolV2TargetStatusFinished(target.status));
-        if (completedTargets.length === expectedTargetIds.size && expectedTargetIds.size > 0) {
+        const completedTargetIds = new Set();
+        matchingTargets.forEach(target => {
+            const targetId = normalizeProtocolV2TargetId(target.target_id);
+            if (targetId !== undefined && isProtocolV2TargetStatusFinished(target.status)) {
+                completedTargetIds.add(targetId);
+            }
+        });
+        const allExpectedTargetsCompleted = expectedTargetIds.size > 0 &&
+            Array.from(expectedTargetIds).every(targetId => completedTargetIds.has(targetId));
+        if (allExpectedTargetsCompleted) {
             this.postProgressMessage(100, 'installingFirmware');
             return true;
         }
         if (expectedTargetIds.size > 0 && matchingTargets.length > 0) {
             const hasInProgressTarget = matchingTargets.some(target => isProtocolV2TargetStatusInProgress(target.status));
-            const completedProgress = Math.floor((completedTargets.length / expectedTargetIds.size) * 100);
+            const completedProgress = Math.floor((completedTargetIds.size / expectedTargetIds.size) * 100);
             const progress = Math.min(99, Math.max(completedProgress, hasInProgressTarget ? 1 : 0));
             this.postProgressMessage(progress, 'installingFirmware');
         }
@@ -50210,95 +50476,316 @@ class CipherKeyValue extends BaseMethod {
     }
 }
 
-const Mainnet = 'mainnet';
-const networkAliases = {
-    tbtc: { name: 'btc', coin: 'Testnet' },
-    bch: { name: 'btc', coin: 'Bcash' },
-    doge: { name: 'btc', coin: 'Dogecoin' },
-    ltc: { name: 'btc', coin: 'Litecoin' },
-    neurai: { name: 'btc', coin: 'Neurai' },
-};
-const networkConfigMap = {
-    btc: {
-        methodName: 'btcGetPublicKey',
-        getParams: (baseParams, chainName) => (Object.assign({ coin: chainName }, baseParams)),
-    },
-    evm: {
-        methodName: 'evmGetAddress',
-        getParams: (baseParams, chainName) => {
-            const { path, showOnOneKey } = baseParams;
-            let chainId;
-            if (chainName) {
-                chainId = parseInt(chainName);
-            }
-            return {
-                chainId,
-                path,
-                showOnOneKey,
-            };
-        },
-    },
-    sol: {
-        methodName: 'solGetAddress',
-    },
-    algo: {
-        methodName: 'algoGetAddress',
-    },
-    near: {
-        methodName: 'nearGetAddress',
-    },
-    stc: {
-        methodName: 'starcoinGetAddress',
-    },
-    cfx: {
-        methodName: 'confluxGetAddress',
-        getParams: (baseParams, chainName) => {
-            const { path, showOnOneKey } = baseParams;
-            return {
-                chainId: parseInt(chainName !== null && chainName !== void 0 ? chainName : '1029'),
-                path,
-                showOnOneKey,
-            };
-        },
-    },
-    tron: {
-        methodName: 'tronGetAddress',
-    },
-    aptos: {
-        methodName: 'aptosGetAddress',
-    },
-    xrp: {
-        methodName: 'xrpGetAddress',
-    },
-    cosmos: {
-        methodName: 'cosmosGetPublicKey',
-        getParams: (baseParams) => {
-            const { path, prefix, showOnOneKey } = baseParams;
-            return {
-                hrp: prefix,
-                path,
-                showOnOneKey,
-            };
-        },
-    },
-    ada: {
-        methodName: 'cardanoGetAddress',
-        getParams: (baseParams, chainName) => {
-            const { path, showOnOneKey } = baseParams;
-            const addressPath = typeof path === 'string' ? `${path}/0/0` : serializedPath([...path, 0, 0]);
-            const stakingPath = typeof path === 'string' ? `${path}/2/0` : serializedPath([...path, 2, 0]);
-            let networkId = 1;
-            if (chainName) {
-                networkId = chainName === Mainnet ? 1 : 0;
+function isDeviceLockedError(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'errorCode' in error &&
+        error.errorCode === hdShared.HardwareErrorCode.DeviceLocked);
+}
+
+const isProtocolV2UiEnabled = (method) => method.protocolV2UiMode !== 'none';
+const getDisplayState = (value) => {
+    const visited = new Set();
+    let seen = false;
+    let enabled = false;
+    const visit = (current) => {
+        if (current == null || typeof current !== 'object')
+            return;
+        if (visited.has(current))
+            return;
+        visited.add(current);
+        if (Array.isArray(current)) {
+            current.forEach(visit);
+            return;
+        }
+        Object.entries(current).forEach(([key, item]) => {
+            if ((key === 'show_display' || key === 'showOnOneKey') && typeof item === 'boolean') {
+                seen = true;
+                enabled || (enabled = item);
+                return;
             }
-            return {
-                addressParameters: {
-                    addressType: hdTransport.Messages.CardanoAddressType.BASE,
-                    path: addressPath,
-                    stakingPath,
-                },
-                protocolMagic: 764824073,
-                networkId,
+            visit(item);
+        });
+    };
+    visit(value);
+    return { seen, enabled };
+};
+const createMethodInteraction = (reason, operation) => ({
+    request: 'button',
+    source: 'method-lifecycle',
+    reason,
+    completion: 'operation-completed',
+    deviceOnly: true,
+    operation,
+});
+const hasCipherConfirmation = (value) => {
+    if (Array.isArray(value))
+        return value.some(hasCipherConfirmation);
+    if (value == null || typeof value !== 'object')
+        return false;
+    const params = value;
+    return params.encrypt === true ? params.ask_on_encrypt === true : params.ask_on_decrypt === true;
+};
+const resolveProtocolV2UiInteraction = (method) => {
+    if (method.protocolV2UiInteraction)
+        return method.protocolV2UiInteraction;
+    const operation = method.name;
+    if (!operation)
+        return undefined;
+    const isAddress = /getAddress(?:ByLoop)?$/i.test(operation);
+    const isPublicKey = /getPublicKey$/i.test(operation);
+    if (isAddress || isPublicKey) {
+        const paramsDisplay = getDisplayState(method.params);
+        const payloadDisplay = getDisplayState(method.payload);
+        const display = paramsDisplay.seen ? paramsDisplay : payloadDisplay;
+        const shouldDisplay = display.seen ? display.enabled : isAddress;
+        if (!shouldDisplay)
+            return undefined;
+        return createMethodInteraction(isAddress ? 'address-confirmation' : 'public-key-confirmation', operation);
+    }
+    if (/sign/i.test(operation) || /verifyMessage$/i.test(operation) || operation === 'lnurlAuth') {
+        return createMethodInteraction('signing-confirmation', operation);
+    }
+    if (operation === 'nostrEncryptMessage' || operation === 'nostrDecryptMessage') {
+        const display = getDisplayState(method.params);
+        if (!display.enabled)
+            return undefined;
+        return createMethodInteraction('signing-confirmation', operation);
+    }
+    if (operation === 'cipherKeyValue' && hasCipherConfirmation(method.params)) {
+        return createMethodInteraction('signing-confirmation', operation);
+    }
+    return undefined;
+};
+class ProtocolV2UiInteractionCoordinator {
+    constructor(device, postMessage) {
+        this.opened = false;
+        this.closed = false;
+        this.device = device;
+        this.postMessage = postMessage;
+    }
+    enterMethodInteraction(interaction) {
+        var _a, _b, _c, _d;
+        this.methodInteraction = interaction;
+        if (!interaction)
+            return;
+        const { request } = interaction, metadata = __rest(interaction, ["request"]);
+        const interactionMeta = (_b = (_a = this.device).createProtocolV2UiPhaseMetadata) === null || _b === void 0 ? void 0 : _b.call(_a, request === 'pin' ? 'pin' : 'button', 'start');
+        this.emit(request === 'pin' ? UI_REQUEST.REQUEST_PIN : UI_REQUEST.REQUEST_BUTTON, Object.assign(Object.assign({ device: this.device.toMessageObject() }, metadata), (interactionMeta ? { interaction: interactionMeta } : {})), `method:${request}:${interaction.reason}:${(_c = interaction.page) !== null && _c !== void 0 ? _c : ''}:${(_d = interaction.operation) !== null && _d !== void 0 ? _d : ''}`);
+    }
+    enterUnlockInteraction(method) {
+        var _a, _b;
+        const interaction = (_b = (_a = this.device).createProtocolV2UiPhaseMetadata) === null || _b === void 0 ? void 0 : _b.call(_a, 'pin', 'start');
+        this.emit(UI_REQUEST.REQUEST_PIN, Object.assign({ device: this.device.toMessageObject(), source: 'unlock-coordinator', reason: 'device-locked', deviceOnly: true, method }, (interaction ? { interaction } : {})), `unlock:${method !== null && method !== void 0 ? method : ''}`);
+        return interaction;
+    }
+    resumeMethodInteraction() {
+        this.enterMethodInteraction(this.methodInteraction);
+    }
+    close() {
+        var _a, _b, _c, _d;
+        if (!this.device.isProtocolV2() ||
+            (!this.opened && !((_b = (_a = this.device).hasOpenProtocolV2UiInteraction) === null || _b === void 0 ? void 0 : _b.call(_a))) ||
+            this.closed)
+            return;
+        this.closed = true;
+        const interaction = (_d = (_c = this.device).finishProtocolV2UiInteraction) === null || _d === void 0 ? void 0 : _d.call(_c);
+        this.postMessage(interaction
+            ? createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW, interaction)
+            : createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW));
+    }
+    emit(type, payload, phase) {
+        if (!this.device.isProtocolV2() || this.closed || this.currentPhase === phase)
+            return;
+        this.currentPhase = phase;
+        this.opened = true;
+        const message = type === UI_REQUEST.REQUEST_BUTTON
+            ? createUiMessage(UI_REQUEST.REQUEST_BUTTON, payload)
+            : createUiMessage(UI_REQUEST.REQUEST_PIN, payload);
+        this.postMessage(message);
+    }
+}
+
+const Log$3 = getLogger(exports.LoggerNames.Core);
+const restoreExpectedWalletSessionAfterUnlock = (method, device) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    const expectedPassphraseState = ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.useEmptyPassphrase)
+        ? undefined
+        : (_c = (_b = method.payload) === null || _b === void 0 ? void 0 : _b.passphraseState) !== null && _c !== void 0 ? _c : device.passphraseState;
+    if (!method.useDevicePassphraseState ||
+        typeof expectedPassphraseState !== 'string' ||
+        expectedPassphraseState.length === 0) {
+        return;
+    }
+    yield restoreProtocolV2WalletSession(device, expectedPassphraseState);
+    Log$3.debug('Protocol V2 wallet session restored after unlock', { method: method.name });
+});
+function runMethodWithUnlockRetry(method, device, uiCoordinator) {
+    var _a, _b, _c, _d, _e;
+    return __awaiter(this, void 0, void 0, function* () {
+        const shouldEmitUi = isProtocolV2UiEnabled(method);
+        const shouldCoordinateUi = shouldEmitUi && uiCoordinator !== undefined;
+        const isProtocolV2 = device.isProtocolV2();
+        const requiresFreshStatus = isProtocolV2 &&
+            method.unlockPolicy === 'unlock-before-run' &&
+            !((_a = device.isBootloader) === null || _a === void 0 ? void 0 : _a.call(device)) &&
+            !((_b = device.isRomloader) === null || _b === void 0 ? void 0 : _b.call(device));
+        if (requiresFreshStatus) {
+            yield refreshProtocolV2DeviceStatus(device);
+        }
+        const shouldUnlockBeforeRun = isProtocolV2 &&
+            method.unlockPolicy !== 'none' &&
+            !((_c = device.isBootloader) === null || _c === void 0 ? void 0 : _c.call(device)) &&
+            !((_d = device.isRomloader) === null || _d === void 0 ? void 0 : _d.call(device)) &&
+            ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlocked) === false;
+        if (shouldUnlockBeforeRun) {
+            const unlockInteraction = shouldCoordinateUi
+                ? uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterUnlockInteraction(method.name)
+                : undefined;
+            yield device.unlockDevice(undefined, shouldCoordinateUi
+                ? { emitUiEvent: false, interaction: unlockInteraction }
+                : {
+                    source: 'unlock-coordinator',
+                    reason: 'device-locked',
+                    deviceOnly: true,
+                    method: method.name,
+                });
+            Log$3.debug('Protocol V2 pre-unlock completed', { method: method.name });
+            yield restoreExpectedWalletSessionAfterUnlock(method, device);
+            if (shouldCoordinateUi) {
+                uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
+            }
+            return method.run();
+        }
+        if (shouldCoordinateUi) {
+            uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
+        }
+        try {
+            return yield method.run();
+        }
+        catch (error) {
+            if (!isProtocolV2 || method.unlockPolicy !== 'retry-on-locked' || !isDeviceLockedError(error)) {
+                throw error;
+            }
+            Log$3.debug('Protocol V2 unlock retry triggered', { method: method.name });
+            const unlockInteraction = shouldCoordinateUi
+                ? uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterUnlockInteraction(method.name)
+                : undefined;
+            yield device.unlockDevice(undefined, shouldCoordinateUi
+                ? { emitUiEvent: false, interaction: unlockInteraction }
+                : {
+                    source: 'unlock-coordinator',
+                    reason: 'device-locked',
+                    deviceOnly: true,
+                    method: method.name,
+                });
+            Log$3.debug('Protocol V2 unlock completed', { method: method.name });
+            yield restoreExpectedWalletSessionAfterUnlock(method, device);
+            if (shouldCoordinateUi) {
+                uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.resumeMethodInteraction();
+            }
+            try {
+                const response = yield method.run();
+                Log$3.debug('Protocol V2 method retry completed', { method: method.name, success: true });
+                return response;
+            }
+            catch (retryError) {
+                Log$3.debug('Protocol V2 method retry completed', { method: method.name, success: false });
+                throw retryError;
+            }
+        }
+    });
+}
+
+const Mainnet = 'mainnet';
+const networkAliases = {
+    tbtc: { name: 'btc', coin: 'Testnet' },
+    bch: { name: 'btc', coin: 'Bcash' },
+    doge: { name: 'btc', coin: 'Dogecoin' },
+    ltc: { name: 'btc', coin: 'Litecoin' },
+    neurai: { name: 'btc', coin: 'Neurai' },
+};
+const networkConfigMap = {
+    btc: {
+        methodName: 'btcGetPublicKey',
+        getParams: (baseParams, chainName) => (Object.assign({ coin: chainName }, baseParams)),
+    },
+    evm: {
+        methodName: 'evmGetAddress',
+        getParams: (baseParams, chainName) => {
+            const { path, showOnOneKey } = baseParams;
+            let chainId;
+            if (chainName) {
+                chainId = parseInt(chainName);
+            }
+            return {
+                chainId,
+                path,
+                showOnOneKey,
+            };
+        },
+    },
+    sol: {
+        methodName: 'solGetAddress',
+    },
+    algo: {
+        methodName: 'algoGetAddress',
+    },
+    near: {
+        methodName: 'nearGetAddress',
+    },
+    stc: {
+        methodName: 'starcoinGetAddress',
+    },
+    cfx: {
+        methodName: 'confluxGetAddress',
+        getParams: (baseParams, chainName) => {
+            const { path, showOnOneKey } = baseParams;
+            return {
+                chainId: parseInt(chainName !== null && chainName !== void 0 ? chainName : '1029'),
+                path,
+                showOnOneKey,
+            };
+        },
+    },
+    tron: {
+        methodName: 'tronGetAddress',
+    },
+    aptos: {
+        methodName: 'aptosGetAddress',
+    },
+    xrp: {
+        methodName: 'xrpGetAddress',
+    },
+    cosmos: {
+        methodName: 'cosmosGetPublicKey',
+        getParams: (baseParams) => {
+            const { path, prefix, showOnOneKey } = baseParams;
+            return {
+                hrp: prefix,
+                path,
+                showOnOneKey,
+            };
+        },
+    },
+    ada: {
+        methodName: 'cardanoGetAddress',
+        getParams: (baseParams, chainName) => {
+            const { path, showOnOneKey } = baseParams;
+            const addressPath = typeof path === 'string' ? `${path}/0/0` : serializedPath([...path, 0, 0]);
+            const stakingPath = typeof path === 'string' ? `${path}/2/0` : serializedPath([...path, 2, 0]);
+            let networkId = 1;
+            if (chainName) {
+                networkId = chainName === Mainnet ? 1 : 0;
+            }
+            return {
+                addressParameters: {
+                    addressType: hdTransport.Messages.CardanoAddressType.BASE,
+                    path: addressPath,
+                    stakingPath,
+                },
+                protocolMagic: 764824073,
+                networkId,
                 derivationType: hdTransport.Messages.CardanoDerivationType.ICARUS,
                 showOnOneKey,
                 address: '',
@@ -50494,7 +50981,16 @@ class AllNetworkGetAddressBase extends BaseMethod {
                         this.temporarySafetyCheckPrompted = true;
                     }
                 }
-                const response = yield method.run();
+                if (this.device.isProtocolV2() && this.payload.passphraseState) {
+                    yield ensureProtocolV2WalletSessionUnlocked(this.device);
+                    const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, false, this.payload.skipPassphraseCheck);
+                    if (!passphraseStateSafety) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
+                    }
+                }
+                const response = this.device.isProtocolV2()
+                    ? yield runMethodWithUnlockRetry(method, this.device)
+                    : yield method.run();
                 if (!Array.isArray(response) || response.length === 0) {
                     throw new Error('No response');
                 }
@@ -50535,7 +51031,9 @@ class AllNetworkGetAddressBase extends BaseMethod {
                 script_type: 'SPENDADDRESS',
                 show_display: false,
             });
-            this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
+            if (!this.device.isProtocolV2()) {
+                this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
+            }
             if (res.message.root_fingerprint == null) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter);
             }
@@ -59849,7 +60347,7 @@ const resolveAfter = (msec, value) => new Promise(resolve => {
     setTimeout(resolve, msec, value);
 });
 
-const Log$3 = getLogger(exports.LoggerNames.DeviceConnector);
+const Log$2 = getLogger(exports.LoggerNames.DeviceConnector);
 class DeviceConnector {
     constructor() {
         this.listenTimestamp = 0;
@@ -59880,7 +60378,7 @@ class DeviceConnector {
             this.listening = true;
             let descriptors;
             try {
-                Log$3.debug('Start listening', current);
+                Log$2.debug('Start listening', current);
                 this.listenTimestamp = new Date().getTime();
                 descriptors = waitForEvent
                     ? yield this.transport.listen(current)
@@ -59888,21 +60386,21 @@ class DeviceConnector {
                 if (!this.listening)
                     return;
                 this.upcoming = descriptors;
-                Log$3.debug('Listen result', descriptors);
+                Log$2.debug('Listen result', descriptors);
                 this._reportDevicesChange();
                 if (this.listening)
                     this.listen();
             }
             catch (error) {
                 const time = new Date().getTime() - this.listenTimestamp;
-                Log$3.debug('Listen error', 'timestamp', time, typeof error);
+                Log$2.debug('Listen error', 'timestamp', time, typeof error);
                 if (time > 1100) {
                     yield resolveAfter(1000, null);
                     if (this.listening)
                         this.listen();
                 }
                 else {
-                    Log$3.warn('Transport error');
+                    Log$2.warn('Transport error');
                 }
             }
         });
@@ -59912,7 +60410,7 @@ class DeviceConnector {
     }
     acquire(path, session, forceCleanRunPromise, expectedProtocol, protocolHint) {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$3.debug('acquire', path, session, expectedProtocol, protocolHint);
+            Log$2.debug('acquire', path, session, expectedProtocol, protocolHint);
             const env = DataManager.getSettings('env');
             try {
                 let res;
@@ -59941,7 +60439,7 @@ class DeviceConnector {
                 return res;
             }
             catch (error) {
-                Log$3.error('acquire error: ', error.message);
+                Log$2.error('acquire error: ', error.message);
                 safeThrowError(error);
             }
         });
@@ -59980,7 +60478,7 @@ class DeviceConnector {
     }
 }
 
-const Log$2 = getLogger(exports.LoggerNames.Core);
+const Log$1 = getLogger(exports.LoggerNames.Core);
 class RequestQueue {
     constructor() {
         this.requestQueue = new Map();
@@ -60013,7 +60511,7 @@ class RequestQueue {
     abortRequest(requestId) {
         const request = this.requestQueue.get(requestId);
         if (request === null || request === void 0 ? void 0 : request.abortController) {
-            Log$2.debug(`Aborting request ${requestId}`);
+            Log$1.debug(`Aborting request ${requestId}`);
             request.abortController.abort();
             return true;
         }
@@ -60065,7 +60563,7 @@ class RequestQueue {
     registerPendingCallbackTask(connectId, callbackPromise) {
         this.pendingCallbackTasks.set(connectId, callbackPromise);
         callbackPromise.promise.finally(() => {
-            Log$2.debug(`Callback task completed for connectId: ${connectId}`);
+            Log$1.debug(`Callback task completed for connectId: ${connectId}`);
             if (this.pendingCallbackTasks.get(connectId) === callbackPromise) {
                 this.pendingCallbackTasks.delete(connectId);
             }
@@ -60075,7 +60573,7 @@ class RequestQueue {
         return __awaiter(this, void 0, void 0, function* () {
             const pendingTask = this.pendingCallbackTasks.get(connectId);
             if (pendingTask && pendingTask !== exceptTask) {
-                Log$2.debug(`Waiting for pending callback task to complete for connectId: ${connectId}`);
+                Log$1.debug(`Waiting for pending callback task to complete for connectId: ${connectId}`);
                 yield pendingTask.promise;
             }
         });
@@ -60090,6 +60588,8 @@ class RequestQueue {
 
 function registerHardwareUiEventListeners(device, handlers) {
     device.on(DEVICE.PIN, handlers.pin);
+    device.on(DEVICE.PIN_ON_DEVICE, handlers.pinOnDevice);
+    device.on(DEVICE.PIN_ON_DEVICE_COMPLETE, handlers.pinOnDeviceComplete);
     device.on(DEVICE.BUTTON, handlers.button);
     device.on(DEVICE.PASSPHRASE, handlers.passphrase);
     device.on(DEVICE.PASSPHRASE_ON_DEVICE, handlers.passphraseOnDevice);
@@ -60119,208 +60619,6 @@ const getSynchronize = (mutex) => {
     return (action, lockId) => lock(lockId).then(unlock => Promise.resolve().then(action).finally(unlock));
 };
 
-function isDeviceLockedError(error) {
-    return (typeof error === 'object' &&
-        error !== null &&
-        'errorCode' in error &&
-        error.errorCode === hdShared.HardwareErrorCode.DeviceLocked);
-}
-
-const isProtocolV2UiEnabled = (method) => method.protocolV2UiMode !== 'none';
-const getDisplayState = (value) => {
-    const visited = new Set();
-    let seen = false;
-    let enabled = false;
-    const visit = (current) => {
-        if (current == null || typeof current !== 'object')
-            return;
-        if (visited.has(current))
-            return;
-        visited.add(current);
-        if (Array.isArray(current)) {
-            current.forEach(visit);
-            return;
-        }
-        Object.entries(current).forEach(([key, item]) => {
-            if ((key === 'show_display' || key === 'showOnOneKey') && typeof item === 'boolean') {
-                seen = true;
-                enabled || (enabled = item);
-                return;
-            }
-            visit(item);
-        });
-    };
-    visit(value);
-    return { seen, enabled };
-};
-const createMethodInteraction = (reason, operation) => ({
-    request: 'button',
-    source: 'method-lifecycle',
-    reason,
-    completion: 'operation-completed',
-    deviceOnly: true,
-    operation,
-});
-const hasCipherConfirmation = (value) => {
-    if (Array.isArray(value))
-        return value.some(hasCipherConfirmation);
-    if (value == null || typeof value !== 'object')
-        return false;
-    const params = value;
-    return params.encrypt === true ? params.ask_on_encrypt === true : params.ask_on_decrypt === true;
-};
-const resolveProtocolV2UiInteraction = (method) => {
-    if (method.protocolV2UiInteraction)
-        return method.protocolV2UiInteraction;
-    const operation = method.name;
-    if (!operation)
-        return undefined;
-    const isAddress = /getAddress(?:ByLoop)?$/i.test(operation);
-    const isPublicKey = /getPublicKey$/i.test(operation);
-    if (isAddress || isPublicKey) {
-        const paramsDisplay = getDisplayState(method.params);
-        const payloadDisplay = getDisplayState(method.payload);
-        const display = paramsDisplay.seen ? paramsDisplay : payloadDisplay;
-        const shouldDisplay = display.seen ? display.enabled : isAddress;
-        if (!shouldDisplay)
-            return undefined;
-        return createMethodInteraction(isAddress ? 'address-confirmation' : 'public-key-confirmation', operation);
-    }
-    if (/sign/i.test(operation) || /verifyMessage$/i.test(operation) || operation === 'lnurlAuth') {
-        return createMethodInteraction('signing-confirmation', operation);
-    }
-    if (operation === 'nostrEncryptMessage' || operation === 'nostrDecryptMessage') {
-        const display = getDisplayState(method.params);
-        if (!display.enabled)
-            return undefined;
-        return createMethodInteraction('signing-confirmation', operation);
-    }
-    if (operation === 'cipherKeyValue' && hasCipherConfirmation(method.params)) {
-        return createMethodInteraction('signing-confirmation', operation);
-    }
-    return undefined;
-};
-class ProtocolV2UiInteractionCoordinator {
-    constructor(device, postMessage) {
-        this.opened = false;
-        this.closed = false;
-        this.device = device;
-        this.postMessage = postMessage;
-    }
-    enterMethodInteraction(interaction) {
-        var _a, _b;
-        this.methodInteraction = interaction;
-        if (!interaction)
-            return;
-        const { request } = interaction, metadata = __rest(interaction, ["request"]);
-        this.emit(request === 'pin' ? UI_REQUEST.REQUEST_PIN : UI_REQUEST.REQUEST_BUTTON, Object.assign({ device: this.device.toMessageObject() }, metadata), `method:${request}:${interaction.reason}:${(_a = interaction.page) !== null && _a !== void 0 ? _a : ''}:${(_b = interaction.operation) !== null && _b !== void 0 ? _b : ''}`);
-    }
-    enterUnlockInteraction(method) {
-        this.emit(UI_REQUEST.REQUEST_PIN, {
-            device: this.device.toMessageObject(),
-            source: 'unlock-coordinator',
-            reason: 'device-locked',
-            deviceOnly: true,
-            method,
-        }, `unlock:${method !== null && method !== void 0 ? method : ''}`);
-    }
-    resumeMethodInteraction() {
-        this.enterMethodInteraction(this.methodInteraction);
-    }
-    close() {
-        if (!this.device.isProtocolV2() || !this.opened || this.closed)
-            return;
-        this.closed = true;
-        this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW));
-    }
-    emit(type, payload, phase) {
-        if (!this.device.isProtocolV2() || this.closed || this.currentPhase === phase)
-            return;
-        this.currentPhase = phase;
-        this.opened = true;
-        const message = type === UI_REQUEST.REQUEST_BUTTON
-            ? createUiMessage(UI_REQUEST.REQUEST_BUTTON, payload)
-            : createUiMessage(UI_REQUEST.REQUEST_PIN, payload);
-        this.postMessage(message);
-    }
-}
-
-const Log$1 = getLogger(exports.LoggerNames.Core);
-const restoreExpectedWalletSessionAfterUnlock = (method, device) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
-    const expectedPassphraseState = ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.useEmptyPassphrase)
-        ? undefined
-        : (_c = (_b = method.payload) === null || _b === void 0 ? void 0 : _b.passphraseState) !== null && _c !== void 0 ? _c : device.passphraseState;
-    if (!method.useDevicePassphraseState ||
-        typeof expectedPassphraseState !== 'string' ||
-        expectedPassphraseState.length === 0) {
-        return;
-    }
-    yield restoreProtocolV2WalletSession(device, expectedPassphraseState);
-    Log$1.debug('Protocol V2 wallet session restored after unlock', { method: method.name });
-});
-function runMethodWithUnlockRetry(method, device, uiCoordinator) {
-    var _a, _b, _c, _d, _e;
-    return __awaiter(this, void 0, void 0, function* () {
-        const shouldEmitUi = isProtocolV2UiEnabled(method);
-        const isProtocolV2 = device.isProtocolV2();
-        const requiresFreshStatus = isProtocolV2 &&
-            method.unlockPolicy === 'unlock-before-run' &&
-            !((_a = device.isBootloader) === null || _a === void 0 ? void 0 : _a.call(device)) &&
-            !((_b = device.isRomloader) === null || _b === void 0 ? void 0 : _b.call(device));
-        if (requiresFreshStatus) {
-            yield refreshProtocolV2DeviceStatus(device);
-        }
-        const shouldUnlockBeforeRun = isProtocolV2 &&
-            method.unlockPolicy !== 'none' &&
-            !((_c = device.isBootloader) === null || _c === void 0 ? void 0 : _c.call(device)) &&
-            !((_d = device.isRomloader) === null || _d === void 0 ? void 0 : _d.call(device)) &&
-            ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlocked) === false;
-        if (shouldUnlockBeforeRun) {
-            if (shouldEmitUi) {
-                uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterUnlockInteraction(method.name);
-            }
-            yield device.unlockDevice();
-            Log$1.debug('Protocol V2 pre-unlock completed', { method: method.name });
-            yield restoreExpectedWalletSessionAfterUnlock(method, device);
-            if (shouldEmitUi) {
-                uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
-            }
-            return method.run();
-        }
-        if (shouldEmitUi) {
-            uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
-        }
-        try {
-            return yield method.run();
-        }
-        catch (error) {
-            if (!isProtocolV2 || method.unlockPolicy !== 'retry-on-locked' || !isDeviceLockedError(error)) {
-                throw error;
-            }
-            Log$1.debug('Protocol V2 unlock retry triggered', { method: method.name });
-            if (shouldEmitUi) {
-                uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.enterUnlockInteraction(method.name);
-            }
-            yield device.unlockDevice();
-            Log$1.debug('Protocol V2 unlock completed', { method: method.name });
-            yield restoreExpectedWalletSessionAfterUnlock(method, device);
-            if (shouldEmitUi) {
-                uiCoordinator === null || uiCoordinator === void 0 ? void 0 : uiCoordinator.resumeMethodInteraction();
-            }
-            try {
-                const response = yield method.run();
-                Log$1.debug('Protocol V2 method retry completed', { method: method.name, success: true });
-                return response;
-            }
-            catch (retryError) {
-                Log$1.debug('Protocol V2 method retry completed', { method: method.name, success: false });
-                throw retryError;
-            }
-        }
-    });
-}
-
 const Log = getLogger(exports.LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
 const preWarmInflight = new Map();
@@ -60552,6 +60850,8 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     }
     registerHardwareUiEventListeners(device, {
         pin: onDevicePinHandler,
+        pinOnDevice: onEnterPinOnDeviceHandler,
+        pinOnDeviceComplete: onPinOnDeviceCompleteHandler,
         button: onDeviceButtonHandler,
         passphrase: message.payload.useEmptyPassphrase
             ? onEmptyPassphraseHandler
@@ -60563,6 +60863,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     device.on(DEVICE.STATE, onDeviceStateHandler);
     device.on(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, onSelectDeviceInBootloaderForWebDeviceHandler);
     const protocolV2UiCoordinator = new ProtocolV2UiInteractionCoordinator(device, postMessage);
+    device.beginProtocolV2UiInteraction();
     device.on(DEVICE.SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE, onSelectDeviceForSwitchFirmwareWebDeviceHandler);
     try {
         if (method.connectId) {
@@ -60658,13 +60959,16 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         require: support.require,
                     }));
                 }
-                const passphraseStateSafety = yield device.checkPassphraseStateSafety((_l = method.payload) === null || _l === void 0 ? void 0 : _l.passphraseState, (_m = method.payload) === null || _m === void 0 ? void 0 : _m.useEmptyPassphrase, (_o = method.payload) === null || _o === void 0 ? void 0 : _o.skipPassphraseCheck);
+                yield ensureProtocolV2WalletSessionUnlocked(device);
+                const passphraseStateSafety = yield device.checkPassphraseStateSafety((_l = method.payload) === null || _l === void 0 ? void 0 : _l.passphraseState, (_m = method.payload) === null || _m === void 0 ? void 0 : _m.useEmptyPassphrase, (_o = method.payload) === null || _o === void 0 ? void 0 : _o.skipPassphraseCheck, hasDeriveCardano(method));
                 checkPassphraseEnableState(method, device.features);
                 if (!passphraseStateSafety) {
                     DevicePool.clearDeviceCache(method.payload.connectId);
                     return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError));
                 }
-                postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
+                if (!device.isProtocolV2()) {
+                    postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
+                }
             }
             try {
                 yield method.checkSafetyLevelOnTestNet();
@@ -61173,15 +61477,7 @@ const onDeviceStateHandler = (...[_, stateEvent]) => {
 const onDevicePassphraseHandler = (...[device, requestPayload, callback]) => __awaiter(void 0, void 0, void 0, function* () {
     Log.debug('onDevicePassphraseHandler');
     const uiPromise = createUiPromise(UI_RESPONSE.RECEIVE_PASSPHRASE, device);
-    postMessage(createUiMessage(UI_REQUEST.REQUEST_PASSPHRASE, {
-        device: device.toMessageObject(),
-        passphraseState: device.passphraseState,
-        existsAttachPinUser: requestPayload.existsAttachPinUser,
-        deviceOnly: requestPayload.deviceOnly,
-        source: requestPayload.source,
-        reason: requestPayload.reason,
-        expectedPassphraseState: requestPayload.expectedPassphraseState,
-    }));
+    postMessage(createUiMessage(UI_REQUEST.REQUEST_PASSPHRASE, Object.assign({ device: device.toMessageObject(), passphraseState: device.passphraseState, existsAttachPinUser: requestPayload.existsAttachPinUser, deviceOnly: requestPayload.deviceOnly, source: requestPayload.source, reason: requestPayload.reason, expectedPassphraseState: requestPayload.expectedPassphraseState }, (requestPayload.interaction ? { interaction: requestPayload.interaction } : {}))));
     const uiResp = yield uiPromise.promise;
     const { value, passphraseOnDevice, save, attachPinOnDevice } = uiResp.payload;
     callback({
@@ -61196,20 +61492,19 @@ const onEmptyPassphraseHandler = (...[_, , callback]) => {
     callback({ passphrase: '' });
 };
 const onEnterPassphraseOnDeviceHandler = (...[device, requestPayload]) => {
-    postMessage(createUiMessage(UI_REQUEST.REQUEST_PASSPHRASE_ON_DEVICE, {
-        device: device.toMessageObject(),
-        passphraseState: device.passphraseState,
-        source: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.source,
-        reason: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.reason,
-    }));
+    postMessage(createUiMessage(UI_REQUEST.REQUEST_PASSPHRASE_ON_DEVICE, Object.assign({ device: device.toMessageObject(), passphraseState: device.passphraseState, source: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.source, reason: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.reason }, ((requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.interaction) ? { interaction: requestPayload.interaction } : {}))));
 };
 const onEnterAttachPinOnDeviceHandler = (...[device, requestPayload]) => {
-    postMessage(createUiMessage(UI_REQUEST.REQUEST_PIN, {
-        device: device.toMessageObject(),
-        type: 'ButtonRequest_AttachPin',
-        source: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.source,
-        reason: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.reason,
-    }));
+    postMessage(createUiMessage(UI_REQUEST.REQUEST_PIN, Object.assign({ device: device.toMessageObject(), type: 'ButtonRequest_AttachPin', source: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.source, reason: requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.reason }, ((requestPayload === null || requestPayload === void 0 ? void 0 : requestPayload.interaction) ? { interaction: requestPayload.interaction } : {}))));
+};
+const onEnterPinOnDeviceHandler = (...[device, pinType, metadata]) => {
+    var _a;
+    postMessage(createUiMessage(UI_REQUEST.REQUEST_PIN, Object.assign({ device: device.toMessageObject(), type: pinType === hdTransport.DeviceSessionPinType.AttachToPin
+            ? 'ButtonRequest_AttachPin'
+            : 'ButtonRequest_PinEntry', source: metadata === null || metadata === void 0 ? void 0 : metadata.source, reason: metadata === null || metadata === void 0 ? void 0 : metadata.reason, deviceOnly: (_a = metadata === null || metadata === void 0 ? void 0 : metadata.deviceOnly) !== null && _a !== void 0 ? _a : true, completion: metadata === null || metadata === void 0 ? void 0 : metadata.completion, method: metadata === null || metadata === void 0 ? void 0 : metadata.method, page: metadata === null || metadata === void 0 ? void 0 : metadata.page, operation: metadata === null || metadata === void 0 ? void 0 : metadata.operation }, ((metadata === null || metadata === void 0 ? void 0 : metadata.interaction) ? { interaction: metadata.interaction } : {}))));
+};
+const onPinOnDeviceCompleteHandler = (...[_, metadata]) => {
+    postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW, metadata));
 };
 const onSelectDeviceInBootloaderForWebDeviceHandler = (...[device, callback]) => __awaiter(void 0, void 0, void 0, function* () {
     Log.debug('onSelectDeviceInBootloaderForWebDeviceHandler');