@onekeyfe/hd-core 1.2.0-alpha.58 → 1.2.0-alpha.59

package/dist/index.js

@@ -1410,6 +1410,7 @@ const DeviceModelToTypes = {
         hdShared.EDeviceType.Mini,
     ],
     model_touch: [hdShared.EDeviceType.Touch, hdShared.EDeviceType.Pro],
+    model_pro2: [hdShared.EDeviceType.Pro2, hdShared.EDeviceType.Neo],
     model_classic: [hdShared.EDeviceType.Classic, hdShared.EDeviceType.Classic1s, hdShared.EDeviceType.ClassicPure],
     model_classic1s: [hdShared.EDeviceType.Classic1s, hdShared.EDeviceType.ClassicPure],
 };
@@ -1420,7 +1421,8 @@ const DeviceTypeToModels = {
     [hdShared.EDeviceType.Mini]: ['model_mini'],
     [hdShared.EDeviceType.Touch]: ['model_touch'],
     [hdShared.EDeviceType.Pro]: ['model_touch'],
-    [hdShared.EDeviceType.Pro2]: [],
+    [hdShared.EDeviceType.Pro2]: ['model_pro2'],
+    [hdShared.EDeviceType.Neo]: ['model_pro2'],
     [hdShared.EDeviceType.Unknown]: [],
 };
 
@@ -1436,7 +1438,7 @@ const resolveDeviceSerialNo = (features) => {
     return ((_a = firstNonEmptyString(compatible.serialNo, compatible.onekey_serial_no, compatible.onekey_serial, compatible.serial_no)) !== null && _a !== void 0 ? _a : '');
 };
 const resolveDeviceType = (features) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!features || typeof features !== 'object') {
         return hdShared.EDeviceType.Unknown;
     }
@@ -1457,12 +1459,17 @@ const resolveDeviceType = (features) => {
             return hdShared.EDeviceType.Pro;
         case 'PRO2':
             return hdShared.EDeviceType.Pro2;
+        case 'NEO':
+            return hdShared.EDeviceType.Neo;
         case 'PURE':
             return hdShared.EDeviceType.ClassicPure;
     }
     if (((_b = compatible.model) === null || _b === void 0 ? void 0 : _b.toString().toLowerCase()) === hdShared.EDeviceType.Pro2) {
         return hdShared.EDeviceType.Pro2;
     }
+    if (((_c = compatible.model) === null || _c === void 0 ? void 0 : _c.toString().toLowerCase()) === hdShared.EDeviceType.Neo) {
+        return hdShared.EDeviceType.Neo;
+    }
     const serialNo = resolveDeviceSerialNo(features);
     const prefix = serialNo.slice(0, 2).toLowerCase();
     if (prefix === 'bi' || prefix === 'cl')
@@ -1477,11 +1484,11 @@ const resolveDeviceType = (features) => {
         return hdShared.EDeviceType.Pro;
     if (prefix === 'p2')
         return hdShared.EDeviceType.Pro2;
-    const bootloaderMode = (_c = compatible.bootloaderMode) !== null && _c !== void 0 ? _c : compatible.bootloader_mode;
+    const bootloaderMode = (_d = compatible.bootloaderMode) !== null && _d !== void 0 ? _d : compatible.bootloader_mode;
     if (!serialNo && bootloaderMode === true && compatible.model === '1') {
         return hdShared.EDeviceType.Classic;
     }
-    return (_d = compatible.deviceType) !== null && _d !== void 0 ? _d : hdShared.EDeviceType.Unknown;
+    return (_e = compatible.deviceType) !== null && _e !== void 0 ? _e : hdShared.EDeviceType.Unknown;
 };
 const resolveDeviceFirmwareType = (features) => {
     if (!features) {
@@ -1555,6 +1562,8 @@ const getDeviceTypeByBleName = (name) => {
         return hdShared.EDeviceType.Touch;
     if (/\bPro\s*2\b/i.test(name) || /^Pro2/i.test(name))
         return hdShared.EDeviceType.Pro2;
+    if (/\bNeo\b/i.test(name) || /^Neo/i.test(name))
+        return hdShared.EDeviceType.Neo;
     if (/\bPro\b/i.test(name) || /^Pro/i.test(name))
         return hdShared.EDeviceType.Pro;
     return hdShared.EDeviceType.Unknown;
@@ -1586,6 +1595,7 @@ const getMethodVersionRange = (features, getVersionRange) => {
         return versionRange;
     }
     const modelFallbacks = [
+        'model_pro2',
         'model_classic1s',
         'model_classic',
         'model_mini',
@@ -39632,24 +39642,39 @@ function validateBootResources(value) {
     if (resource.required !== false) {
         throw new Error('Invalid Pro2 boot resources required flag: expected false');
     }
-    if (resource.target !== 'CRATE') {
-        throw new Error('Invalid Pro2 boot resources target: expected CRATE');
+    if (resource.target !== 'RES') {
+        throw new Error('Invalid Pro2 boot resources target: expected RES');
     }
-    if (typeof resource.url !== 'string' || !resource.url.startsWith('https://')) {
-        throw new Error('Invalid Pro2 boot resources url');
+    if (resource.manifestUrl !== undefined &&
+        (typeof resource.manifestUrl !== 'string' || !resource.manifestUrl.startsWith('https://'))) {
+        throw new Error('Invalid Pro2 boot resources manifestUrl');
     }
-    if (!Number.isSafeInteger(resource.size) || Number(resource.size) <= 0) {
-        throw new Error('Invalid Pro2 boot resources size');
+    if (!Array.isArray(resource.files) || resource.files.length === 0) {
+        throw new Error('Invalid Pro2 boot resources files');
     }
-    return {
-        required: false,
-        target: 'CRATE',
-        url: resource.url,
-        size: Number(resource.size),
-        fileHash: normalizeHex$1(resource.fileHash, SHA256_HEX_LENGTH, 'boot fileHash'),
-        payloadHash: normalizeHex$1(resource.payloadHash, SHA3_512_HEX_LENGTH, 'boot payloadHash'),
-        headerHash: normalizeHex$1(resource.headerHash, SHA3_512_HEX_LENGTH, 'boot headerHash'),
-    };
+    const files = resource.files.map((value, index) => {
+        if (!value || typeof value !== 'object') {
+            throw new Error(`Invalid Pro2 boot resource file at files[${index}]`);
+        }
+        const file = value;
+        if (typeof file.url !== 'string' || !file.url.startsWith('https://')) {
+            throw new Error(`Invalid Pro2 boot resource url at files[${index}]`);
+        }
+        if (typeof file.devicePath !== 'string' ||
+            !file.devicePath.startsWith('vol0:/') ||
+            file.devicePath.includes('..') ||
+            file.devicePath.includes('\\\\')) {
+            throw new Error(`Invalid Pro2 boot resource devicePath at files[${index}]`);
+        }
+        if (!Number.isSafeInteger(file.size) || Number(file.size) <= 0) {
+            throw new Error(`Invalid Pro2 boot resource size at files[${index}]`);
+        }
+        return Object.assign(Object.assign({}, (typeof file.name === 'string' && file.name ? { name: file.name } : undefined)), { url: file.url, devicePath: file.devicePath, size: Number(file.size), fileHash: normalizeHex$1(file.fileHash, SHA256_HEX_LENGTH, `boot files[${index}].fileHash`) });
+    });
+    if (new Set(files.map(file => file.devicePath)).size !== files.length) {
+        throw new Error('Invalid Pro2 boot resources files: duplicate devicePath');
+    }
+    return Object.assign(Object.assign({ required: false, target: 'RES' }, (resource.manifestUrl ? { manifestUrl: resource.manifestUrl } : undefined)), { files });
 }
 function parseProtocolV2Resources(value) {
     if (value === undefined)
@@ -39768,7 +39793,7 @@ class DataManager {
         return enrichedData;
     }
     static load(settings) {
-        var _b;
+        var _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             this.settings = settings;
             this.protocolV2ResourcesConfigError = undefined;
@@ -39813,8 +39838,11 @@ class DataManager {
             }
             if (data) {
                 let pro2Resources;
+                let neoResources;
+                this.protocolV2ResourcesConfigError = undefined;
                 try {
                     pro2Resources = parseProtocolV2Resources((_b = data.pro2) === null || _b === void 0 ? void 0 : _b.resources);
+                    neoResources = parseProtocolV2Resources((_c = data.neo) === null || _c === void 0 ? void 0 : _c.resources);
                 }
                 catch (error) {
                     this.protocolV2ResourcesConfigError =
@@ -39822,7 +39850,9 @@ class DataManager {
                     Log$j.warn('[DataConfig] Ignoring invalid Pro2 resources config:', error);
                 }
                 const enrichedPro2Config = this.enrichFirmwareReleaseInfo(data.pro2);
+                const enrichedNeoConfig = this.enrichFirmwareReleaseInfo(data.neo);
                 const pro2Config = __rest(enrichedPro2Config, ["resources"]);
+                const neoConfig = __rest(enrichedNeoConfig, ["resources"]);
                 Log$j.log(`[DataConfig] Config loaded successfully via [${fetchMethod}]`);
                 this.deviceMap = {
                     [hdShared.EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
@@ -39832,6 +39862,7 @@ class DataManager {
                     [hdShared.EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
                     [hdShared.EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
                     [hdShared.EDeviceType.Pro2]: Object.assign(Object.assign({}, pro2Config), (pro2Resources ? { resources: pro2Resources } : undefined)),
+                    [hdShared.EDeviceType.Neo]: Object.assign(Object.assign({}, neoConfig), (neoResources ? { resources: neoResources } : undefined)),
                 };
                 this.assets = {
                     bridge: data.bridge,
@@ -39859,7 +39890,7 @@ class DataManager {
             }
         });
     }
-    static forceReloadData() {
+    static forceReloadData({ requireResources = false, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.settings) {
                 throw new Error('Remote config settings are not initialized');
@@ -39868,19 +39899,19 @@ class DataManager {
             if (!loaded) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Unable to refresh the latest remote config');
             }
-            if (this.protocolV2ResourcesConfigError) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, `Invalid Pro2 resources config: ${this.protocolV2ResourcesConfigError.message}`);
+            if (requireResources && this.protocolV2ResourcesConfigError) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, `Invalid Pro2 resources config: ${this.protocolV2ResourcesConfigError.message}`);
             }
             this.lastCheckTimestamp = getTimeStamp();
         });
     }
-    static getProtocolV2Resources() {
+    static getProtocolV2Resources(deviceType = hdShared.EDeviceType.Pro2) {
         var _b, _c;
-        return (_c = (_b = this.deviceMap[hdShared.EDeviceType.Pro2]) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.stable;
+        return (_c = (_b = this.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.stable;
     }
-    static getProtocolV2BootResources() {
+    static getProtocolV2BootResources(deviceType = hdShared.EDeviceType.Pro2) {
         var _b, _c;
-        return (_c = (_b = this.deviceMap[hdShared.EDeviceType.Pro2]) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.boot;
+        return (_c = (_b = this.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.boot;
     }
     static getProtobufMessages(schema = 'v1CurrentSchema') {
         return this.messages[schema];
@@ -39920,6 +39951,10 @@ DataManager.deviceMap = {
         firmware: [],
         ble: [],
     },
+    [hdShared.EDeviceType.Neo]: {
+        firmware: [],
+        ble: [],
+    },
     [hdShared.EDeviceType.ClassicPure]: {
         firmware: [],
         ble: [],
@@ -40784,7 +40819,8 @@ const supportInputPinOnSoftware = (features) => {
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Touch ||
         deviceType === hdShared.EDeviceType.Pro ||
-        deviceType === hdShared.EDeviceType.Pro2) {
+        deviceType === hdShared.EDeviceType.Pro2 ||
+        deviceType === hdShared.EDeviceType.Neo) {
         return { support: false };
     }
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
@@ -40817,7 +40853,8 @@ const getPassphraseStateWithRefreshDeviceInfo = (device, options) => __awaiter(v
     const { passphraseState, newSession, unlockedAttachPin } = yield getPassphraseState(device, Object.assign({}, options));
     const isModeT = deviceType === hdShared.EDeviceType.Touch ||
         deviceType === hdShared.EDeviceType.Pro ||
-        deviceType === hdShared.EDeviceType.Pro2;
+        deviceType === hdShared.EDeviceType.Pro2 ||
+        deviceType === hdShared.EDeviceType.Neo;
     const needRefreshWithPassphrase = passphraseState && device.getCurrentPassphraseProtection() !== true;
     const needRefreshWithLocked = isModeT && locked;
     if (needRefreshWithLocked || needRefreshWithPassphrase) {
@@ -41250,6 +41287,7 @@ const getLanguageConfig = (deviceType) => {
             keys = Object.keys(LANGUAGE_LABELS);
             break;
         case hdShared.EDeviceType.Pro2:
+        case hdShared.EDeviceType.Neo:
             return PRO2_LANGUAGE_OPTIONS.map(option => (Object.assign({}, option)));
         default:
             keys = [];
@@ -41278,6 +41316,7 @@ const getAutoLockOptions = (deviceType, protocol) => {
         case hdShared.EDeviceType.Touch:
         case hdShared.EDeviceType.Pro:
         case hdShared.EDeviceType.Pro2:
+        case hdShared.EDeviceType.Neo:
             return withNever([30000, 60000, 120000, 300000, 600000, 1800000], protocol);
         default:
             return [];
@@ -41295,6 +41334,7 @@ const getAutoShutDownOptions = (deviceType, protocol) => {
         case hdShared.EDeviceType.Pro:
             return withNever([60000, 120000, 300000, 600000], protocol);
         case hdShared.EDeviceType.Pro2:
+        case hdShared.EDeviceType.Neo:
             return withNever([60000, 120000, 300000, 600000, 1800000], protocol);
         default:
             return [];
@@ -41997,7 +42037,7 @@ class DevicePool extends events.exports {
                 const device = this.devicesCache[connectId];
                 if (device) {
                     const exist = descriptorList.find(d => d.path === device.originalDescriptor.path);
-                    if (exist) {
+                    if (exist && !(initOptions === null || initOptions === void 0 ? void 0 : initOptions.forceProtocolDetection)) {
                         device.updateDescriptor(exist, true);
                         yield this._refreshRuntimeState(device, initOptions);
                         devices[connectId] = device;
@@ -42048,13 +42088,20 @@ class DevicePool extends events.exports {
     }
     static _createDevice(descriptor, initOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            let device = this.getDeviceByPath(descriptor.path);
-            if (!device) {
-                device = Device.fromDescriptor(descriptor);
+            const cachedDevice = this.getDeviceByPath(descriptor.path);
+            const forceProtocolDetection = (initOptions === null || initOptions === void 0 ? void 0 : initOptions.forceProtocolDetection) === true;
+            const isNewDevice = !cachedDevice;
+            const device = cachedDevice !== null && cachedDevice !== void 0 ? cachedDevice : Device.fromDescriptor(descriptor);
+            if (isNewDevice || forceProtocolDetection) {
                 device.deviceConnector = this.connector;
-                yield device.connect(initOptions === null || initOptions === void 0 ? void 0 : initOptions.connectProtocol, {
-                    forceProtocolDetection: initOptions === null || initOptions === void 0 ? void 0 : initOptions.forceProtocolDetection,
-                });
+                if (forceProtocolDetection && !isNewDevice) {
+                    yield device.acquire(initOptions === null || initOptions === void 0 ? void 0 : initOptions.connectProtocol, { forceProtocolDetection: true });
+                }
+                else {
+                    yield device.connect(initOptions === null || initOptions === void 0 ? void 0 : initOptions.connectProtocol, {
+                        forceProtocolDetection: initOptions === null || initOptions === void 0 ? void 0 : initOptions.forceProtocolDetection,
+                    });
+                }
                 try {
                     yield device.initialize(initOptions);
                     if ((initOptions === null || initOptions === void 0 ? void 0 : initOptions.refreshRuntimeState) && device.isProtocolV2()) {
@@ -42350,7 +42397,16 @@ const DEVICE_SESSION_CALLS = new Set([
     'DeviceSessionAskPin',
     'DeviceSessionAskPassphrase',
 ]);
-const PROTOCOL_V2_ACTION_CANCELLED_SUBCODE = 1;
+const DEVICE_CONTROL_CALLS = new Set([
+    'DeviceReboot',
+    'DeviceSettingsGet',
+    'DeviceSettingsSet',
+    'DeviceSettingsPageShow',
+    'DeviceCertificateWrite',
+    'DeviceCertificateRead',
+    'DeviceCertificateSign',
+    'DeviceMiscUsbMscControl',
+]);
 const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
 function shouldReduceDebugForCall(type) {
     return HIGH_VOLUME_DEBUG_CALLS.has(type);
@@ -42670,10 +42726,8 @@ class DeviceCommands {
             if (code === 'Failure_ProcessError') {
                 const normalizedMessage = (_a = message === null || message === void 0 ? void 0 : message.trim()) !== null && _a !== void 0 ? _a : '';
                 const isProtocolV2ActionCancelledFailure = this.device.isProtocolV2() && isProtocolV2ActionCancelledMessage(normalizedMessage);
-                const isProtocolV2ActionCancelledSubcode = this.device.isProtocolV2() && subcode === PROTOCOL_V2_ACTION_CANCELLED_SUBCODE;
                 const isProtocolV2DeviceBusyFailure = this.device.isProtocolV2() &&
-                    callType.startsWith('Device') &&
-                    !DEVICE_SESSION_CALLS.has(callType) &&
+                    DEVICE_CONTROL_CALLS.has(callType) &&
                     subcode === hdTransport.DeviceErrorCode.DeviceError_Busy;
                 const isLegacyProtocolV2LockedFailure = this.device.isProtocolV2() && /^device (?:is )?locked$/i.test(normalizedMessage);
                 if (DEVICE_SESSION_CALLS.has(callType) &&
@@ -42732,8 +42786,8 @@ class DeviceCommands {
                         firmwareMessage: message,
                     });
                 }
-                else if (subcode === hdTransport.DeviceErrorCode.DeviceError_ActionCancelled ||
-                    isProtocolV2ActionCancelledSubcode ||
+                else if ((DEVICE_CONTROL_CALLS.has(callType) &&
+                    subcode === hdTransport.DeviceErrorCode.DeviceError_ActionCancelled) ||
                     isProtocolV2ActionCancelledFailure) {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled, message, {
                         failureCode: code,
@@ -42948,6 +43002,9 @@ const resolveProtocolV2DeviceIdentity = (deviceType) => {
         case hdTransport.DeviceType.PRO2:
         case 'PRO2':
             return { deviceType: hdShared.EDeviceType.Pro2, model: 'pro2' };
+        case hdTransport.DeviceType.NEO:
+        case 'NEO':
+            return { deviceType: hdShared.EDeviceType.Neo, model: 'neo' };
         default:
             return { deviceType: hdShared.EDeviceType.Unknown, model: null };
     }
@@ -44110,6 +44167,7 @@ class Device extends events.exports {
         if (versionRange)
             return versionRange;
         const modelFallbacks = [
+            'model_pro2',
             'model_classic1s',
             'model_classic',
             'model_mini',
@@ -44128,7 +44186,8 @@ class Device extends events.exports {
         const deviceType = this.getCurrentDeviceType();
         if (deviceType === hdShared.EDeviceType.Touch ||
             deviceType === hdShared.EDeviceType.Pro ||
-            deviceType === hdShared.EDeviceType.Pro2) {
+            deviceType === hdShared.EDeviceType.Pro2 ||
+            deviceType === hdShared.EDeviceType.Neo) {
             return { support: true };
         }
         const firmwareVersion = this.getCurrentFirmwareVersionString();
@@ -44141,7 +44200,8 @@ class Device extends events.exports {
         const deviceType = this.getCurrentDeviceType();
         if (deviceType === hdShared.EDeviceType.Touch ||
             deviceType === hdShared.EDeviceType.Pro ||
-            deviceType === hdShared.EDeviceType.Pro2) {
+            deviceType === hdShared.EDeviceType.Pro2 ||
+            deviceType === hdShared.EDeviceType.Neo) {
             return { support: false };
         }
         const firmwareVersion = this.getCurrentFirmwareVersionString();
@@ -44485,8 +44545,10 @@ class Device extends events.exports {
             const protocolV2DeviceType = runtimeDeviceInfo
                 ? resolveProtocolV2DeviceIdentity((_c = runtimeDeviceInfo.hw) === null || _c === void 0 ? void 0 : _c.Device_type).deviceType
                 : this.getCurrentDeviceType();
-            if (runtimeMode === 'romloader' && protocolV2DeviceType !== hdShared.EDeviceType.Pro2) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Protocol V2 romloader mode is only supported for Pro2.');
+            if (runtimeMode === 'romloader' &&
+                protocolV2DeviceType !== hdShared.EDeviceType.Pro2 &&
+                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);
             if (runtimeMode === 'bootloader' || runtimeMode === 'romloader') {
@@ -44821,7 +44883,8 @@ class Device extends events.exports {
         if (!this.state)
             return undefined;
         return (this.isProtocolV2() &&
-            this.getCurrentDeviceType() === hdShared.EDeviceType.Pro2 &&
+            (this.getCurrentDeviceType() === hdShared.EDeviceType.Pro2 ||
+                this.getCurrentDeviceType() === hdShared.EDeviceType.Neo) &&
             this.state.status.mode === 'romloader');
     }
     isInitialized() {
@@ -44859,7 +44922,8 @@ class Device extends events.exports {
         const deviceType = this.getCurrentDeviceType();
         const isModeT = deviceType === hdShared.EDeviceType.Touch ||
             deviceType === hdShared.EDeviceType.Pro ||
-            deviceType === hdShared.EDeviceType.Pro2;
+            deviceType === hdShared.EDeviceType.Pro2 ||
+            deviceType === hdShared.EDeviceType.Neo;
         const unlocked = (_a = this.state) === null || _a === void 0 ? void 0 : _a.status.unlocked;
         const preCheckTouch = isModeT && unlocked === false;
         const passphraseProtection = this.getCurrentPassphraseProtection();
@@ -45888,6 +45952,7 @@ class OpenWalletSession extends BaseMethod {
     }
     init() {
         this.useDevicePassphraseState = false;
+        this.unlockPolicy = 'unlock-before-run';
         this.skipForceUpdateCheck = true;
         this.params = normalizeParams(this.payload);
         this.payload.useEmptyPassphrase = this.params.mode === OpenWalletSessionMode.Standard;
@@ -46494,8 +46559,8 @@ class CheckAllFirmwareRelease extends BaseMethod {
                     ? ['identity', 'versions', 'verification']
                     : ['identity', 'versions'],
             });
-            if (state.identity.deviceType !== 'pro2') {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod, 'checkAllFirmwareRelease requires a Pro2 device for Protocol V2');
+            if (state.identity.deviceType !== 'pro2' && state.identity.deviceType !== 'neo') {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportMethod, 'checkAllFirmwareRelease requires a Pro2 or Neo device for Protocol V2');
             }
             const { features } = this.device;
             if (!features) {
@@ -46510,7 +46575,8 @@ class CheckAllFirmwareRelease extends BaseMethod {
                 firmwareType,
                 release,
             });
-            const resources = DataManager.getProtocolV2Resources();
+            const resourceDeviceType = state.identity.deviceType === 'neo' ? hdShared.EDeviceType.Neo : hdShared.EDeviceType.Pro2;
+            const resources = DataManager.getProtocolV2Resources(resourceDeviceType);
             let resourceStatus = 'unknown';
             if (resources === null || resources === void 0 ? void 0 : resources.length) {
                 const loaderMode = state.status.mode === 'bootloader' || state.status.mode === 'romloader';
@@ -46551,7 +46617,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                 }, bootloader: {
                     status: 'valid',
                     release: emptyRelease,
-                }, features, protocol: 'V2', deviceType: 'pro2' }, plan), { resourceStatus, hasUpgrade: plan.hasUpgrade || resourceStatus === 'outdated', targetsToUpdate });
+                }, features, protocol: 'V2', deviceType: state.identity.deviceType }, plan), { resourceStatus, hasUpgrade: plan.hasUpgrade || resourceStatus === 'outdated', targetsToUpdate });
         });
     }
 }
@@ -49507,7 +49573,6 @@ function normalizeRebootType(value) {
     return hdTransport.DeviceRebootType.Normal;
 }
 const INSTALLABLE_FIRMWARE_TARGET_IDS = new Set([
-    ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
     ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
     ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1,
     ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2,
@@ -49543,7 +49608,6 @@ const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
 const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
-const PROTOCOL_V2_BOOT_RESOURCES_FILE_NAME = 'boot_resources.crate.okpkg';
 const getProtocolV2DeviceTransferProgress = (bytesBeforeChunk, bytesAfterChunk, totalBytes) => {
     if (!Number.isFinite(totalBytes) || totalBytes <= 0) {
         return 100;
@@ -49733,13 +49797,17 @@ const isProtocolV2FirmwareFingerprintValid = (binary, fingerprint) => {
         return true;
     return bytesToHex(sha256.sha256(toProtocolV2Bytes(binary))) === expectedFingerprint;
 };
-const assertProtocolV2ReconnectIdentity = (expectedSerialNumber, actualSerialNumber) => {
-    if (!expectedSerialNumber || !actualSerialNumber) {
+const assertProtocolV2ReconnectIdentity = (expectedSerialNumber, actualSerialNumber, expectedPath, actualPath) => {
+    if (expectedSerialNumber && actualSerialNumber) {
+        if (actualSerialNumber !== expectedSerialNumber) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Protocol V2 reconnect physical identity mismatch: expected ${expectedSerialNumber}, received ${actualSerialNumber}`);
+        }
         return;
     }
-    if (actualSerialNumber !== expectedSerialNumber) {
-        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Protocol V2 reconnect physical identity mismatch: expected ${expectedSerialNumber}, received ${actualSerialNumber}`);
+    if (expectedPath && actualPath && expectedPath === actualPath) {
+        return;
     }
+    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Protocol V2 reconnect physical identity unavailable: expected path ${expectedPath !== null && expectedPath !== void 0 ? expectedPath : 'unknown'}, received ${actualPath !== null && actualPath !== void 0 ? actualPath : 'unknown'}`);
 };
 class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     getSupportedProtocols() {
@@ -49768,7 +49836,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             { name: 'chunkSize', type: 'number' },
             { name: 'forcedUpdateRes', type: 'boolean' },
             { name: 'bootloaderBinary', type: 'buffer' },
-            { name: 'bootResourcesBinary', type: 'buffer' },
             { name: 'romloaderBinary', type: 'buffer' },
             { name: 'applicationP1Binary', type: 'buffer' },
             { name: 'applicationP2Binary', type: 'buffer' },
@@ -49780,13 +49847,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             { name: 'firmwareType', type: 'string' },
             { name: 'targetsToUpdate', type: 'array', allowEmpty: true },
             { name: 'platform', type: 'string' },
-            { name: 'resourceBundleFiles', type: 'array', allowEmpty: true },
+            { name: 'resourceFiles', type: 'array', allowEmpty: true },
         ]);
         this.params = {
             chunkSize: payload.chunkSize,
             forcedUpdateRes: payload.forcedUpdateRes,
             bootloaderBinary: payload.bootloaderBinary,
-            bootResourcesBinary: payload.bootResourcesBinary,
             romloaderBinary: payload.romloaderBinary,
             applicationP1Binary: payload.applicationP1Binary,
             applicationP2Binary: payload.applicationP2Binary,
@@ -49795,7 +49861,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             se02Binary: payload.se02Binary,
             se03Binary: payload.se03Binary,
             se04Binary: payload.se04Binary,
-            resourceBundleFiles: payload.resourceBundleFiles,
+            resourceFiles: payload.resourceFiles,
             firmwareType: payload.firmwareType,
             targetsToUpdate: payload.targetsToUpdate,
             platform: payload.platform,
@@ -49828,23 +49894,22 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const deviceFeatures = yield this.getProtocolV2DeviceFeatures();
             const deviceFirmwareType = getFirmwareType(deviceFeatures);
             const firmwareType = (_a = this.params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
-            const needsRemoteResources = !((_b = this.params.resourceBundleFiles) === null || _b === void 0 ? void 0 : _b.length) &&
-                !!((_c = this.params.targetsToUpdate) === null || _c === void 0 ? void 0 : _c.includes('resource'));
+            const needsRemoteResources = !((_b = this.params.resourceFiles) === null || _b === void 0 ? void 0 : _b.length) && !!((_c = this.params.targetsToUpdate) === null || _c === void 0 ? void 0 : _c.includes('resource'));
             let fwBinaryMap = [];
             let bootloaderBinary = null;
-            let bootResourcesInstallItem;
             let installItems;
             let resourceBundles;
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
-                resourceBundles = this.prepareExplicitProtocolV2ResourceBundles();
+                resourceBundles = this.prepareExplicitProtocolV2ResourceFiles();
                 fwBinaryMap = this.collectExplicitTargetBinaries();
                 bootloaderBinary = this.prepareBootloaderBinary();
                 const needsRemoteFirmware = !this.hasExplicitProtocolV2Payload(fwBinaryMap);
-                const needsRemoteBootResources = !this.params.bootResourcesBinary &&
-                    !!((_d = this.params.targetsToUpdate) === null || _d === void 0 ? void 0 : _d.includes('boot_resources'));
+                const needsRemoteBootResources = !!((_d = this.params.targetsToUpdate) === null || _d === void 0 ? void 0 : _d.includes('boot_resources'));
                 if (needsRemoteFirmware || needsRemoteResources || needsRemoteBootResources) {
-                    yield DataManager.forceReloadData();
+                    yield DataManager.forceReloadData({
+                        requireResources: needsRemoteResources || needsRemoteBootResources,
+                    });
                 }
                 if (needsRemoteFirmware) {
                     const remoteBinaries = yield this.prepareRemoteProtocolV2Binaries(firmwareType, deviceFeatures);
@@ -49852,12 +49917,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     fwBinaryMap = remoteBinaries.fwBinaryMap;
                     installItems = remoteBinaries.installItems;
                 }
-                bootResourcesInstallItem = yield this.prepareProtocolV2BootResources();
-                if (bootResourcesInstallItem) {
-                    installItems = [
-                        bootResourcesInstallItem,
-                        ...(installItems !== null && installItems !== void 0 ? installItems : this.buildProtocolV2InstallItems({ bootloaderBinary, fwBinaryMap })),
-                    ];
+                const bootResourceFiles = yield this.prepareProtocolV2BootResources();
+                if (bootResourceFiles === null || bootResourceFiles === void 0 ? void 0 : bootResourceFiles.length) {
+                    resourceBundles = [...(resourceBundles !== null && resourceBundles !== void 0 ? resourceBundles : []), ...bootResourceFiles];
                 }
                 if (!needsRemoteResources) {
                     this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
@@ -49879,7 +49941,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const enteredBootloader = yield this.enterProtocolV2BootloaderMode();
             if (needsRemoteResources) {
                 try {
-                    resourceBundles = yield this.prepareProtocolV2ResourceBundles();
+                    const stableResources = yield this.prepareProtocolV2ResourceBundles();
+                    resourceBundles = [...(resourceBundles !== null && resourceBundles !== void 0 ? resourceBundles : []), ...(stableResources !== null && stableResources !== void 0 ? stableResources : [])];
                     this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
                 }
                 catch (err) {
@@ -49923,7 +49986,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return serialNumber || undefined;
     }
     assertProtocolV2DeviceInfoIdentity(deviceInfo) {
-        assertProtocolV2ReconnectIdentity(this.protocolV2ExpectedSerialNumber, this.getProtocolV2SerialNumber(deviceInfo));
+        assertProtocolV2ReconnectIdentity(this.protocolV2ExpectedSerialNumber, this.getProtocolV2SerialNumber(deviceInfo), this.protocolV2ExpectedPath, this.device.originalDescriptor.path);
     }
     getProtocolV2DeviceInfoTimeout() {
         var _a;
@@ -49940,11 +50003,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     captureProtocolV2PhysicalIdentity() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const deviceInfo = yield this.requestProtocolV2PhysicalIdentity();
             const serialNumber = this.getProtocolV2SerialNumber(deviceInfo);
-            assertProtocolV2ReconnectIdentity(serialNumber, serialNumber);
+            const path = ((_a = this.device.originalDescriptor.path) === null || _a === void 0 ? void 0 : _a.trim()) || undefined;
+            assertProtocolV2ReconnectIdentity(serialNumber, serialNumber, path, path);
             this.protocolV2ExpectedSerialNumber = serialNumber;
+            this.protocolV2ExpectedPath = path;
         });
     }
     verifyProtocolV2ReconnectIdentity() {
@@ -49960,9 +50026,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     hasExplicitProtocolV2Payload(fwBinaryMap) {
         var _a;
-        return (!!((_a = this.params.resourceBundleFiles) === null || _a === void 0 ? void 0 : _a.length) ||
+        return (!!((_a = this.params.resourceFiles) === null || _a === void 0 ? void 0 : _a.length) ||
             !!this.params.bootloaderBinary ||
-            !!this.params.bootResourcesBinary ||
             fwBinaryMap.length > 0);
     }
     buildProtocolV2InstallItems({ bootloaderBinary, fwBinaryMap, }) {
@@ -50077,63 +50142,65 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             };
         });
     }
-    validateProtocolV2BootResourcesBinary(binary, resource) {
-        if (resource && !isProtocolV2ResourceFileValid(binary, resource)) {
-            throw new Error('Pro2 boot resources file verification failed');
-        }
-        const header = parseProtocolV2OkppHeader(toProtocolV2Bytes(binary));
-        if (!header || header.type !== 'CRAT') {
-            throw new Error('Invalid Pro2 boot resources CRATE header');
-        }
-        if (resource) {
-            const expectedPayloadHash = normalizeProtocolV2Hex(resource.payloadHash);
-            const expectedHeaderHash = normalizeProtocolV2Hex(resource.headerHash);
-            if (header.payloadHash !== expectedPayloadHash) {
-                throw new Error('Pro2 boot resources payload hash mismatch');
-            }
-            if (header.headerHash !== expectedHeaderHash) {
-                throw new Error('Pro2 boot resources header hash mismatch');
-            }
-        }
+    getProtocolV2DeviceType() {
+        const deviceType = this.device.getCurrentDeviceType();
+        if (deviceType === hdShared.EDeviceType.Pro2 || deviceType === hdShared.EDeviceType.Neo)
+            return deviceType;
+        throw new Error(`Unsupported Protocol V2 device type: ${deviceType}`);
     }
     prepareProtocolV2BootResources() {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            let binary = this.params.bootResourcesBinary;
-            let resource;
-            if (!binary) {
-                if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('boot_resources'))) {
-                    return undefined;
-                }
-                resource = DataManager.getProtocolV2BootResources();
-                if (!resource) {
-                    throw new Error('Missing Pro2 boot resources configuration');
-                }
-                Log$5.log('[FirmwareUpdateV4] downloading Pro2 boot resources CRATE');
-                ({ binary } = yield getSysResourceBinary(resource.url));
+            if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('boot_resources')))
+                return undefined;
+            const resource = DataManager.getProtocolV2BootResources(this.getProtocolV2DeviceType());
+            if (!resource)
+                throw new Error('Missing Protocol V2 boot resources configuration');
+            const files = [];
+            for (const file of resource.files) {
+                Log$5.log(`[FirmwareUpdateV4] downloading boot resource ${file.devicePath}`);
+                const { binary } = yield getSysResourceBinary(file.url);
+                if (!isProtocolV2ResourceFileValid(binary, file)) {
+                    throw new Error(`Boot resource file verification failed: ${file.devicePath}`);
+                }
+                files.push({
+                    name: (_c = (_b = file.name) !== null && _b !== void 0 ? _b : file.devicePath.split('/').pop()) !== null && _c !== void 0 ? _c : file.devicePath,
+                    binary,
+                    devicePath: file.devicePath,
+                });
             }
-            this.validateProtocolV2BootResourcesBinary(binary, resource);
-            return {
-                fileName: PROTOCOL_V2_BOOT_RESOURCES_FILE_NAME,
-                binary,
-                targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
-                kind: 'boot_resources',
-            };
+            return files;
         });
     }
-    prepareExplicitProtocolV2ResourceBundles() {
+    prepareExplicitProtocolV2ResourceFiles() {
         var _a;
-        if (!((_a = this.params.resourceBundleFiles) === null || _a === void 0 ? void 0 : _a.length))
+        const files = (_a = this.params.resourceFiles) !== null && _a !== void 0 ? _a : [];
+        if (!(files === null || files === void 0 ? void 0 : files.length))
             return undefined;
-        return this.params.resourceBundleFiles.map((file, index) => {
+        const prepared = files.map((file, index) => {
             var _a;
-            const devicePath = validateProtocolV2FilesystemPath(file.devicePath, `resourceBundleFiles[${index}].devicePath`);
+            const devicePath = validateProtocolV2FilesystemPath(file.devicePath, `resourceFiles[${index}].devicePath`);
+            const descriptor = file;
+            if (descriptor.size !== undefined && descriptor.size !== file.binary.byteLength) {
+                throw new Error(`resourceFiles[${index}] size mismatch`);
+            }
+            if (descriptor.fileHash &&
+                !isProtocolV2ResourceFileValid(file.binary, {
+                    size: file.binary.byteLength,
+                    fileHash: descriptor.fileHash,
+                })) {
+                throw new Error(`resourceFiles[${index}] SHA-256 mismatch`);
+            }
             return {
                 name: (_a = devicePath.split('/').pop()) !== null && _a !== void 0 ? _a : devicePath,
                 binary: file.binary,
                 devicePath,
             };
         });
+        if (new Set(prepared.map(file => file.devicePath)).size !== prepared.length) {
+            throw new Error('resourceFiles contain duplicate devicePath values');
+        }
+        return prepared;
     }
     prepareProtocolV2ResourceBundles() {
         var _a;
@@ -50141,7 +50208,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('resource'))) {
                 return undefined;
             }
-            const resources = DataManager.getProtocolV2Resources();
+            const resources = DataManager.getProtocolV2Resources(this.getProtocolV2DeviceType());
             if (!(resources === null || resources === void 0 ? void 0 : resources.length)) {
                 throw new Error('Missing Pro2 stable resource configuration');
             }
@@ -50159,7 +50226,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 mode: 'bootloader-recovery',
                 forced: this.params.forcedUpdateRes,
             });
-            Log$5.log(`[FirmwareUpdateV4] Pro2 resource plan mode=bootloader-recovery status=${plan.status} count=${plan.resources.length}`);
+            Log$5.log(`[FirmwareUpdateV4] Protocol V2 resource plan mode=bootloader-recovery status=${plan.status} count=${plan.resources.length}`);
             const bundles = [];
             for (const resource of plan.resources) {
                 bundles.push(yield this.downloadProtocolV2Resource(resource));
@@ -50191,7 +50258,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const transferTotalSize = totalSize + firmwareSize;
             let processedSize = 0;
             for (const bundle of bundles) {
-                Log$5.log(`[FirmwareUpdateV4] syncing RESC bundle ${bundle.name} -> ${bundle.devicePath} bytes=${bundle.binary.byteLength}`);
+                Log$5.log(`[FirmwareUpdateV4] syncing resource ${bundle.name} -> ${bundle.devicePath} bytes=${bundle.binary.byteLength}`);
                 processedSize = yield this.protocolV2CommonUpdateProcess({
                     payload: bundle.binary,
                     filePath: bundle.devicePath,
@@ -50200,7 +50267,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 });
             }
             const elapsedMs = Date.now() - transferStartTime;
-            Log$5.log(`[FirmwareUpdateV4] RESC bundle sync finished transport=${transferTransport} bytes=${totalSize} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(totalSize, elapsedMs)} KB/s`);
+            Log$5.log(`[FirmwareUpdateV4] resource sync finished transport=${transferTransport} bytes=${totalSize} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(totalSize, elapsedMs)} KB/s`);
             return { processedSize, totalSize: transferTotalSize };
         });
     }
@@ -50214,7 +50281,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     isProtocolV2RomloaderMode() {
         var _a;
-        if (!this.device.isProtocolV2() || this.device.getCurrentDeviceType() !== hdShared.EDeviceType.Pro2) {
+        const deviceType = this.device.getCurrentDeviceType();
+        if (!this.device.isProtocolV2() ||
+            (deviceType !== hdShared.EDeviceType.Pro2 && deviceType !== hdShared.EDeviceType.Neo)) {
             return false;
         }
         if (typeof this.device.isRomloader === 'function') {
@@ -50321,7 +50390,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 totalSize = resourceTransfer.totalSize;
             }
             if (orderedInstallItems.length === 0) {
-                Log$5.log('[FirmwareUpdateV4] no firmware targets to install (RESC bundles only)');
+                Log$5.log('[FirmwareUpdateV4] no firmware targets to install (resource files only)');
                 if (totalSize > 0) {
                     this.postProgressMessage(100, 'transferData');
                 }
@@ -50630,7 +50699,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const devicesDescriptor = (_b = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _b !== void 0 ? _b : [];
             if (DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
                 devicesDescriptor.length === 1) {
-                this.device.updateDescriptor(Object.assign(Object.assign({}, devicesDescriptor[0]), { protocolType: PROTOCOL_V2_CONNECT_PROTOCOL }), true);
+                const descriptor = devicesDescriptor[0];
+                if (!this.protocolV2ExpectedSerialNumber && descriptor.path !== this.protocolV2ExpectedPath) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
+                }
+                this.device.updateDescriptor(Object.assign(Object.assign({}, descriptor), { protocolType: PROTOCOL_V2_CONNECT_PROTOCOL }), true);
                 yield this.ensureProtocolV2DeviceAcquired();
                 this.device.commands.disposed = false;
                 this.device.getCommands().mainId = (_c = this.device.mainId) !== null && _c !== void 0 ? _c : '';
@@ -50640,14 +50713,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 connectProtocol: PROTOCOL_V2_CONNECT_PROTOCOL,
             });
             const expectedSerialNumber = (_d = this.protocolV2ExpectedSerialNumber) === null || _d === void 0 ? void 0 : _d.trim();
-            const identityMatch = expectedSerialNumber
-                ? deviceList.find(candidate => { var _a; return ((_a = candidate.getCurrentSerialNo) === null || _a === void 0 ? void 0 : _a.call(candidate).trim()) === expectedSerialNumber; })
-                : undefined;
-            const singleCandidate = deviceList.length === 1 ? deviceList.at(0) : undefined;
-            const singleCandidateSerialNumber = (_e = singleCandidate === null || singleCandidate === void 0 ? void 0 : singleCandidate.getCurrentSerialNo) === null || _e === void 0 ? void 0 : _e.call(singleCandidate).trim();
-            const reconnectDevice = identityMatch !== null && identityMatch !== void 0 ? identityMatch : (singleCandidate && (!expectedSerialNumber || !singleCandidateSerialNumber)
-                ? singleCandidate
-                : undefined);
+            const expectedPath = (_e = this.protocolV2ExpectedPath) === null || _e === void 0 ? void 0 : _e.trim();
+            const reconnectDevice = deviceList.find(candidate => {
+                var _a;
+                const candidateSerialNumber = (_a = candidate.getCurrentSerialNo) === null || _a === void 0 ? void 0 : _a.call(candidate).trim();
+                if (expectedSerialNumber && candidateSerialNumber) {
+                    return candidateSerialNumber === expectedSerialNumber;
+                }
+                return !!expectedPath && candidate.getConnectId() === expectedPath;
+            });
             if (!reconnectDevice) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
             }
@@ -51058,18 +51132,7 @@ class DeviceUploadNft extends BaseMethod {
     }
     updateNft(basename) {
         return __awaiter(this, void 0, void 0, function* () {
-            const params = { file_name_no_ext: basename };
-            const options = { timeoutMs: this.params.timeoutMs };
-            try {
-                return yield this.device.commands.typedCall('NftUpdate', 'Success', params, options);
-            }
-            catch (error) {
-                if (!isProtocolV2ResponseTimeout(error)) {
-                    throw error;
-                }
-                this.throwIfAborted();
-                return this.device.commands.typedCall('NftUpdate', 'Success', params, options);
-            }
+            return this.device.commands.typedCall('NftUpdate', 'Success', { file_name_no_ext: basename }, { timeoutMs: this.params.timeoutMs });
         });
     }
     run() {
@@ -55143,7 +55206,7 @@ class SolSignTransaction extends BaseMethod {
     getVersionRange() {
         if (this.existsVersionedTx()) {
             return {
-                pro2: {
+                model_pro2: {
                     min: '0.0.0',
                 },
                 model_mini: {
@@ -55155,7 +55218,7 @@ class SolSignTransaction extends BaseMethod {
             };
         }
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             classic: {
@@ -55232,7 +55295,7 @@ class SolSignOffchainMessage extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             pro: {
@@ -55275,7 +55338,7 @@ class SolSignMessage extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             pro: {
@@ -55705,7 +55768,7 @@ class TronSignMessage extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_mini: {
@@ -55715,7 +55778,7 @@ class TronSignMessage extends BaseMethod {
     }
     getMessageV2VersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             pro: {
@@ -55870,7 +55933,7 @@ class TronSignTransaction extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_mini: {
@@ -56805,7 +56868,7 @@ class SuiGetAddress extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_mini: {
@@ -56900,7 +56963,7 @@ class SuiGetPublicKey extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_mini: {
@@ -56948,7 +57011,7 @@ class SuiSignMessage extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_mini: {
@@ -57008,7 +57071,7 @@ class SuiSignTransaction extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_mini: {
@@ -58225,7 +58288,7 @@ const baseVersionRange = {
     model_touch: {
         min: '4.3.0',
     },
-    pro2: {
+    model_pro2: {
         min: '0.0.0',
     },
 };
@@ -58237,7 +58300,7 @@ const specialVersionRange = {
         model_touch: {
             min: '4.7.0',
         },
-        pro2: {
+        model_pro2: {
             min: '0.0.0',
         },
     },
@@ -58248,7 +58311,7 @@ const specialVersionRange = {
         model_touch: {
             min: '4.9.0',
         },
-        pro2: {
+        model_pro2: {
             min: '0.0.0',
         },
     },
@@ -58439,7 +58502,7 @@ class KaspaGetAddress extends BaseMethod {
             model_classic1s: {
                 min: '3.12.0',
             },
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
         };
@@ -58892,7 +58955,7 @@ class KaspaSignTransaction extends BaseMethod {
             model_classic1s: {
                 min: '3.12.0',
             },
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
         };
@@ -59896,7 +59959,7 @@ class TonGetAddress extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_touch: {
@@ -60011,7 +60074,7 @@ class TonSignMessage extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_touch: {
@@ -60135,7 +60198,7 @@ class TonSignProof extends BaseMethod {
     }
     getVersionRange() {
         return {
-            pro2: {
+            model_pro2: {
                 min: '0.0.0',
             },
             model_touch: {