@onekeyfe/hd-core 1.2.0-alpha.100 → 1.2.0-alpha.102

package/dist/index.js

@@ -7,6 +7,7 @@ var sha256 = require('@noble/hashes/sha256');
 var utils = require('@noble/hashes/utils');
 var semver = require('semver');
 var hdTransport = require('@onekeyfe/hd-transport');
+var buffer = require('buffer');
 var axios = require('axios');
 var lodash = require('lodash');
 var ByteBuffer = require('bytebuffer');
@@ -15,7 +16,6 @@ var BigNumber = require('bignumber.js');
 var JSZip = require('jszip');
 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 }; }
 
@@ -734,7 +734,7 @@ const assertFirmwareUpdatePlan = (value) => {
         if (!artifact) {
             return planError('Firmware update plan artifact is invalid');
         }
-        assertExactKeys(artifact, ['artifactId', 'role', 'target', 'url', 'container', 'expectedSize', 'expectedSha256'], ['logicalName', 'targetVersion']);
+        assertExactKeys(artifact, ['artifactId', 'role', 'target', 'url', 'container'], ['logicalName', 'expectedSize', 'expectedSha256', 'targetVersion']);
         const artifactId = assertBoundedString(artifact.artifactId, 'artifact id', 160);
         if (artifactIds.has(artifactId)) {
             return planError('Firmware update plan contains duplicate artifact ids');
@@ -750,13 +750,19 @@ const assertFirmwareUpdatePlan = (value) => {
         if (artifact.logicalName !== undefined) {
             assertBoundedString(artifact.logicalName, 'logical name', 256);
         }
-        if (!Number.isSafeInteger(artifact.expectedSize) || artifact.expectedSize <= 0) {
+        if (artifact.expectedSize !== undefined &&
+            (!Number.isSafeInteger(artifact.expectedSize) || artifact.expectedSize <= 0)) {
             return planError('Firmware update plan artifact size is invalid');
         }
-        if (typeof artifact.expectedSha256 !== 'string' ||
-            !/^[a-f0-9]{64}$/u.test(artifact.expectedSha256)) {
+        if (artifact.expectedSha256 !== undefined &&
+            (typeof artifact.expectedSha256 !== 'string' ||
+                !/^[a-f0-9]{64}$/u.test(artifact.expectedSha256))) {
             return planError('Firmware update plan artifact digest is invalid');
         }
+        if (plan.executor === 'v4' &&
+            (artifact.expectedSize === undefined || artifact.expectedSha256 === undefined)) {
+            return planError('Protocol V2 firmware artifact integrity metadata is invalid');
+        }
         if (artifact.targetVersion !== undefined) {
             assertBoundedString(artifact.targetVersion, 'target version', 64);
         }
@@ -1007,10 +1013,10 @@ const buildFirmwareUpdatePlan = ({ features, firmwareType, platform, firmware, b
     else {
         if (isUpgrade(bootloader) || forcedTargets.has('bootloader')) {
             const bootloaderRelease = asRelease(bootloader);
-            const integrity = requireArtifactIntegrity({
+            const integrity = asIntegrity({
                 size: bootloaderRelease === null || bootloaderRelease === void 0 ? void 0 : bootloaderRelease.bootloaderExpectedSize,
                 sha256: bootloaderRelease === null || bootloaderRelease === void 0 ? void 0 : bootloaderRelease.bootloaderFingerprint,
-            }, 'Bootloader release');
+            });
             artifacts.push(Object.assign(Object.assign({ artifactId: 'bootloader', role: 'bootloader', target: 'bootloader', url: assertArtifactUrl(bootloaderRelease === null || bootloaderRelease === void 0 ? void 0 : bootloaderRelease.bootloaderResource, 'Bootloader release'), container: 'raw' }, integrity), (asVersion(bootloaderRelease === null || bootloaderRelease === void 0 ? void 0 : bootloaderRelease.bootloaderVersion)
                 ? {
                     targetVersion: asVersion(bootloaderRelease === null || bootloaderRelease === void 0 ? void 0 : bootloaderRelease.bootloaderVersion),
@@ -1024,7 +1030,10 @@ const buildFirmwareUpdatePlan = ({ features, firmwareType, platform, firmware, b
                 });
             }
             if (shouldUpdateFirmware) {
-                const integrity = requireArtifactIntegrity({ size: firmwareRelease.expectedSize, sha256: firmwareRelease.fingerprint }, 'Firmware release');
+                const integrity = asIntegrity({
+                    size: firmwareRelease.expectedSize,
+                    sha256: firmwareRelease.fingerprint,
+                });
                 artifacts.push(Object.assign(Object.assign({ artifactId: 'firmware', role: 'firmware', target: 'firmware', url: assertArtifactUrl(firmwareRelease.url, 'Firmware release'), container: 'raw' }, integrity), (asVersion(firmwareRelease.version)
                     ? { targetVersion: asVersion(firmwareRelease.version) }
                     : {})));
@@ -1036,24 +1045,24 @@ const buildFirmwareUpdatePlan = ({ features, firmwareType, platform, firmware, b
                     platform,
                 });
                 if (resourceUrl) {
-                    const integrity = requireArtifactIntegrity({
+                    const integrity = asIntegrity({
                         size: resourceUrl === asString(firmwareRelease.fullResource)
                             ? firmwareRelease.fullResourceExpectedSize
                             : firmwareRelease.resourceExpectedSize,
                         sha256: resourceUrl === asString(firmwareRelease.fullResource)
                             ? firmwareRelease.fullResourceFingerprint
                             : firmwareRelease.resourceFingerprint,
-                    }, 'Legacy resource archive');
+                    });
                     artifacts.push(Object.assign({ artifactId: 'resource', role: 'resource', target: 'resource', url: assertArtifactUrl(resourceUrl, 'Firmware resource release'), container: 'zip' }, integrity));
                 }
             }
         }
         if (isUpgrade(ble) || isRecoveryInstall(ble) || forcedTargets.has('ble')) {
             const bleRelease = asRelease(ble);
-            const integrity = requireArtifactIntegrity({
+            const integrity = asIntegrity({
                 size: bleRelease === null || bleRelease === void 0 ? void 0 : bleRelease.expectedSize,
                 sha256: (_a = bleRelease === null || bleRelease === void 0 ? void 0 : bleRelease.fingerprintWeb) !== null && _a !== void 0 ? _a : bleRelease === null || bleRelease === void 0 ? void 0 : bleRelease.fingerprint,
-            }, 'BLE release');
+            });
             artifacts.push(Object.assign(Object.assign({ artifactId: 'ble', role: 'ble', target: 'ble', url: assertArtifactUrl((_b = bleRelease === null || bleRelease === void 0 ? void 0 : bleRelease.webUpdate) !== null && _b !== void 0 ? _b : bleRelease === null || bleRelease === void 0 ? void 0 : bleRelease.url, 'BLE release'), container: 'raw' }, integrity), (asVersion(bleRelease === null || bleRelease === void 0 ? void 0 : bleRelease.version)
                 ? { targetVersion: asVersion(bleRelease === null || bleRelease === void 0 ? void 0 : bleRelease.version) }
                 : {})));
@@ -2210,14 +2219,132 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
   }
 }
 
+const BRIDGE_BINARY_PAYLOAD_MARKER = '__onekey_hd_bridge_binary_payload__';
+const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+const invalidBinaryPayload = (message) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, message);
+function isPlainObject(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+}
+function isArrayBufferValue(value) {
+    return Boolean(typeof ArrayBuffer !== 'undefined' &&
+        (value instanceof ArrayBuffer ||
+            Object.prototype.toString.call(value) === '[object ArrayBuffer]'));
+}
+function isBlobValue(value) {
+    return Boolean(typeof Blob !== 'undefined' &&
+        (value instanceof Blob || Object.prototype.toString.call(value) === '[object Blob]') &&
+        typeof value.arrayBuffer === 'function');
+}
+function readBinaryPayload(value) {
+    if (!isPlainObject(value) || !(BRIDGE_BINARY_PAYLOAD_MARKER in value))
+        return undefined;
+    const payload = value;
+    if (payload[BRIDGE_BINARY_PAYLOAD_MARKER] !== 1 ||
+        (payload.type !== 'array-buffer' && payload.type !== 'uint8-array') ||
+        typeof payload.data !== 'string') {
+        throw invalidBinaryPayload('Invalid bridge binary payload');
+    }
+    return payload;
+}
+function bytesToPayload(bytes, type) {
+    return {
+        [BRIDGE_BINARY_PAYLOAD_MARKER]: 1,
+        data: buffer.Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString('base64'),
+        type,
+    };
+}
+function payloadToBytes(payload) {
+    if (payload.data.length % 4 !== 0 || !BASE64_PATTERN.test(payload.data)) {
+        throw invalidBinaryPayload('Invalid bridge binary payload data');
+    }
+    const decoded = buffer.Buffer.from(payload.data, 'base64');
+    if (decoded.toString('base64') !== payload.data) {
+        throw invalidBinaryPayload('Invalid bridge binary payload data');
+    }
+    return Uint8Array.from(decoded);
+}
+function encodeValue(value, seen) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (isArrayBufferValue(value)) {
+            return bytesToPayload(new Uint8Array(value), 'array-buffer');
+        }
+        if (typeof ArrayBuffer !== 'undefined' && ArrayBuffer.isView(value)) {
+            return bytesToPayload(new Uint8Array(value.buffer, value.byteOffset, value.byteLength), 'uint8-array');
+        }
+        if (isBlobValue(value)) {
+            return bytesToPayload(new Uint8Array(yield value.arrayBuffer()), 'uint8-array');
+        }
+        const encodedPayload = readBinaryPayload(value);
+        if (encodedPayload)
+            return encodedPayload;
+        if (Array.isArray(value)) {
+            if (seen.has(value))
+                throw invalidBinaryPayload('Circular bridge payload');
+            seen.add(value);
+            try {
+                const encoded = [];
+                for (const item of value) {
+                    encoded.push(yield encodeValue(item, seen));
+                }
+                return encoded.some((item, index) => item !== value[index]) ? encoded : value;
+            }
+            finally {
+                seen.delete(value);
+            }
+        }
+        if (!isPlainObject(value))
+            return value;
+        if (seen.has(value))
+            throw invalidBinaryPayload('Circular bridge payload');
+        seen.add(value);
+        try {
+            const entries = [];
+            for (const [key, item] of Object.entries(value)) {
+                entries.push([key, yield encodeValue(item, seen)]);
+            }
+            return entries.some(([key, item]) => item !== value[key]) ? Object.fromEntries(entries) : value;
+        }
+        finally {
+            seen.delete(value);
+        }
+    });
+}
+function decodeValue(value) {
+    const payload = readBinaryPayload(value);
+    if (payload) {
+        const bytes = payloadToBytes(payload);
+        return payload.type === 'array-buffer' ? bytes.buffer : bytes;
+    }
+    if (Array.isArray(value)) {
+        const decoded = value.map(decodeValue);
+        return decoded.some((item, index) => item !== value[index]) ? decoded : value;
+    }
+    if (!isPlainObject(value))
+        return value;
+    const entries = Object.entries(value).map(([key, item]) => [key, decodeValue(item)]);
+    return entries.some(([key, item]) => item !== value[key]) ? Object.fromEntries(entries) : value;
+}
+function encodeBridgeBinaryPayload(value) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return encodeValue(value, new WeakSet());
+    });
+}
+function decodeBridgeBinaryPayload(value) {
+    return decodeValue(value);
+}
+
 const eventEmitter = new events.exports();
 const topLevelInject = () => {
     let lowLevelApi;
-    const call = (params) => {
+    const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
         if (!lowLevelApi)
             return Promise.resolve(undefined);
-        return lowLevelApi.call(params);
-    };
+        const encodedParams = yield encodeBridgeBinaryPayload(params);
+        return lowLevelApi.call(encodedParams);
+    });
     const protocolAwareCall = createProtocolAwareCall(call);
     const api = Object.assign(Object.assign({ on: (type, fn) => {
             eventEmitter.on(type, fn);
@@ -43233,7 +43360,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);
+                        yield this._refreshProtocolV2DiscoveryState(device, initOptions);
                     }
                 }
                 finally {
@@ -43250,26 +43377,28 @@ class DevicePool extends events.exports {
             let refreshError;
             yield device.run(() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield this._refreshProtocolV2DiscoveryState(device);
+                    yield this._refreshProtocolV2DiscoveryState(device, initOptions);
                 }
                 catch (error) {
                     refreshError = error;
                 }
-            }), {
-                connectProtocol: initOptions.connectProtocol,
-                forceProtocolDetection: initOptions.forceProtocolDetection,
-            });
+            }), Object.assign({ connectProtocol: initOptions.connectProtocol, forceProtocolDetection: initOptions.forceProtocolDetection }, (initOptions.allowLegacyProtocolV2ProtocolInfo
+                ? { allowLegacyProtocolV2ProtocolInfo: true }
+                : {})));
             if (refreshError instanceof Error)
                 throw refreshError;
             if (refreshError)
                 throw new Error(String(refreshError));
         });
     }
-    static _refreshProtocolV2DiscoveryState(device) {
+    static _refreshProtocolV2DiscoveryState(device, initOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield device.getDeviceState({ refreshSections: ['status'] });
+            const stateReadOptions = (initOptions === null || initOptions === void 0 ? void 0 : initOptions.allowLegacyProtocolV2ProtocolInfo)
+                ? { allowLegacyProtocolV2ProtocolInfo: true }
+                : {};
+            yield device.getDeviceState(Object.assign({ refreshSections: ['status'] }, stateReadOptions));
             try {
-                yield device.getDeviceState({ refreshSections: ['settings'] });
+                yield device.getDeviceState(Object.assign({ refreshSections: ['settings'] }, stateReadOptions));
             }
             catch (error) {
                 Log$j.debug('Unable to refresh Protocol V2 device label during discovery', error);
@@ -44217,6 +44346,7 @@ const getProtocolV2SeState = (se) => {
     }
 };
 const getProtocolV2SeType = (se) => normalizeEnumValue(hdTransport.DeviceSeType, se === null || se === void 0 ? void 0 : se.type);
+const isLegacyProtocolV2ProtocolInfo = (protocolInfo) => Object.prototype.hasOwnProperty.call(protocolInfo, 'protobuf_definition');
 const parseProtocolV2BuildFingerprint = (buildFingerprint) => {
     if (!buildFingerprint)
         return null;
@@ -45632,7 +45762,9 @@ class Device extends events.exports {
                     commands: this.commands,
                     timeoutMs: options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs,
                 });
-                const features = yield this.probeProtocolV2RuntimeState(deviceInfo, options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs);
+                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);
             }
             catch (error) {
@@ -45655,7 +45787,7 @@ class Device extends events.exports {
         });
     }
     getDeviceState(params = {}) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const refresh = new Set((_a = params.refreshSections) !== null && _a !== void 0 ? _a : []);
             const getProtocolV2DeviceInfoRequest = () => {
@@ -45673,7 +45805,14 @@ class Device extends events.exports {
                         commands: this.commands,
                         request: getProtocolV2DeviceInfoRequest(),
                     });
-                    yield this.probeProtocolV2RuntimeState(deviceInfo);
+                    if (params.allowLegacyProtocolV2ProtocolInfo) {
+                        yield this.probeProtocolV2RuntimeState(deviceInfo, undefined, {
+                            allowLegacyProtocolV2ProtocolInfo: true,
+                        });
+                    }
+                    else {
+                        yield this.probeProtocolV2RuntimeState(deviceInfo);
+                    }
                     refreshedDeviceInfo = deviceInfo;
                     initializedWithDeviceInfo = true;
                 }
@@ -45703,9 +45842,12 @@ class Device extends events.exports {
                     }
                 }
                 if (refresh.has('status') && !initializedWithDeviceInfo) {
-                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo);
+                    const cachedMode = (_c = this.state) === null || _c === void 0 ? void 0 : _c.status.mode;
+                    yield this.probeProtocolV2RuntimeState(refreshedDeviceInfo, undefined, Object.assign({ forceRuntimeContextRefresh: cachedMode === 'bootloader' || cachedMode === 'romloader' }, (params.allowLegacyProtocolV2ProtocolInfo
+                        ? { allowLegacyProtocolV2ProtocolInfo: true }
+                        : {})));
                 }
-                if (refresh.has('settings') && ((_c = this.state) === null || _c === void 0 ? void 0 : _c.status.mode) === 'normal') {
+                if (refresh.has('settings') && ((_d = this.state) === null || _d === void 0 ? void 0 : _d.status.mode) === 'normal') {
                     const { message } = yield this.commands.typedCall('DeviceSettingsGet', 'DeviceSettings', {});
                     this.updateState(mapDeviceSettingsToState(message), 'settings-read');
                 }
@@ -45763,18 +45905,27 @@ class Device extends events.exports {
         this.updateState(mapFeaturesToState(normalized), source);
         return this.features;
     }
-    ensureProtocolV2RuntimeContext(timeoutMs) {
+    ensureProtocolV2RuntimeContext(timeoutMs, options) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const cachedProtocolInfo = (_a = this.protocolV2RuntimeContext) !== null && _a !== void 0 ? _a : (!this.protocolV2StateNeedsReload
-                ? (_d = (_c = (_b = this.state) === null || _b === void 0 ? void 0 : _b.raw) === null || _c === void 0 ? void 0 : _c.protocolV2ProtocolInfo) !== null && _d !== void 0 ? _d : undefined
-                : undefined);
+            const 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
+                    ? (_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;
+                return assertProtocolInfoAllowed(cachedProtocolInfo);
             }
             if (this.protocolV2RuntimeContextPromise) {
-                return this.protocolV2RuntimeContextPromise;
+                return assertProtocolInfoAllowed(yield this.protocolV2RuntimeContextPromise);
             }
             const requestToken = {};
             const pendingRequest = (() => __awaiter(this, void 0, void 0, function* () {
@@ -45791,7 +45942,7 @@ class Device extends events.exports {
             this.protocolV2RuntimeContextRequestToken = requestToken;
             this.protocolV2RuntimeContextPromise = pendingRequest;
             try {
-                return yield pendingRequest;
+                return assertProtocolInfoAllowed(yield pendingRequest);
             }
             finally {
                 if (this.protocolV2RuntimeContextPromise === pendingRequest) {
@@ -45803,11 +45954,15 @@ class Device extends events.exports {
             }
         });
     }
-    probeProtocolV2RuntimeState(deviceInfo, timeoutMs) {
+    probeProtocolV2RuntimeState(deviceInfo, timeoutMs, options) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            const protocolInfo = yield this.ensureProtocolV2RuntimeContext(timeoutMs);
+            const 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 protocolV2DeviceType = runtimeDeviceInfo
                 ? resolveProtocolV2DeviceIdentity((_c = runtimeDeviceInfo.hw) === null || _c === void 0 ? void 0 : _c.Device_type).deviceType
@@ -45817,7 +45972,8 @@ class Device extends events.exports {
                 protocolV2DeviceType !== hdShared.EDeviceType.Neo) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Protocol V2 romloader mode is only supported for Pro2 and Neo.');
             }
-            const deviceStatusSupported = supportsProtocolV2Message(protocolInfo, PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE);
+            const deviceStatusSupported = legacyProtocolInfo ||
+                supportsProtocolV2Message(protocolInfo, PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE);
             if (runtimeMode === 'bootloader' || runtimeMode === 'romloader') {
                 return this.updateProtocolV2Features(deviceInfo, null, runtimeMode, protocolInfo);
             }
@@ -46069,6 +46225,7 @@ class Device extends events.exports {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInterruptedFromUser);
+            this.markTransportDisconnected();
             yield ((_a = this.cancelableAction) === null || _a === void 0 ? void 0 : _a.call(this, error));
             yield ((_b = this.commands) === null || _b === void 0 ? void 0 : _b.cancel());
             if (this.runPromise) {
@@ -46823,6 +46980,7 @@ class SearchDevices extends BaseMethod {
                         connectProtocol: undefined,
                         forceProtocolDetection: true,
                         refreshRuntimeState: true,
+                        allowLegacyProtocolV2ProtocolInfo: true,
                     });
                     deviceList.push(...result.deviceList);
                 }
@@ -46906,9 +47064,7 @@ class GetDeviceState extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const state = yield this.device.getDeviceState({
-                refreshSections: SCOPE_SECTIONS[this.params.scope],
-            });
+            const state = yield this.device.getDeviceState(Object.assign({ refreshSections: SCOPE_SECTIONS[this.params.scope] }, (this.params.scope === 'firmware' ? { allowLegacyProtocolV2ProtocolInfo: true } : {})));
             if (this.params.scope === 'settings' &&
                 this.device.isProtocolV2() &&
                 isLoaderMode(state.status.mode)) {
@@ -47447,6 +47603,7 @@ 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`);
@@ -51810,6 +51967,10 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error) => {
         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 &&
@@ -51942,6 +52103,7 @@ 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;
@@ -53047,19 +53209,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         }
         return ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.mode) === 'romloader';
     }
-    enterProtocolV2BootloaderMode() {
+    isLegacyProtocolV2Runtime() {
+        var _a, _b;
+        const protocolInfo = (_b = (_a = this.device.state) === null || _a === void 0 ? void 0 : _a.raw) === null || _b === void 0 ? void 0 : _b.protocolV2ProtocolInfo;
+        return protocolInfo ? isLegacyProtocolV2ProtocolInfo(protocolInfo) : false;
+    }
+    rebootProtocolV2ToBootloader() {
         return __awaiter(this, void 0, void 0, function* () {
-            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);
@@ -53078,6 +53234,25 @@ 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();
@@ -53094,7 +53269,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
                     });
                     this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
-                    const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
+                    const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT, { allowLegacyProtocolV2ProtocolInfo: true });
                     if ((features === null || features === void 0 ? void 0 : features.mode) === 'bootloader') {
                         return features;
                     }
@@ -53588,7 +53763,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     probeProtocolV2NormalMode(deviceInfo) {
         return __awaiter(this, void 0, void 0, function* () {
-            const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
+            const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT, { allowLegacyProtocolV2ProtocolInfo: true });
             return features.mode === 'normal' && !features.bootloaderMode;
         });
     }
@@ -53641,7 +53816,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);
+                    const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT, { allowLegacyProtocolV2ProtocolInfo: true });
                     if (features.mode === 'normal' && !features.bootloaderMode) {
                         return features;
                     }
@@ -53768,7 +53943,22 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     protocolV2StartFirmwareUpdate({ targets, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const commands = this.device.getCommands();
-            const response = yield commands.typedCall('DeviceFirmwareUpdateRequest', 'Success', { targets }, { timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT });
+            const startUpdate = () => commands.typedCall('DeviceFirmwareUpdateRequest', 'Success', { targets }, { timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT });
+            let response;
+            try {
+                response = yield startUpdate();
+            }
+            catch (error) {
+                if (!this.protocolV2LegacyDirectUpdate ||
+                    !isProtocolV2FirmwareUpdateEndpointUnavailable(error)) {
+                    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);
             this.postProgressMessage(0, 'installingFirmware');
             return response;
@@ -63221,11 +63411,13 @@ 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 hasSigningMessageRepr = request.signning_message == null;
-                return Promise.resolve(Object.assign(Object.assign({}, request), { skip_validate: hasClassic || hasSigningMessageRepr }));
+                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 [first, rest] = cutString(data, request.init_data_length * 2);
             const response = yield this.device.commands.typedCall('TonTxAck', 'TonSignedMessage', {
@@ -64349,13 +64541,15 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
 
 const publicMethodRegistry = ApiMethods;
 function findMethod(message) {
-    const { method } = message.payload;
+    const payload = decodeBridgeBinaryPayload(message.payload);
+    const normalizedMessage = payload === message.payload ? message : Object.assign(Object.assign({}, message), { payload });
+    const { method } = payload;
     if (typeof method !== 'string') {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Method is not set');
     }
     const MethodConstructor = publicMethodRegistry[method];
     if (MethodConstructor) {
-        return new MethodConstructor(message);
+        return new MethodConstructor(normalizedMessage);
     }
     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, `Method ${method} is not set`);
 }
@@ -64730,6 +64924,10 @@ 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();
@@ -64744,15 +64942,9 @@ function hasDeriveCardano(method) {
     }
     return method.name.startsWith('cardano') || ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.deriveCardano);
 }
-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,
-});
+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 }
+    : {})));
 let _core;
 let _deviceList;
 let _connector;

package/dist/protocols/protocol-v2/features.d.ts

@@ -7,6 +7,14 @@ export type ProtocolV2SeStateLabel = 'BOOT' | 'APP_FACTORY' | 'APP';
 export declare const getProtocolV2SeState: (se?: DeviceSEInfo) => ProtocolV2SeStateLabel | null;
 export declare const getProtocolV2SeType: (se?: DeviceSEInfo) => string | null;
 export type ProtocolV2RuntimeMode = 'normal' | 'bootloader' | 'romloader';
+export type ProtocolV2ProtocolInfo = ProtocolInfo & {
+    protobuf_definition?: string | null;
+};
+export declare const isLegacyProtocolV2ProtocolInfo: (protocolInfo: ProtocolInfo) => protocolInfo is ProtocolInfo & {
+    protobuf_definition?: string | null | undefined;
+} & {
+    protobuf_definition: string | null;
+};
 export type ProtocolV2BuildFingerprint = {
     binary: 'application' | 'bootloader' | 'romloader';
     version: string;