@onekeyfe/hd-core 0.1.8 → 0.1.9

package/src/api/helpers/pathUtils.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-bitwise */
 
-import { ChangeOutputScriptType, InputScriptType } from '@onekeyfe/hd-transport/src/types/messages';
+import { ChangeOutputScriptType, InputScriptType } from '@onekeyfe/hd-transport';
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 const HD_HARDENED = 0x80000000;

package/src/api/helpers/typeNameUtils.ts

@@ -1,6 +1,6 @@
 /* eslint-disable prefer-regex-literals */
 
-import { EthereumDataType, EthereumFieldType } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumDataType, EthereumFieldType } from '@onekeyfe/hd-transport';
 
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { EthereumSignTypedDataTypes } from '../../types/api/evmSignTypedData';

package/src/api/index.ts

@@ -17,6 +17,7 @@ export { default as deviceRecovery } from './device/DeviceRecovery';
 export { default as deviceReset } from './device/DeviceReset';
 export { default as deviceSettings } from './device/DeviceSettings';
 export { default as deviceUpdateReboot } from './device/DeviceUpdateReboot';
+export { default as deviceVerify } from './device/DeviceVerify';
 export { default as deviceWipe } from './device/DeviceWipe';
 export { default as evmGetAddress } from './evm/EVMGetAddress';
 export { default as evmGetPublicKey } from './evm/EVMGetPublicKey';

package/src/api/nem/NEMGetAddress.ts

@@ -1,4 +1,4 @@
-import { NEMGetAddress as HardwareNEMGetAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { NEMGetAddress as HardwareNEMGetAddress } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath, serializedPath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/nem/NEMSignTransaction.ts

@@ -8,7 +8,7 @@ import {
   NEMSignTx,
   NEMTransactionCommon,
   NEMTransfer,
-} from '@onekeyfe/hd-transport/src/types/messages';
+} from '@onekeyfe/hd-transport';
 
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { UI_REQUEST } from '../../constants/ui-request';

package/src/api/solana/SolGetAddress.ts

@@ -1,4 +1,4 @@
-import { SolanaGetAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { SolanaGetAddress } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -42,10 +42,12 @@ export default class SolGetAddress extends BaseMethod<SolanaGetAddress[]> {
     for (let i = 0; i < this.params.length; i++) {
       const param = this.params[i];
 
+      // @ts-expect-error
       const res = await this.device.commands.typedCall('SolanaGetAddress', 'SolanaAddress', {
         ...param,
       });
 
+      // @ts-expect-error
       const { address } = res.message;
 
       responses.push({

package/src/api/solana/SolSignTransaction.ts

@@ -1,4 +1,4 @@
-import { SolanaSignTx as HardwareSolanaSignTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { SolanaSignTx as HardwareSolanaSignTx } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
@@ -52,10 +52,12 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
     for (let i = 0; i < this.params.length; i++) {
       const param = this.params[i];
 
+      // @ts-expect-error
       const res = await this.device.commands.typedCall('SolanaSignTx', 'SolanaSignedTx', {
         ...param,
       });
 
+      // @ts-expect-error
       const { signature } = res.message;
 
       responses.push({

package/src/api/starcoin/StarcoinGetAddress.ts

@@ -1,4 +1,4 @@
-import { StarcoinGetAddress as HardwareStarcoinGetAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinGetAddress as HardwareStarcoinGetAddress } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath, serializedPath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/starcoin/StarcoinGetPublicKey.ts

@@ -1,4 +1,4 @@
-import { StarcoinGetPublicKey as HardwareStarcoinGetPublicKey } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinGetPublicKey as HardwareStarcoinGetPublicKey } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath, serializedPath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/starcoin/StarcoinSignMessage.ts

@@ -1,4 +1,4 @@
-import { StarcoinSignMessage as HardwareStarcoinSignMessage } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinSignMessage as HardwareStarcoinSignMessage } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/starcoin/StarcoinSignTransaction.ts

@@ -1,4 +1,4 @@
-import { StarcoinSignTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinSignTx } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/starcoin/StarcoinVerifyMessage.ts

@@ -1,4 +1,4 @@
-import { StarcoinVerifyMessage as HardwareStarcoinVerifyMessage } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinVerifyMessage as HardwareStarcoinVerifyMessage } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';

package/src/api/stellar/StellarGetAddress.ts

@@ -1,4 +1,4 @@
-import { StellarGetAddress as HardwareStellarGetAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { StellarGetAddress as HardwareStellarGetAddress } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/api/stellar/StellarSignTransaction.ts

@@ -1,7 +1,7 @@
 import {
   StellarSignedTx,
   StellarSignTx as HardwareStellarSignTx,
-} from '@onekeyfe/hd-transport/src/types/messages';
+} from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';

package/src/device/Device.ts

@@ -12,6 +12,7 @@ import {
   getDeviceType,
   getDeviceUUID,
   getDeviceBLEFirmwareVersion,
+  getDeviceTypeOnBootloader,
 } from '../utils/deviceFeaturesUtils';
 import type { Features, Device as DeviceTyped, UnavailableCapabilities } from '../types';
 import { DEVICE, DeviceButtonRequestPayload } from '../events';
@@ -114,7 +115,9 @@ export class Device extends EventEmitter {
       connectId: env === 'react-native' ? this.mainId || null : getDeviceUUID(this.features),
       /** Hardware ID, will not change at any time */
       uuid: getDeviceUUID(this.features),
-      deviceType: getDeviceType(this.features),
+      deviceType: this.features.bootloader_mode
+        ? getDeviceTypeOnBootloader(this.features)
+        : getDeviceType(this.features),
       /** ID for current seeds, will clear after replace a new seed at device */
       deviceId: this.features.device_id || null,
       path: this.originalDescriptor.path,

package/src/inject.ts

@@ -77,6 +77,7 @@ 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' }),
+    deviceVerify: (connectId, params) => call({ ...params, connectId, method: 'deviceVerify' }),
     deviceWipe: connectId => call({ connectId, method: 'deviceWipe' }),
 
     evmGetAddress: (connectId, params) => call({ ...params, connectId, method: 'evmGetAddress' }),

package/src/types/api/btcGetAddress.ts

@@ -2,7 +2,7 @@ import {
   Address,
   InputScriptType,
   MultisigRedeemScriptType,
-} from '@onekeyfe/hd-transport/src/types/messages';
+} from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type BTCAddress = {

package/src/types/api/btcGetPublicKey.ts

@@ -1,4 +1,4 @@
-import { InputScriptType, PublicKey } from '@onekeyfe/hd-transport/src/types/messages';
+import { InputScriptType, PublicKey } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type BTCPublicKey = {

package/src/types/api/btcSignMessage.ts

@@ -1,4 +1,4 @@
-import { MessageSignature } from '@onekeyfe/hd-transport/src/types/messages';
+import { MessageSignature } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type BTCSignMessageParams = {

package/src/types/api/btcSignTransaction.ts

@@ -4,7 +4,7 @@ import {
   TxOutputBinType,
   TxOutputType,
   TxInputType,
-} from '@onekeyfe/hd-transport/src/types/messages';
+} from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type SignedTransaction = {

package/src/types/api/btcVerifyMessage.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type BTCVerifyMessageParams = {

package/src/types/api/cipherKeyValue.ts

@@ -1,4 +1,4 @@
-import { CipheredKeyValue as HardwareCipheredKeyValue } from '@onekeyfe/hd-transport/src/types/messages';
+import { CipheredKeyValue as HardwareCipheredKeyValue } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type CipheredKeyValue = {

package/src/types/api/deviceBackup.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { Response } from '../params';
 
 export declare function deviceBackup(connectId: string): Response<Success>;

package/src/types/api/deviceChangePin.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type DeviceChangePinParams = {

package/src/types/api/deviceFlags.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type DeviceFlagsParams = {

package/src/types/api/deviceRebootToBootloader.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { Response } from '../params';
 
 export declare function deviceRebootToBootloader(connectId: string): Response<Success>;

package/src/types/api/deviceRecovery.ts

@@ -1,4 +1,4 @@
-import { RecoveryDeviceType, Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { RecoveryDeviceType, Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type DeviceRecoveryParams = {

package/src/types/api/deviceReset.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type DeviceResetParams = {

package/src/types/api/deviceSettings.ts

@@ -1,4 +1,4 @@
-import { SafetyCheckLevel, Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { SafetyCheckLevel, Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type DeviceSettingsParams = {

package/src/types/api/deviceUpdateReboot.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { Response } from '../params';
 
 export declare function deviceUpdateReboot(connectId: string): Response<Success>;

package/src/types/api/deviceVerify.ts

@@ -0,0 +1,15 @@
+import type { CommonParams, Response } from '../params';
+
+export type DeviceVerifyParams = {
+  dataHex: string;
+};
+
+export type DeviceVerifySignature = {
+  cert: Buffer;
+  signature: Buffer;
+};
+
+export declare function deviceVerify(
+  connectId: string,
+  params: CommonParams & DeviceVerifyParams
+): Response<DeviceVerifySignature>;

package/src/types/api/deviceWipe.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { Response } from '../params';
 
 export declare function deviceWipe(connectId: string): Response<Success>;

package/src/types/api/evmGetPublicKey.ts

@@ -1,4 +1,4 @@
-import { EthereumPublicKey } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumPublicKey } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type EVMPublicKey = {

package/src/types/api/evmSignMessage.ts

@@ -1,4 +1,4 @@
-import { EthereumMessageSignature } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumMessageSignature } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type EVMSignMessageParams = {

package/src/types/api/evmSignMessageEIP712.ts

@@ -1,4 +1,4 @@
-import { EthereumMessageSignature } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumMessageSignature } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type EVMSignMessageEIP712Params = {

package/src/types/api/evmSignTypedData.ts

@@ -1,4 +1,4 @@
-import { EthereumMessageSignature } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumMessageSignature } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type EthereumSignTypedDataTypeProperty = {

package/src/types/api/evmVerifyMessage.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type EVMVerifyMessageParams = {

package/src/types/api/export.ts

@@ -18,6 +18,7 @@ export type { DeviceFlagsParams } from './deviceFlags';
 export type { DeviceRecoveryParams } from './deviceRecovery';
 export type { DeviceResetParams } from './deviceReset';
 export type { DeviceSettingsParams } from './deviceSettings';
+export type { DeviceVerifyParams, DeviceVerifySignature } from './deviceVerify';
 
 export type { EVMAddress, EVMGetAddressParams } from './evmGetAddress';
 export type { EVMPublicKey, EVMGetPublicKeyParams } from './evmGetPublicKey';

package/src/types/api/index.ts

@@ -20,6 +20,7 @@ import { btcVerifyMessage } from './btcVerifyMessage';
 import { uiResponse } from './uiResponse';
 import { deviceReset } from './deviceReset';
 import { deviceRecovery } from './deviceRecovery';
+import { deviceVerify } from './deviceVerify';
 import { deviceWipe } from './deviceWipe';
 import { deviceRebootToBootloader } from './deviceRebootToBootloader';
 import { deviceBackup } from './deviceBackup';
@@ -79,6 +80,7 @@ export type CoreApi = {
   deviceReset: typeof deviceReset;
   deviceSettings: typeof deviceSettings;
   deviceUpdateReboot: typeof deviceUpdateReboot;
+  deviceVerify: typeof deviceVerify;
   deviceWipe: typeof deviceWipe;
 
   evmGetAddress: typeof evmGetAddress;

package/src/types/api/nemGetAddress.ts

@@ -1,4 +1,4 @@
-import { NEMAddress as HardwareNEMAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { NEMAddress as HardwareNEMAddress } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type NEMAddress = {

package/src/types/api/nemSignTransaction.ts

@@ -1,4 +1,4 @@
-import { NEMSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { NEMSignedTx } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 type MosaicID = {

package/src/types/api/solGetAddress.ts

@@ -1,4 +1,4 @@
-import { SolanaAddress as HardwareSolanaAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { SolanaAddress as HardwareSolanaAddress } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type SolanaAddress = {

package/src/types/api/solSignTransaction.ts

@@ -1,4 +1,4 @@
-import { SolanaSignedTx as HardwareSolanaSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { SolanaSignedTx as HardwareSolanaSignedTx } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type SolanaSignedTx = {

package/src/types/api/starcoinGetAddress.ts

@@ -1,4 +1,4 @@
-import { StarcoinAddress as HardwareStarcoinAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinAddress as HardwareStarcoinAddress } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type StarcoinAddress = {

package/src/types/api/starcoinGetPublicKey.ts

@@ -1,4 +1,4 @@
-import { StarcoinPublicKey as HardwareStarcoinPublicKey } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinPublicKey as HardwareStarcoinPublicKey } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type StarcoinPublicKey = {

package/src/types/api/starcoinSignMessage.ts

@@ -1,4 +1,4 @@
-import { StarcoinMessageSignature } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinMessageSignature } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type StarcoinSignMessageParams = {

package/src/types/api/starcoinSignTransaction.ts

@@ -1,4 +1,4 @@
-import { StarcoinSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { StarcoinSignedTx } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type StarcoinSignTransactionParams = {

package/src/types/api/starcoinVerifyMessage.ts

@@ -1,4 +1,4 @@
-import { Success } from '@onekeyfe/hd-transport/src/types/messages';
+import { Success } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type StarcoinVerifyMessageParams = {

package/src/types/api/stellarGetAddress.ts

@@ -1,4 +1,4 @@
-import { StellarAddress as HardwareStellarAddress } from '@onekeyfe/hd-transport/src/types/messages';
+import { StellarAddress as HardwareStellarAddress } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 
 export type StellarAddress = {

package/src/types/api/stellarSignTransaction.ts

@@ -1,4 +1,4 @@
-import { StellarSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { StellarSignedTx } from '@onekeyfe/hd-transport';
 import { CommonParams, Response } from '../params';
 
 export type StellarAsset = {

package/src/utils/deviceFeaturesUtils.ts

@@ -24,6 +24,17 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   return 'classic';
 };
 
+export const getDeviceTypeOnBootloader = (features?: Features): IDeviceType => {
+  if (!features || typeof features !== 'object') {
+    return 'classic';
+  }
+  if (features.model === 'T') {
+    return 'touch';
+  }
+
+  return getDeviceType(features);
+};
+
 export const getDeviceTypeByBleName = (name?: string): IDeviceType | null => {
   if (!name) return 'classic';
   if (name.startsWith('MI')) return 'mini';