@onekeyfe/hd-core 0.1.55 → 0.1.56

package/src/data-manager/DataManager.ts

@@ -18,7 +18,7 @@ import type {
   IDeviceBLEFirmwareStatus,
   ITransportStatus,
 } from '../types';
-import { getReleaseChangelog, getReleaseStatus, findLatestRelease } from '../utils/release';
+import { getReleaseChangelog, getReleaseStatus } from '../utils/release';
 
 export default class DataManager {
   static deviceMap: DeviceTypeMap = {
@@ -64,25 +64,6 @@ export default class DataManager {
     return getReleaseStatus(targetDeviceConfigList, currentVersion);
   };
 
-  /**
-   * Touch、Pro System UI Resource Update
-   * ** Interval upgrade is not considered **
-   */
-  static getSysResourcesLatestRelease = (features: Features) => {
-    const deviceType = getDeviceType(features);
-    const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
-
-    if (deviceType !== 'pro' && deviceType !== 'touch') return undefined;
-
-    const targetDeviceConfigList = this.deviceMap[deviceType]?.firmware ?? [];
-    const currentVersion = deviceFirmwareVersion.join('.');
-    const targetDeviceConfig = targetDeviceConfigList.filter(
-      item => semver.gt(item.version.join('.'), currentVersion) && !!item.resource
-    );
-
-    return findLatestRelease(targetDeviceConfig)?.resource;
-  };
-
   static getFirmwareChangelog = (features: Features) => {
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
@@ -99,21 +80,10 @@ export default class DataManager {
     return getReleaseChangelog(targetDeviceConfigList, currentVersion);
   };
 
-  static getFirmwareLatestRelease = (features: Features) => {
+  static getFirmwareLeatestRelease = (features: Features) => {
     const deviceType = getDeviceType(features);
     const targetDeviceConfigList = this.deviceMap[deviceType]?.firmware ?? [];
-
-    const target = findLatestRelease(targetDeviceConfigList);
-    if (!target) return target;
-
-    if (!target.resource) {
-      const resource = this.getSysResourcesLatestRelease(features);
-      return {
-        ...target,
-        resource,
-      };
-    }
-    return target;
+    return targetDeviceConfigList[targetDeviceConfigList.length - 1];
   };
 
   static getBLEFirmwareStatus = (features: Features): IDeviceBLEFirmwareStatus => {
@@ -143,10 +113,10 @@ export default class DataManager {
     return getReleaseChangelog(targetDeviceConfigList, currentVersion);
   };
 
-  static getBleFirmwareLatestRelease = (features: Features) => {
+  static getBleFirmwareLeatestRelease = (features: Features) => {
     const deviceType = getDeviceType(features);
     const targetDeviceConfigList = this.deviceMap[deviceType]?.ble ?? [];
-    return findLatestRelease(targetDeviceConfigList);
+    return targetDeviceConfigList[targetDeviceConfigList.length - 1];
   };
 
   static getTransportStatus = (localVersion: string): ITransportStatus => {

package/src/inject.ts

@@ -85,8 +85,6 @@ export const inject = ({
     deviceReset: (connectId, params) => call({ ...params, connectId, method: 'deviceReset' }),
     deviceSettings: (connectId, params) => call({ ...params, connectId, method: 'deviceSettings' }),
     deviceUpdateReboot: connectId => call({ connectId, method: 'deviceUpdateReboot' }),
-    deviceUploadResource: (connectId, params) =>
-      call({ ...params, connectId, method: 'deviceUploadResource' }),
     deviceSupportFeatures: connectId => call({ connectId, method: 'deviceSupportFeatures' }),
     deviceVerify: (connectId, params) => call({ ...params, connectId, method: 'deviceVerify' }),
     deviceWipe: connectId => call({ connectId, method: 'deviceWipe' }),

package/src/types/api/confluxSignTransaction.ts

@@ -28,5 +28,5 @@ export type ConfluxSignTransactionParams = {
 export declare function confluxSignTransaction(
   connectId: string,
   deviceId: string,
-  params: CommonParams & ConfluxSignTransactionParams
+  params: CommonParams & ConfluxTransaction
 ): Response<ConfluxSignedTx>;

package/src/types/api/export.ts

@@ -20,8 +20,6 @@ export type { DeviceResetParams } from './deviceReset';
 export type { DeviceSettingsParams } from './deviceSettings';
 export type { DeviceVerifyParams, DeviceVerifySignature } from './deviceVerify';
 export type { DeviceSupportFeatures } from './deviceSupportFeatures';
-export type { DeviceUploadResourceParams } from './deviceUploadResource';
-export type { FirmwareUpdateParams, FirmwareUpdateBinaryParams } from './firmwareUpdate';
 
 export type { EVMAddress, EVMGetAddressParams } from './evmGetAddress';
 export type { EVMPublicKey, EVMGetPublicKeyParams } from './evmGetPublicKey';

package/src/types/api/firmwareUpdate.ts

@@ -1,21 +1,21 @@
 import type { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
 
-export interface FirmwareUpdateBinaryParams {
+export interface FirmwareUpdateBinary {
   binary: ArrayBuffer;
 }
 
-export interface FirmwareUpdateParams {
-  version?: number[];
+export interface FirmwareUpdate {
+  version: number[];
   btcOnly?: boolean;
   updateType: 'firmware' | 'ble';
 }
 
 export declare function firmwareUpdate(
   connectId: string | undefined,
-  params: Params<FirmwareUpdateParams>
+  params: Params<FirmwareUpdate>
 ): Response<PROTO.Success>;
 export declare function firmwareUpdate(
   connectId: string | undefined,
-  params: Params<FirmwareUpdateBinaryParams>
+  params: Params<FirmwareUpdateBinary>
 ): Response<PROTO.Success>;

package/src/types/api/index.ts

@@ -24,7 +24,6 @@ import { deviceChangePin } from './deviceChangePin';
 import { deviceSettings } from './deviceSettings';
 import { deviceFlags } from './deviceFlags';
 import { deviceUpdateReboot } from './deviceUpdateReboot';
-import { deviceUploadResource } from './deviceUploadResource';
 import { deviceSupportFeatures } from './deviceSupportFeatures';
 
 import { cipherKeyValue } from './cipherKeyValue';
@@ -111,7 +110,6 @@ export type CoreApi = {
   deviceReset: typeof deviceReset;
   deviceSettings: typeof deviceSettings;
   deviceUpdateReboot: typeof deviceUpdateReboot;
-  deviceUploadResource: typeof deviceUploadResource;
   deviceSupportFeatures: typeof deviceSupportFeatures;
   deviceVerify: typeof deviceVerify;
   deviceWipe: typeof deviceWipe;

package/src/types/settings.ts

@@ -27,8 +27,6 @@ export type ILocale = 'zh-CN' | 'en-US';
 export type IFirmwareReleaseInfo = {
   required: boolean;
   url: string;
-  /** Firmware UI resource */
-  resource?: string;
   fingerprint: string;
   version: IVersionArray;
   changelog: {

package/src/utils/release.ts

@@ -1,10 +1,5 @@
 import semver from 'semver';
-import {
-  IBLEFirmwareReleaseInfo,
-  IDeviceFirmwareStatus,
-  IFirmwareReleaseInfo,
-  IVersionArray,
-} from '../types';
+import { IBLEFirmwareReleaseInfo, IDeviceFirmwareStatus, IFirmwareReleaseInfo } from '../types';
 
 export const getReleaseStatus = (
   releases: (IFirmwareReleaseInfo | IBLEFirmwareReleaseInfo)[],
@@ -27,15 +22,3 @@ export const getReleaseChangelog = (
   const newVersions = releases.filter(r => semver.gt(r.version.join('.'), currentVersion));
   return newVersions.map(r => r.changelog);
 };
-
-export const findLatestRelease = <T extends { version: IVersionArray }>(
-  releases: T[]
-): T | undefined => {
-  let leastRelease = releases[0];
-  releases.forEach(release => {
-    if (semver.gt(release.version.join('.'), leastRelease.version.join('.'))) {
-      leastRelease = release;
-    }
-  });
-  return leastRelease;
-};

package/dist/api/device/DeviceUploadResource.d.ts

@@ -1,18 +0,0 @@
-import { ResourceUpload, Success } from '@onekeyfe/hd-transport';
-import { TypedResponseMessage } from '../../device/DeviceCommands';
-import { BaseMethod } from '../BaseMethod';
-export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
-    paramsData: {
-        data: Uint8Array;
-        thumbnailData: Uint8Array;
-    };
-    getVersionRange(): {
-        model_touch: {
-            min: string;
-        };
-    };
-    init(): void;
-    processResourceRequest: (res: TypedResponseMessage<'ResourceRequest'> | TypedResponseMessage<'ZoomRequest'> | TypedResponseMessage<'Success'>) => Promise<Success>;
-    run(): Promise<Success>;
-}
-//# sourceMappingURL=DeviceUploadResource.d.ts.map

package/dist/api/device/DeviceUploadResource.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DeviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUploadResource.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,cAAc,CAAC;IAC1E,UAAU;;;MAGR;IAEF,eAAe;;;;;IAQf,IAAI;IA8BJ,sBAAsB,QAEhB,qBAAqB,iBAAiB,CAAC,GACvC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,SAAS,CAAC,KAClC,QAAQ,OAAO,CAAC,CAkCjB;IAEI,GAAG;CASV"}

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

@@ -1,11 +0,0 @@
-import { ResourceType, Success } from '@onekeyfe/hd-transport';
-import type { CommonParams, Response } from '../params';
-export declare type DeviceUploadResourceParams = {
-    suffix: string;
-    dataHex: string;
-    thumbnailDataHex: string;
-    resType: ResourceType;
-    nftMetaData: string;
-};
-export declare function deviceUploadResource(connectId: string, params: CommonParams & DeviceUploadResourceParams): Response<Success>;
-//# sourceMappingURL=deviceUploadResource.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"deviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUploadResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,OAAO,CAAC,CAAC"}

package/src/api/device/DeviceUploadResource.ts

@@ -1,104 +0,0 @@
-import { bytesToHex } from '@noble/hashes/utils';
-import { ResourceUpload, Success } from '@onekeyfe/hd-transport';
-import { blake2s } from '@noble/hashes/blake2s';
-import { TypedResponseMessage } from '../../device/DeviceCommands';
-import { DeviceUploadResourceParams } from '../../types';
-import { BaseMethod } from '../BaseMethod';
-import { validateParams } from '../helpers/paramsValidator';
-import { hexToBytes } from '../helpers/hexUtils';
-
-export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
-  paramsData = {
-    data: new Uint8Array(),
-    thumbnailData: new Uint8Array(),
-  };
-
-  getVersionRange() {
-    return {
-      model_touch: {
-        min: '3.2.0',
-      },
-    };
-  }
-
-  init() {
-    this.useDevicePassphraseState = false;
-
-    // check payload
-    validateParams(this.payload, [
-      { name: 'suffix', type: 'string', required: true },
-      { name: 'dataHex', type: 'string', required: true },
-      { name: 'thumbnailDataHex', type: 'string', required: true },
-      { name: 'resType', type: 'number', required: true },
-      { name: 'nftMetaData', type: 'string' },
-    ]);
-
-    const { suffix, dataHex, thumbnailDataHex, resType, nftMetaData } = this
-      .payload as DeviceUploadResourceParams;
-
-    // init params
-    this.paramsData = {
-      data: hexToBytes(dataHex),
-      thumbnailData: hexToBytes(thumbnailDataHex),
-    };
-
-    this.params = {
-      extension: suffix,
-      data_length: this.paramsData.data.byteLength,
-      zoom_data_length: this.paramsData.thumbnailData.byteLength,
-      res_type: resType,
-      nft_meta_data: nftMetaData,
-    };
-  }
-
-  processResourceRequest = async (
-    res:
-      | TypedResponseMessage<'ResourceRequest'>
-      | TypedResponseMessage<'ZoomRequest'>
-      | TypedResponseMessage<'Success'>
-  ): Promise<Success> => {
-    if (res.type === 'Success') {
-      return res.message;
-    }
-
-    const { offset, data_length } = res.message;
-    const { data, thumbnailData } = this.paramsData;
-
-    if (offset === undefined) {
-      throw new Error('offset is undefined');
-    }
-
-    let payload: Uint8Array;
-    if (res.type === 'ResourceRequest') {
-      payload = new Uint8Array(data.slice(offset, Math.min(offset + data_length, data.byteLength)));
-    } else {
-      payload = new Uint8Array(
-        thumbnailData.slice(offset, Math.min(offset + data_length, thumbnailData.byteLength))
-      );
-    }
-
-    const digest = blake2s(payload);
-
-    const resourceAckParams = {
-      data_chunk: bytesToHex(payload),
-      hash: bytesToHex(digest),
-    };
-
-    const response = await this.device.commands.typedCall(
-      'ResourceAck',
-      ['ResourceRequest', 'ZoomRequest', 'Success'],
-      resourceAckParams
-    );
-    return this.processResourceRequest(response);
-  };
-
-  async run() {
-    const res = await this.device.commands.typedCall(
-      'ResourceUpload',
-      ['ResourceRequest', 'ZoomRequest', 'Success'],
-      this.params
-    );
-
-    return this.processResourceRequest(res);
-  }
-}

package/src/types/api/deviceUploadResource.ts

@@ -1,15 +0,0 @@
-import { ResourceType, Success } from '@onekeyfe/hd-transport';
-import type { CommonParams, Response } from '../params';
-
-export type DeviceUploadResourceParams = {
-  suffix: string;
-  dataHex: string;
-  thumbnailDataHex: string;
-  resType: ResourceType;
-  nftMetaData: string;
-};
-
-export declare function deviceUploadResource(
-  connectId: string,
-  params: CommonParams & DeviceUploadResourceParams
-): Response<Success>;