@onekeyfe/hd-core 1.2.0-alpha.115 → 1.2.0-alpha.117

package/dist/index.js

@@ -27499,9 +27499,10 @@ var nested = {
 			MessageType_FilesystemDirMake: 60809,
 			MessageType_FilesystemDirRemove: 60810,
 			MessageType_FilesystemFormat: 60811,
-			MessageType_DeviceFirmwareUpdateRequest: 61000,
-			MessageType_DeviceFirmwareUpdateStatusGet: 61001,
-			MessageType_DeviceFirmwareUpdateStatus: 61002,
+			MessageType_DeviceFirmwareUpdateStage: 61000,
+			MessageType_DeviceFirmwareUpdateRequest: 61001,
+			MessageType_DeviceFirmwareUpdateStatusGet: 61002,
+			MessageType_DeviceFirmwareUpdateStatus: 61003,
 			MessageType_DeviceSessionGet: 61200,
 			MessageType_DeviceSession: 61201,
 			MessageType_DeviceSessionAskPin: 61202,
@@ -38003,7 +38004,7 @@ var nested = {
 				type: "bytes",
 				id: 1
 			},
-			signing_message: {
+			signning_message: {
 				type: "bytes",
 				id: 2
 			},
@@ -38897,14 +38898,14 @@ var nested = {
 				type: "string",
 				id: 2
 			},
-			burn_in_completed: {
-				type: "bool",
-				id: 3
-			},
 			factory_test_completed: {
 				type: "bool",
 				id: 4
 			},
+			factory_burn_in_completed: {
+				type: "bool",
+				id: 3
+			},
 			manufacture_time: {
 				type: "DeviceFactoryInfoManufactureTime",
 				id: 5
@@ -38991,7 +38992,7 @@ var nested = {
 			}
 		}
 	},
-	DeviceFirmwareUpdateRequest: {
+	DeviceFirmwareUpdateStage: {
 		fields: {
 			targets: {
 				rule: "repeated",
@@ -39000,6 +39001,10 @@ var nested = {
 			}
 		}
 	},
+	DeviceFirmwareUpdateRequest: {
+		fields: {
+		}
+	},
 	DeviceFirmwareUpdateRecord: {
 		fields: {
 			target_id: {
@@ -39181,7 +39186,7 @@ var nested = {
 				type: "bool",
 				id: 100
 			},
-			fw: {
+			main_mcu: {
 				type: "bool",
 				id: 200
 			},
@@ -39250,7 +39255,7 @@ var nested = {
 				type: "DeviceHardwareInfo",
 				id: 100
 			},
-			fw: {
+			main_mcu: {
 				type: "DeviceMainMcuInfo",
 				id: 200
 			},
@@ -39792,9 +39797,12 @@ var nested = {
 				id: 1
 			},
 			text: {
-				rule: "required",
 				type: "string",
 				id: 2
+			},
+			text_id: {
+				type: "uint32",
+				id: 3
 			}
 		}
 	},
@@ -39825,7 +39833,6 @@ var nested = {
 	ViewSignPage: {
 		fields: {
 			title: {
-				rule: "required",
 				type: "string",
 				id: 1
 			},
@@ -39859,13 +39866,16 @@ var nested = {
 				options: {
 					"default": "LayoutDefault"
 				}
+			},
+			title_id: {
+				type: "uint32",
+				id: 8
 			}
 		}
 	},
 	ViewVerifyPage: {
 		fields: {
 			title: {
-				rule: "required",
 				type: "string",
 				id: 1
 			},
@@ -39890,6 +39900,14 @@ var nested = {
 			value_key: {
 				type: "uint32",
 				id: 6
+			},
+			title_id: {
+				type: "uint32",
+				id: 7
+			},
+			chain_id: {
+				type: "uint32",
+				id: 8
 			}
 		}
 	},
@@ -40736,7 +40754,9 @@ function parseProtocolV2ResourceManifestFile(value, index) {
     }
     const file = value;
     const archivePath = assertManifestRelativePath(file.archive_path, `files[${index}].archive_path`);
-    const originalName = assertManifestRelativePath(file.original_name, `files[${index}].original_name`);
+    const originalName = file.original_name === undefined
+        ? (_a = archivePath.split('/').pop()) !== null && _a !== void 0 ? _a : archivePath
+        : assertManifestRelativePath(file.original_name, `files[${index}].original_name`);
     if (originalName.includes('/')) {
         throw new Error(`Invalid Pro2 resource manifest files[${index}].original_name`);
     }
@@ -40748,74 +40768,28 @@ 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 {
-        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,
-    };
+    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 }));
 }
 function parseProtocolV2ResourceManifest(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         throw new Error('Invalid Pro2 resource manifest');
     }
     const manifest = value;
-    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');
+    if (!Array.isArray(manifest.files)) {
+        throw new Error('Invalid Pro2 resource manifest files');
     }
     const files = manifest.files.map(parseProtocolV2ResourceManifestFile);
     const devicePaths = new Set(files.map(file => file.device_path));
     const archivePaths = new Set(files.map(file => file.archive_path));
     if (files.length === 0 ||
         devicePaths.size !== files.length ||
-        archivePaths.size !== files.length ||
-        !devicePaths.has(PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH$1) ||
-        !files.some(file => file.device_path.startsWith('vol0:/bundles/'))) {
+        archivePaths.size !== files.length) {
         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,
     };
 }
@@ -44250,10 +44224,10 @@ const getProtocolV2RuntimeMode = (protocolInfo, deviceInfo) => {
         return 'normal';
     if (binary)
         return binary;
-    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)
+    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)
             return 'romloader';
-        if ((_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.fw) === null || _d === void 0 ? void 0 : _d.bootloader)
+        if ((_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _d === void 0 ? void 0 : _d.bootloader)
             return 'bootloader';
     }
     return undefined;
@@ -44263,7 +44237,7 @@ const supportsProtocolV2Message = (protocolInfo, messageType) => protocolInfo.su
 const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
     targets: {
         hw: true,
-        fw: true,
+        main_mcu: true,
         coprocessor: true,
     },
     types: {
@@ -44274,7 +44248,7 @@ const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
 const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
     targets: {
         hw: true,
-        fw: true,
+        main_mcu: true,
         coprocessor: true,
         se1: true,
         se2: true,
@@ -44289,7 +44263,7 @@ const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
 const PROTOCOL_V2_FULL_DEVICE_INFO_REQUEST = {
     targets: {
         hw: true,
-        fw: true,
+        main_mcu: true,
         coprocessor: true,
         se1: true,
         se2: true,
@@ -44556,11 +44530,11 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
             }
             : { mode },
         versions: definedEntries({
-            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),
+            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),
             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),
@@ -44572,16 +44546,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.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),
+            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),
             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),
@@ -51679,8 +51653,8 @@ 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_INSTALL_STATUS_INITIAL_DELAY = 1000;
 const PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
@@ -51702,6 +51676,10 @@ 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;
@@ -51745,14 +51723,11 @@ function assertProtocolV2FirmwareTargetsSupported(deviceType, params, hasExplici
 }
 const getProtocolV2DeviceTransferProgress = (bytesBeforeChunk, bytesAfterChunk, totalBytes) => {
     if (!Number.isFinite(totalBytes) || totalBytes <= 0) {
-        return 100;
+        return 0;
     }
     if (bytesBeforeChunk <= 0 && bytesAfterChunk < totalBytes) {
         return 0;
     }
-    if (bytesAfterChunk >= totalBytes) {
-        return 100;
-    }
     return Math.min(Math.max(Math.ceil((bytesAfterChunk / totalBytes) * 100), 1), 99);
 };
 const PROTOCOL_V2_REMOTE_COMPONENT_TARGETS = {
@@ -51840,36 +51815,12 @@ 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 &&
@@ -52002,11 +51953,9 @@ 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() {
@@ -52502,60 +52451,63 @@ 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 || entries.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT + 1) {
+            if (entries.length === 0) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP entry set 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' });
+            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 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);
             }
-            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' });
+            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 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' });
+            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' });
             }
             let totalSize = 0;
-            const materializedEntries = [
-                { entryName: 'manifest.json', binary: manifestBinary },
-            ];
+            const materializedEntries = [];
+            const normalizedFiles = [];
             for (const file of selectedFiles) {
-                const entry = zip.file(file.archive_path);
+                const entry = manifestEntry
+                    ? zip.file(`${manifestDirectory}${file.archive_path}`)
+                    : entries.find(candidate => getProtocolV2LocalResourceArchivePath(candidate.name) === file.archive_path);
                 if (!entry) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource ZIP is missing ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
                 }
@@ -52566,11 +52518,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 }
                 const fileBinary = yield entry.async('arraybuffer');
                 const digest = bytesToHex(sha256.sha256(new Uint8Array(fileBinary)));
-                if (fileBinary.byteLength !== file.size || digest !== file.sha256.toLowerCase()) {
+                if (fileBinary.byteLength !== file.size ||
+                    (file.sha256 && 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 };
         });
     }
@@ -52589,7 +52545,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     prepareProtocolV2ResourceArchiveSources() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const archiveArtifacts = (_b = (_a = this.params.preparedPlan) === null || _a === void 0 ? void 0 : _a.artifacts.filter(artifact => artifact.role === 'resourceBundle' &&
                 artifact.target === 'resource' &&
@@ -52617,18 +52573,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive does not match its approved receipt', { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
             }
             const verifiedArchive = yield this.prepareProtocolV2LocalResourceArchive(archiveBinary);
-            const entries = (_c = archiveArtifact.materializedEntries) !== null && _c !== void 0 ? _c : [];
-            const entriesByName = new Map(entries.map(entry => [entry.entryName, entry]));
-            if (entries.length !== verifiedArchive.materializedEntries.length ||
-                verifiedArchive.materializedEntries.some(entry => {
-                    const preparedEntry = entriesByName.get(entry.entryName);
-                    const digest = bytesToHex(sha256.sha256(new Uint8Array(entry.binary)));
-                    return (!preparedEntry ||
-                        preparedEntry.artifact.size !== entry.binary.byteLength ||
-                        preparedEntry.artifact.sha256.toLowerCase() !== digest);
-                })) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource entries do not match the approved archive', { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
-            }
             const verifiedEntriesByName = new Map(verifiedArchive.materializedEntries.map(entry => [entry.entryName, entry.binary]));
             const manifestBinary = verifiedEntriesByName.get('manifest.json');
             if (!manifestBinary) {
@@ -52644,7 +52588,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const manifest = parseProtocolV2ResourceManifest(manifestValue);
             const selectedFiles = selectProtocolV2ResourceManifestFiles({
                 manifest,
-                targetsToUpdate: (_d = this.params.targetsToUpdate) !== null && _d !== void 0 ? _d : [],
+                targetsToUpdate: (_c = this.params.targetsToUpdate) !== null && _c !== void 0 ? _c : [],
             });
             if (selectedFiles.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive contains too many files', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
@@ -52964,13 +52908,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (!isProtocolV2FirmwareFingerprintValid(binary, component.fingerprint)) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 firmware fingerprint mismatch: ${key}/${component.target}`);
             }
-            const expectedPayloadHash = normalizeProtocolV2Hex(component.payloadHash);
-            if (expectedPayloadHash) {
-                const header = parseProtocolV2OkppHeader(toProtocolV2Bytes(binary));
-                if (!header || header.payloadHash !== expectedPayloadHash) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 firmware payload hash mismatch: ${key}/${component.target}`);
-                }
-            }
             return Object.assign(Object.assign({}, target), { binary });
         });
     }
@@ -53157,11 +53094,6 @@ 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 {
@@ -53184,16 +53116,13 @@ 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;
@@ -53374,7 +53303,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 path: item.path,
             }));
             yield this.protocolV2StartFirmwareUpdate({ targets });
-            yield this.waitForProtocolV2FirmwareUpdateComplete(targets);
+            yield hdShared.wait(PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY);
+            yield this.waitForProtocolV2FirmwareUpdateComplete(targets, true);
         });
     }
     protocolV2SourceUpdateProcess({ source, filePath, processedSize, totalSize, }) {
@@ -53540,7 +53470,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 previousVersion !== currentVersion);
         });
     }
-    waitForProtocolV2FirmwareUpdateComplete(targets) {
+    waitForProtocolV2FirmwareUpdateComplete(targets, requireCurrentInstallStatus = false) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.protocolV2FinalStatusVerified = false;
@@ -53553,7 +53483,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let missingTargetStatusSince;
             let missingTargetStatusKey;
             let normalModeWithoutInstallEvidenceSince;
-            let installEvidenceObserved = this.protocolV2InstallAckReceived;
+            let installEvidenceObserved = false;
+            let currentInstallStatusObserved = false;
             const resetMissingTargetStatusGrace = () => {
                 missingTargetStatusSince = undefined;
                 missingTargetStatusKey = undefined;
@@ -53568,25 +53499,53 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     const currentDeviceInfo = deviceInfo;
                     try {
-                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', {
+                        const statusResponse = yield this.device.getCommands().typedCall('DeviceFirmwareUpdateStatusGet', ['DeviceFirmwareUpdateStatus', 'Success'], {
                             fields: {
                                 status: true,
                                 payload_version: true,
                                 path: true,
                             },
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
-                        const statusTargets = ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : []);
+                        if (statusResponse.type === 'Success') {
+                            installEvidenceObserved = true;
+                            resetMissingTargetStatusGrace();
+                            lastError = new Error('Protocol V2 firmware install acknowledged; waiting for target status');
+                        }
+                        const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
+                            ? ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : [])
+                            : [];
                         if (statusTargets.some(target => {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
-                            return targetId !== undefined && expectedTargetIds.has(targetId);
+                            return (targetId !== undefined &&
+                                expectedTargetIds.has(targetId) &&
+                                isProtocolV2TargetStatusInProgress(target.status));
                         })) {
+                            currentInstallStatusObserved = true;
+                        }
+                        const hasMatchingTargetStatus = statusTargets.some(target => {
+                            const targetId = normalizeProtocolV2TargetId(target.target_id);
+                            return targetId !== undefined && expectedTargetIds.has(targetId);
+                        });
+                        if (hasMatchingTargetStatus &&
+                            (!requireCurrentInstallStatus || currentInstallStatusObserved)) {
                             installEvidenceObserved = true;
                             normalModeWithoutInstallEvidenceSince = undefined;
                         }
-                        if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths)) {
+                        const matchingStatusTargets = statusTargets.filter(target => {
+                            const targetId = normalizeProtocolV2TargetId(target.target_id);
+                            return targetId !== undefined && expectedTargetIds.has(targetId);
+                        });
+                        const shouldVerifyTargetCompletion = !requireCurrentInstallStatus || currentInstallStatusObserved;
+                        if (shouldVerifyTargetCompletion &&
+                            this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths)) {
                             this.protocolV2FinalStatusVerified = true;
                             return;
                         }
+                        if (requireCurrentInstallStatus &&
+                            !currentInstallStatusObserved &&
+                            matchingStatusTargets.length > 0) {
+                            lastError = new Error('Protocol V2 firmware status is stale; waiting for the current install to start');
+                        }
                         if (statusTargets.length === 0 && currentDeviceInfo) {
                             const isNormalMode = yield this.probeProtocolV2NormalMode(currentDeviceInfo);
                             if (isNormalMode &&
@@ -53597,26 +53556,34 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                                 return;
                             }
                         }
-                        const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
-                        if (missingTargetIds.length > 0) {
-                            const now = Date.now();
-                            const missingKey = missingTargetIds.join(',');
-                            if (missingTargetStatusSince === undefined || missingTargetStatusKey !== missingKey) {
-                                missingTargetStatusSince = now;
-                                missingTargetStatusKey = missingKey;
-                            }
-                            else if (now - missingTargetStatusSince >=
-                                PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
-                                const reportedTargetIds = statusTargets
-                                    .map(target => normalizeProtocolV2TargetId(target.target_id))
-                                    .filter((targetId) => targetId !== undefined);
-                                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware status is missing requested records: targetIds=${missingKey} reportedTargetIds=${reportedTargetIds.join(',')}`);
+                        if (statusTargets.length === 0) {
+                            resetMissingTargetStatusGrace();
+                            if (statusResponse.type !== 'Success') {
+                                lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
                             }
-                            lastError = new Error(`Protocol V2 firmware status is temporarily missing targetIds=${missingKey}`);
                         }
                         else {
-                            resetMissingTargetStatusGrace();
-                            lastError = new Error('Protocol V2 firmware targets are still installing');
+                            const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
+                            if (missingTargetIds.length > 0) {
+                                const now = Date.now();
+                                const missingKey = missingTargetIds.join(',');
+                                if (missingTargetStatusSince === undefined || missingTargetStatusKey !== missingKey) {
+                                    missingTargetStatusSince = now;
+                                    missingTargetStatusKey = missingKey;
+                                }
+                                else if (now - missingTargetStatusSince >=
+                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
+                                    const reportedTargetIds = statusTargets
+                                        .map(target => normalizeProtocolV2TargetId(target.target_id))
+                                        .filter((targetId) => targetId !== undefined);
+                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware status is missing requested records: targetIds=${missingKey} reportedTargetIds=${reportedTargetIds.join(',')}`);
+                                }
+                                lastError = new Error(`Protocol V2 firmware status is temporarily missing targetIds=${missingKey}`);
+                            }
+                            else {
+                                resetMissingTargetStatusGrace();
+                                lastError = new Error('Protocol V2 firmware targets are still installing');
+                            }
                         }
                     }
                     catch (error) {
@@ -53879,46 +53846,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     protocolV2StartFirmwareUpdate({ targets, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.protocolV2InstallAckReceived = false;
             this.protocolV2LastRuntimeProbeFeatures = undefined;
-            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;
+            const commands = this.device.getCommands();
+            yield commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
+            yield commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
             this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdating);
             this.postProgressMessage(0, 'installingFirmware');
-            return response;
         });
     }
     protocolV2Reboot(rebootType) {
@@ -54938,7 +54871,7 @@ const resolvePreUnlockPinType = (method) => {
     return targetsKnownHiddenWallet ? hdTransport.DeviceSessionPinType.Any : hdTransport.DeviceSessionPinType.Main;
 };
 function runMethodWithUnlockPolicy(method, device, options = {}) {
-    var _a, _b;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const { context = createProtocolV2UnlockContext(), uiCoordinator, afterStatusBeforeUnlock, prepare, run: configuredRun, } = options;
         const run = configuredRun !== null && configuredRun !== void 0 ? configuredRun : (() => method.run());
@@ -54947,8 +54880,9 @@ function runMethodWithUnlockPolicy(method, device, options = {}) {
         const shouldCoordinateUi = shouldEmitUi && uiCoordinator !== undefined;
         const requiresPreUnlock = device.isProtocolV2() &&
             (method.useDevicePassphraseState || 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));
+            ((_a = device.state) === null || _a === void 0 ? void 0 : _a.status.initialized) !== false &&
+            !((_b = device.isBootloader) === null || _b === void 0 ? void 0 : _b.call(device)) &&
+            !((_c = device.isRomloader) === null || _c === void 0 ? void 0 : _c.call(device));
         if (requiresPreUnlock && !context.preflightCompleted) {
             const status = yield refreshProtocolV2DeviceStatus(device);
             if (typeof (status === null || status === void 0 ? void 0 : status.unlocked) !== 'boolean') {