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

package/dist/index.js

@@ -41475,6 +41475,11 @@ const LogLabelMethod = new Set([
     'fileWrite',
     'fileRead',
 ]);
+const LogPayloadBlockMethod = new Set([
+    'deviceUploadNft',
+    'deviceUploadWallpaper',
+    'uploadPortfolio',
+]);
 const SensitiveLogKeys = new Set([
     'devicestate',
     'entropy',
@@ -41531,7 +41536,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());
@@ -42465,7 +42473,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 [];
     }
@@ -43237,7 +43245,7 @@ class DevicePool extends events.exports {
                 try {
                     yield device.initialize(initOptions);
                     if ((initOptions === null || initOptions === void 0 ? void 0 : initOptions.refreshRuntimeState) && device.isProtocolV2()) {
-                        yield this._refreshProtocolV2DiscoveryState(device, initOptions);
+                        yield this._refreshProtocolV2DiscoveryState(device);
                     }
                 }
                 finally {
@@ -43254,28 +43262,30 @@ class DevicePool extends events.exports {
             let refreshError;
             yield device.run(() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield this._refreshProtocolV2DiscoveryState(device, initOptions);
+                    yield this._refreshProtocolV2DiscoveryState(device);
                 }
                 catch (error) {
                     refreshError = error;
                 }
-            }), Object.assign({ connectProtocol: initOptions.connectProtocol, forceProtocolDetection: initOptions.forceProtocolDetection }, (initOptions.allowLegacyProtocolV2ProtocolInfo
-                ? { allowLegacyProtocolV2ProtocolInfo: true }
-                : {})));
+            }), {
+                connectProtocol: initOptions.connectProtocol,
+                forceProtocolDetection: initOptions.forceProtocolDetection,
+            });
             if (refreshError instanceof Error)
                 throw refreshError;
             if (refreshError)
                 throw new Error(String(refreshError));
         });
     }
-    static _refreshProtocolV2DiscoveryState(device, initOptions) {
+    static _refreshProtocolV2DiscoveryState(device) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stateReadOptions = (initOptions === null || initOptions === void 0 ? void 0 : initOptions.allowLegacyProtocolV2ProtocolInfo)
-                ? { allowLegacyProtocolV2ProtocolInfo: true }
-                : {};
-            yield device.getDeviceState(Object.assign({ refreshSections: ['status'] }, stateReadOptions));
+            yield device.getDeviceState({
+                refreshSections: ['status'],
+            });
             try {
-                yield device.getDeviceState(Object.assign({ refreshSections: ['settings'] }, stateReadOptions));
+                yield device.getDeviceState({
+                    refreshSections: ['settings'],
+                });
             }
             catch (error) {
                 Log$j.debug('Unable to refresh Protocol V2 device label during discovery', error);
@@ -43717,9 +43727,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) {
@@ -43812,12 +43819,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),
+                    },
                 });
             }
         }
@@ -44238,12 +44243,20 @@ 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.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;
 };
 const PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE = 60602;
 const supportsProtocolV2Message = (protocolInfo, messageType) => protocolInfo.supported_messages.includes(messageType);
@@ -45640,10 +45653,7 @@ class Device extends events.exports {
                     commands: this.commands,
                     timeoutMs: options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs,
                 });
-                const features = (options === null || options === void 0 ? void 0 : options.allowLegacyProtocolV2ProtocolInfo)
-                    ? yield this.probeProtocolV2RuntimeState(deviceInfo, options.protocolV2DeviceInfoTimeoutMs, { allowLegacyProtocolV2ProtocolInfo: true })
-                    : 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);
@@ -45683,14 +45693,7 @@ class Device extends events.exports {
                         commands: this.commands,
                         request: getProtocolV2DeviceInfoRequest(),
                     });
-                    if (params.allowLegacyProtocolV2ProtocolInfo) {
-                        yield this.probeProtocolV2RuntimeState(deviceInfo, undefined, {
-                            allowLegacyProtocolV2ProtocolInfo: true,
-                        });
-                    }
-                    else {
-                        yield this.probeProtocolV2RuntimeState(deviceInfo);
-                    }
+                    yield this.probeProtocolV2RuntimeState(deviceInfo);
                     refreshedDeviceInfo = deviceInfo;
                     initializedWithDeviceInfo = true;
                 }
@@ -45721,9 +45724,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, Object.assign({ forceRuntimeContextRefresh: cachedMode === 'bootloader' || cachedMode === 'romloader' }, (params.allowLegacyProtocolV2ProtocolInfo
-                        ? { allowLegacyProtocolV2ProtocolInfo: true }
-                        : {})));
+                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo, undefined, {
+                        forceRuntimeContextRefresh: cachedMode === 'bootloader' || cachedMode === 'romloader',
+                    });
                 }
                 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', {});
@@ -45762,9 +45765,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') {
@@ -45786,13 +45790,6 @@ class Device extends events.exports {
     ensureProtocolV2RuntimeContext(timeoutMs, options) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const assertProtocolInfoAllowed = (protocolInfo) => {
-                if (isLegacyProtocolV2ProtocolInfo(protocolInfo) &&
-                    (options === null || options === void 0 ? void 0 : options.allowLegacyProtocolV2ProtocolInfo) !== true) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Legacy Protocol V2 ProtocolInfo is supported only during device discovery and firmware update.');
-                }
-                return protocolInfo;
-            };
             const cachedProtocolInfo = (options === null || options === void 0 ? void 0 : options.forceRefresh) === true
                 ? undefined
                 : (_a = this.protocolV2RuntimeContext) !== null && _a !== void 0 ? _a : (!this.protocolV2StateNeedsReload
@@ -45800,10 +45797,10 @@ class Device extends events.exports {
                     : undefined);
             if (cachedProtocolInfo) {
                 this.protocolV2RuntimeContext = cachedProtocolInfo;
-                return assertProtocolInfoAllowed(cachedProtocolInfo);
+                return cachedProtocolInfo;
             }
             if (this.protocolV2RuntimeContextPromise) {
-                return assertProtocolInfoAllowed(yield this.protocolV2RuntimeContextPromise);
+                return this.protocolV2RuntimeContextPromise;
             }
             const requestToken = {};
             const pendingRequest = (() => __awaiter(this, void 0, void 0, function* () {
@@ -45820,7 +45817,7 @@ class Device extends events.exports {
             this.protocolV2RuntimeContextRequestToken = requestToken;
             this.protocolV2RuntimeContextPromise = pendingRequest;
             try {
-                return assertProtocolInfoAllowed(yield pendingRequest);
+                return yield pendingRequest;
             }
             finally {
                 if (this.protocolV2RuntimeContextPromise === pendingRequest) {
@@ -45837,11 +45834,10 @@ class Device extends events.exports {
         return __awaiter(this, void 0, void 0, function* () {
             const protocolInfo = yield this.ensureProtocolV2RuntimeContext(timeoutMs, {
                 forceRefresh: options === null || options === void 0 ? void 0 : options.forceRuntimeContextRefresh,
-                allowLegacyProtocolV2ProtocolInfo: options === null || options === void 0 ? void 0 : options.allowLegacyProtocolV2ProtocolInfo,
             });
-            const runtimeMode = getProtocolV2RuntimeMode(protocolInfo);
-            const legacyProtocolInfo = isLegacyProtocolV2ProtocolInfo(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();
@@ -46854,7 +46850,6 @@ class SearchDevices extends BaseMethod {
                         connectProtocol: undefined,
                         forceProtocolDetection: true,
                         refreshRuntimeState: true,
-                        allowLegacyProtocolV2ProtocolInfo: true,
                     });
                     deviceList.push(...result.deviceList);
                 }
@@ -46938,7 +46933,9 @@ class GetDeviceState extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const state = yield this.device.getDeviceState(Object.assign({ refreshSections: SCOPE_SECTIONS[this.params.scope] }, (this.params.scope === 'firmware' ? { allowLegacyProtocolV2ProtocolInfo: true } : {})));
+            const state = yield this.device.getDeviceState({
+                refreshSections: SCOPE_SECTIONS[this.params.scope],
+            });
             if (this.params.scope === 'settings' &&
                 this.device.isProtocolV2() &&
                 isLoaderMode(state.status.mode)) {
@@ -47477,7 +47474,6 @@ function loadProtocolV2FirmwareReleaseContext({ device, firmwareType: firmwareTy
             refreshSections: checkFirmwareHash
                 ? ['identity', 'versions', 'verification']
                 : ['identity', 'versions'],
-            allowLegacyProtocolV2ProtocolInfo: true,
         });
         if (state.identity.deviceType !== 'pro2' && state.identity.deviceType !== 'neo') {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod, `${methodName} requires a Pro2 or Neo device for Protocol V2`);
@@ -51835,6 +51831,16 @@ 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') ||
@@ -51981,6 +51987,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.protocolV2BootResourceStagingSafe = false;
         this.protocolV2CompletedTargetVersions = new Map();
         this.protocolV2FinalStatusVerified = false;
+        this.protocolV2InstallAckReceived = false;
+        this.protocolV2InstallBaselineVersions = new Map();
     }
     getSupportedProtocols() {
         return ['V2'];
@@ -52158,6 +52166,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
@@ -52166,9 +52177,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,
@@ -52180,14 +52192,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();
@@ -52200,20 +52212,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);
@@ -52233,9 +52244,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 &&
@@ -52247,6 +52267,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');
             }
@@ -52346,13 +52374,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);
@@ -52629,16 +52656,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,
@@ -52924,6 +52955,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* () {
@@ -53143,7 +53198,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
                     });
                     this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
-                    const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT, { allowLegacyProtocolV2ProtocolInfo: true });
+                    const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
                     if ((features === null || features === void 0 ? void 0 : features.mode) === 'bootloader') {
                         return features;
                     }
@@ -53180,81 +53235,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() {
@@ -53282,14 +53274,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({
@@ -53305,7 +53289,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         kind: item.kind,
                     });
                 })));
-                return yield this.executeProtocolV2Phases({
+                return yield this.executeProtocolV2SourceUpdate({
                     installSources,
                     resourceSources: [],
                 });
@@ -53506,6 +53490,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* () {
@@ -53518,11 +53533,14 @@ 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();
@@ -53539,16 +53557,26 @@ 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 &&
-                            (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) {
@@ -53581,12 +53609,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;
@@ -53637,7 +53680,8 @@ 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, { allowLegacyProtocolV2ProtocolInfo: true });
+            const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
+            this.protocolV2LastRuntimeProbeFeatures = features;
             return features.mode === 'normal' && !features.bootloaderMode;
         });
     }
@@ -53690,7 +53734,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
                     });
                     this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
-                    const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT, { allowLegacyProtocolV2ProtocolInfo: true });
+                    const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
                     if (features.mode === 'normal' && !features.bootloaderMode) {
                         return features;
                     }
@@ -53816,22 +53860,41 @@ 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.protocolV2LegacyDirectUpdate ||
-                    !isProtocolV2FirmwareUpdateEndpointUnavailable(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;
-                Log$6.debug('[FirmwareUpdateV4] legacy App does not expose DeviceFirmwareUpdateRequest; rebooting to bootloader');
-                yield this.rebootProtocolV2ToBootloader();
-                response = yield startUpdate();
             }
             this.protocolV2LegacyDirectUpdate = false;
             this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdating);
@@ -64919,10 +64982,6 @@ const createUiProgressMessageFilter = (intervalMs = DEFAULT_UI_PROGRESS_INTERVAL
     };
 };
 
-const isLegacyProtocolV2FirmwareRecoveryMethod = (method) => (method === null || method === void 0 ? void 0 : method.name) === 'firmwareUpdateV4' ||
-    (method === null || method === void 0 ? void 0 : method.name) === 'checkAllFirmwareRelease' ||
-    ((method === null || method === void 0 ? void 0 : method.name) === 'getDeviceState' && method.payload.scope === 'firmware');
-
 const Log = getLogger(exports.LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
 const preWarmInflight = new Map();
@@ -64937,9 +64996,15 @@ function hasDeriveCardano(method) {
     }
     return method.name.startsWith('cardano') || ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.deriveCardano);
 }
-const parseInitOptions = (method) => (Object.assign({ initSession: method === null || method === void 0 ? void 0 : method.payload.initSession, passphraseState: (method === null || method === void 0 ? void 0 : method.payload.useEmptyPassphrase) ? undefined : method === null || method === void 0 ? void 0 : method.payload.passphraseState, deviceId: method === null || method === void 0 ? void 0 : method.payload.deviceId, deriveCardano: method && hasDeriveCardano(method), connectProtocol: method === null || method === void 0 ? void 0 : method.payload.connectProtocol, forceProtocolDetection: method === null || method === void 0 ? void 0 : method.payload.forceProtocolDetection, protocolV2DeviceInfoTimeoutMs: method === null || method === void 0 ? void 0 : method.payload.protocolV2DeviceInfoTimeoutMs }, (isLegacyProtocolV2FirmwareRecoveryMethod(method)
-    ? { allowLegacyProtocolV2ProtocolInfo: true }
-    : {})));
+const parseInitOptions = (method) => ({
+    initSession: method === null || method === void 0 ? void 0 : method.payload.initSession,
+    passphraseState: (method === null || method === void 0 ? void 0 : method.payload.useEmptyPassphrase) ? undefined : method === null || method === void 0 ? void 0 : method.payload.passphraseState,
+    deviceId: method === null || method === void 0 ? void 0 : method.payload.deviceId,
+    deriveCardano: method && hasDeriveCardano(method),
+    connectProtocol: method === null || method === void 0 ? void 0 : method.payload.connectProtocol,
+    forceProtocolDetection: method === null || method === void 0 ? void 0 : method.payload.forceProtocolDetection,
+    protocolV2DeviceInfoTimeoutMs: method === null || method === void 0 ? void 0 : method.payload.protocolV2DeviceInfoTimeoutMs,
+});
 let _core;
 let _deviceList;
 let _connector;
@@ -64963,6 +65028,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);
@@ -65336,7 +65402,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 });
         }
@@ -65765,7 +65833,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();