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

package/dist/index.js

@@ -13,9 +13,10 @@ var ByteBuffer = require('bytebuffer');
 var blake2s = require('@noble/hashes/blake2s');
 var BigNumber = require('bignumber.js');
 var JSZip = require('jszip');
+var buffer = require('buffer');
+var jpegJs = require('jpeg-js');
 var sha3 = require('@noble/hashes/sha3');
 var blake2b = require('@noble/hashes/blake2b');
-var buffer = require('buffer');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -27498,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,
@@ -38002,7 +38004,7 @@ var nested = {
 				type: "bytes",
 				id: 1
 			},
-			signing_message: {
+			signning_message: {
 				type: "bytes",
 				id: 2
 			},
@@ -38896,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
@@ -38990,7 +38992,7 @@ var nested = {
 			}
 		}
 	},
-	DeviceFirmwareUpdateRequest: {
+	DeviceFirmwareUpdateStage: {
 		fields: {
 			targets: {
 				rule: "repeated",
@@ -38999,6 +39001,10 @@ var nested = {
 			}
 		}
 	},
+	DeviceFirmwareUpdateRequest: {
+		fields: {
+		}
+	},
 	DeviceFirmwareUpdateRecord: {
 		fields: {
 			target_id: {
@@ -39180,7 +39186,7 @@ var nested = {
 				type: "bool",
 				id: 100
 			},
-			fw: {
+			main_mcu: {
 				type: "bool",
 				id: 200
 			},
@@ -39249,7 +39255,7 @@ var nested = {
 				type: "DeviceHardwareInfo",
 				id: 100
 			},
-			fw: {
+			main_mcu: {
 				type: "DeviceMainMcuInfo",
 				id: 200
 			},
@@ -39791,9 +39797,12 @@ var nested = {
 				id: 1
 			},
 			text: {
-				rule: "required",
 				type: "string",
 				id: 2
+			},
+			text_id: {
+				type: "uint32",
+				id: 3
 			}
 		}
 	},
@@ -39824,7 +39833,6 @@ var nested = {
 	ViewSignPage: {
 		fields: {
 			title: {
-				rule: "required",
 				type: "string",
 				id: 1
 			},
@@ -39858,13 +39866,16 @@ var nested = {
 				options: {
 					"default": "LayoutDefault"
 				}
+			},
+			title_id: {
+				type: "uint32",
+				id: 8
 			}
 		}
 	},
 	ViewVerifyPage: {
 		fields: {
 			title: {
-				rule: "required",
 				type: "string",
 				id: 1
 			},
@@ -39889,6 +39900,14 @@ var nested = {
 			value_key: {
 				type: "uint32",
 				id: 6
+			},
+			title_id: {
+				type: "uint32",
+				id: 7
+			},
+			chain_id: {
+				type: "uint32",
+				id: 8
 			}
 		}
 	},
@@ -40735,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`);
     }
@@ -40747,41 +40768,18 @@ 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));
@@ -40794,27 +40792,6 @@ 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,
     };
 }
@@ -41474,6 +41451,11 @@ const LogLabelMethod = new Set([
     'fileWrite',
     'fileRead',
 ]);
+const LogPayloadBlockMethod = new Set([
+    'deviceUploadNft',
+    'deviceUploadWallpaper',
+    'uploadPortfolio',
+]);
 const SensitiveLogKeys = new Set([
     'devicestate',
     'entropy',
@@ -41530,7 +41512,10 @@ function getLogBlockLabel(message) {
     return undefined;
 }
 function getSafeLogPayload(value, blockLabel) {
-    if (blockLabel && (LogBlockEvent.has(blockLabel) || isSigningMethod(blockLabel))) {
+    if (blockLabel &&
+        (LogBlockEvent.has(blockLabel) ||
+            LogPayloadBlockMethod.has(blockLabel) ||
+            isSigningMethod(blockLabel))) {
         return { method: blockLabel, payload: '[REDACTED]' };
     }
     const redactedValue = redactLogValue(value, new WeakSet());
@@ -42464,7 +42449,7 @@ const getAutoShutDownOptions = (deviceType, protocol) => {
             return withNever([60000, 120000, 300000, 600000], protocol);
         case hdShared.EDeviceType.Pro2:
         case hdShared.EDeviceType.Neo:
-            return withNever([60000, 120000, 300000, 600000, 1800000], protocol);
+            return withNever([60000, 120000, 300000, 600000], protocol);
         default:
             return [];
     }
@@ -42723,18 +42708,14 @@ function getCompletePro2NftBasenames(childFiles) {
 function utf8Length(value) {
     return new TextEncoder().encode(value).byteLength;
 }
-function assertImage(name, image, expectedWidth, expectedHeight) {
-    if (image.width !== expectedWidth || image.height !== expectedHeight) {
-        throw invalidParameter$1(`Pro2 NFT ${name} dimensions must be ${expectedWidth}x${expectedHeight}.`);
+function buildPro2NftBundleFromEncodedImages(options) {
+    const { image, thumbnail, title, subtitle, timestampMs } = options;
+    if (!(image instanceof Uint8Array) || image.byteLength === 0) {
+        throw invalidParameter$1('Parameter [image] must contain encoded NFT image data.');
     }
-    if (!(image.rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(image.rgba)) {
-        throw invalidParameter$1(`Parameter [${name}.rgba] must be an ArrayBuffer or Uint8Array.`);
+    if (!(thumbnail instanceof Uint8Array) || thumbnail.byteLength === 0) {
+        throw invalidParameter$1('Parameter [thumbnail] must contain encoded NFT thumbnail data.');
     }
-}
-function buildPro2NftBundle(options) {
-    const { image, thumbnail, title, subtitle, timestampMs } = options;
-    assertImage('image', image, PRO2_NFT_IMAGE_WIDTH, PRO2_NFT_IMAGE_HEIGHT);
-    assertImage('thumbnail', thumbnail, PRO2_NFT_THUMBNAIL_WIDTH, PRO2_NFT_THUMBNAIL_HEIGHT);
     const titleLength = typeof title === 'string' ? utf8Length(title) : 0;
     const subtitleLength = typeof subtitle === 'string' ? utf8Length(subtitle) : Number.POSITIVE_INFINITY;
     if (titleLength < 1 || titleLength > 63) {
@@ -42746,17 +42727,15 @@ function buildPro2NftBundle(options) {
     if (!Number.isSafeInteger(timestampMs) || timestampMs <= 0) {
         throw invalidParameter$1('Parameter [timestampMs] must be a positive safe integer.');
     }
-    const encodedImage = encodePro2Image(Object.assign(Object.assign({}, image), { alphaMode: 'black-background' })).data;
-    const encodedThumbnail = encodePro2Image(Object.assign(Object.assign({}, thumbnail), { alphaMode: 'black-background' })).data;
     const metadata = new TextEncoder().encode(JSON.stringify({ title, subtitle }));
     if (metadata.byteLength === 0 || metadata.byteLength > 512) {
         throw invalidParameter$1('Pro2 NFT metadata must contain 1 to 512 UTF-8 bytes.');
     }
-    const hash8 = utils.bytesToHex(blake2s.blake2s(encodedImage)).slice(0, 8);
+    const hash8 = utils.bytesToHex(blake2s.blake2s(image)).slice(0, 8);
     return {
         basename: `nft-${hash8}-${timestampMs}`,
-        image: encodedImage,
-        thumbnail: encodedThumbnail,
+        image,
+        thumbnail,
         metadata,
     };
 }
@@ -43276,9 +43255,13 @@ class DevicePool extends events.exports {
     }
     static _refreshProtocolV2DiscoveryState(device) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield device.getDeviceState({ refreshSections: ['status'] });
+            yield device.getDeviceState({
+                refreshSections: ['status'],
+            });
             try {
-                yield device.getDeviceState({ refreshSections: ['settings'] });
+                yield device.getDeviceState({
+                    refreshSections: ['settings'],
+                });
             }
             catch (error) {
                 Log$j.debug('Unable to refresh Protocol V2 device label during discovery', error);
@@ -43720,9 +43703,6 @@ class DeviceCommands {
                 const promise = this.transport.call(this.mainId, type, msg !== null && msg !== void 0 ? msg : {}, options);
                 this.callPromise = promise;
                 const res = yield promise;
-                if (!shouldReduceDebug) {
-                    LogCore.debug('[DeviceCommands] [call] Received', res.type, hdTransport.getSafeTransportLogPayload(res.message, res.type));
-                }
                 return res;
             }
             catch (error) {
@@ -43815,12 +43795,10 @@ class DeviceCommands {
             if (!shouldReduceDebugForCall(callType)) {
                 Log$h.debug('_filterCommonTypes: ', {
                     request: callType,
-                    response: callType === 'DeviceFirmwareUpdateStatusGet'
-                        ? {
-                            type: res.type,
-                            message: hdTransport.getSafeTransportLogPayload(res.message, res.type),
-                        }
-                        : res.type,
+                    response: {
+                        type: res.type,
+                        message: hdTransport.getSafeTransportLogPayload(res.message, res.type),
+                    },
                 });
             }
         }
@@ -44226,6 +44204,7 @@ const getProtocolV2SeState = (se) => {
     }
 };
 const getProtocolV2SeType = (se) => normalizeEnumValue(hdTransport.DeviceSeType, se === null || se === void 0 ? void 0 : se.type);
+const isLegacyProtocolV2ProtocolInfo = (protocolInfo) => Object.prototype.hasOwnProperty.call(protocolInfo, 'protobuf_definition');
 const parseProtocolV2BuildFingerprint = (buildFingerprint) => {
     if (!buildFingerprint)
         return null;
@@ -44240,19 +44219,27 @@ const parseProtocolV2BuildFingerprint = (buildFingerprint) => {
     }
     return { binary, version, commit, environment, buildType };
 };
-const getProtocolV2RuntimeMode = (protocolInfo) => {
-    var _a;
+const getProtocolV2RuntimeMode = (protocolInfo, deviceInfo) => {
+    var _a, _b, _c, _d;
     const binary = (_a = parseProtocolV2BuildFingerprint(protocolInfo.build_fingerprint)) === null || _a === void 0 ? void 0 : _a.binary;
     if (binary === 'application')
         return 'normal';
-    return binary;
+    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)
+            return 'romloader';
+        if ((_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _d === void 0 ? void 0 : _d.bootloader)
+            return 'bootloader';
+    }
+    return undefined;
 };
 const PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE = 60602;
 const supportsProtocolV2Message = (protocolInfo, messageType) => protocolInfo.supported_messages.includes(messageType);
 const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
     targets: {
         hw: true,
-        fw: true,
+        main_mcu: true,
         coprocessor: true,
     },
     types: {
@@ -44263,7 +44250,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,
@@ -44278,7 +44265,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,
@@ -44545,11 +44532,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),
@@ -44561,16 +44548,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),
@@ -45247,6 +45234,7 @@ class Device extends events.exports {
                     yield this.commands.dispose(false);
                 }
                 this.commands = new DeviceCommands(this, (_g = this.mainId) !== null && _g !== void 0 ? _g : '');
+                this.invalidateProtocolV2RuntimeState();
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.forceProtocolDetection) {
@@ -45641,8 +45629,7 @@ class Device extends events.exports {
                     commands: this.commands,
                     timeoutMs: options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs,
                 });
-                const features = yield this.probeProtocolV2RuntimeState(deviceInfo, options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs);
-                Log$g.debug('Protocol V2 features:', features);
+                yield this.probeProtocolV2RuntimeState(deviceInfo, options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs);
             }
             catch (error) {
                 Log$g.error('Protocol V2 initialization failed:', error);
@@ -45664,7 +45651,7 @@ class Device extends events.exports {
         });
     }
     getDeviceState(params = {}) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const refresh = new Set((_a = params.refreshSections) !== null && _a !== void 0 ? _a : []);
             const getProtocolV2DeviceInfoRequest = () => {
@@ -45712,9 +45699,12 @@ class Device extends events.exports {
                     }
                 }
                 if (refresh.has('status') && !initializedWithDeviceInfo) {
-                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo);
+                    const cachedMode = (_c = this.state) === null || _c === void 0 ? void 0 : _c.status.mode;
+                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo, undefined, {
+                        forceRuntimeContextRefresh: cachedMode === 'bootloader' || cachedMode === 'romloader',
+                    });
                 }
-                if (refresh.has('settings') && ((_c = this.state) === null || _c === void 0 ? void 0 : _c.status.mode) === 'normal') {
+                if (refresh.has('settings') && ((_d = this.state) === null || _d === void 0 ? void 0 : _d.status.mode) === 'normal') {
                     const { message } = yield this.commands.typedCall('DeviceSettingsGet', 'DeviceSettings', {});
                     this.updateState(mapDeviceSettingsToState(message), 'settings-read');
                 }
@@ -45751,9 +45741,10 @@ class Device extends events.exports {
             source,
             changedKeys: result.changedKeys,
         };
-        Log$g.debug('Device state patch committed', {
+        Log$g.debug('Device state updated', {
             source,
-            keys: result.changedKeys,
+            revision: result.revision,
+            changedKeyCount: result.changedKeys.length,
         });
         this.emit(DEVICE.STATE, this, event);
         if (result.state.protocol === 'V1') {
@@ -45772,12 +45763,14 @@ class Device extends events.exports {
         this.updateState(mapFeaturesToState(normalized), source);
         return this.features;
     }
-    ensureProtocolV2RuntimeContext(timeoutMs) {
+    ensureProtocolV2RuntimeContext(timeoutMs, options) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const cachedProtocolInfo = (_a = this.protocolV2RuntimeContext) !== null && _a !== void 0 ? _a : (!this.protocolV2StateNeedsReload
-                ? (_d = (_c = (_b = this.state) === null || _b === void 0 ? void 0 : _b.raw) === null || _c === void 0 ? void 0 : _c.protocolV2ProtocolInfo) !== null && _d !== void 0 ? _d : undefined
-                : undefined);
+            const cachedProtocolInfo = (options === null || options === void 0 ? void 0 : options.forceRefresh) === true
+                ? undefined
+                : (_a = this.protocolV2RuntimeContext) !== null && _a !== void 0 ? _a : (!this.protocolV2StateNeedsReload
+                    ? (_d = (_c = (_b = this.state) === null || _b === void 0 ? void 0 : _b.raw) === null || _c === void 0 ? void 0 : _c.protocolV2ProtocolInfo) !== null && _d !== void 0 ? _d : undefined
+                    : undefined);
             if (cachedProtocolInfo) {
                 this.protocolV2RuntimeContext = cachedProtocolInfo;
                 return cachedProtocolInfo;
@@ -45812,12 +45805,15 @@ class Device extends events.exports {
             }
         });
     }
-    probeProtocolV2RuntimeState(deviceInfo, timeoutMs) {
+    probeProtocolV2RuntimeState(deviceInfo, timeoutMs, options) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const protocolInfo = yield this.ensureProtocolV2RuntimeContext(timeoutMs);
-            const runtimeMode = getProtocolV2RuntimeMode(protocolInfo);
+            const protocolInfo = yield this.ensureProtocolV2RuntimeContext(timeoutMs, {
+                forceRefresh: options === null || options === void 0 ? void 0 : options.forceRuntimeContextRefresh,
+            });
             const runtimeDeviceInfo = deviceInfo !== null && deviceInfo !== void 0 ? deviceInfo : (_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.raw) === null || _b === void 0 ? void 0 : _b.protocolV2DeviceInfo;
+            const runtimeMode = getProtocolV2RuntimeMode(protocolInfo, runtimeDeviceInfo);
+            const legacyProtocolInfo = isLegacyProtocolV2ProtocolInfo(protocolInfo);
             const protocolV2DeviceType = runtimeDeviceInfo
                 ? resolveProtocolV2DeviceIdentity((_c = runtimeDeviceInfo.hw) === null || _c === void 0 ? void 0 : _c.Device_type).deviceType
                 : this.getCurrentDeviceType();
@@ -45826,7 +45822,8 @@ class Device extends events.exports {
                 protocolV2DeviceType !== hdShared.EDeviceType.Neo) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Protocol V2 romloader mode is only supported for Pro2 and Neo.');
             }
-            const deviceStatusSupported = supportsProtocolV2Message(protocolInfo, PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE);
+            const deviceStatusSupported = legacyProtocolInfo ||
+                supportsProtocolV2Message(protocolInfo, PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE);
             if (runtimeMode === 'bootloader' || runtimeMode === 'romloader') {
                 return this.updateProtocolV2Features(deviceInfo, null, runtimeMode, protocolInfo);
             }
@@ -45874,8 +45871,7 @@ class Device extends events.exports {
         const previousStatus = (_d = (_c = this.state) === null || _c === void 0 ? void 0 : _c.raw) === null || _d === void 0 ? void 0 : _d.protocolV2DeviceStatus;
         return this.updateProtocolV2Features(previousDeviceInfo, Object.assign(Object.assign({}, previousStatus), status));
     }
-    markTransportDisconnected() {
-        this.deviceAcquired = false;
+    invalidateProtocolV2RuntimeState() {
         if (!this.isProtocolV2())
             return;
         this.protocolV2StateNeedsReload = true;
@@ -45884,6 +45880,10 @@ class Device extends events.exports {
         this.protocolV2RuntimeContextRequestToken = undefined;
         this.clearPreInitialized();
     }
+    markTransportDisconnected() {
+        this.deviceAcquired = false;
+        this.invalidateProtocolV2RuntimeState();
+    }
     invalidateAfterWipe() {
         const deviceId = this.getCurrentDeviceId();
         if (deviceId) {
@@ -45893,10 +45893,7 @@ class Device extends events.exports {
             if (this.originalDescriptor.path !== deviceId) {
                 deviceWalletSessionStore.deleteDevice(this.originalDescriptor.path);
             }
-            this.protocolV2StateNeedsReload = true;
-            this.protocolV2RuntimeContext = undefined;
-            this.protocolV2RuntimeContextPromise = undefined;
-            this.protocolV2RuntimeContextRequestToken = undefined;
+            this.invalidateProtocolV2RuntimeState();
         }
         this.passphraseState = undefined;
         this.stateStore = new DeviceStateStore();
@@ -45906,11 +45903,7 @@ class Device extends events.exports {
     markProtocolV2Reboot(rebootType) {
         if (!this.isProtocolV2())
             return;
-        this.protocolV2StateNeedsReload = true;
-        this.protocolV2RuntimeContext = undefined;
-        this.protocolV2RuntimeContextPromise = undefined;
-        this.protocolV2RuntimeContextRequestToken = undefined;
-        this.clearPreInitialized();
+        this.invalidateProtocolV2RuntimeState();
         let loaderMode;
         if (rebootType === hdTransport.DeviceRebootType.Bootloader) {
             loaderMode = 'bootloader';
@@ -45966,6 +45959,7 @@ class Device extends events.exports {
         if (device.features) {
             this._updateFeatures(device.features);
         }
+        this.invalidateProtocolV2RuntimeState();
     }
     run(fn, options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51652,7 +51646,6 @@ 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;
@@ -51675,6 +51668,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;
@@ -51954,6 +51951,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.protocolV2BootResourceStagingSafe = false;
         this.protocolV2CompletedTargetVersions = new Map();
         this.protocolV2FinalStatusVerified = false;
+        this.protocolV2InstallBaselineVersions = new Map();
     }
     getSupportedProtocols() {
         return ['V2'];
@@ -52131,6 +52129,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.captureProtocolV2PhysicalIdentity();
             const deviceFeatures = yield this.getProtocolV2DeviceFeatures();
+            this.protocolV2InstallBaselineVersions =
+                this.getProtocolV2ObservableTargetVersions(deviceFeatures);
+            this.protocolV2LastRuntimeProbeFeatures = undefined;
             const currentDeviceType = this.device.getCurrentDeviceType();
             const capabilityDeviceType = currentDeviceType === hdShared.EDeviceType.Pro2 || currentDeviceType === hdShared.EDeviceType.Neo
                 ? currentDeviceType
@@ -52139,9 +52140,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const deviceFirmwareType = getFirmwareType(deviceFeatures);
             const firmwareType = (_a = this.params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             this.validateExpectedTargetVersions();
+            const wantsResources = !!((_b = this.params.targetsToUpdate) === null || _b === void 0 ? void 0 : _b.includes('resource'));
             if (!this.params.preparedPlan &&
                 this.params.resourceArchiveBinary &&
-                ((_b = this.params.targetsToUpdate) === null || _b === void 0 ? void 0 : _b.includes('resource'))) {
+                ((_c = this.params.targetsToUpdate) === null || _c === void 0 ? void 0 : _c.includes('resource'))) {
                 const localMemoryHost = yield this.prepareProtocolV2LocalMemoryHost({
                     features: deviceFeatures,
                     firmwareType,
@@ -52153,14 +52155,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     localMemoryHost.release();
                 }
             }
-            const hasPreparedComponentArtifacts = Object.values((_c = this.params.componentArtifacts) !== null && _c !== void 0 ? _c : {}).some(Boolean);
+            const hasPreparedComponentArtifacts = Object.values((_d = this.params.componentArtifacts) !== null && _d !== void 0 ? _d : {}).some(Boolean);
             if (this.params.preparedPlan || hasPreparedComponentArtifacts) {
                 return this.runProtocolV2PreparedArtifacts(deviceFeatures, firmwareType);
             }
-            const wantsResources = !!((_d = this.params.targetsToUpdate) === null || _d === void 0 ? void 0 : _d.includes('resource'));
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             let installItems;
+            let resourceMemoryHost;
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
                 fwBinaryMap = this.collectExplicitTargetBinaries();
@@ -52173,20 +52175,19 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 const needsRemoteFirmware = ((_e = this.params.targetsToUpdate) === null || _e === void 0 ? void 0 : _e.length)
                     ? missingFirmwareTargets.length > 0
                     : explicitInstallItems.length === 0;
-                if (wantsResources) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource archive must be provided through a local or external PreparedPlan', {
-                        firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
-                    });
-                }
-                if (needsRemoteFirmware &&
+                const needsSdkManagedArtifacts = needsRemoteFirmware || wantsResources;
+                if (needsSdkManagedArtifacts &&
                     (this.params.artifactReader ||
                         DataManager.getSettings('firmwareManifestMode') === 'external-only')) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 firmware artifacts must be prepared by the external firmware host', {
                         firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
                     });
                 }
-                if (needsRemoteFirmware) {
-                    yield DataManager.forceReloadData();
+                if (needsSdkManagedArtifacts) {
+                    yield DataManager.forceReloadData({
+                        requireResources: wantsResources,
+                        resourceDeviceType: capabilityDeviceType === hdShared.EDeviceType.Neo ? hdShared.EDeviceType.Neo : hdShared.EDeviceType.Pro2,
+                    });
                 }
                 if (needsRemoteFirmware) {
                     const remoteBinaries = yield this.prepareRemoteProtocolV2Binaries(firmwareType, deviceFeatures, explicitInstallItems);
@@ -52206,9 +52207,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         targetId: item.targetId,
                     }));
                 }
+                if (wantsResources) {
+                    this.params.resourceArchiveBinary = yield this.downloadRemoteProtocolV2ResourceArchive(deviceFeatures);
+                    resourceMemoryHost = yield this.prepareProtocolV2LocalMemoryHost({
+                        features: deviceFeatures,
+                        firmwareType,
+                        availableInstallItems: installItems !== null && installItems !== void 0 ? installItems : explicitInstallItems,
+                    });
+                }
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
             }
             catch (err) {
+                resourceMemoryHost === null || resourceMemoryHost === void 0 ? void 0 : resourceMemoryHost.release();
                 if (typeof err === 'object' &&
                     err !== null &&
                     'params' in err &&
@@ -52220,6 +52230,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 }
                 throw normalizeFirmwarePreparationError(err);
             }
+            if (resourceMemoryHost) {
+                try {
+                    return yield this.runProtocolV2PreparedArtifacts(deviceFeatures, firmwareType, false);
+                }
+                finally {
+                    resourceMemoryHost.release();
+                }
+            }
             if (!bootloaderBinary && fwBinaryMap.length === 0 && !(installItems === null || installItems === void 0 ? void 0 : installItems.length)) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');
             }
@@ -52319,13 +52337,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             return installSources;
         });
     }
-    prepareProtocolV2LocalMemoryHost({ features, firmwareType, }) {
+    prepareProtocolV2LocalMemoryHost({ features, firmwareType, availableInstallItems = this.buildProtocolV2InstallItems({
+        bootloaderBinary: this.prepareBootloaderBinary(),
+        fwBinaryMap: this.collectExplicitTargetBinaries(),
+    }), }) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const availableInstallItems = this.buildProtocolV2InstallItems({
-                bootloaderBinary: this.prepareBootloaderBinary(),
-                fwBinaryMap: this.collectExplicitTargetBinaries(),
-            });
             const requestedComponentTargets = new Set(((_a = this.params.targetsToUpdate) !== null && _a !== void 0 ? _a : []).filter((target) => target !== 'resource' && target !== 'boot_resources'));
             const localComponentTargets = new Set(availableInstallItems.flatMap(item => {
                 const target = PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(item.targetId);
@@ -52429,60 +52446,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' });
                 }
@@ -52493,11 +52513,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 };
         });
     }
@@ -52602,16 +52626,20 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             return sources;
         });
     }
-    runProtocolV2PreparedArtifacts(features, firmwareType) {
+    runProtocolV2PreparedArtifacts(features, firmwareType, announceDownload = true) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
+                if (announceDownload) {
+                    this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
+                }
                 const installSources = yield this.prepareProtocolV2InstallSources(firmwareType, features);
                 const resourceSources = yield this.prepareProtocolV2ResourceSources();
                 if (installSources.length === 0 && resourceSources.length === 0) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');
                 }
-                this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
+                if (announceDownload) {
+                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
+                }
                 return yield this.executeProtocolV2SourceUpdate({
                     installSources,
                     resourceSources,
@@ -52897,6 +52925,30 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             return Object.assign(Object.assign({}, target), { binary });
         });
     }
+    downloadRemoteProtocolV2ResourceArchive(features) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deviceType = getDeviceType(features);
+            if (deviceType !== hdShared.EDeviceType.Pro2 && deviceType !== hdShared.EDeviceType.Neo) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource archive requires a Pro2 or Neo device');
+            }
+            const source = DataManager.getProtocolV2ResourceSource(deviceType);
+            const expectedSha256 = normalizeProtocolV2Hex(source === null || source === void 0 ? void 0 : source.archiveSha256);
+            if (!(source === null || source === void 0 ? void 0 : source.archiveUrl) ||
+                !Number.isSafeInteger(source.archiveSize) ||
+                source.archiveSize <= 0 ||
+                source.archiveSize > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES ||
+                !expectedSha256 ||
+                !/^[0-9a-f]{64}$/u.test(expectedSha256)) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource archive integrity metadata is invalid', { firmwareUpdateCode: 'FirmwarePlanInvalid' });
+            }
+            const { binary } = yield getSysResourceBinary(source.archiveUrl);
+            if (binary.byteLength !== source.archiveSize ||
+                bytesToHex(sha256.sha256(new Uint8Array(binary))) !== expectedSha256) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource archive does not match the remote config', { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
+            }
+            return binary;
+        });
+    }
     prepareRemoteProtocolV2Binaries(firmwareType, features, explicitInstallItems = []) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -53056,19 +53108,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         }
         return ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.mode) === 'romloader';
     }
-    enterProtocolV2BootloaderMode() {
+    rebootProtocolV2ToBootloader() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isProtocolV2RomloaderMode()) {
-                Log$6.debug('Protocol V2 device is in romloader mode; start firmware update directly');
-                this.protocolV2ExecutionInLoader = true;
-                return false;
-            }
-            if (this.isProtocolV2BootloaderMode()) {
-                Log$6.debug('Protocol V2 device is already in bootloader mode, skip reboot');
-                this.protocolV2ExecutionInLoader = true;
-                this.postTipMessage(exports.FirmwareUpdateTipMessage.GoToBootloaderSuccess);
-                return false;
-            }
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.AutoRebootToBootloader);
                 yield this.protocolV2Reboot(hdTransport.DeviceRebootType.Bootloader);
@@ -53087,6 +53128,22 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
         });
     }
+    enterProtocolV2BootloaderMode() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isProtocolV2RomloaderMode()) {
+                Log$6.debug('Protocol V2 device is in romloader mode; start firmware update directly');
+                this.protocolV2ExecutionInLoader = true;
+                return false;
+            }
+            if (this.isProtocolV2BootloaderMode()) {
+                Log$6.debug('Protocol V2 device is already in bootloader mode, skip reboot');
+                this.protocolV2ExecutionInLoader = true;
+                this.postTipMessage(exports.FirmwareUpdateTipMessage.GoToBootloaderSuccess);
+                return false;
+            }
+            return this.rebootProtocolV2ToBootloader();
+        });
+    }
     waitForProtocolV2BootloaderMode(timeout = PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT, retryInterval = 1000) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
@@ -53140,81 +53197,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         push(this.params.se04Binary, 'se04.bin', ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04);
         return entries;
     }
-    buildProtocolV2ExecutionPhases({ installSources, resourceSources, }) {
-        const phases = [];
-        const bootResourceSources = resourceSources.filter(source => isProtocolV2BootResourcePackagePath(source.devicePath));
-        const remainingResourceSources = resourceSources.filter(source => !isProtocolV2BootResourcePackagePath(source.devicePath));
-        if (bootResourceSources.length > 0) {
-            phases.push({
-                kind: 'resource-sync',
-                installSources: [],
-                resourceSources: bootResourceSources,
-            });
-        }
-        const bootloaderSources = installSources.filter(source => source.kind === 'bootloader');
-        if (bootloaderSources.length > 0) {
-            phases.push({
-                kind: 'bootloader-install',
-                installSources: bootloaderSources,
-                resourceSources: [],
-            }, {
-                kind: 'bootloader-verify',
-                installSources: [],
-                resourceSources: [],
-            });
-        }
-        if (remainingResourceSources.length > 0) {
-            phases.push({
-                kind: 'resource-sync',
-                installSources: [],
-                resourceSources: remainingResourceSources,
-            });
-        }
-        const componentSources = installSources.filter(source => source.kind !== 'bootloader');
-        if (componentSources.length > 0) {
-            phases.push({
-                kind: 'component-install',
-                installSources: componentSources,
-                resourceSources: [],
-            });
-        }
-        phases.push({
-            kind: 'final-verify',
-            installSources: [],
-            resourceSources: [],
-        });
-        return phases;
-    }
-    executeProtocolV2Phases({ installSources, resourceSources, }) {
+    executeProtocolV2SourceUpdate({ installSources, resourceSources, }) {
         return __awaiter(this, void 0, void 0, function* () {
             this.protocolV2BootResourceStagingSafe = false;
-            const phases = this.buildProtocolV2ExecutionPhases({
-                installSources,
-                resourceSources,
-            });
-            for (const phase of phases) {
-                if (phase.kind === 'final-verify') {
-                    return this.completeProtocolV2FinalVerification();
-                }
-                if (phase.kind === 'resource-sync') {
-                    yield this.enterProtocolV2BootloaderMode();
-                    if (!phase.resourceSources.some(source => isProtocolV2BootResourcePackagePath(source.devicePath))) {
-                        yield this.ensureProtocolV2BootResourceStagingIsEmpty();
-                    }
-                    yield this.executeProtocolV2TransferPhase(phase);
-                }
-                else if (phase.kind === 'bootloader-install' || phase.kind === 'component-install') {
-                    yield this.enterProtocolV2BootloaderMode();
-                    yield this.ensureProtocolV2BootResourceStagingIsEmpty();
-                    yield this.executeProtocolV2TransferPhase(phase);
-                    yield this.exitProtocolV2BootloaderToNormal();
-                }
-                else if (phase.kind === 'bootloader-verify') {
-                    yield this.waitForProtocolV2FinalFeatures();
-                    this.assertExpectedProtocolV2Versions(['boot']);
-                }
+            if (installSources.length > 0 || resourceSources.length > 0) {
+                yield this.enterProtocolV2BootloaderMode();
+                yield this.ensureProtocolV2BootResourceStagingIsEmpty();
+                yield this.executeProtocolV2TransferPhase({
+                    installSources,
+                    resourceSources,
+                });
             }
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 execution has no final verification phase');
+            return this.completeProtocolV2FinalVerification();
         });
     }
     ensureProtocolV2BootResourceStagingIsEmpty() {
@@ -53242,14 +53236,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.protocolV2BootResourceStagingSafe = true;
         });
     }
-    executeProtocolV2SourceUpdate({ installSources, resourceSources, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.executeProtocolV2Phases({
-                installSources,
-                resourceSources,
-            });
-        });
-    }
     executeProtocolV2Update({ fwBinaryMap, bootloaderBinary, installItems, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const memoryInstallItems = installItems !== null && installItems !== void 0 ? installItems : this.buildProtocolV2InstallItems({
@@ -53265,7 +53251,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         kind: item.kind,
                     });
                 })));
-                return yield this.executeProtocolV2Phases({
+                return yield this.executeProtocolV2SourceUpdate({
                     installSources,
                     resourceSources: [],
                 });
@@ -53466,6 +53452,37 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
         return Array.from(expectedTargetIds).filter(targetId => !reportedTargetIds.has(targetId));
     }
+    getProtocolV2ObservableTargetVersions(features) {
+        const versions = new Map();
+        versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER, getDeviceBootloaderVersion(features).join('.'));
+        const applicationVersion = getDeviceFirmwareVersion(features).join('.');
+        versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, applicationVersion);
+        versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2, applicationVersion);
+        versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR, getDeviceBLEFirmwareVersion(features).join('.'));
+        const secureElementVersions = [
+            [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01, features.se01Version],
+            [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02, features.se02Version],
+            [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03, features.se03Version],
+            [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04, features.se04Version],
+        ];
+        secureElementVersions.forEach(([targetId, version]) => {
+            if (version)
+                versions.set(targetId, version);
+        });
+        return versions;
+    }
+    hasProtocolV2InstallVersionChanged(expectedTargetIds) {
+        if (!this.protocolV2LastRuntimeProbeFeatures)
+            return false;
+        const currentVersions = this.getProtocolV2ObservableTargetVersions(this.protocolV2LastRuntimeProbeFeatures);
+        return Array.from(expectedTargetIds).some(targetId => {
+            const previousVersion = this.protocolV2InstallBaselineVersions.get(targetId);
+            const currentVersion = currentVersions.get(targetId);
+            return (previousVersion !== undefined &&
+                currentVersion !== undefined &&
+                previousVersion !== currentVersion);
+        });
+    }
     waitForProtocolV2FirmwareUpdateComplete(targets) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -53478,11 +53495,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let deviceInfo;
             let missingTargetStatusSince;
             let missingTargetStatusKey;
+            let normalModeWithoutInstallEvidenceSince;
+            let installEvidenceObserved = false;
             const resetMissingTargetStatusGrace = () => {
                 missingTargetStatusSince = undefined;
                 missingTargetStatusKey = undefined;
             };
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
+                this.throwIfAborted();
                 try {
                     if (shouldReconnect) {
                         yield this.reconnectProtocolV2Device();
@@ -53491,24 +53511,39 @@ 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 });
+                        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);
+                            return targetId !== undefined && expectedTargetIds.has(targetId);
+                        })) {
+                            installEvidenceObserved = true;
+                            normalModeWithoutInstallEvidenceSince = undefined;
+                        }
                         if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths)) {
                             this.protocolV2FinalStatusVerified = true;
                             return;
                         }
-                        if (statusTargets.length === 0 &&
-                            currentDeviceInfo &&
-                            (yield this.probeProtocolV2NormalMode(currentDeviceInfo))) {
-                            Log$6.log('[FirmwareUpdateV4] empty firmware status after confirmed App reboot; update complete');
-                            this.postProgressMessage(100, 'installingFirmware');
-                            return;
+                        if (statusTargets.length === 0 && currentDeviceInfo) {
+                            const isNormalMode = yield this.probeProtocolV2NormalMode(currentDeviceInfo);
+                            if (isNormalMode &&
+                                (installEvidenceObserved ||
+                                    this.hasProtocolV2InstallVersionChanged(expectedTargetIds))) {
+                                Log$6.log('[FirmwareUpdateV4] empty firmware status after confirmed App reboot; update complete');
+                                this.postProgressMessage(100, 'installingFirmware');
+                                return;
+                            }
                         }
                         const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
                         if (missingTargetIds.length > 0) {
@@ -53541,12 +53576,27 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             if (!currentDeviceInfo) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
                             }
-                            if (yield this.probeProtocolV2NormalMode(currentDeviceInfo)) {
+                            const isNormalMode = yield this.probeProtocolV2NormalMode(currentDeviceInfo);
+                            if (isNormalMode &&
+                                (installEvidenceObserved ||
+                                    this.hasProtocolV2InstallVersionChanged(expectedTargetIds))) {
                                 Log$6.log('[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot');
                                 this.postProgressMessage(100, 'installingFirmware');
                                 return;
                             }
-                            lastError = new Error('Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode');
+                            if (isNormalMode) {
+                                const now = Date.now();
+                                normalModeWithoutInstallEvidenceSince !== null && normalModeWithoutInstallEvidenceSince !== void 0 ? normalModeWithoutInstallEvidenceSince : (normalModeWithoutInstallEvidenceSince = now);
+                                if (now - normalModeWithoutInstallEvidenceSince >=
+                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
+                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 device returned to normal mode without install ACK, target status, or version change');
+                                }
+                                lastError = new Error('Protocol V2 device is in normal mode but installation is not yet confirmed');
+                            }
+                            else {
+                                normalModeWithoutInstallEvidenceSince = undefined;
+                                lastError = new Error('Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode');
+                            }
                         }
                         else {
                             shouldReconnect = true;
@@ -53598,6 +53648,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     probeProtocolV2NormalMode(deviceInfo) {
         return __awaiter(this, void 0, void 0, function* () {
             const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
+            this.protocolV2LastRuntimeProbeFeatures = features;
             return features.mode === 'normal' && !features.bootloaderMode;
         });
     }
@@ -53776,11 +53827,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     protocolV2StartFirmwareUpdate({ targets, }) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.protocolV2LastRuntimeProbeFeatures = undefined;
             const commands = this.device.getCommands();
-            const response = yield commands.typedCall('DeviceFirmwareUpdateRequest', 'Success', { targets }, { timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT });
+            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) {
@@ -53913,6 +53965,61 @@ class DeviceGetOnboardingStatus extends BaseMethod {
     }
 }
 
+const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+const JPEG_CONTAINER_OVERHEAD_BYTES = 64 * 1024;
+const JPEG_MAX_MEMORY_USAGE_IN_MB = 32;
+const JPEG_MAX_RESOLUTION_IN_MP = 1;
+function decodeCanonicalBase64({ value, parameterName, maxBytes, }) {
+    if (typeof value !== 'string' || value.length === 0) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must be a non-empty Base64 string.`);
+    }
+    if (value.length > Math.ceil(maxBytes / 3) * 4) {
+        throw invalidParameter$1(`Parameter [${parameterName}] exceeds the maximum supported size.`);
+    }
+    if (value.length % 4 !== 0 || !BASE64_PATTERN.test(value)) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must use canonical Base64 encoding.`);
+    }
+    const decoded = buffer.Buffer.from(value, 'base64');
+    if (decoded.byteLength === 0 || decoded.byteLength > maxBytes) {
+        throw invalidParameter$1(`Parameter [${parameterName}] exceeds the maximum supported size.`);
+    }
+    if (decoded.toString('base64') !== value) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must use canonical Base64 encoding.`);
+    }
+    return Uint8Array.from(decoded);
+}
+function decodeJpegBase64ToRgba({ jpegBase64, parameterName, expectedWidth, expectedHeight, }) {
+    const jpegBytes = decodeCanonicalBase64({
+        value: jpegBase64,
+        parameterName,
+        maxBytes: expectedWidth * expectedHeight * 8 + JPEG_CONTAINER_OVERHEAD_BYTES,
+    });
+    if (jpegBytes[0] !== 0xff || jpegBytes[1] !== 0xd8) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must contain a JPEG image.`);
+    }
+    let decoded;
+    try {
+        decoded = jpegJs.decode(jpegBytes, {
+            useTArray: true,
+            formatAsRGBA: true,
+            tolerantDecoding: false,
+            maxResolutionInMP: JPEG_MAX_RESOLUTION_IN_MP,
+            maxMemoryUsageInMB: JPEG_MAX_MEMORY_USAGE_IN_MB,
+        });
+    }
+    catch (_a) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must contain a valid JPEG image.`);
+    }
+    if (decoded.width !== expectedWidth || decoded.height !== expectedHeight) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must contain a ${expectedWidth}x${expectedHeight} JPEG image.`);
+    }
+    const expectedLength = expectedWidth * expectedHeight * 4;
+    if (decoded.data.byteLength !== expectedLength) {
+        throw invalidParameter$1(`Decoded parameter [${parameterName}] must contain ${expectedLength} RGBA bytes.`);
+    }
+    return decoded;
+}
+
 const Log$4 = getLogger(exports.LoggerNames.Core);
 const MIN_FILE_CHUNK_SIZE = 64;
 const FILE_TRANSFER_RATE_WINDOW_MS = 1000;
@@ -54189,6 +54296,9 @@ function writeProtocolV2File(options) {
 
 const WALLPAPER_DIRECTORY = 'vol1:/wallpapers';
 const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
+const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
+const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$2 = 60805;
+const FILESYSTEM_DIR_MAKE_MESSAGE_TYPE = 60809;
 function normalizeFileName(fileName, data) {
     if (fileName !== undefined && (!fileName || !SAFE_FILE_NAME.test(fileName))) {
         throw invalidParameter$1('Parameter [fileName] may only contain letters, numbers, underscores, hyphens and an optional .bin suffix.');
@@ -54207,26 +54317,40 @@ class DeviceUploadWallpaper extends BaseMethod {
         return ['V2'];
     }
     init() {
-        const { width, height, rgba, fileName, chunkSize } = this.payload;
-        if (width !== PRO2_WALLPAPER_WIDTH || height !== PRO2_WALLPAPER_HEIGHT) {
-            throw invalidParameter$1(`Pro2 wallpaper dimensions must be ${PRO2_WALLPAPER_WIDTH}x${PRO2_WALLPAPER_HEIGHT}.`);
-        }
-        if (!(rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(rgba)) {
-            throw invalidParameter$1('Parameter [rgba] must be an ArrayBuffer or Uint8Array.');
-        }
+        const { jpegBase64, fileName, chunkSize } = this.payload;
         if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
             throw invalidParameter$1('Parameter [chunkSize] must be a positive integer.');
         }
-        const rgbaBytes = rgba instanceof ArrayBuffer
-            ? rgba
-            : new Uint8Array(rgba.buffer, rgba.byteOffset, rgba.byteLength);
-        this.encoded = encodePro2Wallpaper({ width, height, rgba: rgbaBytes });
+        const decoded = decodeJpegBase64ToRgba({
+            jpegBase64,
+            parameterName: 'jpegBase64',
+            expectedWidth: PRO2_WALLPAPER_WIDTH,
+            expectedHeight: PRO2_WALLPAPER_HEIGHT,
+        });
+        this.encoded = encodePro2Wallpaper({
+            width: PRO2_WALLPAPER_WIDTH,
+            height: PRO2_WALLPAPER_HEIGHT,
+            rgba: decoded.data,
+        });
         this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-        this.params = { width, height, rgba: rgbaBytes, fileName, chunkSize };
+        this.params = { jpegBase64, fileName, chunkSize };
         this.unlockPolicy = 'none';
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
     }
+    assertCapabilities() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const protocolInfo = yield this.device.ensureProtocolV2RuntimeContext();
+            const requiredMessageTypes = [
+                DEVICE_SETTINGS_SET_MESSAGE_TYPE,
+                FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$2,
+                FILESYSTEM_DIR_MAKE_MESSAGE_TYPE,
+            ];
+            if (requiredMessageTypes.some(messageType => !supportsProtocolV2Message(protocolInfo, messageType))) {
+                throw hdShared.createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
+            }
+        });
+    }
     ensureDirectory() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.directoryReady)
@@ -54276,6 +54400,7 @@ class DeviceUploadWallpaper extends BaseMethod {
             const { encoded } = this;
             if (!encoded)
                 throw invalidParameter$1('Wallpaper data has not been initialized.');
+            yield this.assertCapabilities();
             yield this.ensureDirectory();
             yield this.upload();
             const response = yield this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
@@ -54300,7 +54425,7 @@ class DeviceUploadNft extends BaseMethod {
         return ['V2'];
     }
     init() {
-        const { image, thumbnail, title, subtitle, timestampMs = Date.now(), chunkSize = PRO2_NFT_DEFAULT_CHUNK_SIZE, paceMs = PRO2_NFT_DEFAULT_PACE_MS, timeoutMs = PRO2_NFT_DEFAULT_TIMEOUT_MS, } = this.payload;
+        const { imageJpegBase64, thumbnailJpegBase64, title, subtitle, timestampMs = Date.now(), chunkSize = PRO2_NFT_DEFAULT_CHUNK_SIZE, paceMs = PRO2_NFT_DEFAULT_PACE_MS, timeoutMs = PRO2_NFT_DEFAULT_TIMEOUT_MS, } = this.payload;
         if (!Number.isInteger(chunkSize) ||
             chunkSize < PRO2_NFT_MIN_CHUNK_SIZE ||
             chunkSize > PRO2_NFT_MAX_CHUNK_SIZE) {
@@ -54312,8 +54437,51 @@ class DeviceUploadNft extends BaseMethod {
         if (!Number.isInteger(timeoutMs) || timeoutMs <= 0) {
             throw invalidParameter$1('Parameter [timeoutMs] must be a positive integer.');
         }
-        this.bundle = buildPro2NftBundle({ image, thumbnail, title, subtitle, timestampMs });
-        this.params = { image, thumbnail, title, subtitle, timestampMs, chunkSize, paceMs, timeoutMs };
+        const encodedImage = (() => {
+            const decoded = decodeJpegBase64ToRgba({
+                jpegBase64: imageJpegBase64,
+                parameterName: 'imageJpegBase64',
+                expectedWidth: PRO2_NFT_IMAGE_WIDTH,
+                expectedHeight: PRO2_NFT_IMAGE_HEIGHT,
+            });
+            return encodePro2Image({
+                width: PRO2_NFT_IMAGE_WIDTH,
+                height: PRO2_NFT_IMAGE_HEIGHT,
+                rgba: decoded.data,
+                alphaMode: 'black-background',
+            }).data;
+        })();
+        const encodedThumbnail = (() => {
+            const decoded = decodeJpegBase64ToRgba({
+                jpegBase64: thumbnailJpegBase64,
+                parameterName: 'thumbnailJpegBase64',
+                expectedWidth: PRO2_NFT_THUMBNAIL_WIDTH,
+                expectedHeight: PRO2_NFT_THUMBNAIL_HEIGHT,
+            });
+            return encodePro2Image({
+                width: PRO2_NFT_THUMBNAIL_WIDTH,
+                height: PRO2_NFT_THUMBNAIL_HEIGHT,
+                rgba: decoded.data,
+                alphaMode: 'black-background',
+            }).data;
+        })();
+        this.bundle = buildPro2NftBundleFromEncodedImages({
+            image: encodedImage,
+            thumbnail: encodedThumbnail,
+            title,
+            subtitle,
+            timestampMs,
+        });
+        this.params = {
+            imageJpegBase64,
+            thumbnailJpegBase64,
+            title,
+            subtitle,
+            timestampMs,
+            chunkSize,
+            paceMs,
+            timeoutMs,
+        };
         this.unlockPolicy = 'none';
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -54456,11 +54624,17 @@ class FileWrite extends BaseMethod {
 
 const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
+const PORTFOLIO_PACKAGE_MAX_BYTES = 128 * 1024;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 class UploadPortfolio extends FileWrite {
     init() {
-        const { packageBytes, timeoutMs } = this.payload;
+        const { packageBase64, timeoutMs } = this.payload;
+        const packageBytes = decodeCanonicalBase64({
+            value: packageBase64,
+            parameterName: 'packageBase64',
+            maxBytes: PORTFOLIO_PACKAGE_MAX_BYTES,
+        });
         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 = 'none';
@@ -63233,8 +63407,9 @@ class TonSignMessage extends BaseMethod {
             if (!request.init_data_length) {
                 const deviceType = this.device.getCurrentDeviceType();
                 const hasClassic = DeviceModelToTypes.model_classic1s.includes(deviceType);
-                const hasSigningMessageRepr = request.signning_message == null;
-                return Promise.resolve(Object.assign(Object.assign({}, request), { skip_validate: hasClassic || hasSigningMessageRepr }));
+                const signingMessage = request.signning_message;
+                const shouldSkipValidation = signingMessage == null;
+                return Promise.resolve(Object.assign(Object.assign({}, request), { signing_message: signingMessage, skip_validate: hasClassic || shouldSkipValidation }));
             }
             const [first, rest] = cutString(data, request.init_data_length * 2);
             const response = yield this.device.commands.typedCall('TonTxAck', 'TonSignedMessage', {
@@ -64785,6 +64960,7 @@ const toError = (error) => {
         return new Error(String(error));
     }
 };
+const isExpectedCompatibilityError = (error) => error instanceof hdShared.HardwareError && error.errorCode === hdShared.HardwareErrorCode.DeviceNotSupportMethod;
 const updateMethodRequestContext = (method, updates) => {
     if (method.requestContext) {
         updateRequestContext(method.requestContext.responseID, updates);
@@ -65158,7 +65334,9 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             return yield task.callPromise.promise;
         }
         catch (e) {
-            Log.debug('Device Run Error: ', e);
+            if (!isExpectedCompatibilityError(e)) {
+                Log.debug('Device Run Error: ', e);
+            }
             completeMethodRequestContext(method, e);
             return createResponseMessage(method.responseID, false, { error: e });
         }
@@ -65587,7 +65765,6 @@ const cleanup = () => {
     const pendingUiPromises = _uiPromises;
     _uiPromises = [];
     rejectUiPromises(pendingUiPromises, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled, 'UI request was cancelled'));
-    Log.debug('Cleanup...');
 };
 const removeDeviceListener = (device) => {
     device.removeAllListeners();