@onekeyfe/hd-core 1.1.18-alpha.0 → 1.1.19-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.18-alpha.0",
+  "version": "1.1.19-alpha.0",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.18-alpha.0",
-    "@onekeyfe/hd-transport": "1.1.18-alpha.0",
+    "@onekeyfe/hd-shared": "1.1.19-alpha.0",
+    "@onekeyfe/hd-transport": "1.1.19-alpha.0",
     "axios": "1.12.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.3.1"
   },
-  "gitHead": "bec196c57a2a5be4e239dbb14338ddbcd8d4e14f"
+  "gitHead": "5726559b1f2f1b919c7ea4626a89df735314107c"
 }

package/src/api/BaseMethod.ts

@@ -1,18 +1,27 @@
 import semver from 'semver';
 import {
-  createNeedUpgradeFirmwareHardwareError,
   ERRORS,
   HardwareErrorCode,
+  createNeedUpgradeFirmwareHardwareError,
 } from '@onekeyfe/hd-shared';
+
 import { supportInputPinOnSoftware, supportModifyHomescreen } from '../utils/deviceFeaturesUtils';
 import { createDeviceMessage } from '../events/device';
 import { UI_REQUEST } from '../constants/ui-request';
-import { Device } from '../device/Device';
-import DeviceConnector from '../device/DeviceConnector';
-import { DeviceFirmwareRange, KnownDevice } from '../types';
-import { CoreMessage, createFirmwareMessage, createUiMessage, DEVICE, FIRMWARE } from '../events';
+import { DEVICE, FIRMWARE, createFirmwareMessage, createUiMessage } from '../events';
 import { getBleFirmwareReleaseInfo, getFirmwareReleaseInfo } from './firmware/releaseHelper';
-import { getDeviceFirmwareVersion, getLogger, getMethodVersionRange, LoggerNames } from '../utils';
+import {
+  LoggerNames,
+  getDeviceFirmwareVersion,
+  getFirmwareType,
+  getLogger,
+  getMethodVersionRange,
+} from '../utils';
+
+import type { Device } from '../device/Device';
+import type DeviceConnector from '../device/DeviceConnector';
+import type { DeviceFirmwareRange, KnownDevice } from '../types';
+import type { CoreMessage } from '../events';
 import type { CoreContext } from '../core';
 
 const Log = getLogger(LoggerNames.Method);
@@ -128,7 +137,8 @@ export abstract class BaseMethod<Params = undefined> {
 
   checkFirmwareRelease() {
     if (!this.device || !this.device.features) return;
-    const releaseInfo = getFirmwareReleaseInfo(this.device.features);
+    const firmwareType = getFirmwareType(this.device.features);
+    const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
     this.postMessage(
       createFirmwareMessage(FIRMWARE.RELEASE_INFO, {
         ...releaseInfo,

package/src/api/CheckAllFirmwareRelease.ts

@@ -1,17 +1,17 @@
 import { BaseMethod } from './BaseMethod';
 import { UI_REQUEST } from '../constants/ui-request';
-
 import {
   getBleFirmwareReleaseInfo,
   getBootloaderReleaseInfo,
   getFirmwareReleaseInfo,
 } from './firmware/releaseHelper';
 import { getBridgeReleaseInfo } from '../utils/bridgeUpdate';
-import {
+import { getDeviceFirmwareVersion, getDeviceType, getFirmwareType } from '../utils';
+
+import type {
   AllFirmwareRelease,
   CheckAllFirmwareReleaseParams,
 } from '../types/api/checkAllFirmwareRelease';
-import { getDeviceFirmwareVersion, getDeviceType } from '../utils';
 
 export default class CheckAllFirmwareRelease extends BaseMethod {
   init() {
@@ -22,13 +22,16 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
 
   async run() {
     const { features } = this.device;
-    const { checkBridgeRelease } = this.payload as CheckAllFirmwareReleaseParams;
+    const { checkBridgeRelease, firmwareType: firmwareTypeParams } = this
+      .payload as CheckAllFirmwareReleaseParams;
 
     if (!features) {
       return Promise.resolve(null);
     }
 
-    const firmwareRelease = getFirmwareReleaseInfo(features);
+    const deviceFirmwareType = getFirmwareType(features);
+    const firmwareType = firmwareTypeParams ?? deviceFirmwareType;
+    const firmwareRelease = getFirmwareReleaseInfo(features, firmwareType);
 
     const currentFirmwareVersion = getDeviceFirmwareVersion(features).join('.');
     const willUpdateFirmwareVersion = firmwareRelease.release?.version?.join('.');
@@ -45,7 +48,11 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
         willUpdateFirmwareVersion,
       });
     }
-    const bootloaderRelease = getBootloaderReleaseInfo(features, willUpdateFirmwareVersion);
+    const bootloaderRelease = getBootloaderReleaseInfo({
+      features,
+      willUpdateFirmwareVersion,
+      firmwareType,
+    });
     const bleFirmwareReleaseInfo = getBleFirmwareReleaseInfo(features);
 
     return {
@@ -60,6 +67,7 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
             release: bridgeReleaseInfo.releaseVersion,
           }
         : undefined,
+      features,
     } as AllFirmwareRelease;
   }
 }

package/src/api/CheckBootloaderRelease.ts

@@ -1,7 +1,9 @@
 import { BaseMethod } from './BaseMethod';
-
 import { UI_REQUEST } from '../constants/ui-request';
 import { getBootloaderReleaseInfo } from './firmware/releaseHelper';
+import { getFirmwareType } from '../utils';
+
+import type { CheckBootloaderReleaseParams } from '../types/api/checkBootloaderRelease';
 
 export default class CheckBootloaderRelease extends BaseMethod {
   init() {
@@ -15,7 +17,16 @@ export default class CheckBootloaderRelease extends BaseMethod {
       return null;
     }
     const { features } = this.device;
-    const releaseInfo = getBootloaderReleaseInfo(features, this.payload.willUpdateFirmwareVersion);
+    const payload = this.payload as CheckBootloaderReleaseParams;
+
+    const deviceFirmwareType = getFirmwareType(features);
+    const firmwareType = payload.firmwareType ?? deviceFirmwareType;
+
+    const releaseInfo = getBootloaderReleaseInfo({
+      features,
+      willUpdateFirmwareVersion: payload.willUpdateFirmwareVersion,
+      firmwareType,
+    });
     return Promise.resolve(releaseInfo);
   }
 }

package/src/api/CheckFirmwareRelease.ts

@@ -1,7 +1,9 @@
 import { BaseMethod } from './BaseMethod';
 import { UI_REQUEST } from '../constants/ui-request';
-
 import { getFirmwareReleaseInfo } from './firmware/releaseHelper';
+import { getFirmwareType } from '../utils';
+
+import type { CheckFirmwareReleaseParams } from '../types/api/checkFirmwareRelease';
 
 export default class CheckFirmwareRelease extends BaseMethod {
   init() {
@@ -15,8 +17,13 @@ export default class CheckFirmwareRelease extends BaseMethod {
   }
 
   run() {
+    const payload = this.payload as CheckFirmwareReleaseParams;
+
     if (this.device.features) {
-      const releaseInfo = getFirmwareReleaseInfo(this.device.features);
+      const deviceFirmwareType = getFirmwareType(this.device.features);
+      const firmwareType = payload.firmwareType ?? deviceFirmwareType;
+
+      const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
       return Promise.resolve(releaseInfo);
     }
     return Promise.resolve(null);

package/src/api/FirmwareUpdate.ts

@@ -1,24 +1,25 @@
 import {
+  EFirmwareType,
   ERRORS,
-  HardwareErrorCode,
   HardwareError,
+  HardwareErrorCode,
   createDeferred,
-  Deferred,
 } from '@onekeyfe/hd-shared';
+
 import { UI_REQUEST } from '../constants/ui-request';
 import { BaseMethod } from './BaseMethod';
 import { validateParams } from './helpers/paramsValidator';
 import { getBinary } from './firmware/getBinary';
 import { uploadFirmware } from './firmware/uploadFirmware';
 import { createUiMessage } from '../events';
-import { type KnownDevice, DeviceModelToTypes } from '../types';
-
+import { DeviceModelToTypes, type KnownDevice } from '../types';
 import { isEnteredManuallyBoot } from './firmware/bootloaderHelper';
-
 import { LoggerNames, getDeviceType, getDeviceUUID, getLogger, wait } from '../utils';
 import { DataManager } from '../data-manager';
 import { DevicePool } from '../device/DevicePool';
 
+import type { Deferred } from '@onekeyfe/hd-shared';
+
 type Params = {
   binary?: ArrayBuffer;
   version?: number[];
@@ -189,6 +190,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
           features: device.features,
           version: params.version,
           updateType: params.updateType,
+          firmwareType: EFirmwareType.Universal,
         });
         binary = firmware.binary;
         this.postTipMessage('DownloadFirmwareSuccess');

package/src/api/FirmwareUpdateV2.ts

@@ -1,12 +1,14 @@
 import {
-  createDeferred,
-  Deferred,
+  type Deferred,
   EDeviceType,
+  type EFirmwareType,
   ERRORS,
   HardwareError,
   HardwareErrorCode,
+  createDeferred,
 } from '@onekeyfe/hd-shared';
 import semver from 'semver';
+
 import { UI_REQUEST } from '../constants/ui-request';
 import { BaseMethod } from './BaseMethod';
 import { validateParams } from './helpers/paramsValidator';
@@ -14,20 +16,21 @@ import { DevicePool } from '../device/DevicePool';
 import { getBinary, getInfo, getSysResourceBinary } from './firmware/getBinary';
 import { updateResources, uploadFirmware } from './firmware/uploadFirmware';
 import {
+  LoggerNames,
+  getDeviceFirmwareVersion,
   getDeviceType,
   getDeviceUUID,
-  wait,
+  getFirmwareType,
   getLogger,
-  LoggerNames,
-  getDeviceFirmwareVersion,
+  wait,
 } from '../utils';
-import { createUiMessage, FirmwareUpdateTipMessage } from '../events/ui-request';
+import { FirmwareUpdateTipMessage, createUiMessage } from '../events/ui-request';
 import { DeviceModelToTypes } from '../types';
 import { DataManager } from '../data-manager';
+import { DEVICE } from '../events';
 
-import type { KnownDevice, Features } from '../types';
+import type { Features, KnownDevice } from '../types';
 import type { Device } from '../device/Device';
-import { DEVICE } from '../events';
 
 type Params = {
   binary?: ArrayBuffer;
@@ -35,6 +38,7 @@ type Params = {
   updateType: 'firmware' | 'ble';
   forcedUpdateRes?: boolean;
   isUpdateBootloader?: boolean;
+  firmwareType?: EFirmwareType;
 };
 
 const Log = getLogger(LoggerNames.Method);
@@ -55,6 +59,7 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
       { name: 'binary', type: 'buffer' },
       { name: 'forcedUpdateRes', type: 'boolean' },
       { name: 'platform', type: 'string', required: true },
+      { name: 'firmwareType', type: 'string' },
     ]);
 
     if (!payload.updateType) {
@@ -74,6 +79,7 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
       this.params = {
         ...this.params,
         version: payload.version,
+        firmwareType: payload.firmwareType,
       };
     }
 
@@ -246,14 +252,14 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
    * Check the version number of Touch to determine if it
    * needs to be upgraded via the desktop
    */
-  checkVersionForCopyTouchResource(features?: Features) {
+  checkVersionForCopyTouchResource(features: Features | undefined, firmwareType: EFirmwareType) {
     if (!features) return;
     const deviceType = getDeviceType(features);
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     const targetVersion = this.params.version?.join('.');
     const { updateType } = this.params;
 
-    const releaseInfo = getInfo({ features, updateType });
+    const releaseInfo = getInfo({ features, updateType, firmwareType });
     if (!releaseInfo) return;
     const { fullResourceRange } = releaseInfo;
     if (!fullResourceRange) return;
@@ -275,7 +281,10 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
     const { features, commands } = device;
     const deviceType = getDeviceType(features);
 
-    this.checkVersionForCopyTouchResource(features);
+    const deviceFirmwareType = getFirmwareType(device.features);
+    const firmwareType = params.firmwareType ?? deviceFirmwareType;
+
+    this.checkVersionForCopyTouchResource(features, firmwareType);
 
     if (!features?.bootloader_mode && features) {
       const uuid = getDeviceUUID(features);
@@ -287,10 +296,11 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
       // check & upgrade firmware resource
       if (features && this.isSupportResourceUpdate(features, params.updateType)) {
         this.postTipMessage('CheckLatestUiResource');
-        const resourceUrl = DataManager.getSysResourcesLatestRelease(
+        const resourceUrl = DataManager.getSysResourcesLatestRelease({
           features,
-          params.forcedUpdateRes
-        );
+          forcedUpdateRes: params.forcedUpdateRes,
+          firmwareType,
+        });
         if (resourceUrl) {
           this.postTipMessage('DownloadLatestUiResource');
           const resource = await getSysResourceBinary(resourceUrl);
@@ -360,11 +370,13 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
           );
         }
         this.postTipMessage('DownloadFirmware');
+
         const firmware = await getBinary({
           features: device.features,
           version: params.version,
           updateType: params.updateType,
           isUpdateBootloader: params.isUpdateBootloader,
+          firmwareType,
         });
         binary = firmware.binary;
         this.postTipMessage('DownloadFirmwareSuccess');

package/src/api/FirmwareUpdateV3.ts

@@ -1,23 +1,26 @@
-import { Deferred, ERRORS, HardwareErrorCode, EDeviceType, wait } from '@onekeyfe/hd-shared';
+import { EDeviceType, ERRORS, HardwareErrorCode, wait } from '@onekeyfe/hd-shared';
 import semver from 'semver';
 import JSZip from 'jszip';
-import { UI_REQUEST, FirmwareUpdateTipMessage } from '../events/ui-request';
-import { validateParams } from './helpers/paramsValidator';
 
+import { FirmwareUpdateTipMessage, UI_REQUEST } from '../events/ui-request';
+import { validateParams } from './helpers/paramsValidator';
 import {
-  getDeviceType,
-  getDeviceBootloaderVersion,
+  LoggerNames,
   getDeviceBLEFirmwareVersion,
+  getDeviceBootloaderVersion,
   getDeviceFirmwareVersion,
-  LoggerNames,
+  getDeviceType,
+  getFirmwareType,
   getLogger,
 } from '../utils';
 import { getBinary, getSysResourceBinary } from './firmware/getBinary';
 import { DataManager } from '../data-manager';
-import { FirmwareUpdateV3Params } from '../types/api/firmwareUpdate';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import { DevicePool } from '../device/DevicePool';
-import { TypedResponseMessage } from '../device/DeviceCommands';
+
+import type { FirmwareUpdateV3Params } from '../types/api/firmwareUpdate';
+import type { Deferred, EFirmwareType } from '@onekeyfe/hd-shared';
+import type { TypedResponseMessage } from '../device/DeviceCommands';
 
 const Log = getLogger(LoggerNames.Method);
 
@@ -54,6 +57,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
       { name: 'forcedUpdateRes', type: 'boolean' },
       { name: 'bootloaderVersion', type: 'array' },
       { name: 'bootloaderBinary', type: 'buffer' },
+      { name: 'firmwareType', type: 'string' },
       { name: 'platform', type: 'string' },
     ]);
 
@@ -66,6 +70,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
       bootloaderBinary: payload.bootloaderBinary,
       firmwareVersion: payload.firmwareVersion,
       resourceBinary: payload.resourceBinary,
+      firmwareType: payload.firmwareType,
       platform: payload.platform,
     };
   }
@@ -83,14 +88,17 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
       throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device features not available');
     }
 
+    const deviceFirmwareType = getFirmwareType(features);
+    const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
+
     let resourceBinary: ArrayBuffer | null = null;
     let fwBinaryMap: { fileName: string; binary: ArrayBuffer }[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
-      resourceBinary = await this.prepareResourceBinary();
-      fwBinaryMap = await this.prepareFirmwareAndBleBinary();
-      bootloaderBinary = await this.prepareBootloaderBinary();
+      resourceBinary = await this.prepareResourceBinary(firmwareType);
+      fwBinaryMap = await this.prepareFirmwareAndBleBinary(firmwareType);
+      bootloaderBinary = await this.prepareBootloaderBinary(firmwareType);
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
     } catch (err) {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
@@ -130,16 +138,17 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     }
   }
 
-  private async prepareResourceBinary() {
+  private async prepareResourceBinary(firmwareType: EFirmwareType) {
     if (this.params.resourceBinary) {
       return this.params.resourceBinary;
     }
     const { features } = this.device;
     if (!features) return null;
-    const resourceUrl = DataManager.getSysResourcesLatestRelease(
+    const resourceUrl = DataManager.getSysResourcesLatestRelease({
       features,
-      this.params.forcedUpdateRes
-    );
+      forcedUpdateRes: this.params.forcedUpdateRes,
+      firmwareType,
+    });
 
     if (resourceUrl) {
       const resource = (await getSysResourceBinary(resourceUrl)).binary;
@@ -149,7 +158,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     return null;
   }
 
-  private async prepareBootloaderBinary(): Promise<ArrayBuffer | null> {
+  private async prepareBootloaderBinary(firmwareType: EFirmwareType): Promise<ArrayBuffer | null> {
     if (this.params.bootloaderBinary) {
       return this.params.bootloaderBinary;
     }
@@ -157,7 +166,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     if (!features) return null;
 
     if (this.params.bootloaderVersion) {
-      const bootResourceUrl = DataManager.getBootloaderResource(features);
+      const bootResourceUrl = DataManager.getBootloaderResource(features, firmwareType);
       if (bootResourceUrl) {
         const bootBinary = (await getSysResourceBinary(bootResourceUrl)).binary;
         return bootBinary;
@@ -166,7 +175,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     return null;
   }
 
-  private async prepareFirmwareAndBleBinary() {
+  private async prepareFirmwareAndBleBinary(firmwareType: EFirmwareType) {
     const fwBinaryMap: { fileName: string; binary: ArrayBuffer }[] = [];
     if (this.params.firmwareBinary) {
       fwBinaryMap.push({
@@ -182,6 +191,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
             version: this.params.firmwareVersion,
             updateType: 'firmware',
             isUpdateBootloader: false,
+            firmwareType,
           })
         ).binary;
         fwBinaryMap.push({
@@ -203,6 +213,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
           features,
           version: this.params.bleVersion,
           updateType: 'ble',
+          firmwareType,
         });
         fwBinaryMap.push({
           fileName: 'ble-firmware.bin',

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -9,22 +9,21 @@ import {
 import { serializedPath, toHardened } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
-import { CoreApi } from '../../types';
-import type {
-  AllNetworkAddressParams,
-  INetwork,
-  AllNetworkAddress,
-  CommonResponseParams,
-} from '../../types/api/allNetworkGetAddress';
 import { PROTO } from '../../constants';
-
 import { findMethod } from '../utils';
-import { createUiMessage, DEVICE, IFRAME } from '../../events';
+import { DEVICE, IFRAME, createUiMessage } from '../../events';
 import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
-import { Device, DeviceEvents } from '../../device/Device';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { onDeviceButtonHandler } from '../../core';
-import { DevicePool } from '../../device/DevicePool';
+
+import type { Device, DeviceEvents } from '../../device/Device';
+import type { CoreApi } from '../../types';
+import type {
+  AllNetworkAddress,
+  AllNetworkAddressParams,
+  CommonResponseParams,
+  INetwork,
+} from '../../types/api/allNetworkGetAddress';
 
 const Mainnet = 'mainnet';
 

package/src/api/device/DeviceFullyUploadResource.ts

@@ -4,10 +4,11 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { getSysResourceBinary } from '../firmware/getBinary';
 import { updateResources } from '../firmware/uploadFirmware';
-import { getDeviceType, getDeviceFirmwareVersion } from '../../utils';
+import { getDeviceType, getDeviceFirmwareVersion, getFirmwareType } from '../../utils';
 import { createUiMessage } from '../../events/ui-request';
 import type { KnownDevice, Features } from '../../types';
 import { DataManager } from '../../data-manager';
+import type { DeviceFullyUploadResourceParams } from '../../types/api/deviceFullyUploadResource';
 
 export default class DeviceFullyUploadResource extends BaseMethod {
   checkPromise: Deferred<any> | null = null;
@@ -43,13 +44,18 @@ export default class DeviceFullyUploadResource extends BaseMethod {
     const { device } = this;
     const { features } = device;
 
+    const payload = this.payload as DeviceFullyUploadResourceParams;
+
+    const deviceFirmwareType = getFirmwareType(features);
+    const firmwareType = payload.firmwareType ?? deviceFirmwareType;
+
     if (!features?.bootloader_mode && features) {
       // check & upgrade firmware resource
       if (features) {
         let { binary } = this.payload;
         if (!binary) {
           this.postTipMessage('CheckLatestUiResource');
-          const resourceUrl = DataManager.getSysFullResource(features);
+          const resourceUrl = DataManager.getSysFullResource(features, firmwareType);
           if (resourceUrl) {
             this.postTipMessage('DownloadLatestUiResource');
             const resource = await getSysResourceBinary(resourceUrl);

package/src/api/device/DeviceUpdateBootloader.ts

@@ -1,4 +1,4 @@
-import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { RebootType } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { FirmwareUpdateTipMessage } from '../../events/ui-request';
@@ -8,10 +8,11 @@ import { updateBootloader } from '../firmware/uploadFirmware';
 import { DeviceModelToTypes } from '../../types';
 import { DataManager } from '../../data-manager';
 import { checkBootloaderLength } from '../firmware/updateBootloader';
-import { getDeviceType } from '../../utils';
+import { getDeviceType, getFirmwareType } from '../../utils';
 
 import type { Device } from '../../device/Device';
 import type { Features } from '../../types';
+import { DeviceUpdateBootloaderParams } from '../../types/api/deviceUpdateBootloader';
 
 export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any> {
   init() {
@@ -41,11 +42,21 @@ export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any
     return true;
   }
 
-  async updateTouchBootloader(device: Device, features?: Features) {
+  async updateTouchBootloader({
+    device,
+    features,
+    firmwareType,
+  }: {
+    device: Device;
+    features?: Features;
+    firmwareType: EFirmwareType;
+  }) {
     let { binary } = this.payload;
     if (!binary) {
       this.postTipMessage(FirmwareUpdateTipMessage.CheckLatestUiResource);
-      const resourceUrl = features ? DataManager.getBootloaderResource(features) : null;
+      const resourceUrl = features
+        ? DataManager.getBootloaderResource(features, firmwareType)
+        : null;
       if (resourceUrl) {
         this.postTipMessage(FirmwareUpdateTipMessage.DownloadLatestBootloaderResource);
         const resource = await getSysResourceBinary(resourceUrl);
@@ -83,9 +94,14 @@ export default class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod<any
     const { device } = this;
     const { features } = device;
 
+    const payload = this.payload as DeviceUpdateBootloaderParams;
+
     const deviceType = getDeviceType(features);
+    const deviceFirmwareType = getFirmwareType(features);
+    const firmwareType = payload.firmwareType ?? deviceFirmwareType;
+
     if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-      return this.updateTouchBootloader(device, features);
+      return this.updateTouchBootloader({ device, features, firmwareType });
     }
 
     return Promise.resolve(true);

package/src/api/evm/EVMSignTypedData.ts

@@ -1,7 +1,7 @@
 import semver from 'semver';
 import { get } from 'lodash';
 import BigNumber from 'bignumber.js';
-import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { ERRORS, HardwareErrorCode, EDeviceType } from '@onekeyfe/hd-shared';
 import {
   EthereumTypedDataSignature,
   EthereumTypedDataStructAck,
@@ -337,15 +337,9 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     let biggerLimit = 1024; // 1k
 
     const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
-    const currentDeviceType = getDeviceType(this.device.features);
     const supportBiggerDataVersion = '4.4.0';
 
-    const supportBiggerData =
-      DeviceModelToTypes.model_classic1s.includes(currentDeviceType) ||
-      (DeviceModelToTypes.model_touch.includes(currentDeviceType) &&
-        semver.gte(currentVersion, supportBiggerDataVersion));
-
-    if (supportBiggerData) {
+    if (semver.gte(currentVersion, supportBiggerDataVersion)) {
       biggerLimit = 1536; // 1.5k
     }