@onekeyfe/hd-core 1.1.27-alpha.35 → 1.1.27-alpha.4

package/src/api/GetOnekeyFeatures.ts

@@ -4,76 +4,6 @@ import { UI_REQUEST } from '../constants/ui-request';
 import { fixVersion } from '../utils/deviceFeaturesUtils';
 import { BaseMethod } from './BaseMethod';
 
-import type { OnekeyFeatures } from '../types';
-
-const ONEKEY_FEATURE_KEYS: Array<keyof OnekeyFeatures> = [
-  'onekey_device_type',
-  'onekey_board_version',
-  'onekey_boot_version',
-  'onekey_firmware_version',
-  'onekey_board_hash',
-  'onekey_boot_hash',
-  'onekey_firmware_hash',
-  'onekey_board_build_id',
-  'onekey_boot_build_id',
-  'onekey_firmware_build_id',
-  'onekey_serial_no',
-  'onekey_ble_name',
-  'onekey_ble_version',
-  'onekey_ble_build_id',
-  'onekey_ble_hash',
-  'onekey_se_type',
-  'onekey_se01_state',
-  'onekey_se02_state',
-  'onekey_se03_state',
-  'onekey_se04_state',
-  'onekey_se01_version',
-  'onekey_se02_version',
-  'onekey_se03_version',
-  'onekey_se04_version',
-  'onekey_se01_hash',
-  'onekey_se02_hash',
-  'onekey_se03_hash',
-  'onekey_se04_hash',
-  'onekey_se01_build_id',
-  'onekey_se02_build_id',
-  'onekey_se03_build_id',
-  'onekey_se04_build_id',
-  'onekey_se01_boot_version',
-  'onekey_se02_boot_version',
-  'onekey_se03_boot_version',
-  'onekey_se04_boot_version',
-  'onekey_se01_boot_hash',
-  'onekey_se02_boot_hash',
-  'onekey_se03_boot_hash',
-  'onekey_se04_boot_hash',
-  'onekey_se01_boot_build_id',
-  'onekey_se02_boot_build_id',
-  'onekey_se03_boot_build_id',
-  'onekey_se04_boot_build_id',
-];
-
-function normalizeOnekeyFirmwareVersion(message: OnekeyFeatures) {
-  if (message.onekey_firmware_version && !semver.valid(message.onekey_firmware_version)) {
-    message.onekey_firmware_version = fixVersion(message.onekey_firmware_version);
-  }
-}
-
-function pickOnekeyFeatures(features?: OnekeyFeatures | null): OnekeyFeatures {
-  const message: OnekeyFeatures = {};
-  if (!features) return message;
-
-  for (const key of ONEKEY_FEATURE_KEYS) {
-    const value = features[key];
-    if (value !== undefined && value !== null) {
-      (message as Record<string, unknown>)[key] = value;
-    }
-  }
-
-  normalizeOnekeyFirmwareVersion(message);
-  return message;
-}
-
 export default class GetOnekeyFeatures extends BaseMethod {
   init() {
     this.allowDeviceMode = [
@@ -86,12 +16,10 @@ export default class GetOnekeyFeatures extends BaseMethod {
   }
 
   async run() {
-    if (this.device.originalDescriptor?.protocolType === 'V2') {
-      return Promise.resolve(pickOnekeyFeatures(this.device.features as OnekeyFeatures));
-    }
-
     const { message } = await this.device.commands.typedCall('OnekeyGetFeatures', 'OnekeyFeatures');
-    normalizeOnekeyFirmwareVersion(message);
+    if (!!message.onekey_firmware_version && !semver.valid(message.onekey_firmware_version)) {
+      message.onekey_firmware_version = fixVersion(message.onekey_firmware_version);
+    }
     return Promise.resolve(message);
   }
 }

package/src/api/GetPassphraseState.ts

@@ -1,8 +1,7 @@
-import { EDeviceType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST } from '../constants/ui-request';
 import { getPassphraseStateWithRefreshDeviceInfo } from '../utils/deviceFeaturesUtils';
-import { getDeviceType } from '../utils/deviceInfoUtils';
 import { BaseMethod } from './BaseMethod';
 
 export default class GetPassphraseState extends BaseMethod {
@@ -15,23 +14,15 @@ export default class GetPassphraseState extends BaseMethod {
     if (!this.device.features)
       return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed));
 
-    const { passphraseState, newSession, unlockedAttachPin } =
-      await getPassphraseStateWithRefreshDeviceInfo(this.device, {
-        expectPassphraseState: this.payload.passphraseState,
-        onlyMainPin: this.payload.useEmptyPassphrase,
-        allowCreateAttachPin: this.payload.allowCreateAttachPin,
-      });
+    const { passphraseState } = await getPassphraseStateWithRefreshDeviceInfo(this.device);
 
     const { features } = this.device;
-    const isPro2 = getDeviceType(features) === EDeviceType.Pro2;
-    const passphraseProtection = features?.passphrase_protection ?? null;
 
     // refresh device info
-    return Promise.resolve({
-      passphrase_state: isPro2 || passphraseProtection === true ? passphraseState : undefined,
-      session_id: newSession ?? features?.session_id ?? undefined,
-      unlocked_attach_pin: unlockedAttachPin ?? features?.unlocked_attach_pin,
-      passphrase_protection: passphraseProtection,
-    });
+    if (features && features.passphrase_protection === true) {
+      return Promise.resolve(passphraseState);
+    }
+
+    return Promise.resolve(undefined);
   }
 }

package/src/api/SearchDevices.ts

@@ -34,22 +34,17 @@ export default class SearchDevices extends BaseMethod {
         const lowerId = device.id?.toLowerCase();
         if (!seenIds.has(lowerId)) {
           seenIds.add(lowerId);
-          const bleName =
-            device.name ?? (device as unknown as { localName?: string }).localName ?? '';
           devices.push({
             ...device,
             connectId: device.id,
-            name: bleName || device.name,
-            deviceType: getDeviceTypeByBleName(bleName),
+            deviceType: getDeviceTypeByBleName(device.name ?? ''),
           });
         }
       }
       return devices;
     }
 
-    const { deviceList } = await DevicePool.getDevices(devicesDescriptor, undefined, {
-      connectProtocol: this.payload.connectProtocol,
-    });
+    const { deviceList } = await DevicePool.getDevices(devicesDescriptor);
     return deviceList.map(device => device.toMessageObject());
   }
 }

package/src/api/alephium/AlephiumGetAddress.ts

@@ -4,7 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 
 import type { AlephiumGetAddress as HardwareAlephiumGetAddress } from '@onekeyfe/hd-transport';
-import type { AlephiumAddress, AlephiumGetAddressParams, DeviceFirmwareRange } from '../../types';
+import type { AlephiumAddress, AlephiumGetAddressParams } from '../../types';
 
 export default class AlephiumGetAddress extends BaseMethod<HardwareAlephiumGetAddress[]> {
   hasBundle = false;
@@ -43,12 +43,8 @@ export default class AlephiumGetAddress extends BaseMethod<HardwareAlephiumGetAd
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/alephium/AlephiumSignMessage.ts

@@ -5,12 +5,12 @@ import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
 import type { AlephiumSignMessage as HardwareAlephiumSignMessage } from '@onekeyfe/hd-transport';
-import type { DeviceFirmwareRange } from '../../types';
 
 export default class AlephiumSignMessage extends BaseMethod<HardwareAlephiumSignMessage> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -30,12 +30,8 @@ export default class AlephiumSignMessage extends BaseMethod<HardwareAlephiumSign
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/alephium/AlephiumSignTransaction.ts

@@ -11,13 +11,14 @@ import type {
   AlephiumSignTx as HardwareAlephiumSignTx,
   TypedCall,
 } from '@onekeyfe/hd-transport';
-import type { AlephiumSignTransactionParams, DeviceFirmwareRange } from '../../types';
+import type { AlephiumSignTransactionParams } from '../../types';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 export default class AlephiumSignTransaction extends BaseMethod<HardwareAlephiumSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -38,12 +39,8 @@ export default class AlephiumSignTransaction extends BaseMethod<HardwareAlephium
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/algo/AlgoSignTransaction.ts

@@ -12,6 +12,7 @@ export default class AlgoSignTransaction extends BaseMethod<HardwareAlgorandSign
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/allnetwork/AllNetworkGetAddressBase.ts

@@ -12,12 +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,
-  isMethodVersionRangeUnsupported,
-} from '../../utils';
+import { getDeviceFirmwareVersion, getFirmwareType, getMethodVersionRange } from '../../utils';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { onDeviceButtonHandler } from '../../core';
 import {
@@ -376,6 +371,14 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
       this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
 
       preCheckDeviceSupport(this.device, method);
+      if (this.temporarySafetyCheckPrompted) {
+        method.temporarySafetyCheckPrompted = true;
+      } else {
+        const appliedTemporarySafetyCheck = await method.checkSafetyLevelOnTestNet();
+        if (appliedTemporarySafetyCheck) {
+          this.temporarySafetyCheckPrompted = true;
+        }
+      }
 
       const response = await method.run();
 
@@ -466,10 +469,6 @@ function preCheckDeviceSupport(device: Device, method: BaseMethod) {
   );
   const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
 
-  if (isMethodVersionRangeUnsupported(versionRange)) {
-    throw ERRORS.createDeviceNotSupportMethodError(method.name, getFirmwareType(device.features));
-  }
-
   if (
     versionRange &&
     semver.valid(versionRange.min) &&
@@ -510,14 +509,6 @@ function handleSkippableHardwareError(
     );
     const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
 
-    if (isMethodVersionRangeUnsupported(versionRange)) {
-      error = ERRORS.createDeviceNotSupportMethodError(
-        method.name,
-        getFirmwareType(device.features)
-      );
-      return error;
-    }
-
     if (
       versionRange &&
       semver.valid(versionRange.min) &&

package/src/api/aptos/AptosSignInMessage.ts

@@ -10,6 +10,7 @@ export default class AptosSignInMessage extends BaseMethod<AptosSignSIWAMessage>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/aptos/AptosSignMessage.ts

@@ -10,6 +10,7 @@ export default class AptosSignMessage extends BaseMethod<HardwareAptosSignMessag
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/aptos/AptosSignTransaction.ts

@@ -10,6 +10,7 @@ export default class AptosSignTransaction extends BaseMethod<HardwareAptosSignTx
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/benfen/BenfenGetAddress.ts

@@ -6,7 +6,7 @@ import { hex2BfcAddress, publicKeyToAddress } from './normalize';
 import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
-import type { BenfenAddress, BenfenGetAddressParams, DeviceFirmwareRange } from '../../types';
+import type { BenfenAddress, BenfenGetAddressParams } from '../../types';
 import type { BenfenGetAddress as HardwareBenfenGetAddress } from '@onekeyfe/hd-transport';
 
 export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddress[]> {
@@ -47,12 +47,8 @@ export default class BenfenGetAddress extends BaseMethod<HardwareBenfenGetAddres
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

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, DeviceFirmwareRange } from '../../types';
+import type { BenfenGetPublicKeyParams, BenfenPublicKey } from '../../types';
 
 export default class BenfenGetPublicKey extends BaseMethod<any> {
   hasBundle = false;
@@ -38,12 +38,8 @@ export default class BenfenGetPublicKey extends BaseMethod<any> {
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignMessage.ts

@@ -5,12 +5,12 @@ 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() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
@@ -26,12 +26,8 @@ export default class BenfenSignMessage extends BaseMethod<HardwareBenfenSignMess
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/benfen/BenfenSignTransaction.ts

@@ -8,12 +8,12 @@ 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() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
@@ -33,12 +33,8 @@ export default class BenfenSignTransaction extends BaseMethod<BenfenSignTx> {
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/btc/BTCSignMessage.ts

@@ -12,6 +12,7 @@ export default class BTCSignMessage extends BaseMethod<SignMessage> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/btc/BTCSignPsbt.ts

@@ -13,6 +13,7 @@ export default class BTCSignPsbt extends BaseMethod<SignPsbt> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'psbt', type: 'hexString', required: true },

package/src/api/btc/BTCSignTransaction.ts

@@ -29,6 +29,7 @@ export default class BTCSignTransaction extends BaseMethod<Params> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'coin', type: 'string', required: true },

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

@@ -1,5 +1,3 @@
-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];
@@ -10,13 +8,9 @@ function isCoinNameInList(coinName: string, coinNames: (string | undefined)[]) {
   return false;
 }
 
-export function getBitcoinForkVersionRange(params: (string | undefined)[]): DeviceFirmwareRange {
+export function getBitcoinForkVersionRange(params: (string | undefined)[]) {
   if (isCoinNameInList('Neurai', params)) {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_mini: {
         min: '3.7.0',
       },

package/src/api/cardano/CardanoSignMessage.ts

@@ -14,6 +14,7 @@ export default class CardanoSignMessage extends BaseMethod<CardanoSignMessagePar
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     const { payload } = this;
     validateParams(payload, [

package/src/api/cardano/CardanoSignTransaction.ts

@@ -49,6 +49,7 @@ export default class CardanoSignTransaction extends BaseMethod<any> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     this.hasBundle = !!this.payload?.bundle;
 

package/src/api/conflux/ConfluxSignMessage.ts

@@ -9,6 +9,7 @@ import type { ConfluxSignMessage as HardwareConfluxSignMessage } from '@onekeyfe
 export default class ConfluxSignMessage extends BaseMethod<HardwareConfluxSignMessage> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/conflux/ConfluxSignMessageCIP23.ts

@@ -9,6 +9,7 @@ import type { ConfluxSignMessageCIP23 as HardwareConfluxSignMessageCIP23 } from
 export default class ConfluxSignMessageCIP23 extends BaseMethod<HardwareConfluxSignMessageCIP23> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/conflux/ConfluxSignTransaction.ts

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

package/src/api/cosmos/CosmosSignTransaction.ts

@@ -14,6 +14,7 @@ export default class CosmosSignTransaction extends BaseMethod<HardwareCosmosSign
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/device/DeviceRebootToBoardloader.ts

@@ -1,5 +1,3 @@
-import { DeviceRebootType } from '@onekeyfe/hd-transport';
-
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBoardloaderParams } from '../../types/api/deviceRebootToBoardloader';
@@ -23,17 +21,10 @@ export default class DeviceRebootToBoardloader extends BaseMethod<RebootToBoardl
   }
 
   async run() {
-    // Protocol V2 uses DeviceReboot with reboot_type enum.
-    if (this.device.originalDescriptor?.protocolType === 'V2') {
-      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
-        reboot_type: DeviceRebootType.Boardloader,
-      });
-      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,5 +1,3 @@
-import { DeviceRebootType } from '@onekeyfe/hd-transport';
-
 import { BaseMethod } from '../BaseMethod';
 
 import type { RebootToBootloader } from '@onekeyfe/hd-transport';
@@ -23,15 +21,8 @@ export default class DeviceRebootToBootloader extends BaseMethod<RebootToBootloa
   }
 
   async run() {
-    // Protocol V2 uses DeviceReboot with reboot_type enum.
-    if (this.device.originalDescriptor?.protocolType === 'V2') {
-      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
-        reboot_type: DeviceRebootType.Bootloader,
-      });
-      return Promise.resolve(res.message);
-    }
-
     const res = await this.device.commands.typedCall('RebootToBootloader', 'Success');
+
     return Promise.resolve(res.message);
   }
 }

package/src/api/device/PreInitialize.ts

@@ -0,0 +1,41 @@
+import { BaseMethod } from '../BaseMethod';
+import { LoggerNames, getLogger } from '../../utils';
+
+import type { InitOptions } from '../../device/Device';
+
+// Core prefix (@onekey/hd-core) so the host app's LOG_EVENT bridge forwards
+// this into the collected hardware log scope (like [PRE-INIT][HIT]/[MISS]).
+const Log = getLogger(LoggerNames.Core);
+
+const parseInitOptions = (payload?: {
+  initSession?: boolean;
+  passphraseState?: string;
+  deriveCardano?: boolean;
+}): InitOptions => ({
+  initSession: payload?.initSession,
+  passphraseState: payload?.passphraseState,
+  deriveCardano: payload?.deriveCardano,
+});
+
+export default class PreInitialize extends BaseMethod {
+  init() {
+    this.skipForceUpdateCheck = true;
+    this.useDevicePassphraseState = false;
+    // Fire-and-forget warm-up signal (core dedups + hangs up for the next call)
+    this.isPreWarmSignal = true;
+  }
+
+  async run() {
+    try {
+      await this.device.preInitialize(parseInitOptions(this.payload));
+      if (this.device.hasDeviceAcquire()) {
+        await this.device.release();
+      }
+      return true;
+    } catch {
+      this.device.clearPreInitialized();
+      Log.debug('[PRE-INIT][FAILED]');
+      return false;
+    }
+  }
+}