@onekeyfe/hd-core 1.1.16 → 1.1.18-alpha.1

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/firmware/getBinary.ts

@@ -1,17 +1,21 @@
 import semver from 'semver';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import { Features } from '../../types';
+
 import { getDeviceType, httpRequest } from '../../utils';
 import { DataManager } from '../../data-manager';
 import { findLatestRelease } from '../../utils/release';
 import { getFirmwareUpdateField } from '../../utils/deviceFeaturesUtils';
-import { IFirmwareField } from '../../data-manager/DataManager';
+
+import type { Features } from '../../types';
+import type { EFirmwareType } from '@onekeyfe/hd-shared';
+import type { IFirmwareField } from '../../data-manager/DataManager';
 
 export interface GetInfoProps {
   features: Features;
   updateType: 'firmware' | 'ble';
   isUpdateBootloader?: boolean;
   targetVersion?: string;
+  firmwareType: EFirmwareType;
 }
 
 interface GetBinaryProps extends GetInfoProps {
@@ -23,8 +27,14 @@ export const getBinary = async ({
   updateType,
   version,
   isUpdateBootloader,
+  firmwareType,
 }: GetBinaryProps) => {
-  const releaseInfo = getInfo({ features, updateType, targetVersion: version?.join('.') });
+  const releaseInfo = getInfo({
+    features,
+    updateType,
+    targetVersion: version?.join('.'),
+    firmwareType,
+  });
 
   if (!releaseInfo) {
     throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'no firmware found for this device');
@@ -71,7 +81,7 @@ export const getSysResourceBinary = async (url: string) => {
   };
 };
 
-export const getInfo = ({ features, updateType, targetVersion }: GetInfoProps) => {
+export const getInfo = ({ features, updateType, targetVersion, firmwareType }: GetInfoProps) => {
   const deviceType = getDeviceType(features);
   if (deviceType === 'unknown') {
     return null;
@@ -82,6 +92,7 @@ export const getInfo = ({ features, updateType, targetVersion }: GetInfoProps) =
     features,
     updateType,
     targetVersion,
+    firmwareType,
   });
   const releaseInfo = deviceMap?.[deviceType]?.[firmwareUpdateField] ?? [];
   return findLatestRelease(releaseInfo);

package/src/api/firmware/releaseHelper.ts

@@ -6,10 +6,12 @@ import {
   getDeviceType,
 } from '../../utils';
 
-export const getFirmwareReleaseInfo = (features: Features) => {
-  const firmwareStatus = DataManager.getFirmwareStatus(features);
-  const changelog = DataManager.getFirmwareChangelog(features);
-  const release = DataManager.getFirmwareLatestRelease(features);
+import type { EFirmwareType } from '@onekeyfe/hd-shared';
+
+export const getFirmwareReleaseInfo = (features: Features, firmwareType: EFirmwareType) => {
+  const firmwareStatus = DataManager.getFirmwareStatus(features, firmwareType);
+  const changelog = DataManager.getFirmwareChangelog(features, firmwareType);
+  const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
   const bootloaderMode = !!features.bootloader_mode;
   return {
     status: firmwareStatus,
@@ -32,11 +34,16 @@ export const getBleFirmwareReleaseInfo = (features: Features) => {
   };
 };
 
-export const getBootloaderReleaseInfo = (
-  features: Features,
-  willUpdateFirmwareVersion?: string
-) => {
-  const release = DataManager.getFirmwareLatestRelease(features);
+export const getBootloaderReleaseInfo = ({
+  features,
+  willUpdateFirmwareVersion,
+  firmwareType,
+}: {
+  features: Features;
+  willUpdateFirmwareVersion?: string;
+  firmwareType: EFirmwareType;
+}) => {
+  const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
   const changelog = [release?.bootloaderChangelog].filter(
     item =>
       item != null &&
@@ -52,9 +59,13 @@ export const getBootloaderReleaseInfo = (
   const deviceType = getDeviceType(features);
   // classic mini classic1s
   if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-    shouldUpdate = !!checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmwareVersion);
+    shouldUpdate = !!checkNeedUpdateBootForClassicAndMini({
+      features,
+      willUpdateFirmware: willUpdateFirmwareVersion,
+      firmwareType,
+    });
   } else if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-    shouldUpdate = checkNeedUpdateBootForTouch(features);
+    shouldUpdate = checkNeedUpdateBootForTouch(features, firmwareType);
   }
 
   return {

package/src/api/firmware/updateBootloader.ts

@@ -1,16 +1,17 @@
 import ByteBuffer from 'bytebuffer';
 import semver from 'semver';
+import type { EFirmwareType } from '@onekeyfe/hd-shared';
 import { DeviceModelToTypes, Features } from '../../types';
 import { getDeviceType, getDeviceBootloaderVersion, getDeviceFirmwareVersion } from '../../utils';
 import { DataManager } from '../../data-manager';
 import { shouldUpdateBootloaderForClassicAndMini } from './bootloaderHelper';
 
-export function checkNeedUpdateBootForTouch(features: Features) {
+export function checkNeedUpdateBootForTouch(features: Features, firmwareType: EFirmwareType) {
   const deviceType = getDeviceType(features);
   if (!DeviceModelToTypes.model_touch.includes(deviceType)) return false;
   const currentVersion = getDeviceFirmwareVersion(features).join('.');
   const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
-  const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
+  const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features, firmwareType);
   if (!targetBootloaderVersion) return false;
 
   return (
@@ -23,22 +24,29 @@ export function checkNeedUpdateBootForTouch(features: Features) {
   );
 }
 
-export function checkNeedUpdateBootForClassicAndMini(
-  features: Features,
-  willUpdateFirmware?: string
-) {
+export function checkNeedUpdateBootForClassicAndMini({
+  features,
+  willUpdateFirmware,
+  firmwareType,
+}: {
+  features: Features;
+  willUpdateFirmware?: string;
+  firmwareType: EFirmwareType;
+}) {
   const deviceType = getDeviceType(features);
   if (!DeviceModelToTypes.model_mini.includes(deviceType)) return false;
   if (!willUpdateFirmware) return false;
   const currentVersion = getDeviceFirmwareVersion(features).join('.');
   const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
-  const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
+  const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features, firmwareType);
   if (targetBootloaderVersion && semver.gte(bootloaderVersion, targetBootloaderVersion.join('.'))) {
     return false;
   }
 
-  const bootloaderRelatedFirmwareVersion =
-    DataManager.getBootloaderRelatedFirmwareVersion(features);
+  const bootloaderRelatedFirmwareVersion = DataManager.getBootloaderRelatedFirmwareVersion(
+    features,
+    firmwareType
+  );
   if (!bootloaderRelatedFirmwareVersion) return false;
 
   return shouldUpdateBootloaderForClassicAndMini({

package/src/api/sui/SuiSignTransaction.ts

@@ -1,6 +1,6 @@
-import { SuiSignTx as HardwareSuiSignTx, TypedCall, SuiSignedTx } from '@onekeyfe/hd-transport';
 import semver from 'semver';
 import { bytesToHex } from '@noble/hashes/utils';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -8,6 +8,12 @@ import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 import { getDeviceFirmwareVersion, getDeviceType } from '../../utils';
 import { DeviceModelToTypes } from '../../types';
+
+import type {
+  SuiSignTx as HardwareSuiSignTx,
+  SuiSignedTx,
+  TypedCall,
+} from '@onekeyfe/hd-transport';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 type SuiSignTx = Omit<HardwareSuiSignTx, 'data_initial_chunk' | 'data_length'> & HardwareSuiSignTx;

package/src/core/index.ts

@@ -22,6 +22,7 @@ import {
   setLoggerPostMessage,
   wait,
   getMethodVersionRange,
+  getFirmwareType,
 } from '../utils';
 import {
   findDefectiveBatchDevice,
@@ -282,7 +283,8 @@ const onCallDevice = async (
           }
         }
 
-        const newVersionStatus = DataManager.getFirmwareStatus(device.features);
+        const deviceFirmwareType = getFirmwareType(device.features);
+        const newVersionStatus = DataManager.getFirmwareStatus(device.features, deviceFirmwareType);
         const bleVersionStatus = DataManager.getBLEFirmwareStatus(device.features);
 
         const currentFirmwareVersion = getDeviceFirmwareVersion(device.features).join('.');