@onekeyfe/hd-core 0.2.15 → 0.2.17

package/src/data-manager/DataManager.ts

@@ -17,6 +17,7 @@ import type {
   IDeviceFirmwareStatus,
   IDeviceBLEFirmwareStatus,
   ITransportStatus,
+  IDeviceType,
 } from '../types';
 import { getReleaseChangelog, getReleaseStatus, findLatestRelease } from '../utils/release';
 
@@ -48,6 +49,12 @@ export default class DataManager {
     default: MessagesJSON as unknown as JSON,
   };
 
+  /**
+   *  Since 3.5.0, Touch uses the firmware-v2 field to get firmware release info
+   */
+  static getFirmwareUpdateField = (deviceType: IDeviceType) =>
+    deviceType === 'touch' ? 'firmware-v2' : 'firmware';
+
   static getFirmwareStatus = (features: Features): IDeviceFirmwareStatus => {
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
@@ -59,7 +66,8 @@ export default class DataManager {
       return 'unknown';
     }
 
-    const targetDeviceConfigList = this.deviceMap[deviceType]?.firmware ?? [];
+    const firmwareUpdateField = this.getFirmwareUpdateField(deviceType);
+    const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseStatus(targetDeviceConfigList, currentVersion);
   };
@@ -74,7 +82,8 @@ export default class DataManager {
 
     if (deviceType !== 'pro' && deviceType !== 'touch') return undefined;
 
-    const targetDeviceConfigList = this.deviceMap[deviceType]?.firmware ?? [];
+    const firmwareUpdateField = this.getFirmwareUpdateField(deviceType);
+    const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const currentVersion = deviceFirmwareVersion.join('.');
     const targetDeviceConfig = targetDeviceConfigList.filter(item =>
       forcedUpdateRes
@@ -94,7 +103,8 @@ export default class DataManager {
 
     if (deviceType !== 'pro' && deviceType !== 'touch') return undefined;
 
-    const targetDeviceConfigList = this.deviceMap[deviceType]?.firmware ?? [];
+    const firmwareUpdateField = this.getFirmwareUpdateField(deviceType);
+    const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.fullResource);
 
     return findLatestRelease(targetDeviceConfig)?.fullResource;
@@ -111,14 +121,16 @@ export default class DataManager {
       return [];
     }
 
-    const targetDeviceConfigList = this.deviceMap[deviceType]?.firmware ?? [];
+    const firmwareUpdateField = this.getFirmwareUpdateField(deviceType);
+    const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseChangelog(targetDeviceConfigList, currentVersion);
   };
 
   static getFirmwareLatestRelease = (features: Features) => {
     const deviceType = getDeviceType(features);
-    const targetDeviceConfigList = this.deviceMap[deviceType]?.firmware ?? [];
+    const firmwareUpdateField = this.getFirmwareUpdateField(deviceType);
+    const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
 
     const target = findLatestRelease(targetDeviceConfigList);
     if (!target) return target;

package/src/inject.ts

@@ -80,6 +80,8 @@ export const inject = ({
     deviceChangePin: (connectId, params) =>
       call({ ...params, connectId, method: 'deviceChangePin' }),
     deviceFlags: (connectId, params) => call({ ...params, connectId, method: 'deviceFlags' }),
+    deviceRebootToBoardloader: connectId =>
+      call({ connectId, method: 'deviceRebootToBoardloader' }),
     deviceRebootToBootloader: connectId => call({ connectId, method: 'deviceRebootToBootloader' }),
     deviceRecovery: (connectId, params) => call({ ...params, connectId, method: 'deviceRecovery' }),
     deviceReset: (connectId, params) => call({ ...params, connectId, method: 'deviceReset' }),
@@ -212,6 +214,11 @@ export const inject = ({
       call({ ...params, connectId, deviceId, method: 'cardanoGetPublicKey' }),
     cardanoSignTransaction: (connectId, deviceId, params) =>
       call({ ...params, connectId, deviceId, method: 'cardanoSignTransaction' }),
+
+    filecoinGetAddress: (connectId, deviceId, params) =>
+      call({ ...params, connectId, deviceId, method: 'filecoinGetAddress' }),
+    filecoinSignTransaction: (connectId, deviceId, params) =>
+      call({ ...params, connectId, deviceId, method: 'filecoinSignTransaction' }),
   };
   return api;
 };

package/src/types/api/cardano.ts

@@ -99,7 +99,6 @@ export type CardanoOutput = (
   amount: string;
   tokenBundle?: CardanoAssetGroup[];
   datumHash?: string;
-  // @ts-expect-error
   format?: PROTO.CardanoTxOutputSerializationFormat;
   inlineDatum?: string;
   referenceScript?: string;

package/src/types/api/deviceRebootToBoardloader.ts

@@ -0,0 +1,6 @@
+import { Success, RebootToBoardloader } from '@onekeyfe/hd-transport';
+import type { Response } from '../params';
+
+export type RebootToBoardloaderParams = RebootToBoardloader;
+
+export declare function deviceRebootToBoardloader(connectId: string): Response<Success>;

package/src/types/api/export.ts

@@ -118,3 +118,6 @@ export type {
 } from './cardanoGetAddress';
 
 export type { CardanoSignTransaction, CardanoSignedTxData } from './cardano';
+
+export type { FilecoinAddress, FilecoinGetAddressParams } from './filecoinGetAddress';
+export type { FilecoinSignTransactionParams, FilecoinSignedTx } from './filecoinSignTransaction';

package/src/types/api/filecoinGetAddress.ts

@@ -0,0 +1,23 @@
+import { FilecoinAddress as HardwareFilecoinAddress } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+
+export type FilecoinAddress = {
+  path: string;
+} & HardwareFilecoinAddress;
+
+export type FilecoinGetAddressParams = {
+  path: string | number[];
+  showOnOneKey?: boolean;
+};
+
+export declare function filecoinGetAddress(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & FilecoinGetAddressParams
+): Response<FilecoinAddress>;
+
+export declare function filecoinGetAddress(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & { bundle?: FilecoinGetAddressParams[] }
+): Response<Array<FilecoinAddress>>;

package/src/types/api/filecoinSignTransaction.ts

@@ -0,0 +1,23 @@
+import { FilecoinSignedTx as HardwareFilecoinSignedTx } from '@onekeyfe/hd-transport';
+import type { CommonParams, Response } from '../params';
+
+export type FilecoinSignedTx = {
+  path: string;
+} & HardwareFilecoinSignedTx;
+
+export type FilecoinSignTransactionParams = {
+  path: string | number[];
+  rawTx?: string;
+};
+
+export declare function filecoinSignTransaction(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & FilecoinSignTransactionParams
+): Response<FilecoinSignedTx>;
+
+export declare function filecoinSignTransaction(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & { bundle?: FilecoinSignTransactionParams[] }
+): Response<Array<FilecoinSignedTx>>;

package/src/types/api/firmwareUpdate.ts

@@ -20,3 +20,15 @@ export declare function firmwareUpdate(
   connectId: string | undefined,
   params: Params<FirmwareUpdateBinaryParams>
 ): Response<PROTO.Success>;
+
+type IPlatform = 'native' | 'desktop' | 'ext' | 'web' | 'webEmbed';
+type Platform = { platform: IPlatform };
+
+export declare function firmwareUpdateV2(
+  connectId: string | undefined,
+  params: Params<FirmwareUpdateParams & Platform>
+): Response<PROTO.Success>;
+export declare function firmwareUpdateV2(
+  connectId: string | undefined,
+  params: Params<FirmwareUpdateBinaryParams & Platform>
+): Response<PROTO.Success>;

package/src/types/api/index.ts

@@ -11,7 +11,7 @@ import { getFeatures } from './getFeatures';
 import { getPassphraseState } from './getPassphraseState';
 import { checkFirmwareRelease } from './checkFirmwareRelease';
 import { checkBLEFirmwareRelease } from './checkBLEFirmwareRelease';
-import { firmwareUpdate } from './firmwareUpdate';
+import { firmwareUpdate, firmwareUpdateV2 } from './firmwareUpdate';
 import { requestWebUsbDevice } from './requestWebUsbDevice';
 
 import { deviceReset } from './deviceReset';
@@ -19,6 +19,7 @@ import { deviceRecovery } from './deviceRecovery';
 import { deviceVerify } from './deviceVerify';
 import { deviceWipe } from './deviceWipe';
 import { deviceRebootToBootloader } from './deviceRebootToBootloader';
+import { deviceRebootToBoardloader } from './deviceRebootToBoardloader';
 import { deviceBackup } from './deviceBackup';
 import { deviceChangePin } from './deviceChangePin';
 import { deviceSettings } from './deviceSettings';
@@ -94,6 +95,9 @@ import { cardanoGetAddress } from './cardanoGetAddress';
 import { cardanoGetPublicKey } from './cardanoGetPublicKey';
 import { cardanoSignTransaction } from './cardanoSignTransaction';
 
+import { filecoinGetAddress } from './filecoinGetAddress';
+import { filecoinSignTransaction } from './filecoinSignTransaction';
+
 export * from './export';
 
 export type CoreApi = {
@@ -126,6 +130,7 @@ export type CoreApi = {
   deviceBackup: typeof deviceBackup;
   deviceChangePin: typeof deviceChangePin;
   deviceFlags: typeof deviceFlags;
+  deviceRebootToBoardloader: typeof deviceRebootToBoardloader;
   deviceRebootToBootloader: typeof deviceRebootToBootloader;
   deviceRecovery: typeof deviceRecovery;
   deviceReset: typeof deviceReset;
@@ -139,7 +144,7 @@ export type CoreApi = {
   checkFirmwareRelease: typeof checkFirmwareRelease;
   checkBLEFirmwareRelease: typeof checkBLEFirmwareRelease;
   firmwareUpdate: typeof firmwareUpdate;
-  firmwareUpdateV2: typeof firmwareUpdate;
+  firmwareUpdateV2: typeof firmwareUpdateV2;
 
   cipherKeyValue: typeof cipherKeyValue;
 
@@ -251,4 +256,10 @@ export type CoreApi = {
   cardanoGetAddress: typeof cardanoGetAddress;
   cardanoGetPublicKey: typeof cardanoGetPublicKey;
   cardanoSignTransaction: typeof cardanoSignTransaction;
+
+  /**
+   * Filecoin function
+   */
+  filecoinGetAddress: typeof filecoinGetAddress;
+  filecoinSignTransaction: typeof filecoinSignTransaction;
 };

package/src/types/settings.ts

@@ -56,6 +56,7 @@ export type IBLEFirmwareReleaseInfo = {
 export type DeviceTypeMap = {
   [k in IDeviceType]: {
     firmware: IFirmwareReleaseInfo[];
+    'firmware-v2'?: IFirmwareReleaseInfo[];
     ble: IBLEFirmwareReleaseInfo[];
   };
 };