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

package/dist/index.js

@@ -13,10 +13,9 @@ 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 }; }
 
@@ -41475,11 +41474,6 @@ const LogLabelMethod = new Set([
     'fileWrite',
     'fileRead',
 ]);
-const LogPayloadBlockMethod = new Set([
-    'deviceUploadNft',
-    'deviceUploadWallpaper',
-    'uploadPortfolio',
-]);
 const SensitiveLogKeys = new Set([
     'devicestate',
     'entropy',
@@ -41536,10 +41530,7 @@ function getLogBlockLabel(message) {
     return undefined;
 }
 function getSafeLogPayload(value, blockLabel) {
-    if (blockLabel &&
-        (LogBlockEvent.has(blockLabel) ||
-            LogPayloadBlockMethod.has(blockLabel) ||
-            isSigningMethod(blockLabel))) {
+    if (blockLabel && (LogBlockEvent.has(blockLabel) || isSigningMethod(blockLabel))) {
         return { method: blockLabel, payload: '[REDACTED]' };
     }
     const redactedValue = redactLogValue(value, new WeakSet());
@@ -42473,7 +42464,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], protocol);
+            return withNever([60000, 120000, 300000, 600000, 1800000], protocol);
         default:
             return [];
     }
@@ -42732,14 +42723,18 @@ function getCompletePro2NftBasenames(childFiles) {
 function utf8Length(value) {
     return new TextEncoder().encode(value).byteLength;
 }
-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.');
+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}.`);
     }
-    if (!(thumbnail instanceof Uint8Array) || thumbnail.byteLength === 0) {
-        throw invalidParameter$1('Parameter [thumbnail] must contain encoded NFT thumbnail data.');
+    if (!(image.rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(image.rgba)) {
+        throw invalidParameter$1(`Parameter [${name}.rgba] must be an ArrayBuffer or Uint8Array.`);
     }
+}
+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) {
@@ -42751,15 +42746,17 @@ function buildPro2NftBundleFromEncodedImages(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(image)).slice(0, 8);
+    const hash8 = utils.bytesToHex(blake2s.blake2s(encodedImage)).slice(0, 8);
     return {
         basename: `nft-${hash8}-${timestampMs}`,
-        image,
-        thumbnail,
+        image: encodedImage,
+        thumbnail: encodedThumbnail,
         metadata,
     };
 }
@@ -43279,13 +43276,9 @@ 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);
@@ -43727,6 +43720,9 @@ 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) {
@@ -43819,10 +43815,12 @@ class DeviceCommands {
             if (!shouldReduceDebugForCall(callType)) {
                 Log$h.debug('_filterCommonTypes: ', {
                     request: callType,
-                    response: {
-                        type: res.type,
-                        message: hdTransport.getSafeTransportLogPayload(res.message, res.type),
-                    },
+                    response: callType === 'DeviceFirmwareUpdateStatusGet'
+                        ? {
+                            type: res.type,
+                            message: hdTransport.getSafeTransportLogPayload(res.message, res.type),
+                        }
+                        : res.type,
                 });
             }
         }
@@ -44228,7 +44226,6 @@ 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;
@@ -44243,20 +44240,12 @@ const parseProtocolV2BuildFingerprint = (buildFingerprint) => {
     }
     return { binary, version, commit, environment, buildType };
 };
-const getProtocolV2RuntimeMode = (protocolInfo, deviceInfo) => {
-    var _a, _b, _c, _d;
+const getProtocolV2RuntimeMode = (protocolInfo) => {
+    var _a;
     const binary = (_a = parseProtocolV2BuildFingerprint(protocolInfo.build_fingerprint)) === null || _a === void 0 ? void 0 : _a.binary;
     if (binary === 'application')
         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)
-            return 'romloader';
-        if ((_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.fw) === null || _d === void 0 ? void 0 : _d.bootloader)
-            return 'bootloader';
-    }
-    return undefined;
+    return binary;
 };
 const PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE = 60602;
 const supportsProtocolV2Message = (protocolInfo, messageType) => protocolInfo.supported_messages.includes(messageType);
@@ -45258,7 +45247,6 @@ 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) {
@@ -45653,7 +45641,8 @@ class Device extends events.exports {
                     commands: this.commands,
                     timeoutMs: options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs,
                 });
-                yield this.probeProtocolV2RuntimeState(deviceInfo, 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);
             }
             catch (error) {
                 Log$g.error('Protocol V2 initialization failed:', error);
@@ -45675,7 +45664,7 @@ class Device extends events.exports {
         });
     }
     getDeviceState(params = {}) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const refresh = new Set((_a = params.refreshSections) !== null && _a !== void 0 ? _a : []);
             const getProtocolV2DeviceInfoRequest = () => {
@@ -45723,12 +45712,9 @@ class Device extends events.exports {
                     }
                 }
                 if (refresh.has('status') && !initializedWithDeviceInfo) {
-                    const cachedMode = (_c = this.state) === null || _c === void 0 ? void 0 : _c.status.mode;
-                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo, undefined, {
-                        forceRuntimeContextRefresh: cachedMode === 'bootloader' || cachedMode === 'romloader',
-                    });
+                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo);
                 }
-                if (refresh.has('settings') && ((_d = this.state) === null || _d === void 0 ? void 0 : _d.status.mode) === 'normal') {
+                if (refresh.has('settings') && ((_c = this.state) === null || _c === void 0 ? void 0 : _c.status.mode) === 'normal') {
                     const { message } = yield this.commands.typedCall('DeviceSettingsGet', 'DeviceSettings', {});
                     this.updateState(mapDeviceSettingsToState(message), 'settings-read');
                 }
@@ -45765,10 +45751,9 @@ class Device extends events.exports {
             source,
             changedKeys: result.changedKeys,
         };
-        Log$g.debug('Device state updated', {
+        Log$g.debug('Device state patch committed', {
             source,
-            revision: result.revision,
-            changedKeyCount: result.changedKeys.length,
+            keys: result.changedKeys,
         });
         this.emit(DEVICE.STATE, this, event);
         if (result.state.protocol === 'V1') {
@@ -45787,14 +45772,12 @@ class Device extends events.exports {
         this.updateState(mapFeaturesToState(normalized), source);
         return this.features;
     }
-    ensureProtocolV2RuntimeContext(timeoutMs, options) {
+    ensureProtocolV2RuntimeContext(timeoutMs) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            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);
+            const cachedProtocolInfo = (_a = this.protocolV2RuntimeContext) !== null && _a !== void 0 ? _a : (!this.protocolV2StateNeedsReload
+                ? (_d = (_c = (_b = this.state) === null || _b === void 0 ? void 0 : _b.raw) === null || _c === void 0 ? void 0 : _c.protocolV2ProtocolInfo) !== null && _d !== void 0 ? _d : undefined
+                : undefined);
             if (cachedProtocolInfo) {
                 this.protocolV2RuntimeContext = cachedProtocolInfo;
                 return cachedProtocolInfo;
@@ -45829,15 +45812,12 @@ class Device extends events.exports {
             }
         });
     }
-    probeProtocolV2RuntimeState(deviceInfo, timeoutMs, options) {
+    probeProtocolV2RuntimeState(deviceInfo, timeoutMs) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const protocolInfo = yield this.ensureProtocolV2RuntimeContext(timeoutMs, {
-                forceRefresh: options === null || options === void 0 ? void 0 : options.forceRuntimeContextRefresh,
-            });
+            const protocolInfo = yield this.ensureProtocolV2RuntimeContext(timeoutMs);
+            const runtimeMode = getProtocolV2RuntimeMode(protocolInfo);
             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();
@@ -45846,8 +45826,7 @@ 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 = legacyProtocolInfo ||
-                supportsProtocolV2Message(protocolInfo, PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE);
+            const deviceStatusSupported = supportsProtocolV2Message(protocolInfo, PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE);
             if (runtimeMode === 'bootloader' || runtimeMode === 'romloader') {
                 return this.updateProtocolV2Features(deviceInfo, null, runtimeMode, protocolInfo);
             }
@@ -45895,7 +45874,8 @@ 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));
     }
-    invalidateProtocolV2RuntimeState() {
+    markTransportDisconnected() {
+        this.deviceAcquired = false;
         if (!this.isProtocolV2())
             return;
         this.protocolV2StateNeedsReload = true;
@@ -45904,10 +45884,6 @@ class Device extends events.exports {
         this.protocolV2RuntimeContextRequestToken = undefined;
         this.clearPreInitialized();
     }
-    markTransportDisconnected() {
-        this.deviceAcquired = false;
-        this.invalidateProtocolV2RuntimeState();
-    }
     invalidateAfterWipe() {
         const deviceId = this.getCurrentDeviceId();
         if (deviceId) {
@@ -45917,7 +45893,10 @@ class Device extends events.exports {
             if (this.originalDescriptor.path !== deviceId) {
                 deviceWalletSessionStore.deleteDevice(this.originalDescriptor.path);
             }
-            this.invalidateProtocolV2RuntimeState();
+            this.protocolV2StateNeedsReload = true;
+            this.protocolV2RuntimeContext = undefined;
+            this.protocolV2RuntimeContextPromise = undefined;
+            this.protocolV2RuntimeContextRequestToken = undefined;
         }
         this.passphraseState = undefined;
         this.stateStore = new DeviceStateStore();
@@ -45927,7 +45906,11 @@ class Device extends events.exports {
     markProtocolV2Reboot(rebootType) {
         if (!this.isProtocolV2())
             return;
-        this.invalidateProtocolV2RuntimeState();
+        this.protocolV2StateNeedsReload = true;
+        this.protocolV2RuntimeContext = undefined;
+        this.protocolV2RuntimeContextPromise = undefined;
+        this.protocolV2RuntimeContextRequestToken = undefined;
+        this.clearPreInitialized();
         let loaderMode;
         if (rebootType === hdTransport.DeviceRebootType.Bootloader) {
             loaderMode = 'bootloader';
@@ -45983,7 +45966,6 @@ 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* () {
@@ -46838,7 +46820,7 @@ class SearchDevices extends BaseMethod {
                     if (!seenIds.has(lowerId)) {
                         seenIds.add(lowerId);
                         const bleName = (_e = (_d = device.name) !== null && _d !== void 0 ? _d : device.localName) !== null && _e !== void 0 ? _e : '';
-                        devices.push(Object.assign(Object.assign({}, device), { connectId: device.id, serialNo: null, uuid: device.id, deviceId: null, name: bleName || device.name, deviceType: getDeviceTypeByBleName(bleName) }));
+                        devices.push(Object.assign(Object.assign({}, device), { connectId: device.id, serialNo: null, uuid: '', deviceId: null, name: bleName || device.name, deviceType: getDeviceTypeByBleName(bleName) }));
                     }
                 }
                 return devices;
@@ -51831,26 +51813,12 @@ const isProtocolV2ReconnectProbeError = (error) => {
     return ((message.includes('device protocol mismatch') && message.includes('expected v2')) ||
         message.includes('did not respond to expected protocol'));
 };
-const isProtocolV2BleTransportReleasedError = (error) => {
-    const message = getProtocolV2UnknownErrorText(error).toLowerCase();
-    const compactMessage = message.replace(/\s+/gu, '');
-    return (message.includes('react native ble transport released') ||
-        message.includes('bledevicedisconnected') ||
-        message.includes('bleconnectederror') ||
-        (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'));
-};
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
     return error instanceof hdShared.HardwareError &&
@@ -51983,12 +51951,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() {
         return ['V2'];
@@ -52166,9 +52131,6 @@ 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
@@ -52177,10 +52139,9 @@ 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 &&
-                ((_c = this.params.targetsToUpdate) === null || _c === void 0 ? void 0 : _c.includes('resource'))) {
+                ((_b = this.params.targetsToUpdate) === null || _b === void 0 ? void 0 : _b.includes('resource'))) {
                 const localMemoryHost = yield this.prepareProtocolV2LocalMemoryHost({
                     features: deviceFeatures,
                     firmwareType,
@@ -52192,14 +52153,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     localMemoryHost.release();
                 }
             }
-            const hasPreparedComponentArtifacts = Object.values((_d = this.params.componentArtifacts) !== null && _d !== void 0 ? _d : {}).some(Boolean);
+            const hasPreparedComponentArtifacts = Object.values((_c = this.params.componentArtifacts) !== null && _c !== void 0 ? _c : {}).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();
@@ -52212,19 +52173,20 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 const needsRemoteFirmware = ((_e = this.params.targetsToUpdate) === null || _e === void 0 ? void 0 : _e.length)
                     ? missingFirmwareTargets.length > 0
                     : explicitInstallItems.length === 0;
-                const needsSdkManagedArtifacts = needsRemoteFirmware || wantsResources;
-                if (needsSdkManagedArtifacts &&
+                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 &&
                     (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 (needsSdkManagedArtifacts) {
-                    yield DataManager.forceReloadData({
-                        requireResources: wantsResources,
-                        resourceDeviceType: capabilityDeviceType === hdShared.EDeviceType.Neo ? hdShared.EDeviceType.Neo : hdShared.EDeviceType.Pro2,
-                    });
+                if (needsRemoteFirmware) {
+                    yield DataManager.forceReloadData();
                 }
                 if (needsRemoteFirmware) {
                     const remoteBinaries = yield this.prepareRemoteProtocolV2Binaries(firmwareType, deviceFeatures, explicitInstallItems);
@@ -52244,18 +52206,9 @@ 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 &&
@@ -52267,14 +52220,6 @@ 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');
             }
@@ -52374,12 +52319,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             return installSources;
         });
     }
-    prepareProtocolV2LocalMemoryHost({ features, firmwareType, availableInstallItems = this.buildProtocolV2InstallItems({
-        bootloaderBinary: this.prepareBootloaderBinary(),
-        fwBinaryMap: this.collectExplicitTargetBinaries(),
-    }), }) {
+    prepareProtocolV2LocalMemoryHost({ features, firmwareType, }) {
         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);
@@ -52656,20 +52602,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             return sources;
         });
     }
-    runProtocolV2PreparedArtifacts(features, firmwareType, announceDownload = true) {
+    runProtocolV2PreparedArtifacts(features, firmwareType) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (announceDownload) {
-                    this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
-                }
+                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');
                 }
-                if (announceDownload) {
-                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
-                }
+                this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
                 return yield this.executeProtocolV2SourceUpdate({
                     installSources,
                     resourceSources,
@@ -52955,30 +52897,6 @@ 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* () {
@@ -53138,13 +53056,19 @@ 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() {
+    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;
+            }
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.AutoRebootToBootloader);
                 yield this.protocolV2Reboot(hdTransport.DeviceRebootType.Bootloader);
@@ -53163,25 +53087,6 @@ 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;
-            }
-            return this.rebootProtocolV2ToBootloader();
-        });
-    }
     waitForProtocolV2BootloaderMode(timeout = PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT, retryInterval = 1000) {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
@@ -53235,18 +53140,81 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         push(this.params.se04Binary, 'se04.bin', ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04);
         return entries;
     }
-    executeProtocolV2SourceUpdate({ installSources, resourceSources, }) {
+    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, }) {
         return __awaiter(this, void 0, void 0, function* () {
             this.protocolV2BootResourceStagingSafe = false;
-            if (installSources.length > 0 || resourceSources.length > 0) {
-                yield this.enterProtocolV2BootloaderMode();
-                yield this.ensureProtocolV2BootResourceStagingIsEmpty();
-                yield this.executeProtocolV2TransferPhase({
-                    installSources,
-                    resourceSources,
-                });
+            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']);
+                }
             }
-            return this.completeProtocolV2FinalVerification();
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 execution has no final verification phase');
         });
     }
     ensureProtocolV2BootResourceStagingIsEmpty() {
@@ -53274,6 +53242,14 @@ 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({
@@ -53289,7 +53265,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         kind: item.kind,
                     });
                 })));
-                return yield this.executeProtocolV2SourceUpdate({
+                return yield this.executeProtocolV2Phases({
                     installSources,
                     resourceSources: [],
                 });
@@ -53490,37 +53466,6 @@ 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* () {
@@ -53533,14 +53478,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let deviceInfo;
             let missingTargetStatusSince;
             let missingTargetStatusKey;
-            let normalModeWithoutInstallEvidenceSince;
-            let installEvidenceObserved = this.protocolV2InstallAckReceived;
             const resetMissingTargetStatusGrace = () => {
                 missingTargetStatusSince = undefined;
                 missingTargetStatusKey = undefined;
             };
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
-                this.throwIfAborted();
                 try {
                     if (shouldReconnect) {
                         yield this.reconnectProtocolV2Device();
@@ -53557,26 +53499,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             },
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
                         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) {
-                            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;
-                            }
+                        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;
                         }
                         const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
                         if (missingTargetIds.length > 0) {
@@ -53609,27 +53541,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             if (!currentDeviceInfo) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
                             }
-                            const isNormalMode = yield this.probeProtocolV2NormalMode(currentDeviceInfo);
-                            if (isNormalMode &&
-                                (installEvidenceObserved ||
-                                    this.hasProtocolV2InstallVersionChanged(expectedTargetIds))) {
+                            if (yield this.probeProtocolV2NormalMode(currentDeviceInfo)) {
                                 Log$6.log('[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot');
                                 this.postProgressMessage(100, 'installingFirmware');
                                 return;
                             }
-                            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');
-                            }
+                            lastError = new Error('Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode');
                         }
                         else {
                             shouldReconnect = true;
@@ -53681,7 +53598,6 @@ 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;
         });
     }
@@ -53860,43 +53776,8 @@ 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() && isProtocolV2BleTransportReleasedError(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() && isProtocolV2BleTransportReleasedError(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();
+            const response = yield commands.typedCall('DeviceFirmwareUpdateRequest', 'Success', { targets }, { timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT });
             this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdating);
             this.postProgressMessage(0, 'installingFirmware');
             return response;
@@ -54032,61 +53913,6 @@ 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;
@@ -54363,9 +54189,6 @@ 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.');
@@ -54384,40 +54207,26 @@ class DeviceUploadWallpaper extends BaseMethod {
         return ['V2'];
     }
     init() {
-        const { jpegBase64, fileName, chunkSize } = this.payload;
+        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.');
+        }
         if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
             throw invalidParameter$1('Parameter [chunkSize] must be a positive integer.');
         }
-        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,
-        });
+        const rgbaBytes = rgba instanceof ArrayBuffer
+            ? rgba
+            : new Uint8Array(rgba.buffer, rgba.byteOffset, rgba.byteLength);
+        this.encoded = encodePro2Wallpaper({ width, height, rgba: rgbaBytes });
         this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-        this.params = { jpegBase64, fileName, chunkSize };
+        this.params = { width, height, rgba: rgbaBytes, 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)
@@ -54467,7 +54276,6 @@ 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', {
@@ -54492,7 +54300,7 @@ class DeviceUploadNft extends BaseMethod {
         return ['V2'];
     }
     init() {
-        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;
+        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;
         if (!Number.isInteger(chunkSize) ||
             chunkSize < PRO2_NFT_MIN_CHUNK_SIZE ||
             chunkSize > PRO2_NFT_MAX_CHUNK_SIZE) {
@@ -54504,51 +54312,8 @@ class DeviceUploadNft extends BaseMethod {
         if (!Number.isInteger(timeoutMs) || timeoutMs <= 0) {
             throw invalidParameter$1('Parameter [timeoutMs] must be a positive integer.');
         }
-        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.bundle = buildPro2NftBundle({ image, thumbnail, title, subtitle, timestampMs });
+        this.params = { image, thumbnail, title, subtitle, timestampMs, chunkSize, paceMs, timeoutMs };
         this.unlockPolicy = 'none';
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -54691,17 +54456,11 @@ 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 { packageBase64, timeoutMs } = this.payload;
-        const packageBytes = decodeCanonicalBase64({
-            value: packageBase64,
-            parameterName: 'packageBase64',
-            maxBytes: PORTFOLIO_PACKAGE_MAX_BYTES,
-        });
+        const { packageBytes, timeoutMs } = this.payload;
         this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, emitProgress: false, timeoutMs });
         super.init();
         this.unlockPolicy = 'none';
@@ -63471,13 +63230,11 @@ class TonSignMessage extends BaseMethod {
         super(...arguments);
         this.initState = null;
         this.processTxRequest = (request, data) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (!request.init_data_length) {
                 const deviceType = this.device.getCurrentDeviceType();
                 const hasClassic = DeviceModelToTypes.model_classic1s.includes(deviceType);
-                const signingMessage = (_a = request.signing_message) !== null && _a !== void 0 ? _a : request.signning_message;
-                const shouldSkipValidation = signingMessage == null;
-                return Promise.resolve(Object.assign(Object.assign({}, request), { signing_message: signingMessage, skip_validate: hasClassic || shouldSkipValidation }));
+                const hasSigningMessageRepr = request.signning_message == null;
+                return Promise.resolve(Object.assign(Object.assign({}, request), { skip_validate: hasClassic || hasSigningMessageRepr }));
             }
             const [first, rest] = cutString(data, request.init_data_length * 2);
             const response = yield this.device.commands.typedCall('TonTxAck', 'TonSignedMessage', {
@@ -65028,7 +64785,6 @@ 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);
@@ -65402,9 +65158,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             return yield task.callPromise.promise;
         }
         catch (e) {
-            if (!isExpectedCompatibilityError(e)) {
-                Log.debug('Device Run Error: ', e);
-            }
+            Log.debug('Device Run Error: ', e);
             completeMethodRequestContext(method, e);
             return createResponseMessage(method.responseID, false, { error: e });
         }
@@ -65833,6 +65587,7 @@ 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();