@onekeyfe/hd-core 1.0.0-alpha.9 → 1.0.1

package/src/inject.ts

@@ -292,8 +292,6 @@ export const createCoreApi = (
 
   dnxGetAddress: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'dnxGetAddress' }),
-  dnxGetTrackingKey: (connectId, deviceId, params) =>
-    call({ ...params, connectId, deviceId, method: 'dnxGetTrackingKey' }),
   dnxSignTransaction: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'dnxSignTransaction' }),
 });

package/src/types/api/export.ts

@@ -151,5 +151,4 @@ export type { NervosAddress, NervosGetAddressParams } from './nervosGetAddress';
 export type { NervosSignedTx, NervosSignTransactionParams } from './nervosSignTransaction';
 
 export type { DnxAddress, DnxGetAddressParams } from './dnxGetAddress';
-export type { DnxTrackingKey, DnxGetTrackingKeyParams } from './dnxGetTrackingKey';
 export type { DnxTxKey, DnxSignTransactionParams, DnxSignature } from './dnxSignTransaction';

package/src/types/api/index.ts

@@ -124,7 +124,6 @@ import { nervosGetAddress } from './nervosGetAddress';
 import { nervosSignTransaction } from './nervosSignTransaction';
 
 import { dnxGetAddress } from './dnxGetAddress';
-import { dnxGetTrackingKey } from './dnxGetTrackingKey';
 import { dnxSignTransaction } from './dnxSignTransaction';
 
 export * from './export';
@@ -342,6 +341,5 @@ export type CoreApi = {
    * Dnx Network
    */
   dnxGetAddress: typeof dnxGetAddress;
-  dnxGetTrackingKey: typeof dnxGetTrackingKey;
   dnxSignTransaction: typeof dnxSignTransaction;
 };

package/src/types/device.ts

@@ -3,7 +3,12 @@ import { IVersionArray } from './settings';
 
 export type DeviceStatus = 'available' | 'occupied' | 'used';
 
-export type DeviceMode = 'normal' | 'bootloader' | 'initialize' | 'seedless';
+export enum EOneKeyDeviceMode {
+  bootloader = 'bootloader',
+  normal = 'normal',
+  notInitialized = 'notInitialized',
+  backupMode = 'backupMode',
+}
 
 export type UnavailableCapability =
   | 'no-capability'
@@ -23,7 +28,7 @@ export type KnownDevice = {
   bleName: string | null;
   name: string;
   error?: typeof undefined;
-  mode: DeviceMode;
+  mode: EOneKeyDeviceMode;
   features: PROTO.Features;
   unavailableCapabilities: UnavailableCapabilities;
   bleFirmwareVersion: IVersionArray | null;

package/src/utils/deviceFeaturesUtils.ts

@@ -1,4 +1,5 @@
 import semver from 'semver';
+import { isNaN } from 'lodash';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { toHardened } from '../api/helpers/pathUtils';
 import { DeviceCommands } from '../device/DeviceCommands';
@@ -75,11 +76,19 @@ export const supportNewPassphrase = (features?: Features): SupportFeatureType =>
 export const getPassphraseStateWithRefreshDeviceInfo = async (device: Device) => {
   const { features, commands } = device;
   const locked = features?.unlocked === false;
+
   const passphraseState = await getPassphraseState(features, commands);
   const isModeT = getDeviceType(features) === 'touch' || getDeviceType(features) === 'pro';
 
+  // 如果可以获取到 passphraseState，但是设备 features 显示设备未开启 passphrase，需要刷新设备状态
+  // if passphraseState can be obtained, but the device features show that the device has not enabled passphrase, the device status needs to be refreshed
+  const needRefreshWithPassphrase = passphraseState && features?.passphrase_protection !== true;
+  // 如果 Touch/Pro 在之前是锁定状态，刷新设备状态
   // if Touch/Pro was locked before, refresh the device state
-  if (isModeT && locked) {
+  const needRefreshWithLocked = isModeT && locked;
+
+  if (needRefreshWithLocked || needRefreshWithPassphrase) {
+    // refresh device state
     await device.getFeatures();
   }
 
@@ -167,3 +176,30 @@ export const getFirmwareUpdateField = ({
   }
   return 'firmware';
 };
+
+export function fixVersion(version: string) {
+  let parts = version.split('.');
+
+  while (parts.length < 3) {
+    parts.push('0');
+  }
+  parts = parts.map(part => (isNaN(parseInt(part, 10)) ? '0' : part));
+
+  return parts.join('.');
+}
+
+export const fixFeaturesFirmwareVersion = (features: Features): Features => {
+  // 修复 Touch、Pro 设备 bootloader 低于 2.5.2 版本时，返回的 features 中没有 firmware_version 错误的问题
+  // fix Touch、Pro device when bootloader version is lower than 2.5.2, the features returned do not have firmware_version error
+  const tempFeatures = { ...features };
+
+  if (tempFeatures.onekey_firmware_version && !semver.valid(tempFeatures.onekey_firmware_version)) {
+    tempFeatures.onekey_firmware_version = fixVersion(tempFeatures.onekey_firmware_version);
+  }
+
+  if (tempFeatures.onekey_version && !semver.valid(tempFeatures.onekey_version)) {
+    tempFeatures.onekey_version = fixVersion(tempFeatures.onekey_version);
+  }
+
+  return tempFeatures;
+};

package/src/utils/deviceInfoUtils.ts

@@ -119,16 +119,18 @@ export const getMethodVersionRange = (
   const deviceType = getDeviceType(features);
   let versionRange: IVersionRange | undefined = getVersionRange(deviceType);
 
-  if (!versionRange) {
+  if (versionRange) {
     return versionRange;
   }
 
-  if (DeviceModelToTypes.model_classic.includes(deviceType)) {
-    versionRange = getVersionRange('model_classic');
-  } else if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-    versionRange = getVersionRange('model_mini');
-  } else if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-    versionRange = getVersionRange('model_touch');
+  const modelFallbacks: IDeviceModel[] = ['model_classic', 'model_mini', 'model_touch'];
+  for (const model of modelFallbacks) {
+    if (DeviceModelToTypes[model].includes(deviceType)) {
+      versionRange = getVersionRange(model);
+      if (versionRange) {
+        return versionRange;
+      }
+    }
   }
 
   return versionRange;

package/src/utils/deviceVersionUtils.ts

@@ -15,11 +15,7 @@ export const getDeviceFirmwareVersion = (features: Features | undefined): IVersi
     return features.onekey_version?.split('.') as unknown as IVersionArray;
   }
 
-  return [
-    features.major_version ?? '0',
-    features.minor_version ?? '0',
-    features.patch_version ?? '0',
-  ];
+  return [0, 0, 0];
 };
 
 /**
@@ -53,7 +49,11 @@ export const getDeviceBootloaderVersion = (features: Features | undefined): IVer
   // low version hardware
   if (!features.bootloader_version) {
     if (features.bootloader_mode) {
-      return [features?.major_version, features?.minor_version, features?.patch_version];
+      return [
+        features?.major_version ?? 0,
+        features?.minor_version ?? 0,
+        features?.patch_version ?? 0,
+      ];
     }
     return [0, 0, 0];
   }

package/dist/api/dynex/DnxGetTrackingKey.d.ts

@@ -1,13 +0,0 @@
-import type { DnxGetTrackingKey as HardwareDnxGetTrackingKey } from '@onekeyfe/hd-transport';
-import { BaseMethod } from '../BaseMethod';
-import type { DnxTrackingKey } from '../../types';
-export default class DnxGetTrackingKey extends BaseMethod<HardwareDnxGetTrackingKey> {
-    init(): void;
-    getVersionRange(): {
-        classic: {
-            min: string;
-        };
-    };
-    run(): Promise<DnxTrackingKey>;
-}
-//# sourceMappingURL=DnxGetTrackingKey.d.ts.map

package/dist/api/dynex/DnxGetTrackingKey.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DnxGetTrackingKey.d.ts","sourceRoot":"","sources":["../../../src/api/dynex/DnxGetTrackingKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,IAAI,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAG7F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAA2B,cAAc,EAAE,MAAM,aAAa,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,yBAAyB,CAAC;IAClF,IAAI;IAiBJ,eAAe;;;;;IAQT,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC;CAYrC"}

package/dist/types/api/dnxGetTrackingKey.d.ts

@@ -1,10 +0,0 @@
-import type { CommonParams, Response } from '../params';
-export type DnxTrackingKey = {
-    path: string;
-    trackingKey: string;
-};
-export type DnxGetTrackingKeyParams = {
-    path: string | number[];
-};
-export declare function dnxGetTrackingKey(connectId: string, deviceId: string, params: CommonParams & DnxGetTrackingKeyParams): Response<DnxTrackingKey>;
-//# sourceMappingURL=dnxGetTrackingKey.d.ts.map

package/dist/types/api/dnxGetTrackingKey.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dnxGetTrackingKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/dnxGetTrackingKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,cAAc,CAAC,CAAC"}

package/src/api/dynex/DnxGetTrackingKey.ts

@@ -1,47 +0,0 @@
-import type { DnxGetTrackingKey as HardwareDnxGetTrackingKey } from '@onekeyfe/hd-transport';
-import { UI_REQUEST } from '../../constants/ui-request';
-import { serializedPath, validatePath } from '../helpers/pathUtils';
-import { BaseMethod } from '../BaseMethod';
-import { validateParams } from '../helpers/paramsValidator';
-
-import type { DnxGetTrackingKeyParams, DnxTrackingKey } from '../../types';
-
-export default class DnxGetTrackingKey extends BaseMethod<HardwareDnxGetTrackingKey> {
-  init() {
-    this.checkDeviceId = true;
-    this.notAllowDeviceMode = [...this.notAllowDeviceMode, UI_REQUEST.INITIALIZE];
-
-    const payload = this.payload as DnxGetTrackingKeyParams;
-
-    // check payload
-    validateParams(payload, [{ name: 'path', required: true }]);
-
-    // init params
-    const addressN = validatePath(payload.path, 3);
-
-    this.params = {
-      address_n: addressN,
-    };
-  }
-
-  getVersionRange() {
-    return {
-      classic: {
-        min: '3.8.0',
-      },
-    };
-  }
-
-  async run(): Promise<DnxTrackingKey> {
-    const res = await this.device.commands.typedCall('DnxGetTrackingKey', 'DnxTrackingKey', {
-      ...this.params,
-    });
-
-    const { tracking_key } = res.message;
-
-    return Promise.resolve({
-      path: serializedPath(this.params.address_n),
-      trackingKey: tracking_key,
-    });
-  }
-}

package/src/types/api/dnxGetTrackingKey.ts

@@ -1,16 +0,0 @@
-import type { CommonParams, Response } from '../params';
-
-export type DnxTrackingKey = {
-  path: string;
-  trackingKey: string;
-};
-
-export type DnxGetTrackingKeyParams = {
-  path: string | number[];
-};
-
-export declare function dnxGetTrackingKey(
-  connectId: string,
-  deviceId: string,
-  params: CommonParams & DnxGetTrackingKeyParams
-): Response<DnxTrackingKey>;