@onekeyfe/hd-core 1.2.0-alpha.11 → 1.2.0-alpha.13

package/src/data/messages/messages-protocol-v2.json

@@ -485,7 +485,6 @@
         "MessageType_DeviceSessionGet": 60606,
         "MessageType_DeviceSession": 60607,
         "MessageType_DeviceSessionAskPin": 60608,
-        "MessageType_DeviceSessionPinResult": 60609,
         "MessageType_FilesystemPermissionFix": 60800,
         "MessageType_FilesystemPathInfo": 60801,
         "MessageType_FilesystemPathInfoQuery": 60802,
@@ -6161,6 +6160,33 @@
         "PromptTemporarily": 2
       }
     },
+    "Initialize": {
+      "fields": {
+        "session_id": {
+          "type": "bytes",
+          "id": 1
+        },
+        "_skip_passphrase": {
+          "type": "bool",
+          "id": 2,
+          "options": {
+            "deprecated": true
+          }
+        },
+        "derive_cardano": {
+          "type": "bool",
+          "id": 3
+        },
+        "passphrase_state": {
+          "type": "string",
+          "id": 8000
+        },
+        "is_contains_attach": {
+          "type": "bool",
+          "id": 8001
+        }
+      }
+    },
     "StartSession": {
       "fields": {
         "session_id": {
@@ -6183,6 +6209,12 @@
     "EndSession": {
       "fields": {}
     },
+    "GetFeatures": {
+      "fields": {}
+    },
+    "OnekeyGetFeatures": {
+      "fields": {}
+    },
     "OneKeyDeviceType": {
       "values": {
         "CLASSIC": 0,
@@ -6204,6 +6236,388 @@
         "APP": 1
       }
     },
+    "Features": {
+      "fields": {
+        "vendor": {
+          "type": "string",
+          "id": 1
+        },
+        "major_version": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 2
+        },
+        "minor_version": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 3
+        },
+        "patch_version": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 4
+        },
+        "bootloader_mode": {
+          "type": "bool",
+          "id": 5
+        },
+        "device_id": {
+          "type": "string",
+          "id": 6
+        },
+        "pin_protection": {
+          "type": "bool",
+          "id": 7
+        },
+        "passphrase_protection": {
+          "type": "bool",
+          "id": 8
+        },
+        "language": {
+          "type": "string",
+          "id": 9
+        },
+        "label": {
+          "type": "string",
+          "id": 10
+        },
+        "initialized": {
+          "type": "bool",
+          "id": 12
+        },
+        "revision": {
+          "type": "bytes",
+          "id": 13
+        },
+        "bootloader_hash": {
+          "type": "bytes",
+          "id": 14
+        },
+        "imported": {
+          "type": "bool",
+          "id": 15
+        },
+        "unlocked": {
+          "type": "bool",
+          "id": 16
+        },
+        "_passphrase_cached": {
+          "type": "bool",
+          "id": 17,
+          "options": {
+            "deprecated": true
+          }
+        },
+        "firmware_present": {
+          "type": "bool",
+          "id": 18
+        },
+        "needs_backup": {
+          "type": "bool",
+          "id": 19
+        },
+        "flags": {
+          "type": "uint32",
+          "id": 20
+        },
+        "model": {
+          "type": "string",
+          "id": 21
+        },
+        "fw_major": {
+          "type": "uint32",
+          "id": 22
+        },
+        "fw_minor": {
+          "type": "uint32",
+          "id": 23
+        },
+        "fw_patch": {
+          "type": "uint32",
+          "id": 24
+        },
+        "fw_vendor": {
+          "type": "string",
+          "id": 25
+        },
+        "unfinished_backup": {
+          "type": "bool",
+          "id": 27
+        },
+        "no_backup": {
+          "type": "bool",
+          "id": 28
+        },
+        "recovery_mode": {
+          "type": "bool",
+          "id": 29
+        },
+        "capabilities": {
+          "rule": "repeated",
+          "type": "Capability",
+          "id": 30,
+          "options": {
+            "packed": false
+          }
+        },
+        "backup_type": {
+          "type": "BackupType",
+          "id": 31
+        },
+        "sd_card_present": {
+          "type": "bool",
+          "id": 32
+        },
+        "sd_protection": {
+          "type": "bool",
+          "id": 33
+        },
+        "wipe_code_protection": {
+          "type": "bool",
+          "id": 34
+        },
+        "session_id": {
+          "type": "bytes",
+          "id": 35
+        },
+        "passphrase_always_on_device": {
+          "type": "bool",
+          "id": 36
+        },
+        "safety_checks": {
+          "type": "SafetyCheckLevel",
+          "id": 37
+        },
+        "auto_lock_delay_ms": {
+          "type": "uint32",
+          "id": 38
+        },
+        "display_rotation": {
+          "type": "uint32",
+          "id": 39
+        },
+        "experimental_features": {
+          "type": "bool",
+          "id": 40
+        },
+        "offset": {
+          "type": "uint32",
+          "id": 500
+        },
+        "coprocessor_bt_name": {
+          "type": "string",
+          "id": 501
+        },
+        "coprocessor_version": {
+          "type": "string",
+          "id": 502
+        },
+        "coprocessor_bt_enable": {
+          "type": "bool",
+          "id": 503
+        },
+        "se_enable": {
+          "type": "bool",
+          "id": 504
+        },
+        "se_ver": {
+          "type": "string",
+          "id": 506
+        },
+        "backup_only": {
+          "type": "bool",
+          "id": 507
+        },
+        "onekey_version": {
+          "type": "string",
+          "id": 508
+        },
+        "onekey_serial": {
+          "type": "string",
+          "id": 509
+        },
+        "bootloader_version": {
+          "type": "string",
+          "id": 510
+        },
+        "serial_no": {
+          "type": "string",
+          "id": 511
+        },
+        "spi_flash": {
+          "type": "string",
+          "id": 512
+        },
+        "initstates": {
+          "type": "uint32",
+          "id": 513
+        },
+        "NFT_voucher": {
+          "type": "bytes",
+          "id": 514
+        },
+        "cpu_info": {
+          "type": "string",
+          "id": 515
+        },
+        "pre_firmware": {
+          "type": "string",
+          "id": 516
+        },
+        "coin_switch": {
+          "type": "uint32",
+          "id": 517
+        },
+        "build_id": {
+          "type": "bytes",
+          "id": 518
+        },
+        "romloader_version": {
+          "type": "string",
+          "id": 519
+        },
+        "busy": {
+          "type": "bool",
+          "id": 41
+        },
+        "onekey_device_type": {
+          "type": "OneKeyDeviceType",
+          "id": 600
+        },
+        "onekey_se_type": {
+          "type": "OneKeySeType",
+          "id": 601
+        },
+        "onekey_romloader_version": {
+          "type": "string",
+          "id": 602
+        },
+        "onekey_romloader_hash": {
+          "type": "bytes",
+          "id": 603
+        },
+        "onekey_bootloader_version": {
+          "type": "string",
+          "id": 604
+        },
+        "onekey_bootloader_hash": {
+          "type": "bytes",
+          "id": 605
+        },
+        "onekey_se01_version": {
+          "type": "string",
+          "id": 606
+        },
+        "onekey_se01_hash": {
+          "type": "bytes",
+          "id": 607
+        },
+        "onekey_se01_build_id": {
+          "type": "string",
+          "id": 608
+        },
+        "onekey_firmware_version": {
+          "type": "string",
+          "id": 609
+        },
+        "onekey_firmware_hash": {
+          "type": "bytes",
+          "id": 610
+        },
+        "onekey_firmware_build_id": {
+          "type": "string",
+          "id": 611
+        },
+        "onekey_serial_no": {
+          "type": "string",
+          "id": 612
+        },
+        "onekey_bootloader_build_id": {
+          "type": "string",
+          "id": 613
+        },
+        "onekey_coprocessor_bt_name": {
+          "type": "string",
+          "id": 614
+        },
+        "onekey_coprocessor_version": {
+          "type": "string",
+          "id": 615
+        },
+        "onekey_coprocessor_build_id": {
+          "type": "string",
+          "id": 616
+        },
+        "onekey_coprocessor_hash": {
+          "type": "bytes",
+          "id": 617
+        },
+        "onekey_se02_version": {
+          "type": "string",
+          "id": 618
+        },
+        "onekey_se03_version": {
+          "type": "string",
+          "id": 619
+        },
+        "onekey_se04_version": {
+          "type": "string",
+          "id": 620
+        },
+        "onekey_se01_state": {
+          "type": "OneKeySEState",
+          "id": 621
+        },
+        "onekey_se02_state": {
+          "type": "OneKeySEState",
+          "id": 622
+        },
+        "onekey_se03_state": {
+          "type": "OneKeySEState",
+          "id": 623
+        },
+        "onekey_se04_state": {
+          "type": "OneKeySEState",
+          "id": 624
+        },
+        "attach_to_pin_user": {
+          "type": "bool",
+          "id": 625
+        },
+        "unlocked_attach_pin": {
+          "type": "bool",
+          "id": 626
+        }
+      },
+      "nested": {
+        "Capability": {
+          "options": {
+            "(has_bitcoin_only_values)": true
+          },
+          "values": {
+            "Capability_Bitcoin": 1,
+            "Capability_Bitcoin_like": 2,
+            "Capability_Binance": 3,
+            "Capability_Cardano": 4,
+            "Capability_Crypto": 5,
+            "Capability_EOS": 6,
+            "Capability_Ethereum": 7,
+            "Capability_Lisk": 8,
+            "Capability_Monero": 9,
+            "Capability_NEM": 10,
+            "Capability_Ripple": 11,
+            "Capability_Stellar": 12,
+            "Capability_Tezos": 13,
+            "Capability_U2F": 14,
+            "Capability_Shamir": 15,
+            "Capability_ShamirGroups": 16,
+            "Capability_PassphraseEntry": 17,
+            "Capability_AttachToPin": 18,
+            "Capability_EthereumTypedData": 1000
+          }
+        }
+      }
+    },
     "OnekeyFeatures": {
       "fields": {
         "onekey_device_type": {
@@ -11169,7 +11583,10 @@
     "ViewSignLayout": {
       "values": {
         "LayoutDefault": 0,
-        "LayoutSafeTxCreate": 1
+        "LayoutSafeTxCreate": 1,
+        "LayoutFinalConfirm": 2,
+        "Layout7702": 3,
+        "LayoutFlat": 4
       }
     },
     "ViewSignPage": {
@@ -12024,20 +12441,9 @@
     "DeviceSessionAskPin": {
       "fields": {}
     },
-    "DeviceSessionPinResult": {
-      "fields": {
-        "unlocked": {
-          "type": "bool",
-          "id": 1
-        },
-        "unlocked_attach_pin": {
-          "type": "bool",
-          "id": 2
-        },
-        "passphrase_protection": {
-          "type": "bool",
-          "id": 3
-        }
+    "DeviceSessionAskPin_FailureSubCodes": {
+      "values": {
+        "UserCancel": 1
       }
     },
     "DeviceStatus": {

package/src/data/messages/messages.json

@@ -7784,14 +7784,6 @@
         "passphrase_state": {
           "type": "string",
           "id": 1
-        },
-        "_only_main_pin": {
-          "type": "bool",
-          "id": 2
-        },
-        "allow_create_attach_pin": {
-          "type": "bool",
-          "id": 3
         }
       }
     },

package/src/device/Device.ts

@@ -67,7 +67,6 @@ import type { PassphrasePromptResponse } from './DeviceCommands';
 import type { Deferred, HardwareConnectProtocol } from '@onekeyfe/hd-shared';
 import type {
   OneKeyDeviceInfo as DeviceDescriptor,
-  DeviceSessionPinResult,
   DeviceStatus,
   ProtocolV2DeviceInfo,
   Success,
@@ -1139,7 +1138,7 @@ export class Device extends EventEmitter {
     // both allow and require cases might generate single unexpected mode
     if (!this.isUnacquired()) {
       // allow cases
-      if (this.isBootloader() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
+      if (this.isBootloader() && !this.isProtocolV2() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
         return UI_REQUEST.BOOTLOADER;
       }
       if (!this.isInitialized() && !allow.includes(UI_REQUEST.NOT_INITIALIZE)) {
@@ -1190,12 +1189,8 @@ export class Device extends EventEmitter {
 
   async unlockDevice() {
     if (this.isProtocolV2()) {
-      let pinResult: DeviceSessionPinResult;
       try {
-        ({ message: pinResult } = await this.commands.typedCall(
-          'DeviceSessionAskPin',
-          'DeviceSessionPinResult'
-        ));
+        await this.commands.typedCall('DeviceSessionAskPin', 'Success');
       } catch (error) {
         const errorText =
           error instanceof Error
@@ -1207,16 +1202,11 @@ export class Device extends EventEmitter {
         throw error;
       }
 
-      const status: DeviceStatus = {};
-      if (pinResult.unlocked != null) {
-        status.unlocked = pinResult.unlocked;
-      }
-      if (pinResult.unlocked_attach_pin != null) {
-        status.unlocked_by_attach_to_pin = pinResult.unlocked_attach_pin;
-      }
-      if (pinResult.passphrase_protection != null) {
-        status.passphrase_enabled = pinResult.passphrase_protection;
-      }
+      const { message: status } = await this.commands.typedCall(
+        'DeviceStatusGet',
+        'DeviceStatus',
+        {}
+      );
       return this.updateProtocolV2Status(status);
     }
 

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -1,9 +1,13 @@
 import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
-import type { Features } from '../types';
-import type { PROTO } from '../constants';
+import {
+  isProtocolV2BootloaderDeviceInfo,
+  isProtocolV2RomloaderDeviceInfo,
+} from '../protocols/protocol-v2/features';
+
 import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
-import { isProtocolV2BootloaderDeviceInfo } from '../protocols/protocol-v2/features';
+import type { PROTO } from '../constants';
+import type { DeviceFeaturesMode, Features } from '../types';
 
 type ProtocolV1FeaturesCompat = PROTO.Features &
   Partial<PROTO.OnekeyFeatures> & {
@@ -131,6 +135,7 @@ export const buildProtocolV1FeaturesPayload = (
   const sessionId = features.session_id ?? previous?.sessionId ?? null;
 
   return {
+    ...features,
     protocol: 'V1',
     protocolVersion: features.protocol_version ?? previous?.protocolVersion ?? 1,
     deviceType,
@@ -203,8 +208,9 @@ export const buildProtocolV1FeaturesPayload = (
       se04BootHash: features.onekey_se04_boot_hash,
     },
     sessionId,
+    session_id: sessionId ?? undefined,
     raw: {
-      protocolV1Features: protocolV1Features,
+      protocolV1Features,
     },
   };
 };
@@ -223,7 +229,7 @@ export const buildProtocolV2FeaturesPayload = (
   const info = deviceInfo;
   const fwApplication = info?.fw?.application;
   const fwBootloader = info?.fw?.bootloader;
-  const fwBoard = firstValue(info?.fw?.application_data, info?.fw?.romloader);
+  const fwBoard = info?.fw?.romloader;
   const bleApplication = info?.coprocessor?.application;
   const status = info?.status;
 
@@ -249,14 +255,18 @@ export const buildProtocolV2FeaturesPayload = (
   const unlocked = firstValue(status?.unlocked, previous?.unlocked) ?? null;
   const attachToPinEnabled = status?.attach_to_pin_enabled ?? null;
   const unlockedAttachPin = status?.unlocked_by_attach_to_pin ?? undefined;
+  const romloaderMode = isProtocolV2RomloaderDeviceInfo(info);
   const bootloaderMode = isProtocolV2BootloaderDeviceInfo(info);
-  const mode = bootloaderMode
-    ? 'bootloader'
-    : initialized === false
-    ? 'notInitialized'
-    : initialized === true
-    ? 'normal'
-    : 'unknown';
+  let mode: DeviceFeaturesMode = 'unknown';
+  if (romloaderMode) {
+    mode = 'romloader';
+  } else if (bootloaderMode) {
+    mode = 'bootloader';
+  } else if (initialized === false) {
+    mode = 'notInitialized';
+  } else if (initialized === true) {
+    mode = 'normal';
+  }
 
   return {
     protocol: 'V2',
@@ -356,6 +366,12 @@ export const buildProtocolV2FeaturesPayload = (
       se04BootHash: getImageHash(info?.se4?.bootloader) ?? previous?.verify?.se04BootHash,
     },
     sessionId: previous?.sessionId ?? null,
+    device_id: deviceId ?? undefined,
+    session_id: previous?.sessionId ?? undefined,
+    ble_name: bleName ?? undefined,
+    onekey_device_type: 'PRO2',
+    passphrase_protection: passphraseProtection ?? undefined,
+    bootloader_mode: bootloaderMode,
     passphraseState: previous?.passphraseState,
     unlockedAttachPin,
     raw: {

package/src/deviceProfile/buildDeviceProfile.ts

@@ -13,6 +13,10 @@ import {
   getDeviceUUID,
   getFirmwareType,
 } from '../utils/deviceInfoUtils';
+import {
+  isProtocolV2BootloaderDeviceInfo,
+  isProtocolV2RomloaderDeviceInfo,
+} from '../protocols/protocol-v2/features';
 
 import type {
   DeviceInfoProtocol,
@@ -26,7 +30,6 @@ import type {
 } from '../types/api/getDeviceInfo';
 import type { Features, OnekeyFeatures } from '../types';
 import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
-import { isProtocolV2BootloaderDeviceInfo } from '../protocols/protocol-v2/features';
 
 type BuildProtocolV1ProfileParams = {
   protocol?: DeviceInfoProtocol;
@@ -87,6 +90,7 @@ const getDeviceMode = (features?: Features): DeviceInfoStatus['mode'] => {
 };
 
 const getProtocolV2Mode = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus['mode'] => {
+  if (isProtocolV2RomloaderDeviceInfo(deviceInfo)) return 'romloader';
   if (isProtocolV2BootloaderDeviceInfo(deviceInfo)) return 'bootloader';
   const initialized = deviceInfo?.status?.init_states;
   if (initialized === false) return 'notInitialized';
@@ -154,9 +158,7 @@ const normalizeV2Versions = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVe
   return {
     firmware: firstMeaningfulVersion(getImageVersion(info?.fw?.application)),
     bootloader: firstMeaningfulVersion(getImageVersion(info?.fw?.bootloader)),
-    board: firstMeaningfulVersion(
-      getImageVersion(info?.fw?.application_data ?? info?.fw?.romloader)
-    ),
+    board: firstMeaningfulVersion(getImageVersion(info?.fw?.romloader)),
     ble: firstMeaningfulVersion(getImageVersion(info?.coprocessor?.application)),
     se01: firstMeaningfulVersion(getImageVersion(info?.se1?.application)),
     se02: firstMeaningfulVersion(getImageVersion(info?.se2?.application)),
@@ -245,8 +247,8 @@ const normalizeV2Verify = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVeri
     firmwareHash: getImageHash(info?.fw?.application),
     bootloaderBuildId: getImageBuildId(info?.fw?.bootloader),
     bootloaderHash: getImageHash(info?.fw?.bootloader),
-    boardBuildId: getImageBuildId(info?.fw?.application_data ?? info?.fw?.romloader),
-    boardHash: getImageHash(info?.fw?.application_data ?? info?.fw?.romloader),
+    boardBuildId: getImageBuildId(info?.fw?.romloader),
+    boardHash: getImageHash(info?.fw?.romloader),
     bleBuildId: getImageBuildId(info?.coprocessor?.application),
     bleHash: getImageHash(info?.coprocessor?.application),
     se01BuildId: getImageBuildId(info?.se1?.application),

package/src/inject.ts

@@ -162,6 +162,8 @@ export const createCoreApi = (
   deviceReboot: (connectId, params) => call({ ...params, connectId, method: 'deviceReboot' }),
   deviceInfoGet: (connectId, params) => call({ ...params, connectId, method: 'deviceInfoGet' }),
   deviceStatusGet: (connectId, params) => call({ ...params, connectId, method: 'deviceStatusGet' }),
+  deviceGetOnboardingStatus: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceGetOnboardingStatus' }),
   deviceSessionGet: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceSessionGet' }),
   deviceFirmwareUpdate: (connectId, params) =>
@@ -205,8 +207,6 @@ export const createCoreApi = (
   filesystemPathInfoQuery: (connectId, params) =>
     call({ ...params, connectId, method: 'filesystemPathInfoQuery' }),
   filesystemFormat: connectId => call({ connectId, method: 'filesystemFormat' }),
-  filesystemDiskControl: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemDiskControl' }),
   deviceRecovery: (connectId, params) => call({ ...params, connectId, method: 'deviceRecovery' }),
   deviceReset: (connectId, params) => call({ ...params, connectId, method: 'deviceReset' }),
   deviceSettings: (connectId, params) => call({ ...params, connectId, method: 'deviceSettings' }),