@onekeyfe/hd-core 0.2.33 → 0.2.34

package/dist/api/firmware/getBinary.d.ts

@@ -14,6 +14,7 @@ export declare const getBinary: ({ features, updateType, version }: GetBinaryPro
     fullResource?: string | undefined;
     fullResourceRange?: string[] | undefined;
     bootloaderResource?: string | undefined;
+    bootloaderVersion?: import("../../types").IVersionArray | undefined;
     fingerprint: string;
     version: import("../../types").IVersionArray;
     changelog: {

package/dist/api/firmware/getBinary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getBinary.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/getBinary.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMvC,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;CAChC;AAED,UAAU,cAAe,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,sCAA6C,cAAc;;;;;;;;;;;;;;EA2BhF,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAe,MAAM;;EAWrD,CAAC;AAEF,eAAO,MAAM,OAAO,6BAA8B,YAAY,2DAO7D,CAAC"}
+{"version":3,"file":"getBinary.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/getBinary.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAMvC,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;CAChC;AAED,UAAU,cAAe,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,sCAA6C,cAAc;;;;;;;;;;;;;;;EA2BhF,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAe,MAAM;;EAWrD,CAAC;AAEF,eAAO,MAAM,OAAO,6BAA8B,YAAY,2DAO7D,CAAC"}

package/dist/api/firmware/updateBootloader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/updateBootloader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAOvC,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,WAarD"}
+{"version":3,"file":"updateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/updateBootloader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQvC,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,WAgBrD"}

package/dist/data-manager/DataManager.d.ts

@@ -1,4 +1,4 @@
-import type { ConnectSettings, DeviceTypeMap, AssetsMap, Features, IDeviceFirmwareStatus, IDeviceBLEFirmwareStatus, ITransportStatus } from '../types';
+import type { ConnectSettings, DeviceTypeMap, AssetsMap, Features, IDeviceFirmwareStatus, IDeviceBLEFirmwareStatus, ITransportStatus, IVersionArray } from '../types';
 export default class DataManager {
     static deviceMap: DeviceTypeMap;
     static assets: AssetsMap | null;
@@ -10,6 +10,7 @@ export default class DataManager {
     static getSysResourcesLatestRelease: (features: Features, forcedUpdateRes?: boolean | undefined) => string | undefined;
     static getSysFullResource: (features: Features) => string | undefined;
     static getBootloaderResource: (features: Features) => string | undefined;
+    static getBootloaderTargetVersion: (features: Features) => IVersionArray | undefined;
     static getFirmwareChangelog: (features: Features) => {
         "zh-CN": string;
         "en-US": string;

package/dist/data-manager/DataManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,SAAS,EAET,QAAQ,EACR,qBAAqB,EACrB,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAKlB,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,SAAS,EAAE,aAAa,CAiB7B;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAEvC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEjC,MAAM,CAAC,QAAQ,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAEhC;IAEF,MAAM,CAAC,iBAAiB,aAAc,QAAQ,KAAG,qBAAqB,CAepE;IAMF,MAAM,CAAC,4BAA4B,aAAc,QAAQ,+DAgBvD;IAMF,MAAM,CAAC,kBAAkB,aAAc,QAAQ,wBAU7C;IAEF,MAAM,CAAC,qBAAqB,aAAc,QAAQ,wBAShD;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ;;;QAe/C;IAEF,MAAM,CAAC,wBAAwB,aAAc,QAAQ,yDAgBnD;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ,KAAG,wBAAwB,CAY1E;IAEF,MAAM,CAAC,uBAAuB,aAAc,QAAQ;;;QAWlD;IAEF,MAAM,CAAC,2BAA2B,aAAc,QAAQ,4DAItD;IAEF,MAAM,CAAC,kBAAkB,iBAAkB,MAAM,KAAG,gBAAgB,CAKlE;WAEW,IAAI,CAAC,QAAQ,EAAE,eAAe;IAwB3C,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,eAAe;IAEpD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;CAShF"}
+{"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,eAAe,EACf,aAAa,EACb,SAAS,EAET,QAAQ,EACR,qBAAqB,EACrB,wBAAwB,EACxB,gBAAgB,EAChB,aAAa,EACd,MAAM,UAAU,CAAC;AAKlB,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,MAAM,CAAC,SAAS,EAAE,aAAa,CAiB7B;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAAQ;IAEvC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEjC,MAAM,CAAC,QAAQ,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAEhC;IAEF,MAAM,CAAC,iBAAiB,aAAc,QAAQ,KAAG,qBAAqB,CAepE;IAMF,MAAM,CAAC,4BAA4B,aAAc,QAAQ,+DAgBvD;IAMF,MAAM,CAAC,kBAAkB,aAAc,QAAQ,wBAU7C;IAEF,MAAM,CAAC,qBAAqB,aAAc,QAAQ,wBAShD;IAEF,MAAM,CAAC,0BAA0B,aAAc,QAAQ,KAAG,aAAa,GAAG,SAAS,CASjF;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ;;;QAe/C;IAEF,MAAM,CAAC,wBAAwB,aAAc,QAAQ,yDAgBnD;IAEF,MAAM,CAAC,oBAAoB,aAAc,QAAQ,KAAG,wBAAwB,CAY1E;IAEF,MAAM,CAAC,uBAAuB,aAAc,QAAQ;;;QAWlD;IAEF,MAAM,CAAC,2BAA2B,aAAc,QAAQ,4DAItD;IAEF,MAAM,CAAC,kBAAkB,iBAAkB,MAAM,KAAG,gBAAgB,CAKlE;WAEW,IAAI,CAAC,QAAQ,EAAE,eAAe;IAwB3C,MAAM,CAAC,mBAAmB;IAI1B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,eAAe;IAEpD,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,eAAe,EAAE,GAAG,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;CAShF"}

package/dist/index.d.ts

@@ -149,6 +149,7 @@ declare type IFirmwareReleaseInfo = {
     fullResource?: string;
     fullResourceRange?: string[];
     bootloaderResource?: string;
+    bootloaderVersion?: IVersionArray;
     fingerprint: string;
     version: IVersionArray;
     changelog: {
@@ -2140,6 +2141,7 @@ declare class DataManager {
     static getSysResourcesLatestRelease: (features: Features, forcedUpdateRes?: boolean | undefined) => string | undefined;
     static getSysFullResource: (features: Features) => string | undefined;
     static getBootloaderResource: (features: Features) => string | undefined;
+    static getBootloaderTargetVersion: (features: Features) => IVersionArray | undefined;
     static getFirmwareChangelog: (features: Features) => {
         "zh-CN": string;
         "en-US": string;

package/dist/index.js

@@ -10741,15 +10741,106 @@ function patchFeatures(response) {
     return response;
 }
 
+const pkg = require('../package.json');
+const getSDKVersion = () => pkg.version;
+const DEFAULT_DOMAIN = `https://jssdk.onekey.so/${getSDKVersion()}/`;
+
+const DEFAULT_PRIORITY = 2;
+const initialSettings = {
+    configSrc: './data/config.json',
+    version: '',
+    debug: false,
+    priority: DEFAULT_PRIORITY,
+    trustedHost: false,
+    connectSrc: DEFAULT_DOMAIN,
+    iframeSrc: `${DEFAULT_DOMAIN}iframe.html`,
+    parentOrigin: typeof window !== 'undefined' && window.location ? window.location.origin : '',
+    supportedBrowser: typeof navigator !== 'undefined' ? !/Trident|MSIE|Edge/.test(navigator.userAgent) : true,
+    env: 'web',
+    lazyLoad: false,
+    timestamp: new Date().getTime(),
+};
+const getEnv = () => {
+    if (typeof chrome !== 'undefined' &&
+        chrome.runtime &&
+        typeof chrome.runtime.onConnect !== 'undefined') {
+        return 'webextension';
+    }
+    if (typeof navigator !== 'undefined') {
+        if (typeof navigator.product === 'string' &&
+            navigator.product.toLowerCase() === 'reactnative') {
+            return 'react-native';
+        }
+        const userAgent = navigator.userAgent.toLowerCase();
+        if (userAgent.indexOf(' electron/') > -1) {
+            return 'electron';
+        }
+    }
+    return 'web';
+};
+const corsValidator = (url) => {
+    if (typeof url !== 'string')
+        return;
+    if (url.match(/^https:\/\/([A-Za-z0-9\-_]+\.)*onekey\.so\//))
+        return url;
+    if (url.match(/^https?:\/\/localhost:[58][0-9]{3}\//))
+        return url;
+    return url;
+};
+const parseConnectSettings = (input = {}) => {
+    const settings = Object.assign({}, initialSettings);
+    if (Object.prototype.hasOwnProperty.call(input, 'debug')) {
+        settings.debug = input.debug;
+    }
+    if (input.isFrame) {
+        settings.parentOrigin = input.parentOrigin;
+    }
+    if (typeof input.connectSrc === 'string') {
+        settings.connectSrc = input.connectSrc;
+    }
+    let globalSrc;
+    if (typeof window !== 'undefined') {
+        globalSrc = window.ONEKEY_CONNECT_SRC;
+    }
+    else if (typeof global !== 'undefined') {
+        globalSrc = global.ONEKEY_CONNECT_SRC;
+    }
+    if (typeof globalSrc === 'string') {
+        settings.connectSrc = corsValidator(globalSrc);
+        settings.debug = true;
+    }
+    const src = settings.connectSrc || DEFAULT_DOMAIN;
+    settings.iframeSrc = `${src}iframe.html`;
+    if (input.transportReconnect) {
+        settings.transportReconnect = input.transportReconnect;
+    }
+    if (input.lazyLoad) {
+        settings.lazyLoad = input.lazyLoad;
+    }
+    if (typeof input.env === 'string') {
+        settings.env = input.env;
+    }
+    else {
+        settings.env = getEnv();
+    }
+    if (input.timestamp) {
+        settings.timestamp = input.timestamp;
+    }
+    return settings;
+};
+
 function checkNeedUpdateBoot(features) {
     const deviceType = getDeviceType(features);
     if (deviceType !== 'touch')
         return false;
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
+    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
+    if (!targetBootloaderVersion)
+        return false;
     return (semver__default["default"].gte(currentVersion, '3.2.0') &&
         semver__default["default"].gte(currentVersion, '4.1.0') &&
-        semver__default["default"].lte(bootloaderVersion, '2.4.0'));
+        semver__default["default"].lte(bootloaderVersion, targetBootloaderVersion.join('.')));
 }
 
 const LOG_EVENT = 'LOG_EVENT';
@@ -11275,6 +11366,16 @@ DataManager.getBootloaderResource = (features) => {
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.bootloaderResource;
 };
+DataManager.getBootloaderTargetVersion = (features) => {
+    var _b, _c, _d, _e;
+    const deviceType = getDeviceType(features);
+    if (deviceType !== 'pro' && deviceType !== 'touch')
+        return undefined;
+    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware');
+    const targetDeviceConfigList = (_c = (_b = _a.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
+    const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
+    return (_e = (_d = targetDeviceConfig === null || targetDeviceConfig === void 0 ? void 0 : targetDeviceConfig[0]) === null || _d === void 0 ? void 0 : _d.bootloaderVersion) !== null && _e !== void 0 ? _e : undefined;
+};
 DataManager.getFirmwareChangelog = (features) => {
     var _b, _c;
     const deviceType = getDeviceType(features);
@@ -11946,94 +12047,6 @@ const UI_REQUEST = {
     FIRMWARE_TIP: 'ui-firmware-tip',
 };
 
-const pkg = require('../package.json');
-const getSDKVersion = () => pkg.version;
-const DEFAULT_DOMAIN = `https://jssdk.onekey.so/${getSDKVersion()}/`;
-
-const DEFAULT_PRIORITY = 2;
-const initialSettings = {
-    configSrc: './data/config.json',
-    version: '',
-    debug: false,
-    priority: DEFAULT_PRIORITY,
-    trustedHost: false,
-    connectSrc: DEFAULT_DOMAIN,
-    iframeSrc: `${DEFAULT_DOMAIN}iframe.html`,
-    parentOrigin: typeof window !== 'undefined' && window.location ? window.location.origin : '',
-    supportedBrowser: typeof navigator !== 'undefined' ? !/Trident|MSIE|Edge/.test(navigator.userAgent) : true,
-    env: 'web',
-    lazyLoad: false,
-    timestamp: new Date().getTime(),
-};
-const getEnv = () => {
-    if (typeof chrome !== 'undefined' &&
-        chrome.runtime &&
-        typeof chrome.runtime.onConnect !== 'undefined') {
-        return 'webextension';
-    }
-    if (typeof navigator !== 'undefined') {
-        if (typeof navigator.product === 'string' &&
-            navigator.product.toLowerCase() === 'reactnative') {
-            return 'react-native';
-        }
-        const userAgent = navigator.userAgent.toLowerCase();
-        if (userAgent.indexOf(' electron/') > -1) {
-            return 'electron';
-        }
-    }
-    return 'web';
-};
-const corsValidator = (url) => {
-    if (typeof url !== 'string')
-        return;
-    if (url.match(/^https:\/\/([A-Za-z0-9\-_]+\.)*onekey\.so\//))
-        return url;
-    if (url.match(/^https?:\/\/localhost:[58][0-9]{3}\//))
-        return url;
-    return url;
-};
-const parseConnectSettings = (input = {}) => {
-    const settings = Object.assign({}, initialSettings);
-    if (Object.prototype.hasOwnProperty.call(input, 'debug')) {
-        settings.debug = input.debug;
-    }
-    if (input.isFrame) {
-        settings.parentOrigin = input.parentOrigin;
-    }
-    if (typeof input.connectSrc === 'string') {
-        settings.connectSrc = input.connectSrc;
-    }
-    let globalSrc;
-    if (typeof window !== 'undefined') {
-        globalSrc = window.ONEKEY_CONNECT_SRC;
-    }
-    else if (typeof global !== 'undefined') {
-        globalSrc = global.ONEKEY_CONNECT_SRC;
-    }
-    if (typeof globalSrc === 'string') {
-        settings.connectSrc = corsValidator(globalSrc);
-        settings.debug = true;
-    }
-    const src = settings.connectSrc || DEFAULT_DOMAIN;
-    settings.iframeSrc = `${src}iframe.html`;
-    if (input.transportReconnect) {
-        settings.transportReconnect = input.transportReconnect;
-    }
-    if (input.lazyLoad) {
-        settings.lazyLoad = input.lazyLoad;
-    }
-    if (typeof input.env === 'string') {
-        settings.env = input.env;
-    }
-    else {
-        settings.env = getEnv();
-    }
-    if (input.timestamp) {
-        settings.timestamp = input.timestamp;
-    }
-    return settings;
-};
-
 const parseRunOptions = (options) => {
     if (!options)
         options = {};

package/dist/types/settings.d.ts

@@ -25,6 +25,7 @@ export declare type IFirmwareReleaseInfo = {
     fullResource?: string;
     fullResourceRange?: string[];
     bootloaderResource?: string;
+    bootloaderVersion?: IVersionArray;
     fingerprint: string;
     version: IVersionArray;
     changelog: {

package/dist/types/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,oBAAY,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,cAAc,GAAG,UAAU,GAAG,cAAc,GAAG,QAAQ,CAAC;IAC9E,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,oBAAY,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAErD,oBAAY,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAGxC,oBAAY,oBAAoB,GAAG;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IAEZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE;SACR,CAAC,IAAI,OAAO,GAAG,MAAM;KACvB,CAAC;CACH,CAAC;AAGF,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,EAAE,OAAO,CAAC;IAElB,GAAG,EAAE,MAAM,CAAC;IAEZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE;SACR,CAAC,IAAI,OAAO,GAAG,MAAM;KACvB,CAAC;CACH,CAAC;AAEF,oBAAY,aAAa,GAAG;KACzB,CAAC,IAAI,WAAW,GAAG;QAClB,QAAQ,EAAE,oBAAoB,EAAE,CAAC;QACjC,aAAa,CAAC,EAAE,oBAAoB,EAAE,CAAC;QACvC,GAAG,EAAE,uBAAuB,EAAE,CAAC;KAChC;CACF,CAAC;AAEF,oBAAY,SAAS,GAAG;IACtB,MAAM,EAAE;QACN,OAAO,EAAE,aAAa,CAAC;QACvB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE;aACR,CAAC,IAAI,OAAO,GAAG,MAAM;SACvB,CAAC;KACH,CAAC;CACH,CAAC;AAEF,oBAAY,oBAAoB,GAAG;IACjC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;CAC7B,GAAG,aAAa,CAAC"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/types/settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,oBAAY,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,EAAE,MAAM,GAAG,KAAK,GAAG,cAAc,GAAG,UAAU,GAAG,cAAc,GAAG,QAAQ,CAAC;IAC9E,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,oBAAY,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AAErD,oBAAY,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AAGxC,oBAAY,oBAAoB,GAAG;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IAEZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,aAAa,CAAC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE;SACR,CAAC,IAAI,OAAO,GAAG,MAAM;KACvB,CAAC;CACH,CAAC;AAGF,oBAAY,uBAAuB,GAAG;IACpC,QAAQ,EAAE,OAAO,CAAC;IAElB,GAAG,EAAE,MAAM,CAAC;IAEZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE;SACR,CAAC,IAAI,OAAO,GAAG,MAAM;KACvB,CAAC;CACH,CAAC;AAEF,oBAAY,aAAa,GAAG;KACzB,CAAC,IAAI,WAAW,GAAG;QAClB,QAAQ,EAAE,oBAAoB,EAAE,CAAC;QACjC,aAAa,CAAC,EAAE,oBAAoB,EAAE,CAAC;QACvC,GAAG,EAAE,uBAAuB,EAAE,CAAC;KAChC;CACF,CAAC;AAEF,oBAAY,SAAS,GAAG;IACtB,MAAM,EAAE;QACN,OAAO,EAAE,aAAa,CAAC;QACvB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE;aACR,CAAC,IAAI,OAAO,GAAG,MAAM;SACvB,CAAC;KACH,CAAC;CACH,CAAC;AAEF,oBAAY,oBAAoB,GAAG;IACjC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;CAC7B,GAAG,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.2.33",
-    "@onekeyfe/hd-transport": "^0.2.33",
+    "@onekeyfe/hd-shared": "^0.2.34",
+    "@onekeyfe/hd-transport": "^0.2.34",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "jszip": "^3.10.1",
@@ -42,5 +42,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "c9180a19c4b3faf1e47ed119ecaa91f35cae27c5"
+  "gitHead": "938bb02e6417dd94caaea4719933a33575705add"
 }

package/src/api/firmware/updateBootloader.ts

@@ -5,18 +5,22 @@ import {
   getDeviceBootloaderVersion,
   getDeviceFirmwareVersion,
 } from '../../utils/deviceFeaturesUtils';
+import { DataManager } from '../../data-manager';
 
 export function checkNeedUpdateBoot(features: Features) {
   const deviceType = getDeviceType(features);
   if (deviceType !== 'touch') return false;
   const currentVersion = getDeviceFirmwareVersion(features).join('.');
   const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
+  const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
+  if (!targetBootloaderVersion) return false;
+
   return (
     // support ResourceUpdate version 3.2.0
     semver.gte(currentVersion, '3.2.0') &&
     // support update bootloader version 4.1.0
     semver.gte(currentVersion, '4.1.0') &&
     // target bootloader version
-    semver.lte(bootloaderVersion, '2.4.0')
+    semver.lte(bootloaderVersion, targetBootloaderVersion.join('.'))
   );
 }

package/src/data-manager/DataManager.ts

@@ -18,6 +18,7 @@ import type {
   IDeviceFirmwareStatus,
   IDeviceBLEFirmwareStatus,
   ITransportStatus,
+  IVersionArray,
 } from '../types';
 import { getReleaseChangelog, getReleaseStatus, findLatestRelease } from '../utils/release';
 
@@ -117,6 +118,17 @@ export default class DataManager {
     return findLatestRelease(targetDeviceConfig)?.bootloaderResource;
   };
 
+  static getBootloaderTargetVersion = (features: Features): IVersionArray | undefined => {
+    const deviceType = getDeviceType(features);
+
+    if (deviceType !== 'pro' && deviceType !== 'touch') return undefined;
+    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
+    const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
+
+    return targetDeviceConfig?.[0]?.bootloaderVersion ?? undefined;
+  };
+
   static getFirmwareChangelog = (features: Features) => {
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);

package/src/types/settings.ts

@@ -33,6 +33,7 @@ export type IFirmwareReleaseInfo = {
   fullResource?: string;
   fullResourceRange?: string[];
   bootloaderResource?: string;
+  bootloaderVersion?: IVersionArray;
   fingerprint: string;
   version: IVersionArray;
   changelog: {