@onekeyfe/hd-core 1.1.27-alpha.30 → 1.1.27-alpha.31

package/src/api/dynex/DnxSignTransaction.ts

@@ -1,8 +1,11 @@
+import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+
 import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
+import { getFirmwareType } from '../../utils';
 
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 import type { DnxSignature } from '../../types';
@@ -115,6 +118,10 @@ export default class DnxSignTransaction extends BaseMethod<DnxSignTx> {
   }
 
   async run() {
+    if (this.device.originalDescriptor?.protocolType === 'V2') {
+      throw createDeviceNotSupportMethodError(this.name, getFirmwareType(this.device.features));
+    }
+
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
 
     const res = await this.device.commands.typedCall('DnxSignTx', 'DnxInputRequest', {

package/src/api/evm/EVMGetAddress.ts

@@ -44,7 +44,7 @@ export default class EvmGetAddress extends BaseMethod<EthereumGetAddressOneKey[]
   }
 
   async getEvmAddress(param: EthereumGetAddressOneKey) {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
       return getAddressLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         param,

package/src/api/evm/EVMGetPublicKey.ts

@@ -57,7 +57,7 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
   }
 
   getEvmPublicKey(param: EthereumGetPublicKey) {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
       return getPublicKeyLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         param,

package/src/api/evm/EVMSignMessage.ts

@@ -34,7 +34,7 @@ export default class EVMSignMessage extends BaseMethod<EthereumSignMessageOneKey
   }
 
   async run() {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
       return signMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,

package/src/api/evm/EVMSignTransaction.ts

@@ -120,7 +120,7 @@ export default class EVMSignTransaction extends BaseMethod {
 
     if (formattedTx == null) throw ERRORS.TypedError('Runtime', 'formattedTx is not set');
 
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
       return signTransactionLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         addressN,

package/src/api/evm/EVMSignTypedData.ts

@@ -260,8 +260,8 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
 
     let supportTrezor = false;
     let response: MessageResponse<MessageKey>;
-    switch (TransportManager.getMessageVersion()) {
-      case 'v1':
+    switch (TransportManager.getProtocolV1MessageSchema()) {
+      case 'protocolV1Legacy':
         supportTrezor = true;
         response = await signTypedDataLegacyV1({
           typedCall: this.device.commands.typedCall.bind(this.device.commands),
@@ -272,7 +272,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
         });
         break;
 
-      case 'latest':
+      case 'protocolV1Current':
       default:
         supportTrezor = false;
         response = await signTypedData({
@@ -308,8 +308,8 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
   }) {
     if (!domainHash) throw ERRORS.TypedError('Runtime', 'domainHash is required');
 
-    switch (TransportManager.getMessageVersion()) {
-      case 'v1':
+    switch (TransportManager.getProtocolV1MessageSchema()) {
+      case 'protocolV1Legacy':
         return signTypedHashLegacyV1({
           typedCall,
           addressN,
@@ -319,7 +319,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
           device: this.device,
         });
 
-      case 'latest':
+      case 'protocolV1Current':
       default:
         return signTypedHash({
           typedCall,

package/src/api/evm/EVMVerifyMessage.ts

@@ -31,7 +31,7 @@ export default class EVMSignMessage extends BaseMethod<EthereumVerifyMessageOneK
   }
 
   async run() {
-    if (TransportManager.getMessageVersion() === 'v1') {
+    if (TransportManager.getProtocolV1MessageSchema() === 'protocolV1Legacy') {
       return verifyMessageLegacyV1({
         typedCall: this.device.commands.typedCall.bind(this.device.commands),
         params: this.params,

package/src/api/helpers/batchGetPublickeys.ts

@@ -7,7 +7,7 @@ import {
 import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { isEqualBip44CoinType } from './pathUtils';
 import { splitArray } from '../../utils/arrayUtils';
-import { getDeviceType, getFirmwareType } from '../../utils';
+import { getDeviceType, getFirmwareType, shouldSkipMethodSupportCheck } from '../../utils';
 import { DeviceModelToTypes } from '../../types';
 
 import type { EcdsaPublicKeys, Path } from '@onekeyfe/hd-transport';
@@ -28,7 +28,9 @@ export async function batchGetPublickeys(
     throw TypedError(HardwareErrorCode.ForbiddenKeyPath, 'Path length must be greater than 3');
   }
 
-  const supportsBatchPublicKey = supportBatchPublicKey(device.features, options);
+  const supportsBatchPublicKey =
+    shouldSkipMethodSupportCheck(device.features, device.originalDescriptor?.protocolType) ||
+    supportBatchPublicKey(device.features, options);
   if (!supportsBatchPublicKey) {
     throw createDeviceNotSupportMethodError('BatchGetPublickeys', getFirmwareType(device.features));
   }

package/src/api/index.ts

@@ -43,11 +43,11 @@ export { default as promptWebDeviceAccess } from './PromptWebDeviceAccess';
 // File system & device control API (Protocol V2 only)
 export { default as getProtoVersion } from './protocol-v2/GetProtoVersion';
 export { default as ping } from './protocol-v2/Ping';
-export { default as devReboot } from './protocol-v2/DevReboot';
-export { default as devGetDeviceInfo } from './protocol-v2/DevGetDeviceInfo';
-export { default as devGetOnboardingStatus } from './protocol-v2/DevGetOnboardingStatus';
-export { default as devFirmwareUpdate } from './protocol-v2/DevFirmwareUpdate';
-export { default as devGetFirmwareUpdateStatus } from './protocol-v2/DevGetFirmwareUpdateStatus';
+export { default as deviceReboot } from './protocol-v2/DeviceReboot';
+export { default as deviceGetDeviceInfo } from './protocol-v2/DeviceGetDeviceInfo';
+export { default as deviceGetOnboardingStatus } from './protocol-v2/DeviceGetOnboardingStatus';
+export { default as deviceFirmwareUpdate } from './protocol-v2/DeviceFirmwareUpdate';
+export { default as deviceGetFirmwareUpdateStatus } from './protocol-v2/DeviceGetFirmwareUpdateStatus';
 export { default as factoryDeviceInfoSettings } from './protocol-v2/FactoryDeviceInfoSettings';
 export { default as factoryGetDeviceInfo } from './protocol-v2/FactoryGetDeviceInfo';
 export { default as filesystemFixPermission } from './protocol-v2/FilesystemFixPermission';

package/src/api/protocol-v2/{DevFirmwareUpdate.ts → DeviceFirmwareUpdate.ts}

@@ -5,9 +5,9 @@ import {
   normalizeFirmwareTargets,
 } from './helpers';
 
-import type { DevFirmwareUpdateParams } from './helpers';
+import type { DeviceFirmwareUpdateParams } from './helpers';
 
-export default class DevFirmwareUpdate extends BaseMethod<DevFirmwareUpdateParams> {
+export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdateParams> {
   init() {
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
@@ -21,7 +21,7 @@ export default class DevFirmwareUpdate extends BaseMethod<DevFirmwareUpdateParam
 
   async run() {
     const res = await this.device.commands.typedCall(
-      'DevFirmwareUpdate',
+      'DeviceFirmwareUpdate',
       PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
       {
         targets: normalizeFirmwareTargets(this.params),

package/src/api/protocol-v2/{DevGetDeviceInfo.ts → DeviceGetDeviceInfo.ts}

@@ -1,9 +1,9 @@
 import { BaseMethod } from '../BaseMethod';
 import { buildTargets, buildTypes } from './helpers';
 
-import type { DevGetDeviceInfoParams } from './helpers';
+import type { DeviceGetDeviceInfoParams } from './helpers';
 
-export default class DevGetDeviceInfo extends BaseMethod<DevGetDeviceInfoParams> {
+export default class DeviceGetDeviceInfo extends BaseMethod<DeviceGetDeviceInfoParams> {
   init() {
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
@@ -26,7 +26,7 @@ export default class DevGetDeviceInfo extends BaseMethod<DevGetDeviceInfoParams>
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('DevGetDeviceInfo', 'DeviceInfo', {
+    const res = await this.device.commands.typedCall('DeviceGetDeviceInfo', 'DeviceInfo', {
       targets: buildTargets(this.params),
       types: buildTypes(this.params),
     });

package/src/api/protocol-v2/{DevGetFirmwareUpdateStatus.ts → DeviceGetFirmwareUpdateStatus.ts}

@@ -1,6 +1,6 @@
 import { BaseMethod } from '../BaseMethod';
 
-export default class DevGetFirmwareUpdateStatus extends BaseMethod {
+export default class DeviceGetFirmwareUpdateStatus extends BaseMethod {
   init() {
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
@@ -9,8 +9,8 @@ export default class DevGetFirmwareUpdateStatus extends BaseMethod {
 
   async run() {
     const res = await this.device.commands.typedCall(
-      'DevGetFirmwareUpdateStatus',
-      'DevFirmwareUpdateStatus',
+      'DeviceGetFirmwareUpdateStatus',
+      'DeviceFirmwareUpdateStatus',
       {}
     );
     return Promise.resolve(res.message);

package/src/api/protocol-v2/{DevGetOnboardingStatus.ts → DeviceGetOnboardingStatus.ts}

@@ -1,6 +1,6 @@
 import { BaseMethod } from '../BaseMethod';
 
-export default class DevGetOnboardingStatus extends BaseMethod {
+export default class DeviceGetOnboardingStatus extends BaseMethod {
   init() {
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
@@ -9,8 +9,8 @@ export default class DevGetOnboardingStatus extends BaseMethod {
 
   async run() {
     const res = await this.device.commands.typedCall(
-      'DevGetOnboardingStatus',
-      'DevOnboardingStatus',
+      'DeviceGetOnboardingStatus',
+      'DeviceOnboardingStatus',
       {}
     );
     return Promise.resolve(res.message);

package/src/api/protocol-v2/{DevReboot.ts → DeviceReboot.ts}

@@ -1,9 +1,9 @@
 import { BaseMethod } from '../BaseMethod';
 import { normalizeRebootType } from './helpers';
 
-import type { DevRebootParams } from './helpers';
+import type { DeviceRebootParams } from './helpers';
 
-export default class DevReboot extends BaseMethod<DevRebootParams> {
+export default class DeviceReboot extends BaseMethod<DeviceRebootParams> {
   init() {
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
@@ -14,7 +14,7 @@ export default class DevReboot extends BaseMethod<DevRebootParams> {
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('DevReboot', 'Success', {
+    const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
       reboot_type: normalizeRebootType(this.params.reboot_type ?? this.params.rebootType),
     });
     return Promise.resolve(res.message);

package/src/api/protocol-v2/helpers.ts

@@ -1,23 +1,23 @@
-import { DevRebootType } from '@onekeyfe/hd-transport';
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
 
 import type {
-  DevFirmwareTarget,
-  DevFirmwareTargetType,
-  DevInfoTargets,
-  DevInfoTypes,
+  DeviceFirmwareTarget,
+  DeviceFirmwareTargetType,
+  DeviceInfoTargets,
+  DeviceInfoTypes,
   TransportCallOptions,
 } from '@onekeyfe/hd-transport';
 
-export type RebootTypeInput = DevRebootType | keyof typeof DevRebootType | string | number;
+export type RebootTypeInput = DeviceRebootType | keyof typeof DeviceRebootType | string | number;
 
-export type DevRebootParams = {
+export type DeviceRebootParams = {
   rebootType?: RebootTypeInput;
   reboot_type?: RebootTypeInput;
 };
 
-export type DevGetDeviceInfoParams = {
-  targets?: DevInfoTargets;
-  types?: DevInfoTypes;
+export type DeviceGetDeviceInfoParams = {
+  targets?: DeviceInfoTargets;
+  types?: DeviceInfoTypes;
   targetHw?: boolean;
   targetFw?: boolean;
   targetBt?: boolean;
@@ -32,18 +32,18 @@ export type DevGetDeviceInfoParams = {
   includeSpecific?: boolean;
 };
 
-export type DevFirmwareTargetInput =
-  | DevFirmwareTarget
+export type DeviceFirmwareTargetInput =
+  | DeviceFirmwareTarget
   | {
-      targetId?: DevFirmwareTargetType | string | number;
-      target_id?: DevFirmwareTargetType | string | number;
+      targetId?: DeviceFirmwareTargetType | string | number;
+      target_id?: DeviceFirmwareTargetType | string | number;
       path: string;
     };
 
-export type DevFirmwareUpdateParams = {
-  targets?: DevFirmwareTargetInput[];
-  targetId?: DevFirmwareTargetType | string | number;
-  target_id?: DevFirmwareTargetType | string | number;
+export type DeviceFirmwareUpdateParams = {
+  targets?: DeviceFirmwareTargetInput[];
+  targetId?: DeviceFirmwareTargetType | string | number;
+  target_id?: DeviceFirmwareTargetType | string | number;
   path?: string;
 };
 
@@ -56,42 +56,42 @@ export type FactoryDeviceInfoSettingsParams = {
   preFirmware?: string;
 };
 
-const DEV_REBOOT_TYPES: Record<string, DevRebootType> = {
-  Normal: DevRebootType.Normal,
-  normal: DevRebootType.Normal,
-  Boardloader: DevRebootType.Boardloader,
-  boardloader: DevRebootType.Boardloader,
-  Bootloader: DevRebootType.Bootloader,
-  bootloader: DevRebootType.Bootloader,
+const DEVICE_REBOOT_TYPES: Record<string, DeviceRebootType> = {
+  Normal: DeviceRebootType.Normal,
+  normal: DeviceRebootType.Normal,
+  Boardloader: DeviceRebootType.Boardloader,
+  boardloader: DeviceRebootType.Boardloader,
+  Bootloader: DeviceRebootType.Bootloader,
+  bootloader: DeviceRebootType.Bootloader,
 };
 
 export const PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS: TransportCallOptions = {
-  intermediateTypes: ['DevFirmwareInstallProgress'],
+  intermediateTypes: ['DeviceFirmwareInstallProgress'],
 };
 
-export const PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES: ('Success' | 'DevFirmwareUpdateStatus')[] =
-  ['Success', 'DevFirmwareUpdateStatus'];
+export const PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES: ('Success' | 'DeviceFirmwareUpdateStatus')[] =
+  ['Success', 'DeviceFirmwareUpdateStatus'];
 
-export function normalizeRebootType(value: RebootTypeInput | undefined): DevRebootType {
+export function normalizeRebootType(value: RebootTypeInput | undefined): DeviceRebootType {
   if (typeof value === 'number') return value;
   if (typeof value === 'string') {
     const numeric = Number(value);
     if (Number.isFinite(numeric)) return numeric;
-    if (value in DEV_REBOOT_TYPES) return DEV_REBOOT_TYPES[value];
+    if (value in DEVICE_REBOOT_TYPES) return DEVICE_REBOOT_TYPES[value];
   }
-  return DevRebootType.Normal;
+  return DeviceRebootType.Normal;
 }
 
 function normalizeTargetId(
-  value: DevFirmwareTargetType | string | number | undefined
-): DevFirmwareTargetType {
+  value: DeviceFirmwareTargetType | string | number | undefined
+): DeviceFirmwareTargetType {
   if (typeof value === 'number') return value;
   const numeric = Number(value);
   if (Number.isFinite(numeric)) return numeric;
   return 0;
 }
 
-export function normalizeFirmwareTargets(params: DevFirmwareUpdateParams): DevFirmwareTarget[] {
+export function normalizeFirmwareTargets(params: DeviceFirmwareUpdateParams): DeviceFirmwareTarget[] {
   const targets =
     params.targets ??
     (params.path
@@ -109,10 +109,10 @@ export function normalizeFirmwareTargets(params: DevFirmwareUpdateParams): DevFi
   }));
 }
 
-export function buildTargets(params: DevGetDeviceInfoParams): DevInfoTargets | undefined {
+export function buildTargets(params: DeviceGetDeviceInfoParams): DeviceInfoTargets | undefined {
   if (params.targets) return params.targets;
 
-  const targets: DevInfoTargets = {
+  const targets: DeviceInfoTargets = {
     hw: params.targetHw,
     fw: params.targetFw,
     bt: params.targetBt,
@@ -125,10 +125,10 @@ export function buildTargets(params: DevGetDeviceInfoParams): DevInfoTargets | u
   return Object.values(targets).some(value => value !== undefined) ? targets : undefined;
 }
 
-export function buildTypes(params: DevGetDeviceInfoParams): DevInfoTypes | undefined {
+export function buildTypes(params: DeviceGetDeviceInfoParams): DeviceInfoTypes | undefined {
   if (params.types) return params.types;
 
-  const types: DevInfoTypes = {
+  const types: DeviceInfoTypes = {
     version: params.includeVersion,
     build_id: params.includeBuildId,
     hash: params.includeHash,

package/src/api/tron/TronSignMessage.ts

@@ -28,7 +28,7 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
     if (this.payload.messageType === 'V1' || this.payload.messageType == null) {
       throw createDeviceNotSupportMethodError(
         'TronSignMessage',
-        getFirmwareType(this.device.features)
+        getFirmwareType(this.device?.features)
       );
     }
 

package/src/api/xrp/XrpSignTransaction.ts

@@ -29,7 +29,7 @@ export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams>
       { name: 'payment', type: 'object' },
     ]);
     validateParams(transaction.payment, [
-      { name: 'amount', type: 'number', required: true },
+      { name: 'amount', type: 'uint', required: true },
       { name: 'destination', type: 'string', required: true },
       { name: 'destinationTag', type: 'number' },
     ]);

package/src/core/index.ts

@@ -1,6 +1,7 @@
 import semver from 'semver';
 import EventEmitter from 'events';
 import {
+  EDeviceType,
   ERRORS,
   ERROR_CODES_REQUIRE_RELEASE,
   HardwareError,
@@ -19,6 +20,7 @@ import {
   enableLog,
   getDeviceBLEFirmwareVersion,
   getDeviceFirmwareVersion,
+  getDeviceType,
   getFirmwareType,
   getLogger,
   getMethodVersionRange,
@@ -992,6 +994,8 @@ export const cancel = (context: CoreContext, connectId?: string) => {
 const checkPassphraseEnableState = (method: BaseMethod, features?: Features) => {
   if (!method.useDevicePassphraseState) return;
 
+  const isPro2 = getDeviceType(features) === EDeviceType.Pro2;
+
   if (features?.passphrase_protection === true) {
     const hasNoPassphraseState =
       method.payload.passphraseState == null || method.payload.passphraseState === '';
@@ -1004,7 +1008,7 @@ const checkPassphraseEnableState = (method: BaseMethod, features?: Features) =>
     }
   }
 
-  if (features?.passphrase_protection === false && method.payload.passphraseState) {
+  if (features?.passphrase_protection === false && method.payload.passphraseState && !isPro2) {
     DevicePool.clearDeviceCache(method.payload.connectId);
     throw ERRORS.TypedError(HardwareErrorCode.DeviceNotOpenedPassphrase);
   }