@onekeyfe/hd-core 1.0.33-alpha.5 → 1.0.33-alpha.8

package/src/events/device.ts

@@ -44,6 +44,10 @@ export interface DeviceButtonRequestPayload extends Omit<PROTO.ButtonRequest, 'c
   code?: PROTO.ButtonRequest['code'] | 'ButtonRequest_FirmwareUpdate';
 }
 
+export type PassphraseRequestPayload = {
+  existsAttachPinUser?: boolean;
+};
+
 export interface DeviceButtonRequest {
   type: typeof DEVICE.BUTTON;
   payload: DeviceButtonRequestPayload & { device: Device | null };

package/src/events/ui-request.ts

@@ -34,7 +34,7 @@ export const UI_REQUEST = {
   BOOTLOADER: 'ui-device_bootloader_mode',
   NOT_IN_BOOTLOADER: 'ui-device_not_in_bootloader_mode',
   REQUIRE_MODE: 'ui-device_require_mode',
-  INITIALIZE: 'ui-device_not_initialized',
+  NOT_INITIALIZE: 'ui-device_not_initialized',
   SEEDLESS: 'ui-device_seedless',
   FIRMWARE_OLD: 'ui-device_firmware_old',
   FIRMWARE_NOT_SUPPORTED: 'ui-device_firmware_unsupported',
@@ -66,7 +66,7 @@ export type UiRequestDeviceAction = {
   type: typeof UI_REQUEST.REQUEST_PIN;
   payload: {
     device: Device;
-    type?: PROTO.PinMatrixRequestType | 'ButtonRequest_PinEntry';
+    type?: PROTO.PinMatrixRequestType | 'ButtonRequest_PinEntry' | 'ButtonRequest_AttachPin';
   };
 };
 
@@ -80,6 +80,7 @@ export interface UiRequestPassphrase {
   payload: {
     device: Device;
     passphraseState?: string;
+    existsAttachPinUser?: boolean;
   };
 }
 

package/src/events/ui-response.ts

@@ -18,6 +18,7 @@ export interface UiResponsePassphrase {
   payload: {
     value: string;
     passphraseOnDevice?: boolean;
+    attachPinOnDevice?: boolean;
     save?: boolean;
   };
 }

package/src/utils/deviceFeaturesUtils.ts

@@ -1,7 +1,7 @@
 import semver from 'semver';
 import { isNaN } from 'lodash';
 import { EDeviceType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-// import { toHardened } from '../api/helpers/pathUtils';
+import { toHardened } from '../api/helpers/pathUtils';
 import { DeviceCommands } from '../device/DeviceCommands';
 import type { Features, SupportFeatureType } from '../types';
 import { DeviceModelToTypes, DeviceTypeToModels } from '../types';
@@ -83,11 +83,13 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   const { features, commands } = device;
   const locked = features?.unlocked === false;
 
-  const sessionId = device.getInternalState();
-  const { passphraseState, newSession } = await getPassphraseState(features, commands, {
-    sessionId,
-    ...options,
-  });
+  const { passphraseState, newSession, unlockedAttachPin } = await getPassphraseState(
+    features,
+    commands,
+    {
+      ...options,
+    }
+  );
 
   // Attach to pin try to fix internal state
   if (newSession && passphraseState && features?.device_id) {
@@ -110,7 +112,7 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     await device.getFeatures();
   }
 
-  return { passphraseState, newSession };
+  return { passphraseState, newSession, unlockedAttachPin };
 };
 
 export const getPassphraseState = async (
@@ -118,30 +120,53 @@ export const getPassphraseState = async (
   commands: DeviceCommands,
   options?: {
     expectPassphraseState?: string;
-    sessionId?: string;
     onlyMainPin?: boolean;
+    // createAttachPinWallet?: boolean;
   }
-): Promise<{ passphraseState: string | undefined; newSession: string | undefined }> => {
-  if (!features) return { passphraseState: undefined, newSession: undefined };
-  // const firmwareVersion = getDeviceFirmwareVersion(features);
-  // const deviceType = getDeviceType(features);
-
-  // if (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion.join('.'), '4.13.2')) {
-  console.log(
-    '=====>>>>>> getPassphraseState begin: ',
-    options?.onlyMainPin,
-    options?.expectPassphraseState,
-    options?.sessionId
-  );
+): Promise<{
+  passphraseState: string | undefined;
+  newSession: string | undefined;
+  unlockedAttachPin: boolean | undefined;
+}> => {
+  if (!features)
+    return { passphraseState: undefined, newSession: undefined, unlockedAttachPin: undefined };
 
-  // @ts-expect-error
-  const { message, type } = await commands.typedCall('GetPassphraseState', 'PassphraseState', {
-    session_id: options?.sessionId,
-    btc_test: options?.onlyMainPin ? undefined : options?.expectPassphraseState,
-    onlyMainPin: options?.onlyMainPin,
-  });
+  const firmwareVersion = getDeviceFirmwareVersion(features);
+  const deviceType = getDeviceType(features);
+
+  if (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion.join('.'), '4.13.2')) {
+    console.log(
+      '=====>>>>>> getPassphraseState begin: ',
+      options?.onlyMainPin,
+      options?.expectPassphraseState
+    );
 
-  console.log('=====>>>>>> getPassphraseState end: result ', message);
+    const { message, type } = await commands.typedCall('GetPassphraseState', 'PassphraseState', {
+      passphrase_state: options?.onlyMainPin ? undefined : options?.expectPassphraseState,
+      // allow_create_attach_pin: options?.createAttachPinWallet,
+      // _only_main_pin: options?.onlyMainPin,
+    });
+
+    console.log('=====>>>>>> getPassphraseState end: result ', message);
+
+    // @ts-expect-error
+    if (type === 'CallMethodError') {
+      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
+    }
+
+    return {
+      passphraseState: message.passphrase_state,
+      newSession: message.session_id,
+      unlockedAttachPin: message.unlocked_attach_pin,
+    };
+  }
+
+  const { message, type } = await commands.typedCall('GetAddress', 'Address', {
+    address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
+    coin_name: 'Testnet',
+    script_type: 'SPENDADDRESS',
+    show_display: false,
+  });
 
   // @ts-expect-error
   if (type === 'CallMethodError') {
@@ -149,29 +174,10 @@ export const getPassphraseState = async (
   }
 
   return {
-    // @ts-expect-error
-    passphraseState: message.btc_test,
-    // @ts-expect-error
-    newSession: message.session_id,
+    passphraseState: message.address,
+    newSession: undefined,
+    unlockedAttachPin: undefined,
   };
-  // }
-
-  // const { message, type } = await commands.typedCall('GetAddress', 'Address', {
-  //   address_n: [toHardened(44), toHardened(1), toHardened(0), 0, 0],
-  //   coin_name: 'Testnet',
-  //   script_type: 'SPENDADDRESS',
-  //   show_display: false,
-  // });
-
-  // // @ts-expect-error
-  // if (type === 'CallMethodError') {
-  //   throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
-  // }
-
-  // return {
-  //   passphraseState: message.address,
-  //   newSession: undefined,
-  // };
 };
 
 export const supportBatchPublicKey = (