@onekeyfe/hd-core 1.2.0-alpha.12 → 1.2.0-alpha.14

package/dist/index.js

@@ -172,7 +172,6 @@ const createCoreApi = (call) => ({
     filesystemDirRemove: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'filesystemDirRemove' })),
     filesystemPathInfoQuery: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'filesystemPathInfoQuery' })),
     filesystemFormat: connectId => call({ connectId, method: 'filesystemFormat' }),
-    filesystemDiskControl: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'filesystemDiskControl' })),
     deviceRecovery: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceRecovery' })),
     deviceReset: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceReset' })),
     deviceSettings: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceSettings' })),
@@ -9288,14 +9287,6 @@ var nested$2 = {
 			passphrase_state: {
 				type: "string",
 				id: 1
-			},
-			_only_main_pin: {
-				type: "bool",
-				id: 2
-			},
-			allow_create_attach_pin: {
-				type: "bool",
-				id: 3
 			}
 		}
 	},
@@ -25791,7 +25782,6 @@ var nested = {
 			MessageType_DeviceSessionGet: 60606,
 			MessageType_DeviceSession: 60607,
 			MessageType_DeviceSessionAskPin: 60608,
-			MessageType_DeviceSessionPinResult: 60609,
 			MessageType_FilesystemPermissionFix: 60800,
 			MessageType_FilesystemPathInfo: 60801,
 			MessageType_FilesystemPathInfoQuery: 60802,
@@ -31485,6 +31475,33 @@ var nested = {
 			PromptTemporarily: 2
 		}
 	},
+	Initialize: {
+		fields: {
+			session_id: {
+				type: "bytes",
+				id: 1
+			},
+			_skip_passphrase: {
+				type: "bool",
+				id: 2,
+				options: {
+					deprecated: true
+				}
+			},
+			derive_cardano: {
+				type: "bool",
+				id: 3
+			},
+			passphrase_state: {
+				type: "string",
+				id: 8000
+			},
+			is_contains_attach: {
+				type: "bool",
+				id: 8001
+			}
+		}
+	},
 	StartSession: {
 		fields: {
 			session_id: {
@@ -31508,6 +31525,14 @@ var nested = {
 		fields: {
 		}
 	},
+	GetFeatures: {
+		fields: {
+		}
+	},
+	OnekeyGetFeatures: {
+		fields: {
+		}
+	},
 	OneKeyDeviceType: {
 		values: {
 			CLASSIC: 0,
@@ -31529,6 +31554,388 @@ var nested = {
 			APP: 1
 		}
 	},
+	Features: {
+		fields: {
+			vendor: {
+				type: "string",
+				id: 1
+			},
+			major_version: {
+				rule: "required",
+				type: "uint32",
+				id: 2
+			},
+			minor_version: {
+				rule: "required",
+				type: "uint32",
+				id: 3
+			},
+			patch_version: {
+				rule: "required",
+				type: "uint32",
+				id: 4
+			},
+			bootloader_mode: {
+				type: "bool",
+				id: 5
+			},
+			device_id: {
+				type: "string",
+				id: 6
+			},
+			pin_protection: {
+				type: "bool",
+				id: 7
+			},
+			passphrase_protection: {
+				type: "bool",
+				id: 8
+			},
+			language: {
+				type: "string",
+				id: 9
+			},
+			label: {
+				type: "string",
+				id: 10
+			},
+			initialized: {
+				type: "bool",
+				id: 12
+			},
+			revision: {
+				type: "bytes",
+				id: 13
+			},
+			bootloader_hash: {
+				type: "bytes",
+				id: 14
+			},
+			imported: {
+				type: "bool",
+				id: 15
+			},
+			unlocked: {
+				type: "bool",
+				id: 16
+			},
+			_passphrase_cached: {
+				type: "bool",
+				id: 17,
+				options: {
+					deprecated: true
+				}
+			},
+			firmware_present: {
+				type: "bool",
+				id: 18
+			},
+			needs_backup: {
+				type: "bool",
+				id: 19
+			},
+			flags: {
+				type: "uint32",
+				id: 20
+			},
+			model: {
+				type: "string",
+				id: 21
+			},
+			fw_major: {
+				type: "uint32",
+				id: 22
+			},
+			fw_minor: {
+				type: "uint32",
+				id: 23
+			},
+			fw_patch: {
+				type: "uint32",
+				id: 24
+			},
+			fw_vendor: {
+				type: "string",
+				id: 25
+			},
+			unfinished_backup: {
+				type: "bool",
+				id: 27
+			},
+			no_backup: {
+				type: "bool",
+				id: 28
+			},
+			recovery_mode: {
+				type: "bool",
+				id: 29
+			},
+			capabilities: {
+				rule: "repeated",
+				type: "Capability",
+				id: 30,
+				options: {
+					packed: false
+				}
+			},
+			backup_type: {
+				type: "BackupType",
+				id: 31
+			},
+			sd_card_present: {
+				type: "bool",
+				id: 32
+			},
+			sd_protection: {
+				type: "bool",
+				id: 33
+			},
+			wipe_code_protection: {
+				type: "bool",
+				id: 34
+			},
+			session_id: {
+				type: "bytes",
+				id: 35
+			},
+			passphrase_always_on_device: {
+				type: "bool",
+				id: 36
+			},
+			safety_checks: {
+				type: "SafetyCheckLevel",
+				id: 37
+			},
+			auto_lock_delay_ms: {
+				type: "uint32",
+				id: 38
+			},
+			display_rotation: {
+				type: "uint32",
+				id: 39
+			},
+			experimental_features: {
+				type: "bool",
+				id: 40
+			},
+			offset: {
+				type: "uint32",
+				id: 500
+			},
+			coprocessor_bt_name: {
+				type: "string",
+				id: 501
+			},
+			coprocessor_version: {
+				type: "string",
+				id: 502
+			},
+			coprocessor_bt_enable: {
+				type: "bool",
+				id: 503
+			},
+			se_enable: {
+				type: "bool",
+				id: 504
+			},
+			se_ver: {
+				type: "string",
+				id: 506
+			},
+			backup_only: {
+				type: "bool",
+				id: 507
+			},
+			onekey_version: {
+				type: "string",
+				id: 508
+			},
+			onekey_serial: {
+				type: "string",
+				id: 509
+			},
+			bootloader_version: {
+				type: "string",
+				id: 510
+			},
+			serial_no: {
+				type: "string",
+				id: 511
+			},
+			spi_flash: {
+				type: "string",
+				id: 512
+			},
+			initstates: {
+				type: "uint32",
+				id: 513
+			},
+			NFT_voucher: {
+				type: "bytes",
+				id: 514
+			},
+			cpu_info: {
+				type: "string",
+				id: 515
+			},
+			pre_firmware: {
+				type: "string",
+				id: 516
+			},
+			coin_switch: {
+				type: "uint32",
+				id: 517
+			},
+			build_id: {
+				type: "bytes",
+				id: 518
+			},
+			romloader_version: {
+				type: "string",
+				id: 519
+			},
+			busy: {
+				type: "bool",
+				id: 41
+			},
+			onekey_device_type: {
+				type: "OneKeyDeviceType",
+				id: 600
+			},
+			onekey_se_type: {
+				type: "OneKeySeType",
+				id: 601
+			},
+			onekey_romloader_version: {
+				type: "string",
+				id: 602
+			},
+			onekey_romloader_hash: {
+				type: "bytes",
+				id: 603
+			},
+			onekey_bootloader_version: {
+				type: "string",
+				id: 604
+			},
+			onekey_bootloader_hash: {
+				type: "bytes",
+				id: 605
+			},
+			onekey_se01_version: {
+				type: "string",
+				id: 606
+			},
+			onekey_se01_hash: {
+				type: "bytes",
+				id: 607
+			},
+			onekey_se01_build_id: {
+				type: "string",
+				id: 608
+			},
+			onekey_firmware_version: {
+				type: "string",
+				id: 609
+			},
+			onekey_firmware_hash: {
+				type: "bytes",
+				id: 610
+			},
+			onekey_firmware_build_id: {
+				type: "string",
+				id: 611
+			},
+			onekey_serial_no: {
+				type: "string",
+				id: 612
+			},
+			onekey_bootloader_build_id: {
+				type: "string",
+				id: 613
+			},
+			onekey_coprocessor_bt_name: {
+				type: "string",
+				id: 614
+			},
+			onekey_coprocessor_version: {
+				type: "string",
+				id: 615
+			},
+			onekey_coprocessor_build_id: {
+				type: "string",
+				id: 616
+			},
+			onekey_coprocessor_hash: {
+				type: "bytes",
+				id: 617
+			},
+			onekey_se02_version: {
+				type: "string",
+				id: 618
+			},
+			onekey_se03_version: {
+				type: "string",
+				id: 619
+			},
+			onekey_se04_version: {
+				type: "string",
+				id: 620
+			},
+			onekey_se01_state: {
+				type: "OneKeySEState",
+				id: 621
+			},
+			onekey_se02_state: {
+				type: "OneKeySEState",
+				id: 622
+			},
+			onekey_se03_state: {
+				type: "OneKeySEState",
+				id: 623
+			},
+			onekey_se04_state: {
+				type: "OneKeySEState",
+				id: 624
+			},
+			attach_to_pin_user: {
+				type: "bool",
+				id: 625
+			},
+			unlocked_attach_pin: {
+				type: "bool",
+				id: 626
+			}
+		},
+		nested: {
+			Capability: {
+				options: {
+					"(has_bitcoin_only_values)": true
+				},
+				values: {
+					Capability_Bitcoin: 1,
+					Capability_Bitcoin_like: 2,
+					Capability_Binance: 3,
+					Capability_Cardano: 4,
+					Capability_Crypto: 5,
+					Capability_EOS: 6,
+					Capability_Ethereum: 7,
+					Capability_Lisk: 8,
+					Capability_Monero: 9,
+					Capability_NEM: 10,
+					Capability_Ripple: 11,
+					Capability_Stellar: 12,
+					Capability_Tezos: 13,
+					Capability_U2F: 14,
+					Capability_Shamir: 15,
+					Capability_ShamirGroups: 16,
+					Capability_PassphraseEntry: 17,
+					Capability_AttachToPin: 18,
+					Capability_EthereumTypedData: 1000
+				}
+			}
+		}
+	},
 	OnekeyFeatures: {
 		fields: {
 			onekey_device_type: {
@@ -36518,7 +36925,10 @@ var nested = {
 	ViewSignLayout: {
 		values: {
 			LayoutDefault: 0,
-			LayoutSafeTxCreate: 1
+			LayoutSafeTxCreate: 1,
+			LayoutFinalConfirm: 2,
+			Layout7702: 3,
+			LayoutFlat: 4
 		}
 	},
 	ViewSignPage: {
@@ -37379,20 +37789,9 @@ var nested = {
 		fields: {
 		}
 	},
-	DeviceSessionPinResult: {
-		fields: {
-			unlocked: {
-				type: "bool",
-				id: 1
-			},
-			unlocked_attach_pin: {
-				type: "bool",
-				id: 2
-			},
-			passphrase_protection: {
-				type: "bool",
-				id: 3
-			}
+	DeviceSessionAskPin_FailureSubCodes: {
+		values: {
+			UserCancel: 1
 		}
 	},
 	DeviceStatus: {
@@ -38851,6 +39250,13 @@ const PROTOBUF_MESSAGE_CONFIG = {
     ],
 };
 
+function isDeviceLockedError(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'errorCode' in error &&
+        error.errorCode === hdShared.HardwareErrorCode.DeviceLocked);
+}
+
 const getErrorText = (error) => {
     if (error instanceof Error)
         return `${error.name} ${error.message}`;
@@ -38878,24 +39284,39 @@ function refreshProtocolV2DeviceStatus(device) {
     });
 }
 function getProtocolV2WalletSession(device, options) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        if (((_a = device.features) === null || _a === void 0 ? void 0 : _a.unlocked) === false) {
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device is locked');
-        }
         if (options === null || options === void 0 ? void 0 : options.initSession) {
             device.clearInternalState();
         }
-        const cachedSessionId = typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+        let sessionId = typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
         try {
             const requestDeviceSession = (sessionId) => device.commands.typedCall('DeviceSessionGet', 'DeviceSession', sessionId ? { session_id: sessionId } : {});
-            const { message } = yield requestDeviceSession(cachedSessionId).catch((error) => __awaiter(this, void 0, void 0, function* () {
-                if (!cachedSessionId || !isProtocolV2InvalidSessionError(error)) {
+            const requestWalletSession = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    return yield requestDeviceSession(sessionId);
+                }
+                catch (error) {
+                    if (!sessionId || !isProtocolV2InvalidSessionError(error)) {
+                        throw error;
+                    }
+                    device.clearInternalState();
+                    sessionId = undefined;
+                    return requestDeviceSession();
+                }
+            });
+            let response;
+            try {
+                response = yield requestWalletSession();
+            }
+            catch (error) {
+                if (!isDeviceLockedError(error)) {
                     throw error;
                 }
-                device.clearInternalState();
-                return requestDeviceSession();
-            }));
+                yield device.unlockDevice();
+                response = yield requestWalletSession();
+            }
+            const { message } = response;
             if ((options === null || options === void 0 ? void 0 : options.expectedPassphraseState) &&
                 options.expectedPassphraseState !== message.btc_test_address) {
                 device.clearInternalState();
@@ -38904,11 +39325,11 @@ function getProtocolV2WalletSession(device, options) {
             if (message.btc_test_address && device.getCurrentPassphraseProtection() !== true) {
                 yield refreshProtocolV2DeviceStatus(device);
             }
-            device.updateInternalState(((_b = device.getCurrentPassphraseProtection()) !== null && _b !== void 0 ? _b : false) || Boolean(message.btc_test_address), message.btc_test_address, device.getCurrentDeviceId(), message.session_id, (options === null || options === void 0 ? void 0 : options.initSession) ? null : (_c = device.features) === null || _c === void 0 ? void 0 : _c.sessionId);
+            device.updateInternalState(((_a = device.getCurrentPassphraseProtection()) !== null && _a !== void 0 ? _a : false) || Boolean(message.btc_test_address), message.btc_test_address, device.getCurrentDeviceId(), message.session_id, (options === null || options === void 0 ? void 0 : options.initSession) ? null : (_b = device.features) === null || _b === void 0 ? void 0 : _b.sessionId);
             return {
                 passphraseState: message.btc_test_address,
                 newSession: message.session_id,
-                unlockedAttachPin: (_e = (_d = device.features) === null || _d === void 0 ? void 0 : _d.unlockedAttachPin) !== null && _e !== void 0 ? _e : undefined,
+                unlockedAttachPin: (_d = (_c = device.features) === null || _c === void 0 ? void 0 : _c.unlockedAttachPin) !== null && _d !== void 0 ? _d : undefined,
             };
         }
         catch (error) {
@@ -40713,6 +41134,7 @@ class DeviceCommands {
         });
     }
     _filterCommonTypes(res, callType, options) {
+        var _a;
         try {
             if (shouldReduceDebugForCall(callType)) {
             }
@@ -40762,7 +41184,8 @@ class DeviceCommands {
                 }
             }
             if (code === 'Failure_ProcessError') {
-                if (subcode === 9) {
+                const isLegacyProtocolV2LockedFailure = this.device.isProtocolV2() && /^device (?:is )?locked$/i.test((_a = message === null || message === void 0 ? void 0 : message.trim()) !== null && _a !== void 0 ? _a : '');
+                if (subcode === 9 || isLegacyProtocolV2LockedFailure) {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceLocked, message, {
                         failureCode: code,
                         subcode,
@@ -41391,53 +41814,10 @@ const buildProtocolV1FeaturesPayload = (protocolV1Features, previous) => {
     const bleName = features.onekey_ble_name || features.ble_name || null;
     const deviceType = getProtocolV1DeviceType(features);
     const sessionId = (_b = (_a = features.session_id) !== null && _a !== void 0 ? _a : previous === null || previous === void 0 ? void 0 : previous.sessionId) !== null && _b !== void 0 ? _b : null;
-    return {
-        protocol: 'V1',
-        protocolVersion: (_d = (_c = features.protocol_version) !== null && _c !== void 0 ? _c : previous === null || previous === void 0 ? void 0 : previous.protocolVersion) !== null && _d !== void 0 ? _d : 1,
-        deviceType,
-        firmwareType: getProtocolV1FirmwareType(features),
-        model: (_e = features.model) !== null && _e !== void 0 ? _e : null,
-        vendor: (_f = features.vendor) !== null && _f !== void 0 ? _f : null,
-        deviceId: (_g = features.device_id) !== null && _g !== void 0 ? _g : null,
-        serialNo,
-        label: getProtocolV1Label(features, deviceType, bleName),
-        bleName,
-        capabilities: (_h = features.capabilities) !== null && _h !== void 0 ? _h : [],
-        mode: getProtocolV1Mode(features),
-        initialized: (_j = features.initialized) !== null && _j !== void 0 ? _j : null,
-        bootloaderMode: (_k = features.bootloader_mode) !== null && _k !== void 0 ? _k : null,
-        unlocked: (_l = features.unlocked) !== null && _l !== void 0 ? _l : true,
-        firmwarePresent: (_m = features.firmware_present) !== null && _m !== void 0 ? _m : null,
-        passphraseProtection: (_o = features.passphrase_protection) !== null && _o !== void 0 ? _o : null,
-        pinProtection: (_p = features.pin_protection) !== null && _p !== void 0 ? _p : null,
-        backupRequired: (_q = features.needs_backup) !== null && _q !== void 0 ? _q : null,
-        noBackup: (_r = features.no_backup) !== null && _r !== void 0 ? _r : null,
-        unfinishedBackup: (_s = features.unfinished_backup) !== null && _s !== void 0 ? _s : null,
-        recoveryMode: (_t = features.recovery_mode) !== null && _t !== void 0 ? _t : null,
-        language: (_u = features.language) !== null && _u !== void 0 ? _u : null,
-        bleEnabled: (_v = features.ble_enable) !== null && _v !== void 0 ? _v : null,
-        sdCardPresent: (_w = features.sd_card_present) !== null && _w !== void 0 ? _w : null,
-        sdProtection: (_x = features.sd_protection) !== null && _x !== void 0 ? _x : null,
-        wipeCodeProtection: (_y = features.wipe_code_protection) !== null && _y !== void 0 ? _y : null,
-        passphraseAlwaysOnDevice: (_z = features.passphrase_always_on_device) !== null && _z !== void 0 ? _z : null,
-        safetyChecks: (_0 = features.safety_checks) !== null && _0 !== void 0 ? _0 : null,
-        autoLockDelayMs: (_1 = features.auto_lock_delay_ms) !== null && _1 !== void 0 ? _1 : null,
-        displayRotation: (_2 = features.display_rotation) !== null && _2 !== void 0 ? _2 : null,
-        experimentalFeatures: (_3 = features.experimental_features) !== null && _3 !== void 0 ? _3 : null,
-        firmwareVersion,
+    return Object.assign(Object.assign({}, features), { protocol: 'V1', protocolVersion: (_d = (_c = features.protocol_version) !== null && _c !== void 0 ? _c : previous === null || previous === void 0 ? void 0 : previous.protocolVersion) !== null && _d !== void 0 ? _d : 1, deviceType, firmwareType: getProtocolV1FirmwareType(features), model: (_e = features.model) !== null && _e !== void 0 ? _e : null, vendor: (_f = features.vendor) !== null && _f !== void 0 ? _f : null, deviceId: (_g = features.device_id) !== null && _g !== void 0 ? _g : null, serialNo, label: getProtocolV1Label(features, deviceType, bleName), bleName, capabilities: (_h = features.capabilities) !== null && _h !== void 0 ? _h : [], mode: getProtocolV1Mode(features), initialized: (_j = features.initialized) !== null && _j !== void 0 ? _j : null, bootloaderMode: (_k = features.bootloader_mode) !== null && _k !== void 0 ? _k : null, unlocked: (_l = features.unlocked) !== null && _l !== void 0 ? _l : true, firmwarePresent: (_m = features.firmware_present) !== null && _m !== void 0 ? _m : null, passphraseProtection: (_o = features.passphrase_protection) !== null && _o !== void 0 ? _o : null, pinProtection: (_p = features.pin_protection) !== null && _p !== void 0 ? _p : null, backupRequired: (_q = features.needs_backup) !== null && _q !== void 0 ? _q : null, noBackup: (_r = features.no_backup) !== null && _r !== void 0 ? _r : null, unfinishedBackup: (_s = features.unfinished_backup) !== null && _s !== void 0 ? _s : null, recoveryMode: (_t = features.recovery_mode) !== null && _t !== void 0 ? _t : null, language: (_u = features.language) !== null && _u !== void 0 ? _u : null, bleEnabled: (_v = features.ble_enable) !== null && _v !== void 0 ? _v : null, sdCardPresent: (_w = features.sd_card_present) !== null && _w !== void 0 ? _w : null, sdProtection: (_x = features.sd_protection) !== null && _x !== void 0 ? _x : null, wipeCodeProtection: (_y = features.wipe_code_protection) !== null && _y !== void 0 ? _y : null, passphraseAlwaysOnDevice: (_z = features.passphrase_always_on_device) !== null && _z !== void 0 ? _z : null, safetyChecks: (_0 = features.safety_checks) !== null && _0 !== void 0 ? _0 : null, autoLockDelayMs: (_1 = features.auto_lock_delay_ms) !== null && _1 !== void 0 ? _1 : null, displayRotation: (_2 = features.display_rotation) !== null && _2 !== void 0 ? _2 : null, experimentalFeatures: (_3 = features.experimental_features) !== null && _3 !== void 0 ? _3 : null, firmwareVersion,
         bootloaderVersion,
         boardVersion,
-        bleVersion,
-        se01Version: firstMeaningfulVersion(features.onekey_se01_version),
-        se02Version: firstMeaningfulVersion(features.onekey_se02_version),
-        se03Version: firstMeaningfulVersion(features.onekey_se03_version),
-        se04Version: firstMeaningfulVersion(features.onekey_se04_version),
-        se01BootVersion: firstMeaningfulVersion(features.onekey_se01_boot_version),
-        se02BootVersion: firstMeaningfulVersion(features.onekey_se02_boot_version),
-        se03BootVersion: firstMeaningfulVersion(features.onekey_se03_boot_version),
-        se04BootVersion: firstMeaningfulVersion(features.onekey_se04_boot_version),
-        seVersion: (_4 = features.se_ver) !== null && _4 !== void 0 ? _4 : null,
-        verify: {
+        bleVersion, se01Version: firstMeaningfulVersion(features.onekey_se01_version), se02Version: firstMeaningfulVersion(features.onekey_se02_version), se03Version: firstMeaningfulVersion(features.onekey_se03_version), se04Version: firstMeaningfulVersion(features.onekey_se04_version), se01BootVersion: firstMeaningfulVersion(features.onekey_se01_boot_version), se02BootVersion: firstMeaningfulVersion(features.onekey_se02_boot_version), se03BootVersion: firstMeaningfulVersion(features.onekey_se03_boot_version), se04BootVersion: firstMeaningfulVersion(features.onekey_se04_boot_version), seVersion: (_4 = features.se_ver) !== null && _4 !== void 0 ? _4 : null, verify: {
             firmwareBuildId: features.onekey_firmware_build_id,
             firmwareHash: features.onekey_firmware_hash,
             bootloaderBuildId: features.onekey_boot_build_id,
@@ -41462,15 +41842,12 @@ const buildProtocolV1FeaturesPayload = (protocolV1Features, previous) => {
             se03BootHash: features.onekey_se03_boot_hash,
             se04BootBuildId: features.onekey_se04_boot_build_id,
             se04BootHash: features.onekey_se04_boot_hash,
-        },
-        sessionId,
-        raw: {
+        }, sessionId, session_id: sessionId !== null && sessionId !== void 0 ? sessionId : undefined, raw: {
             protocolV1Features,
-        },
-    };
+        } });
 };
 const buildProtocolV2FeaturesPayload = (deviceInfo, previous) => {
-    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, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69;
+    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, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69, _70;
     const info = deviceInfo;
     const fwApplication = (_a = info === null || info === void 0 ? void 0 : info.fw) === null || _a === void 0 ? void 0 : _a.application;
     const fwBootloader = (_b = info === null || info === void 0 ? void 0 : info.fw) === null || _b === void 0 ? void 0 : _b.bootloader;
@@ -41582,6 +41959,12 @@ const buildProtocolV2FeaturesPayload = (deviceInfo, previous) => {
             se04BootHash: (_67 = getImageHash((_66 = info === null || info === void 0 ? void 0 : info.se4) === null || _66 === void 0 ? void 0 : _66.bootloader)) !== null && _67 !== void 0 ? _67 : (_68 = previous === null || previous === void 0 ? void 0 : previous.verify) === null || _68 === void 0 ? void 0 : _68.se04BootHash,
         },
         sessionId: (_69 = previous === null || previous === void 0 ? void 0 : previous.sessionId) !== null && _69 !== void 0 ? _69 : null,
+        device_id: deviceId !== null && deviceId !== void 0 ? deviceId : undefined,
+        session_id: (_70 = previous === null || previous === void 0 ? void 0 : previous.sessionId) !== null && _70 !== void 0 ? _70 : undefined,
+        ble_name: bleName !== null && bleName !== void 0 ? bleName : undefined,
+        onekey_device_type: 'PRO2',
+        passphrase_protection: passphraseProtection !== null && passphraseProtection !== void 0 ? passphraseProtection : undefined,
+        bootloader_mode: bootloaderMode,
         passphraseState: previous === null || previous === void 0 ? void 0 : previous.passphraseState,
         unlockedAttachPin,
         raw: {
@@ -42310,7 +42693,7 @@ class Device extends events.exports {
     }
     hasUnexpectedMode(allow, require) {
         if (!this.isUnacquired()) {
-            if (this.isBootloader() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
+            if (this.isBootloader() && !this.isProtocolV2() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
                 return UI_REQUEST.BOOTLOADER;
             }
             if (!this.isInitialized() && !allow.includes(UI_REQUEST.NOT_INITIALIZE)) {
@@ -42356,9 +42739,8 @@ class Device extends events.exports {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isProtocolV2()) {
-                let pinResult;
                 try {
-                    ({ message: pinResult } = yield this.commands.typedCall('DeviceSessionAskPin', 'DeviceSessionPinResult'));
+                    yield this.commands.typedCall('DeviceSessionAskPin', 'Success');
                 }
                 catch (error) {
                     const errorText = error instanceof Error
@@ -42369,16 +42751,7 @@ class Device extends events.exports {
                     }
                     throw error;
                 }
-                const status = {};
-                if (pinResult.unlocked != null) {
-                    status.unlocked = pinResult.unlocked;
-                }
-                if (pinResult.unlocked_attach_pin != null) {
-                    status.unlocked_by_attach_to_pin = pinResult.unlocked_attach_pin;
-                }
-                if (pinResult.passphrase_protection != null) {
-                    status.passphrase_enabled = pinResult.passphrase_protection;
-                }
+                const { message: status } = yield this.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
                 return this.updateProtocolV2Status(status);
             }
             const firmwareVersion = (_c = this.getCurrentFirmwareVersionString()) !== null && _c !== void 0 ? _c : '0.0.0';
@@ -45988,9 +46361,6 @@ const isProtocolV2DeviceDisconnectedError = (error) => {
         message.includes('connection has timed out unexpectedly') ||
         message.includes('connection error has occured') ||
         message.includes('connection error has occurred') ||
-        message.includes('transferIn') ||
-        message.includes('transferin') ||
-        message.includes('usbdevice') ||
         message.includes('multiplatformbleadapter') ||
         message.includes('multipalformebleadapter') ||
         compactMessage.includes('rxerrorerror6') ||
@@ -46286,6 +46656,16 @@ const parseProtocolV2OkppHeader = (bytes) => {
         headerHash: bytesToHex(bytes.slice(PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET, PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET + PROTOCOL_V2_OKPP_HASH_SIZE)),
     };
 };
+const assertProtocolV2ReconnectIdentity = (expectedDeviceId, actualDeviceId) => {
+    if (!expectedDeviceId)
+        return;
+    if (!actualDeviceId) {
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, 'Protocol V2 reconnect identity unavailable');
+    }
+    if (actualDeviceId !== expectedDeviceId) {
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Protocol V2 reconnect identity mismatch: expected ${expectedDeviceId}, received ${actualDeviceId}`);
+    }
+};
 class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     init() {
         this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
@@ -46362,11 +46742,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     runProtocolV2() {
-        var _a, _b;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const deviceFeatures = yield this.getProtocolV2DeviceFeatures();
+            this.protocolV2ExpectedDeviceId = (_a = deviceFeatures.deviceId) !== null && _a !== void 0 ? _a : undefined;
             const deviceFirmwareType = getFirmwareType(deviceFeatures);
-            const firmwareType = (_a = this.params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
+            const firmwareType = (_b = this.params.firmwareType) !== null && _b !== void 0 ? _b : deviceFirmwareType;
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             let installItems;
@@ -46383,7 +46764,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
             }
             catch (err) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_b = err.message) !== null && _b !== void 0 ? _b : err);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_c = err.message) !== null && _c !== void 0 ? _c : err);
             }
             const resourceBundles = this.prepareProtocolV2ResourceBundles(firmwareType, deviceFeatures);
             if (!bootloaderBinary && fwBinaryMap.length === 0 && !(resourceBundles === null || resourceBundles === void 0 ? void 0 : resourceBundles.length)) {
@@ -46712,6 +47093,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     waitForProtocolV2BootloaderMode(timeout = PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT, retryInterval = 1000) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
             let lastError;
@@ -46723,6 +47105,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
                     });
                     const features = this.device.updateProtocolV2Features(deviceInfo);
+                    assertProtocolV2ReconnectIdentity(this.protocolV2ExpectedDeviceId, (_a = features.deviceId) !== null && _a !== void 0 ? _a : undefined);
                     if (features === null || features === void 0 ? void 0 : features.bootloaderMode) {
                         return features;
                     }
@@ -46858,6 +47241,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return !!features && !features.bootloaderMode && features.mode !== 'bootloader';
     }
     probeProtocolV2NormalMode() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const deviceInfo = yield requestProtocolV2DeviceInfo({
                 commands: this.device.getCommands(),
@@ -46865,6 +47249,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
             });
             const features = this.device.updateProtocolV2Features(deviceInfo);
+            assertProtocolV2ReconnectIdentity(this.protocolV2ExpectedDeviceId, (_a = features.deviceId) !== null && _a !== void 0 ? _a : undefined);
             if (this.isProtocolV2NormalModeFeatures(features)) {
                 Log$5.log('Protocol V2 firmware install finished; device is back in normal mode');
                 return true;
@@ -46984,6 +47369,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     waitForProtocolV2ReconnectAndFeatures(timeout) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
             let lastError;
@@ -46996,6 +47382,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
                     });
                     const features = this.device.updateProtocolV2Features(deviceInfo);
+                    assertProtocolV2ReconnectIdentity(this.protocolV2ExpectedDeviceId, (_a = features.deviceId) !== null && _a !== void 0 ? _a : undefined);
                     if (features.bootloaderMode || features.mode === 'bootloader') {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, 'Protocol V2 device is still in bootloader mode');
                     }
@@ -47026,6 +47413,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 this.device.commands.disposed = false;
                 this.device.getCommands().mainId = (_c = this.device.mainId) !== null && _c !== void 0 ? _c : '';
                 yield this.device.initialize();
+                assertProtocolV2ReconnectIdentity(this.protocolV2ExpectedDeviceId, this.device.getCurrentDeviceId());
                 return;
             }
             const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined, {
@@ -47040,6 +47428,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.device.commands.disposed = false;
             this.device.getCommands().mainId = (_d = this.device.mainId) !== null && _d !== void 0 ? _d : '';
             yield this.device.initialize();
+            assertProtocolV2ReconnectIdentity(this.protocolV2ExpectedDeviceId, this.device.getCurrentDeviceId());
         });
     }
     protocolV2CommonUpdateProcess(params) {
@@ -47078,11 +47467,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 const overwrite = offset === 0;
                 const progress = getProtocolV2DeviceTransferProgress((processedSize !== null && processedSize !== void 0 ? processedSize : 0) + offset, (processedSize !== null && processedSize !== void 0 ? processedSize : 0) + chunkEnd, totalSize !== null && totalSize !== void 0 ? totalSize : payload.byteLength);
                 const writeRes = yield this.fileWriteChunk(filePath, payload.byteLength, offset, chunk, overwrite, progress);
-                const processedByte = Number(writeRes.message.processed_byte);
-                const nextOffset = Number.isFinite(processedByte) && processedByte > offset
-                    ? processedByte
-                    : offset + chunkLength;
-                if (nextOffset <= offset || nextOffset > payload.byteLength) {
+                const rawProcessedByte = writeRes.message.processed_byte;
+                const processedByte = Number(rawProcessedByte);
+                const nextOffset = rawProcessedByte === undefined ? offset + chunkLength : processedByte;
+                if (!Number.isFinite(nextOffset) || nextOffset <= offset || nextOffset > chunkEnd) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, `invalid processed_byte ${writeRes.message.processed_byte} for offset ${offset}`);
                 }
                 offset = nextOffset;
@@ -47721,14 +48109,16 @@ function writeProtocolV2File(options) {
             }, { timeoutMs: options.timeoutMs });
             (_g = options.throwIfAborted) === null || _g === void 0 ? void 0 : _g.call(options);
             lastMessage = response.message;
-            const processedByte = Number((_h = response.message) === null || _h === void 0 ? void 0 : _h.processed_byte);
-            written =
-                Number.isFinite(processedByte) && processedByte > offset
-                    ? processedByte - startOffset
-                    : written + chunk.byteLength;
-            if (written > dataLength) {
+            const rawProcessedByte = (_h = response.message) === null || _h === void 0 ? void 0 : _h.processed_byte;
+            const processedByte = Number(rawProcessedByte);
+            if (rawProcessedByte !== undefined &&
+                (!Number.isFinite(processedByte) ||
+                    processedByte <= offset ||
+                    processedByte > offset + chunk.byteLength)) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite invalid processed_byte ${processedByte}`);
             }
+            written =
+                rawProcessedByte === undefined ? written + chunk.byteLength : processedByte - startOffset;
             chunks += 1;
             const elapsedMs = Date.now() - startTime;
             const transferredBytes = Math.min(written, dataLength);
@@ -47803,7 +48193,7 @@ class DeviceUploadWallpaper extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.uploaded)
                 return;
-            const encoded = this.encoded;
+            const { encoded } = this;
             if (!encoded)
                 throw invalidParameter('Wallpaper data has not been initialized.');
             yield writeProtocolV2File({
@@ -47815,6 +48205,11 @@ class DeviceUploadWallpaper extends BaseMethod {
                 overwrite: true,
                 append: false,
                 throwIfAborted: () => this.throwIfAborted(),
+                onProgress: payload => {
+                    if (typeof this.postMessage === 'function') {
+                        this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
+                    }
+                },
             });
             this.uploaded = true;
         });
@@ -47822,7 +48217,7 @@ class DeviceUploadWallpaper extends BaseMethod {
     run() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const encoded = this.encoded;
+            const { encoded } = this;
             if (!encoded)
                 throw invalidParameter('Wallpaper data has not been initialized.');
             yield this.ensureDirectory();
@@ -47873,40 +48268,6 @@ class FilesystemFormat extends BaseMethod {
     }
 }
 
-function normalizeDiskControlEnable(value) {
-    if (value === undefined || value === null)
-        return 0;
-    if (typeof value === 'boolean')
-        return value ? 1 : 0;
-    if (value === 0 || value === '0')
-        return 0;
-    if (value === 1 || value === '1')
-        return 1;
-    throw invalidParameter('Parameter [enable] must be a boolean or 0 | 1.');
-}
-class FilesystemDiskControl extends BaseMethod {
-    init() {
-        this.requireProtocolV2 = true;
-        this.skipForceUpdateCheck = true;
-        this.useDevicePassphraseState = false;
-        this.params = {
-            enable: normalizeDiskControlEnable(this.payload.enable),
-            timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
-        };
-    }
-    run() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const typedCall = this.device.commands.typedCall;
-            const res = yield typedCall('FilesystemDiskControl', 'Success', {
-                enable: this.params.enable,
-            }, {
-                timeoutMs: this.params.timeoutMs,
-            });
-            return Promise.resolve(res.message);
-        });
-    }
-}
-
 const MIN_FILE_READ_CHUNK_SIZE = 64;
 function getProtocolV2FileReadChunkLimit() {
     const env = DataManager.getSettings('env');
@@ -48038,7 +48399,7 @@ class FileRead extends BaseMethod {
 
 class FileWrite extends BaseMethod {
     init() {
-        var _a, _b;
+        var _a, _b, _c;
         this.requireProtocolV2 = true;
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -48054,6 +48415,7 @@ class FileWrite extends BaseMethod {
             chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
             overwrite: (_a = this.payload.overwrite) !== null && _a !== void 0 ? _a : offset === 0,
             append: (_b = this.payload.append) !== null && _b !== void 0 ? _b : false,
+            emitProgress: (_c = this.payload.emitProgress) !== null && _c !== void 0 ? _c : true,
             uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
             timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
         };
@@ -48074,7 +48436,7 @@ class FileWrite extends BaseMethod {
                 timeoutMs: this.params.timeoutMs === undefined ? undefined : Number(this.params.timeoutMs),
                 throwIfAborted: () => this.throwIfAborted(),
                 onProgress: payload => {
-                    if (typeof this.postMessage === 'function') {
+                    if (this.params.emitProgress && typeof this.postMessage === 'function') {
                         this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
                     }
                 },
@@ -48178,13 +48540,14 @@ class PathInfo extends BaseMethod {
     }
 }
 
-const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.pfol.pending';
+const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
 class UploadPortfolio extends FileWrite {
     init() {
         const { packageBytes, timeoutMs } = this.payload;
-        this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, timeoutMs });
+        this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, emitProgress: false, timeoutMs });
         super.init();
+        this.unlockPolicy = 'retry-on-locked';
     }
     run() {
         const _super = Object.create(null, {
@@ -54465,7 +54828,7 @@ class CardanoSignTransaction extends BaseMethod {
         var _a;
         this.checkDeviceId = true;
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-        this.allowUsePreInitialize = true;
+        this.allowUsePreInitialize = false;
         this.hasBundle = !!((_a = this.payload) === null || _a === void 0 ? void 0 : _a.bundle);
         const { payload } = this;
         if (payload.auxiliaryData && payload.auxiliaryData.governanceRegistrationParameters) {
@@ -54701,7 +55064,7 @@ class CardanoSignMessage extends BaseMethod {
     init() {
         this.checkDeviceId = true;
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-        this.allowUsePreInitialize = true;
+        this.allowUsePreInitialize = false;
         const { payload } = this;
         validateParams(payload, [
             { name: 'path', type: 'string', required: true },
@@ -57428,7 +57791,6 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
     deviceUploadWallpaper: DeviceUploadWallpaper,
     filesystemPermissionFix: FilesystemPermissionFix,
     filesystemFormat: FilesystemFormat,
-    filesystemDiskControl: FilesystemDiskControl,
     fileRead: FileRead,
     fileWrite: FileWrite,
     fileDelete: FileDelete,
@@ -57830,12 +58192,6 @@ const getSynchronize = (mutex) => {
 };
 
 const Log$1 = getLogger(exports.LoggerNames.Core);
-function isDeviceLockedError(error) {
-    return (typeof error === 'object' &&
-        error !== null &&
-        'errorCode' in error &&
-        error.errorCode === hdShared.HardwareErrorCode.DeviceLocked);
-}
 function runMethodWithUnlockRetry(method, device) {
     return __awaiter(this, void 0, void 0, function* () {
         try {