@onekeyfe/hd-core 1.2.0-alpha.109 → 1.2.0-alpha.110

package/dist/index.js

@@ -27499,10 +27499,9 @@ var nested = {
 			MessageType_FilesystemDirMake: 60809,
 			MessageType_FilesystemDirRemove: 60810,
 			MessageType_FilesystemFormat: 60811,
-			MessageType_DeviceFirmwareUpdateStage: 61000,
-			MessageType_DeviceFirmwareUpdateRequest: 61001,
-			MessageType_DeviceFirmwareUpdateStatusGet: 61002,
-			MessageType_DeviceFirmwareUpdateStatus: 61003,
+			MessageType_DeviceFirmwareUpdateRequest: 61000,
+			MessageType_DeviceFirmwareUpdateStatusGet: 61001,
+			MessageType_DeviceFirmwareUpdateStatus: 61002,
 			MessageType_DeviceSessionGet: 61200,
 			MessageType_DeviceSession: 61201,
 			MessageType_DeviceSessionAskPin: 61202,
@@ -38004,7 +38003,7 @@ var nested = {
 				type: "bytes",
 				id: 1
 			},
-			signning_message: {
+			signing_message: {
 				type: "bytes",
 				id: 2
 			},
@@ -38898,13 +38897,13 @@ var nested = {
 				type: "string",
 				id: 2
 			},
-			factory_test_completed: {
+			burn_in_completed: {
 				type: "bool",
-				id: 4
+				id: 3
 			},
-			factory_burn_in_completed: {
+			factory_test_completed: {
 				type: "bool",
-				id: 3
+				id: 4
 			},
 			manufacture_time: {
 				type: "DeviceFactoryInfoManufactureTime",
@@ -38992,7 +38991,7 @@ var nested = {
 			}
 		}
 	},
-	DeviceFirmwareUpdateStage: {
+	DeviceFirmwareUpdateRequest: {
 		fields: {
 			targets: {
 				rule: "repeated",
@@ -39001,10 +39000,6 @@ var nested = {
 			}
 		}
 	},
-	DeviceFirmwareUpdateRequest: {
-		fields: {
-		}
-	},
 	DeviceFirmwareUpdateRecord: {
 		fields: {
 			target_id: {
@@ -39186,7 +39181,7 @@ var nested = {
 				type: "bool",
 				id: 100
 			},
-			main_mcu: {
+			fw: {
 				type: "bool",
 				id: 200
 			},
@@ -39255,7 +39250,7 @@ var nested = {
 				type: "DeviceHardwareInfo",
 				id: 100
 			},
-			main_mcu: {
+			fw: {
 				type: "DeviceMainMcuInfo",
 				id: 200
 			},
@@ -39797,12 +39792,9 @@ var nested = {
 				id: 1
 			},
 			text: {
+				rule: "required",
 				type: "string",
 				id: 2
-			},
-			text_id: {
-				type: "uint32",
-				id: 3
 			}
 		}
 	},
@@ -39833,6 +39825,7 @@ var nested = {
 	ViewSignPage: {
 		fields: {
 			title: {
+				rule: "required",
 				type: "string",
 				id: 1
 			},
@@ -39866,16 +39859,13 @@ var nested = {
 				options: {
 					"default": "LayoutDefault"
 				}
-			},
-			title_id: {
-				type: "uint32",
-				id: 8
 			}
 		}
 	},
 	ViewVerifyPage: {
 		fields: {
 			title: {
+				rule: "required",
 				type: "string",
 				id: 1
 			},
@@ -39900,14 +39890,6 @@ var nested = {
 			value_key: {
 				type: "uint32",
 				id: 6
-			},
-			title_id: {
-				type: "uint32",
-				id: 7
-			},
-			chain_id: {
-				type: "uint32",
-				id: 8
 			}
 		}
 	},
@@ -40754,9 +40736,7 @@ function parseProtocolV2ResourceManifestFile(value, index) {
     }
     const file = value;
     const archivePath = assertManifestRelativePath(file.archive_path, `files[${index}].archive_path`);
-    const originalName = file.original_name === undefined
-        ? (_a = archivePath.split('/').pop()) !== null && _a !== void 0 ? _a : archivePath
-        : assertManifestRelativePath(file.original_name, `files[${index}].original_name`);
+    const originalName = assertManifestRelativePath(file.original_name, `files[${index}].original_name`);
     if (originalName.includes('/')) {
         throw new Error(`Invalid Pro2 resource manifest files[${index}].original_name`);
     }
@@ -40768,18 +40748,41 @@ function parseProtocolV2ResourceManifestFile(value, index) {
         throw new Error(`Invalid Pro2 resource manifest files[${index}].size`);
     }
     const digest = normalizeHex$1(file.sha256, SHA256_HEX_LENGTH, `files[${index}].sha256`);
+    if (file.signed !== true) {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].signed`);
+    }
+    if (file.sig_algo !== 'ed25519' && file.sig_algo !== 'mldsa65') {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].sig_algo`);
+    }
+    if (file.payload_version !== null && typeof file.payload_version !== 'string') {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].payload_version`);
+    }
     if (!archivePath.endsWith('.okpkg') || !originalName.endsWith('.okpkg')) {
         throw new Error(`Invalid Pro2 resource manifest files[${index}] package extension`);
     }
-    return Object.assign(Object.assign(Object.assign({ archive_path: archivePath, original_name: originalName, device_path: devicePath, size: Number(file.size), sha256: digest }, (file.signed === undefined ? {} : { signed: file.signed })), (file.sig_algo === undefined ? {} : { sig_algo: file.sig_algo })), (file.payload_version === undefined ? {} : { payload_version: file.payload_version }));
+    return {
+        archive_path: archivePath,
+        original_name: originalName,
+        device_path: devicePath,
+        size: Number(file.size),
+        sha256: digest,
+        signed: true,
+        sig_algo: file.sig_algo,
+        payload_version: (_a = file.payload_version) !== null && _a !== void 0 ? _a : null,
+    };
 }
 function parseProtocolV2ResourceManifest(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         throw new Error('Invalid Pro2 resource manifest');
     }
     const manifest = value;
-    if (!Array.isArray(manifest.files)) {
-        throw new Error('Invalid Pro2 resource manifest files');
+    if (manifest.schema !== 1 ||
+        manifest.variant !== 'resource' ||
+        manifest.device_root !== 'vol0:' ||
+        manifest.restore_mode !== 'bootloader_update' ||
+        !Array.isArray(manifest.trees) ||
+        !Array.isArray(manifest.files)) {
+        throw new Error('Invalid Pro2 resource manifest contract');
     }
     const files = manifest.files.map(parseProtocolV2ResourceManifestFile);
     const devicePaths = new Set(files.map(file => file.device_path));
@@ -40792,6 +40795,27 @@ function parseProtocolV2ResourceManifest(value) {
         throw new Error('Invalid Pro2 resource manifest file set');
     }
     return {
+        schema: 1,
+        artifact_name: assertManifestString(manifest.artifact_name, 'artifact_name'),
+        release_name: assertManifestString(manifest.release_name, 'release_name'),
+        variant: 'resource',
+        commit: assertManifestString(manifest.commit, 'commit'),
+        short_sha: assertManifestString(manifest.short_sha, 'short_sha'),
+        timestamp_utc: assertManifestString(manifest.timestamp_utc, 'timestamp_utc'),
+        core_version: assertManifestString(manifest.core_version, 'core_version'),
+        key_set: assertManifestString(manifest.key_set, 'key_set'),
+        device_root: 'vol0:',
+        restore_mode: 'bootloader_update',
+        trees: manifest.trees.map((tree, index) => {
+            if (!tree || typeof tree !== 'object') {
+                throw new Error(`Invalid Pro2 resource manifest trees[${index}]`);
+            }
+            const item = tree;
+            return {
+                path: assertManifestRelativePath(item.path, `trees[${index}].path`),
+                device: assertManifestString(item.device, `trees[${index}].device`),
+            };
+        }),
         files,
     };
 }
@@ -44226,10 +44250,10 @@ const getProtocolV2RuntimeMode = (protocolInfo, deviceInfo) => {
         return 'normal';
     if (binary)
         return binary;
-    if (isLegacyProtocolV2ProtocolInfo(protocolInfo) && !((_b = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _b === void 0 ? void 0 : _b.application)) {
-        if ((_c = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _c === void 0 ? void 0 : _c.romloader)
+    if (isLegacyProtocolV2ProtocolInfo(protocolInfo) && !((_b = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.fw) === null || _b === void 0 ? void 0 : _b.application)) {
+        if ((_c = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.fw) === null || _c === void 0 ? void 0 : _c.romloader)
             return 'romloader';
-        if ((_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _d === void 0 ? void 0 : _d.bootloader)
+        if ((_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.fw) === null || _d === void 0 ? void 0 : _d.bootloader)
             return 'bootloader';
     }
     return undefined;
@@ -44239,7 +44263,7 @@ const supportsProtocolV2Message = (protocolInfo, messageType) => protocolInfo.su
 const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
     targets: {
         hw: true,
-        main_mcu: true,
+        fw: true,
         coprocessor: true,
     },
     types: {
@@ -44250,7 +44274,7 @@ const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
 const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
     targets: {
         hw: true,
-        main_mcu: true,
+        fw: true,
         coprocessor: true,
         se1: true,
         se2: true,
@@ -44265,7 +44289,7 @@ const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
 const PROTOCOL_V2_FULL_DEVICE_INFO_REQUEST = {
     targets: {
         hw: true,
-        main_mcu: true,
+        fw: true,
         coprocessor: true,
         se1: true,
         se2: true,
@@ -44532,11 +44556,11 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
             }
             : { mode },
         versions: definedEntries({
-            firmware: imageVersion((_d = info.main_mcu) === null || _d === void 0 ? void 0 : _d.application),
-            applicationP1: imageVersion((_e = info.main_mcu) === null || _e === void 0 ? void 0 : _e.application),
-            applicationP2: imageVersion((_f = info.main_mcu) === null || _f === void 0 ? void 0 : _f.application_data),
-            bootloader: imageVersion((_g = info.main_mcu) === null || _g === void 0 ? void 0 : _g.bootloader),
-            board: imageVersion((_h = info.main_mcu) === null || _h === void 0 ? void 0 : _h.romloader),
+            firmware: imageVersion((_d = info.fw) === null || _d === void 0 ? void 0 : _d.application),
+            applicationP1: imageVersion((_e = info.fw) === null || _e === void 0 ? void 0 : _e.application),
+            applicationP2: imageVersion((_f = info.fw) === null || _f === void 0 ? void 0 : _f.application_data),
+            bootloader: imageVersion((_g = info.fw) === null || _g === void 0 ? void 0 : _g.bootloader),
+            board: imageVersion((_h = info.fw) === null || _h === void 0 ? void 0 : _h.romloader),
             ble: imageVersion((_j = info.coprocessor) === null || _j === void 0 ? void 0 : _j.application),
             se01: imageVersion((_k = info.se1) === null || _k === void 0 ? void 0 : _k.application),
             se02: imageVersion((_l = info.se2) === null || _l === void 0 ? void 0 : _l.application),
@@ -44548,16 +44572,16 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
             se04Boot: imageVersion((_s = info.se4) === null || _s === void 0 ? void 0 : _s.bootloader),
         }),
         verification: definedEntries({
-            firmwareBuildId: imageBuildId((_t = info.main_mcu) === null || _t === void 0 ? void 0 : _t.application),
-            firmwareHash: imageHash((_u = info.main_mcu) === null || _u === void 0 ? void 0 : _u.application),
-            applicationP1BuildId: imageBuildId((_v = info.main_mcu) === null || _v === void 0 ? void 0 : _v.application),
-            applicationP1Hash: imageHash((_w = info.main_mcu) === null || _w === void 0 ? void 0 : _w.application),
-            applicationP2BuildId: imageBuildId((_x = info.main_mcu) === null || _x === void 0 ? void 0 : _x.application_data),
-            applicationP2Hash: imageHash((_y = info.main_mcu) === null || _y === void 0 ? void 0 : _y.application_data),
-            bootloaderBuildId: imageBuildId((_z = info.main_mcu) === null || _z === void 0 ? void 0 : _z.bootloader),
-            bootloaderHash: imageHash((_0 = info.main_mcu) === null || _0 === void 0 ? void 0 : _0.bootloader),
-            boardBuildId: imageBuildId((_1 = info.main_mcu) === null || _1 === void 0 ? void 0 : _1.romloader),
-            boardHash: imageHash((_2 = info.main_mcu) === null || _2 === void 0 ? void 0 : _2.romloader),
+            firmwareBuildId: imageBuildId((_t = info.fw) === null || _t === void 0 ? void 0 : _t.application),
+            firmwareHash: imageHash((_u = info.fw) === null || _u === void 0 ? void 0 : _u.application),
+            applicationP1BuildId: imageBuildId((_v = info.fw) === null || _v === void 0 ? void 0 : _v.application),
+            applicationP1Hash: imageHash((_w = info.fw) === null || _w === void 0 ? void 0 : _w.application),
+            applicationP2BuildId: imageBuildId((_x = info.fw) === null || _x === void 0 ? void 0 : _x.application_data),
+            applicationP2Hash: imageHash((_y = info.fw) === null || _y === void 0 ? void 0 : _y.application_data),
+            bootloaderBuildId: imageBuildId((_z = info.fw) === null || _z === void 0 ? void 0 : _z.bootloader),
+            bootloaderHash: imageHash((_0 = info.fw) === null || _0 === void 0 ? void 0 : _0.bootloader),
+            boardBuildId: imageBuildId((_1 = info.fw) === null || _1 === void 0 ? void 0 : _1.romloader),
+            boardHash: imageHash((_2 = info.fw) === null || _2 === void 0 ? void 0 : _2.romloader),
             bleBuildId: imageBuildId((_3 = info.coprocessor) === null || _3 === void 0 ? void 0 : _3.application),
             bleHash: imageHash((_4 = info.coprocessor) === null || _4 === void 0 ? void 0 : _4.application),
             se01BuildId: imageBuildId((_5 = info.se1) === null || _5 === void 0 ? void 0 : _5.application),
@@ -51294,12 +51318,18 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 try {
                     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
                     const timeoutMs = 3000;
-                    const featuresRes = yield Promise.race([
-                        typedCall('GetFeatures', 'Features', {}),
-                        new Promise((_, reject) => {
-                            setTimeout(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse, 'GetFeatures timeout', { method: 'GetFeatures', timeoutMs })), timeoutMs);
-                        }),
-                    ]);
+                    const isBrowserWebUsb = DataManager.isBrowserWebUsb(DataManager.getSettings('env'));
+                    const getFeaturesPromise = isBrowserWebUsb
+                        ? typedCall('GetFeatures', 'Features', {}, { timeoutMs })
+                        : typedCall('GetFeatures', 'Features', {});
+                    const featuresRes = isBrowserWebUsb
+                        ? yield getFeaturesPromise
+                        : yield Promise.race([
+                            getFeaturesPromise,
+                            new Promise((_, reject) => {
+                                setTimeout(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse, 'GetFeatures timeout', { method: 'GetFeatures', timeoutMs })), timeoutMs);
+                            }),
+                        ]);
                     getFeaturesTimeoutCount = 0;
                     const features = buildProtocolV1FeaturesPayload(featuresRes.message, this.device.features);
                     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
@@ -51646,6 +51676,7 @@ const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
 const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
+const PROTOCOL_V2_START_UPDATE_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_TIMEOUT = 8 * 60 * 1000;
 const PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
@@ -51668,10 +51699,6 @@ const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
 const PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES = 1024 * 1024;
 const PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT = 512;
 const PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES = 256 * 1024 * 1024;
-const getProtocolV2LocalResourceArchivePath = (entryName) => {
-    const match = entryName.match(/(?:^|\/)((?:bundles\/|loaders\/(?:bootloader|rom)\/).+\.okpkg)$/iu);
-    return match === null || match === void 0 ? void 0 : match[1];
-};
 const PROTOCOL_V2_NEO_UNSUPPORTED_TARGETS = new Set(['se03', 'se04']);
 const getProtocolV2ZipEntrySizes = (entry) => {
     var _a;
@@ -51810,12 +51837,36 @@ const isProtocolV2ReconnectProbeError = (error) => {
     return ((message.includes('device protocol mismatch') && message.includes('expected v2')) ||
         message.includes('did not respond to expected protocol'));
 };
+const PROTOCOL_V2_BLE_INSTALL_INTERRUPTION_ERROR_CODES = new Set([
+    hdShared.HardwareErrorCode.BleConnectedError,
+    hdShared.HardwareErrorCode.BleCharacteristicNotifyError,
+    hdShared.HardwareErrorCode.BleForceCleanRunPromise,
+    hdShared.HardwareErrorCode.BleDeviceDisconnected,
+]);
+const isProtocolV2BleInstallInterruptionError = (error) => {
+    if (error instanceof hdShared.HardwareError &&
+        PROTOCOL_V2_BLE_INSTALL_INTERRUPTION_ERROR_CODES.has(error.errorCode)) {
+        return true;
+    }
+    const message = getProtocolV2UnknownErrorText(error).toLowerCase();
+    const compactMessage = message.replace(/\s+/gu, '');
+    return (/react native ble transport (?:released|disconnected)/u.test(message) ||
+        (compactMessage.includes('rxerrorerror6') &&
+            (compactMessage.includes('multiplatformbleadapter') ||
+                compactMessage.includes('multipalformebleadapter'))));
+};
 const isProtocolV2FirmwareStatusEndpointUnavailable = (error) => {
     const message = getProtocolV2UnknownErrorText(error).toLowerCase();
     return (message.includes('handler not registered') ||
         message.includes('message handler not found') ||
         message.includes('unsupported message'));
 };
+const isProtocolV2FirmwareUpdateEndpointUnavailable = (error) => {
+    const message = getProtocolV2UnknownErrorText(error).toLowerCase();
+    return (message.includes('handler not registered') ||
+        message.includes('message handler not found') ||
+        message.includes('unsupported message'));
+};
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
     return error instanceof hdShared.HardwareError &&
@@ -51948,9 +51999,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.protocolV2HasExplicitTargetSelection = false;
         this.protocolV2PreparedSources = [];
         this.protocolV2ExecutionInLoader = false;
+        this.protocolV2LegacyDirectUpdate = false;
         this.protocolV2BootResourceStagingSafe = false;
         this.protocolV2CompletedTargetVersions = new Map();
         this.protocolV2FinalStatusVerified = false;
+        this.protocolV2InstallAckReceived = false;
         this.protocolV2InstallBaselineVersions = new Map();
     }
     getSupportedProtocols() {
@@ -52446,63 +52499,60 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP contains an unsafe entry path', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
             const entries = zipEntries.filter(entry => !entry.dir);
-            if (entries.length === 0) {
+            if (entries.length === 0 || entries.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT + 1) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP entry set is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
-            const manifestEntry = entries.find(entry => entry.name.split('/').pop() === 'manifest.json');
-            let manifestBinary;
-            let manifestDirectory = '';
-            let selectedFiles;
-            if (manifestEntry) {
-                if (getProtocolV2ZipEntrySizes(manifestEntry).uncompressedSize >
-                    PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource manifest size is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-                }
-                manifestBinary = yield manifestEntry.async('arraybuffer');
-                if (manifestBinary.byteLength <= 0 ||
-                    manifestBinary.byteLength > PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource manifest size is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+            let declaredUncompressedSize = 0;
+            let declaredCompressedSize = 0;
+            for (const entry of entries) {
+                const sizes = getProtocolV2ZipEntrySizes(entry);
+                declaredCompressedSize += sizes.compressedSize;
+                declaredUncompressedSize += sizes.uncompressedSize;
+                const entryLimit = entry.name === 'manifest.json'
+                    ? PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES
+                    : PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES;
+                if (sizes.uncompressedSize > entryLimit ||
+                    declaredCompressedSize > binary.byteLength ||
+                    declaredUncompressedSize >
+                        PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES + PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP declared size exceeds the allowed limit', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
                 }
-                let manifestValue;
-                try {
-                    manifestValue = JSON.parse(new TextDecoder().decode(manifestBinary));
-                }
-                catch (error) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource manifest is invalid: ${String(error)}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-                }
-                selectedFiles = selectProtocolV2ResourceManifestFiles({
-                    manifest: parseProtocolV2ResourceManifest(manifestValue),
-                    targetsToUpdate: (_a = this.params.targetsToUpdate) !== null && _a !== void 0 ? _a : [],
-                });
-                manifestDirectory = manifestEntry.name.slice(0, -'manifest.json'.length);
             }
-            else {
-                selectedFiles = entries.flatMap(entry => {
-                    var _a;
-                    const archivePath = getProtocolV2LocalResourceArchivePath(entry.name);
-                    if (!archivePath)
-                        return [];
-                    return [
-                        {
-                            archive_path: archivePath,
-                            original_name: (_a = archivePath.split('/').pop()) !== null && _a !== void 0 ? _a : archivePath,
-                            device_path: `vol0:/${archivePath}`,
-                            size: getProtocolV2ZipEntrySizes(entry).uncompressedSize,
-                            sha256: '',
-                        },
-                    ];
-                });
+            const manifestEntry = zip.file('manifest.json');
+            if (!manifestEntry) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP has no manifest.json', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+            }
+            const manifestBinary = yield manifestEntry.async('arraybuffer');
+            if (manifestBinary.byteLength <= 0 ||
+                manifestBinary.byteLength > PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource manifest size is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+            }
+            let manifestValue;
+            try {
+                manifestValue = JSON.parse(new TextDecoder().decode(manifestBinary));
+            }
+            catch (error) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource manifest is invalid: ${String(error)}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
-            if (selectedFiles.length === 0 || selectedFiles.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP has no resource packages', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+            const manifest = parseProtocolV2ResourceManifest(manifestValue);
+            const selectedFiles = selectProtocolV2ResourceManifestFiles({
+                manifest,
+                targetsToUpdate: (_a = this.params.targetsToUpdate) !== null && _a !== void 0 ? _a : [],
+            });
+            const expectedEntryNames = new Set([
+                'manifest.json',
+                ...selectedFiles.map(file => file.archive_path),
+            ]);
+            if (entries.length !== expectedEntryNames.size ||
+                entries.some(entry => !expectedEntryNames.has(entry.name))) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP contains an unexpected entry', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
             let totalSize = 0;
-            const materializedEntries = [];
-            const normalizedFiles = [];
+            const materializedEntries = [
+                { entryName: 'manifest.json', binary: manifestBinary },
+            ];
             for (const file of selectedFiles) {
-                const entry = manifestEntry
-                    ? zip.file(`${manifestDirectory}${file.archive_path}`)
-                    : entries.find(candidate => getProtocolV2LocalResourceArchivePath(candidate.name) === file.archive_path);
+                const entry = zip.file(file.archive_path);
                 if (!entry) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource ZIP is missing ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
                 }
@@ -52513,15 +52563,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 }
                 const fileBinary = yield entry.async('arraybuffer');
                 const digest = bytesToHex(sha256.sha256(new Uint8Array(fileBinary)));
-                if (fileBinary.byteLength !== file.size ||
-                    (file.sha256 && digest !== file.sha256.toLowerCase())) {
+                if (fileBinary.byteLength !== file.size || digest !== file.sha256.toLowerCase()) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource file does not match manifest: ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
                 }
-                normalizedFiles.push(Object.assign(Object.assign({}, file), { sha256: digest }));
                 materializedEntries.push({ entryName: file.archive_path, binary: fileBinary });
             }
-            manifestBinary !== null && manifestBinary !== void 0 ? manifestBinary : (manifestBinary = new TextEncoder().encode(JSON.stringify({ files: normalizedFiles })).buffer);
-            materializedEntries.unshift({ entryName: 'manifest.json', binary: manifestBinary });
             return { binary, materializedEntries };
         });
     }
@@ -53108,6 +53154,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         }
         return ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.mode) === 'romloader';
     }
+    isLegacyProtocolV2Runtime() {
+        var _a, _b;
+        const protocolInfo = (_b = (_a = this.device.state) === null || _a === void 0 ? void 0 : _a.raw) === null || _b === void 0 ? void 0 : _b.protocolV2ProtocolInfo;
+        return protocolInfo ? isLegacyProtocolV2ProtocolInfo(protocolInfo) : false;
+    }
     rebootProtocolV2ToBootloader() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -53130,13 +53181,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     enterProtocolV2BootloaderMode() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.protocolV2LegacyDirectUpdate = false;
             if (this.isProtocolV2RomloaderMode()) {
                 Log$6.debug('Protocol V2 device is in romloader mode; start firmware update directly');
+                this.protocolV2LegacyDirectUpdate = this.isLegacyProtocolV2Runtime();
                 this.protocolV2ExecutionInLoader = true;
                 return false;
             }
             if (this.isProtocolV2BootloaderMode()) {
                 Log$6.debug('Protocol V2 device is already in bootloader mode, skip reboot');
+                this.protocolV2LegacyDirectUpdate = this.isLegacyProtocolV2Runtime();
                 this.protocolV2ExecutionInLoader = true;
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.GoToBootloaderSuccess);
                 return false;
@@ -53496,7 +53550,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let missingTargetStatusSince;
             let missingTargetStatusKey;
             let normalModeWithoutInstallEvidenceSince;
-            let installEvidenceObserved = false;
+            let installEvidenceObserved = this.protocolV2InstallAckReceived;
             const resetMissingTargetStatusGrace = () => {
                 missingTargetStatusSince = undefined;
                 missingTargetStatusKey = undefined;
@@ -53511,18 +53565,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     const currentDeviceInfo = deviceInfo;
                     try {
-                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', ['DeviceFirmwareUpdateStatus', 'Success'], {
+                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', {
                             fields: {
                                 status: true,
                                 payload_version: true,
                                 path: true,
                             },
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
-                        if (statusResponse.type === 'Success') {
-                            this.protocolV2FinalStatusVerified = true;
-                            this.postProgressMessage(100, 'installingFirmware');
-                            return;
-                        }
                         const statusTargets = ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : []);
                         if (statusTargets.some(target => {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53827,12 +53876,46 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     protocolV2StartFirmwareUpdate({ targets, }) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.protocolV2InstallAckReceived = false;
             this.protocolV2LastRuntimeProbeFeatures = undefined;
-            const commands = this.device.getCommands();
-            yield commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
-            yield commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
+            const startUpdate = () => this.device
+                .getCommands()
+                .typedCall('DeviceFirmwareUpdateRequest', 'Success', { targets }, { timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT });
+            let response;
+            try {
+                response = yield startUpdate();
+                this.protocolV2InstallAckReceived = true;
+            }
+            catch (error) {
+                if (this.isBleReconnect() && isProtocolV2BleInstallInterruptionError(error)) {
+                    this.throwIfAborted();
+                    Log$6.log('[FirmwareUpdateV4] install request interrupted by device reboot; continue status polling: ', error);
+                }
+                else if (this.protocolV2LegacyDirectUpdate &&
+                    isProtocolV2FirmwareUpdateEndpointUnavailable(error)) {
+                    this.protocolV2LegacyDirectUpdate = false;
+                    Log$6.debug('[FirmwareUpdateV4] legacy App does not expose DeviceFirmwareUpdateRequest; rebooting to bootloader');
+                    yield this.rebootProtocolV2ToBootloader();
+                    try {
+                        response = yield startUpdate();
+                        this.protocolV2InstallAckReceived = true;
+                    }
+                    catch (retryError) {
+                        if (!(this.isBleReconnect() && isProtocolV2BleInstallInterruptionError(retryError))) {
+                            throw retryError;
+                        }
+                        this.throwIfAborted();
+                        Log$6.log('[FirmwareUpdateV4] install request interrupted after legacy reboot; continue status polling: ', retryError);
+                    }
+                }
+                else {
+                    throw error;
+                }
+            }
+            this.protocolV2LegacyDirectUpdate = false;
             this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdating);
             this.postProgressMessage(0, 'installingFirmware');
+            return response;
         });
     }
     protocolV2Reboot(rebootType) {
@@ -63404,10 +63487,11 @@ class TonSignMessage extends BaseMethod {
         super(...arguments);
         this.initState = null;
         this.processTxRequest = (request, data) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!request.init_data_length) {
                 const deviceType = this.device.getCurrentDeviceType();
                 const hasClassic = DeviceModelToTypes.model_classic1s.includes(deviceType);
-                const signingMessage = request.signning_message;
+                const signingMessage = (_a = request.signing_message) !== null && _a !== void 0 ? _a : request.signning_message;
                 const shouldSkipValidation = signingMessage == null;
                 return Promise.resolve(Object.assign(Object.assign({}, request), { signing_message: signingMessage, skip_validate: hasClassic || shouldSkipValidation }));
             }