@onekeyfe/hd-core 1.1.34-alpha.1 → 1.1.34-alpha.3

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -12,7 +12,7 @@ import { validateParams } from '../helpers/paramsValidator';
 import { PROTO } from '../../constants';
 import { findMethod } from '../utils';
 import { DEVICE, IFRAME, createUiMessage } from '../../events';
-import { getDeviceFirmwareVersion, getFirmwareType, getMethodVersionRange } from '../../utils';
+import { isMethodVersionRangeUnsupported } from '../../utils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { onDeviceButtonHandler } from '../../core';
 import {
@@ -352,6 +352,7 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
     };
 
     let result: AllNetworkAddress[];
+    let requestError: Error | undefined;
     try {
       method.init();
       method.setDevice?.(this.device);
@@ -394,10 +395,8 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
           rootFingerprint,
         },
       }));
-      if (method.requestContext) {
-        completeRequestContext(method.requestContext.responseID);
-      }
     } catch (e: any) {
+      requestError = e instanceof Error ? e : new Error(String(e));
       const error = handleSkippableHardwareError(e, this.device, method);
 
       if (error) {
@@ -415,13 +414,10 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
       } else {
         throw e;
       }
+    } finally {
       if (method.requestContext) {
-        completeRequestContext(
-          method.requestContext.responseID,
-          e instanceof Error ? e : new Error(String(e))
-        );
+        completeRequestContext(method.requestContext.responseID, requestError);
       }
-    } finally {
       this.device.off(DEVICE.BUTTON, buttonListener);
       this.device.off(DEVICE.PIN, onSignalAbort);
       this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
@@ -463,11 +459,12 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
  * @param method BaseMethod
  */
 function preCheckDeviceSupport(device: Device, method: BaseMethod) {
-  const versionRange = getMethodVersionRange(
-    device.features,
-    type => method.getVersionRange()[type]
-  );
-  const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
+  const versionRange = device.getCurrentMethodVersionRange(type => method.getVersionRange()[type]);
+  const currentVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
+
+  if (isMethodVersionRangeUnsupported(versionRange)) {
+    throw ERRORS.createDeviceNotSupportMethodError(method.name, device.getCurrentFirmwareType());
+  }
 
   if (
     versionRange &&
@@ -478,10 +475,10 @@ function preCheckDeviceSupport(device: Device, method: BaseMethod) {
       currentVersion,
       requireVersion: versionRange.min,
       methodName: method.name,
-      firmwareType: getFirmwareType(device.features),
+      firmwareType: device.getCurrentFirmwareType(),
     });
   } else if (method.strictCheckDeviceSupport && !versionRange) {
-    throw ERRORS.createDeviceNotSupportMethodError(method.name, getFirmwareType(device.features));
+    throw ERRORS.createDeviceNotSupportMethodError(method.name, device.getCurrentFirmwareType());
   }
 }
 
@@ -503,11 +500,18 @@ function handleSkippableHardwareError(
     e.message?.includes('Failure_UnexpectedMessage') ||
     e.message?.includes('Failure_UnknownMessage')
   ) {
-    const versionRange = getMethodVersionRange(
-      device.features,
+    const versionRange = device.getCurrentMethodVersionRange(
       type => method.getVersionRange()[type]
     );
-    const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
+    const currentVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
+
+    if (isMethodVersionRangeUnsupported(versionRange)) {
+      error = ERRORS.createDeviceNotSupportMethodError(
+        method.name,
+        device.getCurrentFirmwareType()
+      );
+      return error;
+    }
 
     if (
       versionRange &&
@@ -518,12 +522,12 @@ function handleSkippableHardwareError(
         currentVersion,
         requireVersion: versionRange.min,
         methodName: method.name,
-        firmwareType: getFirmwareType(device.features),
+        firmwareType: device.getCurrentFirmwareType(),
       });
     } else {
       error = ERRORS.createDeviceNotSupportMethodError(
         method.name,
-        getFirmwareType(device.features)
+        device.getCurrentFirmwareType()
       );
     }
   } else if (

package/src/api/aptos/AptosGetAddress.ts

@@ -5,9 +5,8 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { hexToBytes } from '../helpers/hexUtils';
-import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
+import { batchGetPublickeys, supportBatchPublicKeyByDevice } from '../helpers/batchGetPublickeys';
 
 import type { AptosAddress, AptosGetAddressParams } from '../../types';
 import type { AptosGetAddress as HardwareAptosGetAddress } from '@onekeyfe/hd-transport';
@@ -66,7 +65,7 @@ export default class AptosGetAddress extends BaseMethod<HardwareAptosGetAddress[
   }
 
   async run() {
-    const supportsBatchPublicKey = supportBatchPublicKey(this.device?.features);
+    const supportsBatchPublicKey = supportBatchPublicKeyByDevice(this.device);
     let responses: AptosAddress[] = [];
     if (supportsBatchPublicKey) {
       const publicKeyRes = await batchGetPublickeys(this.device, this.params, 'ed25519', 637);

package/src/api/benfen/BenfenGetAddress.ts

@@ -3,10 +3,9 @@ import { validateParams, validateResult } from '../helpers/paramsValidator';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { hex2BfcAddress, publicKeyToAddress } from './normalize';
-import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
-import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
+import { batchGetPublickeys, supportBatchPublicKeyByDevice } from '../helpers/batchGetPublickeys';
 
-import type { BenfenAddress, BenfenGetAddressParams } from '../../types';
+import type { BenfenAddress, BenfenGetAddressParams, DeviceFirmwareRange } from '../../types';
 import type { BenfenGetAddress as HardwareBenfenGetAddress } from '@onekeyfe/hd-transport';
 
 export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddress[]> {
@@ -47,8 +46,12 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
     });
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },
@@ -59,7 +62,7 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
   }
 
   async run() {
-    const supportsBatchPublicKey = supportBatchPublicKey(this.device?.features);
+    const supportsBatchPublicKey = supportBatchPublicKeyByDevice(this.device);
     let responses: BenfenAddress[] = [];
 
     if (supportsBatchPublicKey) {
@@ -75,7 +78,8 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
             'BenfenAddress',
             param
           );
-          address = addressRes.message.address;
+          // BenfenAddress.address is optional in proto but always present on success.
+          address = addressRes.message.address ?? '';
         } else {
           address = publicKeyToAddress(publicKey);
         }
@@ -103,7 +107,7 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
           );
           const result = {
             path: serializedPath(param.address_n),
-            address: hex2BfcAddress(res.message.address),
+            address: hex2BfcAddress(res.message.address ?? ''),
           };
           if (this.shouldConfirm) {
             this.postPreviousAddressMessage(result);

package/src/api/benfen/BenfenGetPublicKey.ts

@@ -4,7 +4,7 @@ import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
-import type { BenfenGetPublicKeyParams, BenfenPublicKey } from '../../types';
+import type { BenfenGetPublicKeyParams, BenfenPublicKey, DeviceFirmwareRange } from '../../types';
 
 export default class BenfenGetPublicKey extends BaseMethod<any> {
   hasBundle = false;
@@ -38,8 +38,12 @@ export default class BenfenGetPublicKey extends BaseMethod<any> {
     });
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignMessage.ts

@@ -5,6 +5,7 @@ import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
 import type { BenfenSignMessage as HardwareBenfenSignMessage } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareRange } from '../../types';
 
 export default class BenfenSignMessage extends BaseMethod<HardwareBenfenSignMessage> {
   init() {
@@ -26,8 +27,12 @@ export default class BenfenSignMessage extends BaseMethod<HardwareBenfenSignMess
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignTransaction.ts

@@ -8,6 +8,7 @@ import { formatAnyHex } from '../helpers/hexUtils';
 
 import type { BenfenSignTx, BenfenSignedTx, MessageType, TypedCall } from '@onekeyfe/hd-transport';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
+import type { DeviceFirmwareRange } from '../../types';
 
 export default class BenfenSignTransaction extends BaseMethod<BenfenSignTx> {
   init() {
@@ -33,8 +34,12 @@ export default class BenfenSignTransaction extends BaseMethod<BenfenSignTx> {
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },

package/src/api/btc/BTCGetPublicKey.ts

@@ -78,7 +78,8 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
       }
 
       for (const param of this.params) {
-        const versionBytes = getVersionBytes(param.coin_name, param.script_type);
+        // init() sets coin_name; keep an empty fallback for the generated optional type.
+        const versionBytes = getVersionBytes(param.coin_name ?? '', param.script_type);
         if (!versionBytes) {
           throw new Error(
             `Invalid coinName, not support generate xpub for scriptType: ${param.script_type}`
@@ -101,7 +102,7 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
 
         const path = serializedPath(param.address_n);
 
-        const xpub = createExtendedPublicKey(node, param.coin_name, param.script_type);
+        const xpub = createExtendedPublicKey(node, param.coin_name ?? '', param.script_type);
 
         const rootFingerprint = res.root_fingerprint;
 

package/src/api/btc/BTCSignPsbt.ts

@@ -5,7 +5,6 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 import { getCoinInfo } from './helpers/btcParamsUtils';
-import { getDeviceType } from '../../utils';
 
 import type { SignPsbt } from '@onekeyfe/hd-transport';
 
@@ -50,7 +49,7 @@ export default class BTCSignPsbt extends BaseMethod<SignPsbt> {
     } catch (error) {
       const { message } = error;
 
-      const deviceType = getDeviceType(this.device.features);
+      const deviceType = this.device.getCurrentDeviceType();
       if (
         message.includes('PSBT parse failed') &&
         (deviceType === EDeviceType.Classic1s || deviceType === EDeviceType.ClassicPure)

package/src/api/btc/helpers/versionLimit.ts

@@ -1,3 +1,5 @@
+import type { DeviceFirmwareRange } from '../../../types';
+
 function isCoinNameInList(coinName: string, coinNames: (string | undefined)[]) {
   for (let i = 0; i < coinNames.length; i++) {
     const coin_name = coinNames[i];
@@ -8,9 +10,13 @@ function isCoinNameInList(coinName: string, coinNames: (string | undefined)[]) {
   return false;
 }
 
-export function getBitcoinForkVersionRange(params: (string | undefined)[]) {
+export function getBitcoinForkVersionRange(params: (string | undefined)[]): DeviceFirmwareRange {
   if (isCoinNameInList('Neurai', params)) {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_mini: {
         min: '3.7.0',
       },

package/src/api/cardano/CardanoSignTransaction.ts

@@ -19,7 +19,6 @@ import {
 } from './helper/auxiliaryData';
 import { gatherWitnessPaths } from './helper/witnesses';
 import { validatePath } from '../helpers/pathUtils';
-import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
 
 import type { DeviceFirmwareRange } from '../../types';
 import type { CollateralInputWithPath, Path } from './helper/cardanoInputs';
@@ -240,10 +239,9 @@ export default class CardanoSignTransaction extends BaseMethod<any> {
       return;
     }
 
-    const firmwareVersion = getDeviceFirmwareVersion(this.device.features)?.join('.');
+    const firmwareVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
 
-    const versionRange = getMethodVersionRange(
-      this.device.features,
+    const versionRange = this.device.getCurrentMethodVersionRange(
       type => this.supportConwayVersionRange()[type]
     );
 

package/src/api/conflux/ConfluxSignTransaction.ts

@@ -35,7 +35,7 @@ export default class ConfluxSignTransaction extends BaseMethod {
 
     // check if transaction is valid
     const schema: SchemaParam[] = [
-      { name: 'to', type: 'hexString', required: true },
+      { name: 'to', type: 'string', required: true },
       { name: 'value', type: 'hexString', required: true },
       { name: 'gasLimit', type: 'hexString', required: true },
       { name: 'gasPrice', type: 'hexString', required: true },
@@ -48,7 +48,10 @@ export default class ConfluxSignTransaction extends BaseMethod {
 
     validateParams(tx, schema);
 
-    this.formattedTx = formatAnyHex(tx);
+    this.formattedTx = {
+      ...formatAnyHex(tx),
+      to: tx.to,
+    };
   }
 
   processTxRequest = async (request: ConfluxTxRequest, data: string): Promise<ConfluxSignedTx> => {

package/src/api/device/DeviceCancel.ts

@@ -5,6 +5,7 @@ import type { Cancel } from '@onekeyfe/hd-transport';
 export default class DeviceCancel extends BaseMethod<Cancel> {
   init() {
     this.useDevicePassphraseState = false;
+    this.unlockPolicy = 'none';
   }
 
   async run() {

package/src/api/device/DeviceChangePin.ts

@@ -1,10 +1,14 @@
+import { DeviceSettingsPage } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
+import { invalidParameter } from '../helpers/filesystemValidation';
 
 import type { ChangePin } from '@onekeyfe/hd-transport';
 
 export default class DeviceChangePin extends BaseMethod<ChangePin> {
   init() {
+    this.unlockPolicy = 'retry-on-locked';
     this.useDevicePassphraseState = false;
 
     // check payload
@@ -13,9 +17,29 @@ export default class DeviceChangePin extends BaseMethod<ChangePin> {
     this.params = {
       remove: this.payload.remove,
     };
+    this.protocolV2UiInteraction = {
+      request: 'button',
+      source: 'method-lifecycle',
+      reason: 'change-pin',
+      completion: 'operation-completed',
+      deviceOnly: true,
+      page: DeviceSettingsPage.DevicePinChange,
+    };
   }
 
   async run() {
+    if (this.device.isProtocolV2()) {
+      if (this.params.remove) {
+        throw invalidParameter(
+          'Parameter [remove=true] is not supported by the Pro2 device PIN page.'
+        );
+      }
+      const res = await this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
+        page: DeviceSettingsPage.DevicePinChange,
+      });
+      return Promise.resolve(res.message);
+    }
+
     const res = await this.device.commands.typedCall('ChangePin', 'Success', {
       ...this.params,
     });

package/src/api/device/DeviceFullyUploadResource.ts

@@ -5,12 +5,11 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { BaseMethod } from '../BaseMethod';
 import { getSysResourceBinary } from '../firmware/getBinary';
 import { updateResources } from '../firmware/uploadFirmware';
-import { getDeviceFirmwareVersion, getDeviceType, getFirmwareType } from '../../utils';
 import { createUiMessage } from '../../events/ui-request';
 import { DataManager } from '../../data-manager';
 
 import type { Deferred } from '@onekeyfe/hd-shared';
-import type { Features, KnownDevice } from '../../types';
+import type { KnownDevice } from '../../types';
 import type { DeviceFullyUploadResourceParams } from '../../types/api/deviceFullyUploadResource';
 
 export default class DeviceFullyUploadResource extends BaseMethod {
@@ -33,12 +32,12 @@ export default class DeviceFullyUploadResource extends BaseMethod {
     );
   };
 
-  isSupportResourceUpdate(features: Features, updateType: string) {
+  isSupportResourceUpdate(updateType: string) {
     if (updateType !== 'firmware') return false;
 
-    const deviceType = getDeviceType(features);
+    const deviceType = this.device.getCurrentDeviceType();
     const isTouchMode = deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro;
-    const currentVersion = getDeviceFirmwareVersion(features).join('.');
+    const currentVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
 
     return isTouchMode && semver.gte(currentVersion, '3.4.0');
   }
@@ -49,10 +48,10 @@ export default class DeviceFullyUploadResource extends BaseMethod {
 
     const payload = this.payload as DeviceFullyUploadResourceParams;
 
-    const deviceFirmwareType = getFirmwareType(features);
+    const deviceFirmwareType = device.getCurrentFirmwareType();
     const firmwareType = payload.firmwareType ?? deviceFirmwareType;
 
-    if (!features?.bootloader_mode && features) {
+    if (!device.isBootloader() && features) {
       // check & upgrade firmware resource
       if (features) {
         let { binary } = this.payload;

package/src/api/device/DeviceLock.ts

@@ -5,11 +5,10 @@ import type { LockDevice } from '@onekeyfe/hd-transport';
 export default class DeviceLock extends BaseMethod<LockDevice> {
   init() {
     this.useDevicePassphraseState = false;
+    this.unlockPolicy = 'none';
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('LockDevice', 'Success');
-
-    return Promise.resolve(res.message);
+    return this.device.lockDevice();
   }
 }

package/src/api/device/DeviceRebootToBoardloader.ts

@@ -1,3 +1,5 @@
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBoardloaderParams } from '../../types/api/deviceRebootToBoardloader';
@@ -21,10 +23,18 @@ export default class DeviceRebootToBoardloader extends BaseMethod<RebootToBoardl
   }
 
   async run() {
+    // Protocol V2 submodule firmware uses DeviceReboot with reboot_type enum.
+    if (this.device.isProtocolV2()) {
+      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
+        reboot_type: DeviceRebootType.Romloader,
+      });
+      this.device.markProtocolV2Reboot(DeviceRebootType.Romloader);
+      return Promise.resolve(res.message);
+    }
+
     // On Touch devices, messsage code 904 is RebootToBoardloader
     // so BininOutMessageSE message code 904 is used here
     const res = await this.device.commands.typedCall('BixinOutMessageSE', 'Success');
-
     return Promise.resolve(res.message);
   }
 }

package/src/api/device/DeviceRebootToBootloader.ts

@@ -1,3 +1,5 @@
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
+
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBootloader } from '@onekeyfe/hd-transport';
@@ -21,8 +23,16 @@ export default class DeviceRebootToBootloader extends BaseMethod<RebootToBootloa
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('RebootToBootloader', 'Success');
+    // Protocol V2 submodule firmware uses DeviceReboot with reboot_type enum.
+    if (this.device.isProtocolV2()) {
+      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
+        reboot_type: DeviceRebootType.Bootloader,
+      });
+      this.device.markProtocolV2Reboot(DeviceRebootType.Bootloader);
+      return Promise.resolve(res.message);
+    }
 
+    const res = await this.device.commands.typedCall('RebootToBootloader', 'Success');
     return Promise.resolve(res.message);
   }
 }