@onekeyfe/hd-core 0.3.14 → 0.3.15

package/__tests__/checkBootloaderReleast.test.js

@@ -0,0 +1,108 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { shouldUpdateBootloaderForClassicAndMini } = require('../src/api/firmware/bootloaderHelper');
+
+const fixtures = [
+  {
+    description: 'version: 2.10.0 -> 2.11.0, boot 1.9.0 -> boot 2.0.0, No need to upgrade',
+    currentVersion: '2.10.0',
+    bootloaderVersion: '1.9.0',
+    willUpdateFirmware: '2.11.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: false,
+  },
+  {
+    description: 'version: 2.10.0 -> 3.0.0, boot 1.9.0 -> boot 2.0.0, Should upgrade bootloader',
+    currentVersion: '2.10.0',
+    bootloaderVersion: '1.9.0',
+    willUpdateFirmware: '3.0.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: true,
+  },
+  {
+    description: 'version: 2.10.0 -> 3.0.0, boot 2.0.0 -> boot 2.0.0, No need to upgrade',
+    currentVersion: '2.10.0',
+    bootloaderVersion: '2.0.0',
+    willUpdateFirmware: '3.0.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: false,
+  },
+  {
+    description: 'version: 3.0.0 -> 3.0.0, boot 2.0.0 -> boot 2.0.0, No need to upgrade',
+    currentVersion: '3.0.0',
+    bootloaderVersion: '2.0.0',
+    willUpdateFirmware: '3.0.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: false,
+  },
+  {
+    description: 'version: 3.0.0 -> 3.1.0, boot 2.0.0 -> boot 2.0.0, No need to upgrade',
+    currentVersion: '3.0.0',
+    bootloaderVersion: '2.0.0',
+    willUpdateFirmware: '3.1.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: false,
+  },
+  {
+    description: 'version: 2.11.0 -> 3.1.0, boot 1.9.0 -> boot 2.0.0, Should upgrade bootloader',
+    currentVersion: '2.11.0',
+    bootloaderVersion: '2.0.0',
+    willUpdateFirmware: '3.1.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: false,
+  },
+  {
+    description: 'version: 2.11.0 -> 3.1.0, boot 2.0.0 -> boot 2.0.0, No need to upgrade',
+    currentVersion: '2.11.0',
+    bootloaderVersion: '2.0.0',
+    willUpdateFirmware: '3.1.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: false,
+  },
+  {
+    description: 'version: 3.1.0 -> 3.2.0, boot 1.9.0 -> boot 2.0.0, Should upgrade bootloader',
+    currentVersion: '3.1.0',
+    bootloaderVersion: '1.9.0',
+    willUpdateFirmware: '3.2.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: true,
+  },
+  {
+    description: 'version: 3.1.0 -> 3.3.0, boot 2.0.0 -> boot 2.0.0, No need to upgrade',
+    currentVersion: '3.1.0',
+    bootloaderVersion: '1.9.0',
+    willUpdateFirmware: '3.2.0',
+    targetBootloaderVersion: [2, 0, 0],
+    bootloaderRelatedFirmwareVersion: [3, 0, 0],
+    shouldUpdateBootloader: true,
+  },
+];
+
+describe('CheckBootloaderReleast', () => {
+  fixtures.forEach(data => {
+    test(data.description, () => {
+      const {
+        currentVersion,
+        bootloaderVersion,
+        willUpdateFirmware,
+        targetBootloaderVersion,
+        bootloaderRelatedFirmwareVersion,
+      } = data;
+      const shouldUpdateBootloader = shouldUpdateBootloaderForClassicAndMini({
+        currentVersion,
+        bootloaderVersion,
+        willUpdateFirmware,
+        targetBootloaderVersion,
+        bootloaderRelatedFirmwareVersion,
+      });
+      expect(shouldUpdateBootloader).toBe(data.shouldUpdateBootloader);
+    });
+  });
+});

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

@@ -0,0 +1,9 @@
+import { IVersionArray } from '../../types';
+export declare function shouldUpdateBootloaderForClassicAndMini({ currentVersion, bootloaderVersion, willUpdateFirmware, targetBootloaderVersion, bootloaderRelatedFirmwareVersion, }: {
+    currentVersion: string;
+    bootloaderVersion: string;
+    willUpdateFirmware: string;
+    targetBootloaderVersion?: IVersionArray;
+    bootloaderRelatedFirmwareVersion: IVersionArray;
+}): boolean;
+//# sourceMappingURL=bootloaderHelper.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"bootloaderHelper.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/bootloaderHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,wBAAgB,uCAAuC,CAAC,EACtD,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,gCAAgC,GACjC,EAAE;IACD,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,uBAAuB,CAAC,EAAE,aAAa,CAAC;IACxC,gCAAgC,EAAE,aAAa,CAAC;CACjD,WAgBA"}

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;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,cAAe,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,2DAKnB,cAAc;;;;;;;;;;;;;;;;;;;;EAiChB,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAe,MAAM;;EAWrD,CAAC;AAEF,eAAO,MAAM,OAAO,4CAA6C,YAAY,2DAiB5E,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;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,cAAe,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,2DAKnB,cAAc;;;;;;;;;;;;;;;;;;;;EAiChB,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAe,MAAM;;EAWrD,CAAC;AAEF,eAAO,MAAM,OAAO,4CAA6C,YAAY,2DAgB5E,CAAC"}

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

@@ -1,5 +1,5 @@
 import { Features } from '../../types';
 export declare function checkNeedUpdateBootForTouch(features: Features): boolean;
-export declare function checkNeedUpdateBootForClassicAndMini(features: Features, willUpdateFirmware: string): boolean | undefined;
+export declare function checkNeedUpdateBootForClassicAndMini(features: Features, willUpdateFirmware: string): boolean;
 export declare function checkBootloaderLength(data: ArrayBuffer): boolean;
 //# sourceMappingURL=updateBootloader.d.ts.map

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":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQvC,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,WAgB7D;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,QAAQ,EAClB,kBAAkB,EAAE,MAAM,uBAwB3B;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,WAiBtD"}
+{"version":3,"file":"updateBootloader.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/updateBootloader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AASvC,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,WAgB7D;AAED,wBAAgB,oCAAoC,CAClD,QAAQ,EAAE,QAAQ,EAClB,kBAAkB,EAAE,MAAM,WAuB3B;AAGD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,WAAW,WAiBtD"}

package/dist/index.d.ts

@@ -2212,14 +2212,14 @@ declare const getDeviceTypeByDeviceId: (deviceId?: string | undefined) => IDevic
 declare const getDeviceUUID: (features: Features) => string;
 declare const getDeviceLabel: (features: Features) => string;
 declare const supportInputPinOnSoftware: (features: Features) => SupportFeatureType;
-declare const getFirmwareUpdateField: (features: Features, updateType: 'firmware' | 'ble') => "firmware" | "ble" | "firmware-v2" | "firmware-v3";
+declare const getFirmwareUpdateField: (features: Features, updateType: 'firmware' | 'ble') => 'firmware' | 'ble' | 'firmware-v3' | 'firmware-v2';
 
 declare const getHDPath: (path: string) => Array<number>;
 declare const getScriptType: (path: Array<number>) => InputScriptType;
 declare const getOutputScriptType: (path?: number[] | undefined) => ChangeOutputScriptType;
 
 declare function checkNeedUpdateBootForTouch(features: Features): boolean;
-declare function checkNeedUpdateBootForClassicAndMini(features: Features, willUpdateFirmware: string): boolean | undefined;
+declare function checkNeedUpdateBootForClassicAndMini(features: Features, willUpdateFirmware: string): boolean;
 
 declare type LogMessage = {
     level: string;

package/dist/index.js

@@ -956,7 +956,7 @@ const getFirmwareUpdateField = (features, updateType) => {
         return 'ble';
     }
     if (deviceType === 'classic' || deviceType === 'mini') {
-        return 'firmware-v2';
+        return 'firmware-v3';
     }
     if (deviceType === 'touch') {
         if (semver__default["default"].lt(deviceFirmwareVersion.join('.'), '3.4.0'))
@@ -11411,6 +11411,19 @@ const parseConnectSettings = (input = {}) => {
     return settings;
 };
 
+function shouldUpdateBootloaderForClassicAndMini({ currentVersion, bootloaderVersion, willUpdateFirmware, targetBootloaderVersion, bootloaderRelatedFirmwareVersion, }) {
+    if (targetBootloaderVersion && semver__default["default"].gte(bootloaderVersion, targetBootloaderVersion.join('.'))) {
+        return false;
+    }
+    if (semver__default["default"].gte(willUpdateFirmware, bootloaderRelatedFirmwareVersion.join('.'))) {
+        return true;
+    }
+    if (semver__default["default"].gte(currentVersion, bootloaderRelatedFirmwareVersion.join('.'))) {
+        return true;
+    }
+    return false;
+}
+
 function checkNeedUpdateBootForTouch(features) {
     const deviceType = getDeviceType(features);
     if (deviceType !== 'touch')
@@ -11439,10 +11452,13 @@ function checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmware) {
     const bootloaderRelatedFirmwareVersion = DataManager.getBootloaderRelatedFirmwareVersion(features);
     if (!bootloaderRelatedFirmwareVersion)
         return false;
-    return (semver__default["default"].lte(willUpdateFirmware, bootloaderRelatedFirmwareVersion.join('.')) ||
-        (semver__default["default"].gte(currentVersion, bootloaderRelatedFirmwareVersion.join('.')) &&
-            targetBootloaderVersion &&
-            semver__default["default"].lt(bootloaderVersion, targetBootloaderVersion.join('.'))));
+    return shouldUpdateBootloaderForClassicAndMini({
+        currentVersion,
+        bootloaderVersion,
+        willUpdateFirmware,
+        targetBootloaderVersion,
+        bootloaderRelatedFirmwareVersion,
+    });
 }
 const INIT_DATA_CHUNK_SIZE$1 = 16 * 1024;
 function checkBootloaderLength(data) {
@@ -14073,7 +14089,6 @@ const getInfo = ({ features, updateType, targetVersion }) => {
             firmwareUpdateField = 'firmware-v3';
         }
     }
-    console.log('=====>>>getInfo: ', firmwareUpdateField);
     const releaseInfo = (_b = (_a = deviceMap === null || deviceMap === void 0 ? void 0 : deviceMap[deviceType]) === null || _a === void 0 ? void 0 : _a[firmwareUpdateField]) !== null && _b !== void 0 ? _b : [];
     return findLatestRelease(releaseInfo);
 };

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -15,5 +15,5 @@ export declare const supportNewPassphrase: (features?: import("packages/hd-trans
 export declare const getPassphraseState: (features: Features, commands: DeviceCommands) => Promise<string | false>;
 export declare const supportBatchPublicKey: (features?: import("packages/hd-transport/dist").Features | undefined) => boolean;
 export declare const supportModifyHomescreen: (features?: import("packages/hd-transport/dist").Features | undefined) => SupportFeatureType;
-export declare const getFirmwareUpdateField: (features: Features, updateType: 'firmware' | 'ble') => "firmware" | "ble" | "firmware-v2" | "firmware-v3";
+export declare const getFirmwareUpdateField: (features: Features, updateType: 'firmware' | 'ble') => 'firmware' | 'ble' | 'firmware-v3' | 'firmware-v2';
 //# sourceMappingURL=deviceFeaturesUtils.d.ts.map

package/dist/utils/deviceFeaturesUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,YAAY,EACZ,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,4EAA0B,YAcpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAAc,QAAQ,kBAW5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,4EAA0B,kBAW1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ,YAAY,cAAc,4BAepF,CAAC;AAEF,eAAO,MAAM,qBAAqB,4EAA0B,OAU3D,CAAC;AAEF,eAAO,MAAM,uBAAuB,4EAA0B,kBAU7D,CAAC;AAKF,eAAO,MAAM,sBAAsB,aAAc,QAAQ,cAAc,UAAU,GAAG,KAAK,uDAgBxF,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,WAAW,EACX,YAAY,EACZ,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,4EAA0B,YAcpD,CAAC;AAEF,eAAO,MAAM,aAAa,4EAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,yBAAyB,4EAA0B,WACvC,CAAC;AAE1B,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,GAAG,SAAS,kBAOtE,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAQhF,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAAc,QAAQ,kBAW5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ,KAAG,kBAU9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,4EAA0B,kBAW1D,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAoB,QAAQ,YAAY,cAAc,4BAepF,CAAC;AAEF,eAAO,MAAM,qBAAqB,4EAA0B,OAU3D,CAAC;AAEF,eAAO,MAAM,uBAAuB,4EAA0B,kBAU7D,CAAC;AAKF,eAAO,MAAM,sBAAsB,aACvB,QAAQ,cACN,UAAU,GAAG,KAAK,KAC7B,UAAU,GAAG,KAAK,GAAG,aAAa,GAAG,aAgBvC,CAAC"}

package/jest.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  preset: '../../jest.config.js',
+  testEnvironment: 'node',
+  modulePathIgnorePatterns: ['node_modules', '<rootDir>/lib', '<rootDir>/libDev'],
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -18,14 +18,15 @@
     "dev": "rimraf dist && rollup -c ../../build/rollup.config.js -w",
     "build": "rimraf dist && rollup -c ../../build/rollup.config.js",
     "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
+    "lint:fix": "eslint . --fix",
+    "test": "jest"
   },
   "bugs": {
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.3.14",
-    "@onekeyfe/hd-transport": "^0.3.14",
+    "@onekeyfe/hd-shared": "^0.3.15",
+    "@onekeyfe/hd-transport": "^0.3.15",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -43,5 +44,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "8dc9f9fa05462f4621a1bbb184b38eda1fb6bdc4"
+  "gitHead": "3c2dd011378ec987f6a9ab900d72a83bc6811608"
 }

package/src/api/firmware/bootloaderHelper.ts

@@ -0,0 +1,32 @@
+import semver from 'semver';
+import { IVersionArray } from '../../types';
+
+export function shouldUpdateBootloaderForClassicAndMini({
+  currentVersion,
+  bootloaderVersion,
+  willUpdateFirmware,
+  targetBootloaderVersion,
+  bootloaderRelatedFirmwareVersion,
+}: {
+  currentVersion: string;
+  bootloaderVersion: string;
+  willUpdateFirmware: string;
+  targetBootloaderVersion?: IVersionArray;
+  bootloaderRelatedFirmwareVersion: IVersionArray;
+}) {
+  // If the current bootloader version is greater than or equal to the version that needs to be upgraded, then no upgrade is required
+  if (targetBootloaderVersion && semver.gte(bootloaderVersion, targetBootloaderVersion.join('.'))) {
+    return false;
+  }
+
+  if (semver.gte(willUpdateFirmware, bootloaderRelatedFirmwareVersion.join('.'))) {
+    return true;
+  }
+
+  // The current version is greater than the relatedVersion and the bootloader version is lower than the target bootloader version
+  if (semver.gte(currentVersion, bootloaderRelatedFirmwareVersion.join('.'))) {
+    return true;
+  }
+
+  return false;
+}

package/src/api/firmware/getBinary.ts

@@ -84,7 +84,6 @@ export const getInfo = ({ features, updateType, targetVersion }: GetInfoProps) =
     }
   }
 
-  console.log('=====>>>getInfo: ', firmwareUpdateField);
   const releaseInfo = deviceMap?.[deviceType]?.[firmwareUpdateField] ?? [];
   return findLatestRelease(releaseInfo);
 };

package/src/api/firmware/updateBootloader.ts

@@ -7,6 +7,7 @@ import {
   getDeviceFirmwareVersion,
 } from '../../utils/deviceFeaturesUtils';
 import { DataManager } from '../../data-manager';
+import { shouldUpdateBootloaderForClassicAndMini } from './bootloaderHelper';
 
 export function checkNeedUpdateBootForTouch(features: Features) {
   const deviceType = getDeviceType(features);
@@ -44,14 +45,13 @@ export function checkNeedUpdateBootForClassicAndMini(
     DataManager.getBootloaderRelatedFirmwareVersion(features);
   if (!bootloaderRelatedFirmwareVersion) return false;
 
-  return (
-    // 1、The target version of the upgrade is lower or equal to relatedVersion
-    semver.lte(willUpdateFirmware, bootloaderRelatedFirmwareVersion.join('.')) ||
-    // 2、The current version is greater than the relatedVersion and the bootloader version is lower than the target bootloader version
-    (semver.gte(currentVersion, bootloaderRelatedFirmwareVersion.join('.')) &&
-      targetBootloaderVersion &&
-      semver.lt(bootloaderVersion, targetBootloaderVersion.join('.')))
-  );
+  return shouldUpdateBootloaderForClassicAndMini({
+    currentVersion,
+    bootloaderVersion,
+    willUpdateFirmware,
+    targetBootloaderVersion,
+    bootloaderRelatedFirmwareVersion,
+  });
 }
 
 const INIT_DATA_CHUNK_SIZE = 16 * 1024;

package/src/utils/deviceFeaturesUtils.ts

@@ -182,7 +182,10 @@ export const supportModifyHomescreen = (features?: Features): SupportFeatureType
 /**
  *  Since 3.5.0, Touch uses the firmware-v3 field to get firmware release info
  */
-export const getFirmwareUpdateField = (features: Features, updateType: 'firmware' | 'ble') => {
+export const getFirmwareUpdateField = (
+  features: Features,
+  updateType: 'firmware' | 'ble'
+): 'firmware' | 'ble' | 'firmware-v3' | 'firmware-v2' => {
   const deviceType = getDeviceType(features);
   const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
   if (updateType === 'ble') {
@@ -190,7 +193,7 @@ export const getFirmwareUpdateField = (features: Features, updateType: 'firmware
   }
 
   if (deviceType === 'classic' || deviceType === 'mini') {
-    return 'firmware-v2';
+    return 'firmware-v3';
   }
 
   if (deviceType === 'touch') {