@onekeyfe/hd-core 1.2.0-alpha.16 → 1.2.0-alpha.18

package/src/protocols/protocol-v2/walletSession.ts

@@ -1,8 +1,11 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
+import { DEVICE, type PassphraseRequestPayload } from '../../events';
 import { isDeviceLockedError } from './lockedError';
 
+import type { DeviceSessionOpen } from '@onekeyfe/hd-transport';
 import type { Device } from '../../device/Device';
+import type { PassphrasePromptResponse } from '../../device/DeviceCommands';
 
 const getErrorText = (error: unknown) => {
   if (error instanceof Error) return `${error.name} ${error.message}`;
@@ -19,6 +22,17 @@ const getErrorText = (error: unknown) => {
 export const isProtocolV2InvalidSessionError = (error: unknown) =>
   getErrorText(error).toLowerCase().includes('failure_invalidsession');
 
+const normalizeHostPassphrase = (passphrase: string | undefined) => {
+  const normalized = (passphrase ?? '').normalize('NFKD');
+  if (!normalized || normalized.includes('\0') || normalized.length > 50) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.CallMethodInvalidParameter,
+      'Invalid hidden wallet passphrase.'
+    );
+  }
+  return normalized;
+};
+
 export async function requestProtocolV2DeviceStatus(device: Device) {
   const { message } = await device.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
   return message;
@@ -29,54 +43,131 @@ export async function refreshProtocolV2DeviceStatus(device: Device) {
   return device.updateProtocolV2Status(status);
 }
 
+const openDeviceSession = async (device: Device, request: DeviceSessionOpen) => {
+  try {
+    return await device.commands.typedCall('DeviceSessionOpen', 'DeviceSession', request);
+  } catch (error) {
+    if (!isDeviceLockedError(error)) {
+      throw error;
+    }
+    await device.unlockDevice();
+    return device.commands.typedCall('DeviceSessionOpen', 'DeviceSession', request);
+  }
+};
+
+const createHiddenWalletRequest = (
+  response: PassphrasePromptResponse
+): {
+  request: DeviceSessionOpen;
+  deviceEvent?: typeof DEVICE.PASSPHRASE_ON_DEVICE | typeof DEVICE.ATTACH_PIN_ON_DEVICE;
+} => {
+  if (response.attachPinOnDevice) {
+    return {
+      request: {
+        select: {
+          attach_pin_on_device: {},
+        },
+      },
+      deviceEvent: DEVICE.ATTACH_PIN_ON_DEVICE,
+    };
+  }
+
+  if (response.passphraseOnDevice) {
+    return {
+      request: {
+        select: {
+          passphrase_on_device: {},
+        },
+      },
+      deviceEvent: DEVICE.PASSPHRASE_ON_DEVICE,
+    };
+  }
+
+  return {
+    request: {
+      select: {
+        host_passphrase: { passphrase: normalizeHostPassphrase(response.passphrase) },
+      },
+    },
+  };
+};
+
+const openSelectedHiddenWallet = async (
+  device: Device,
+  promptPayload: PassphraseRequestPayload
+) => {
+  const response = await device.commands.promptPassphrase(promptPayload, {
+    cancelDeviceOnReject: false,
+  });
+  const { request, deviceEvent } = createHiddenWalletRequest(response);
+
+  if (deviceEvent) {
+    device.emit(deviceEvent, device, promptPayload);
+  }
+
+  return openDeviceSession(device, request);
+};
+
 export async function getProtocolV2WalletSession(
   device: Device,
-  options?: { initSession?: boolean; expectedPassphraseState?: string }
+  options?: {
+    initSession?: boolean;
+    expectedPassphraseState?: string;
+    onlyMainPin?: boolean;
+  }
 ) {
   if (options?.initSession) {
     device.clearInternalState();
   }
 
-  let sessionId =
-    typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+  const expectedPassphraseState = options?.expectedPassphraseState ?? device.passphraseState;
 
   try {
-    const requestDeviceSession = (sessionId?: string) =>
-      device.commands.typedCall(
-        'DeviceSessionGet',
-        'DeviceSession',
-        sessionId ? { session_id: sessionId } : {}
-      );
-
-    const requestWalletSession = async () => {
+    // 锁屏时的 passphrase_enabled 不可信。先完成 PIN 解锁，unlockDevice 会立即
+    // 获取并合并一份新的 DeviceStatus，之后再决定打开主钱包还是隐藏钱包。
+    if (device.features?.unlocked === false) {
+      await device.unlockDevice();
+    }
+
+    if (options?.onlyMainPin || device.getCurrentPassphraseProtection() === false) {
+      return {
+        passphraseState: undefined,
+        newSession: undefined,
+        unlockedAttachPin: false,
+      };
+    }
+
+    const cachedSessionId =
+      typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+    let response;
+    let recoveryFailed = false;
+
+    if (cachedSessionId && expectedPassphraseState) {
       try {
-        return await requestDeviceSession(sessionId);
+        response = await openDeviceSession(device, {
+          resume: { session_id: cachedSessionId },
+        });
       } catch (error) {
-        if (!sessionId || !isProtocolV2InvalidSessionError(error)) {
+        if (!isProtocolV2InvalidSessionError(error)) {
           throw error;
         }
         device.clearInternalState();
-        sessionId = undefined;
-        return requestDeviceSession();
+        recoveryFailed = true;
       }
-    };
+    }
 
-    let response;
-    try {
-      response = await requestWalletSession();
-    } catch (error) {
-      if (!isDeviceLockedError(error)) {
-        throw error;
-      }
-      await device.unlockDevice();
-      response = await requestWalletSession();
+    if (!response) {
+      const promptPayload: PassphraseRequestPayload = {
+        source: 'wallet-session-coordinator',
+        reason: recoveryFailed ? 'session-recovery' : 'open-wallet',
+        expectedPassphraseState,
+        existsAttachPinUser: device.features?.attachToPinEnabled === true,
+      };
+      response = await openSelectedHiddenWallet(device, promptPayload);
     }
-    const { message } = response;
 
-    if (
-      options?.expectedPassphraseState &&
-      options.expectedPassphraseState !== message.btc_test_address
-    ) {
+    const { message } = response;
+    if (expectedPassphraseState && expectedPassphraseState !== message.btc_test_address) {
       device.clearInternalState();
       throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError);
     }
@@ -86,7 +177,7 @@ export async function getProtocolV2WalletSession(
     }
 
     device.updateInternalState(
-      (device.getCurrentPassphraseProtection() ?? false) || Boolean(message.btc_test_address),
+      true,
       message.btc_test_address,
       device.getCurrentDeviceId(),
       message.session_id,

package/src/types/api/getDeviceInfo.ts

@@ -1,7 +1,11 @@
 import type { CommonParams, Response } from '../params';
 import type { Features, IDeviceType, OnekeyFeatures } from '../device';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
-import type { ProtocolType, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type {
+  DeviceStatus,
+  ProtocolType,
+  ProtocolV2DeviceInfo,
+} from '@onekeyfe/hd-transport';
 
 // 协议类型单源：从 hd-transport 的 ProtocolType 派生，只额外允许 'unknown'。
 export type DeviceInfoProtocol = ProtocolType | 'unknown';
@@ -78,6 +82,7 @@ export type DeviceProfileRaw = {
   features?: Features;
   protocolV1OneKeyFeatures?: OnekeyFeatures;
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
+  protocolV2DeviceStatus?: DeviceStatus;
 };
 
 export type DeviceProfile = {

package/src/types/api/index.ts

@@ -6,7 +6,7 @@ import type {
   deviceGetOnboardingStatus,
   deviceInfoGet,
   deviceReboot,
-  deviceSessionGet,
+  deviceSessionOpen,
   deviceSettingsGet,
   deviceSettingsPageShow,
   deviceSettingsSet,
@@ -267,7 +267,7 @@ export type CoreApi = {
   deviceInfoGet: typeof deviceInfoGet;
   deviceStatusGet: typeof deviceStatusGet;
   deviceGetOnboardingStatus: typeof deviceGetOnboardingStatus;
-  deviceSessionGet: typeof deviceSessionGet;
+  deviceSessionOpen: typeof deviceSessionOpen;
   deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
   deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
   deviceFactoryInfoSet: typeof deviceFactoryInfoSet;

package/src/types/api/kaspaSignTransaction.ts

@@ -13,15 +13,47 @@ export type KaspaSignInputParams = {
   sequenceNumber: number | string;
   output: {
     satoshis: number | string;
-    script: string;
+    // Required by the legacy host-prehash flow; unused by the streaming protocol.
+    script?: string;
   };
   sigOpCount?: number;
 };
 
 export type KaspaSignOutputParams = {
   satoshis: number | string;
+  // Streaming protocol describes outputs by address; the device builds the script itself.
+  // `address` for an external output, `addressN` (BIP-32 path) for a change output.
+  address?: string;
+  addressN?: string | number[];
+  // Legacy host-prehash fields, unused by the streaming protocol but kept for compatibility.
+  script?: string;
+  scriptVersion?: number;
+};
+
+// Referenced (previous) transactions for the streaming protocol's input
+// verification: the device may ask for the transactions the inputs spend from
+// (selected by prev_tx_id) to verify input amounts on-device.
+export type KaspaRefTransactionInput = {
+  prevTxId: string;
+  outputIndex: number;
+  sequenceNumber: number | string;
+};
+
+export type KaspaRefTransactionOutput = {
+  satoshis: number | string;
+  scriptVersion?: number;
   script: string;
-  scriptVersion: number;
+};
+
+export type KaspaRefTransaction = {
+  txId: string;
+  version: number;
+  inputs: KaspaRefTransactionInput[];
+  outputs: KaspaRefTransactionOutput[];
+  lockTime?: number | string;
+  subNetworkID?: string;
+  gas?: number | string;
+  payload?: string;
 };
 
 export type KaspaSignTransactionParams = {
@@ -32,6 +64,12 @@ export type KaspaSignTransactionParams = {
   sigHashType?: SignatureType;
   sigOpCount?: number;
   subNetworkID?: string;
+  // Optional transaction payload (hex), streamed to the device in chunks.
+  payload?: string;
+  gas?: number | string;
+  // Previous transactions referenced by the inputs, required only when the
+  // device requests them for on-device input-amount verification.
+  refTxs?: KaspaRefTransaction[];
   scheme?: string;
   prefix?: string;
   useTweak?: boolean; // default is true

package/src/types/api/protocolV2.ts

@@ -1,8 +1,8 @@
 import type { CommonParams, Response } from '../params';
 import type {
+  DevOnboardingStatus,
   DeviceFactoryInfo,
   DeviceFirmwareUpdateStatus,
-  DevOnboardingStatus,
   DeviceSession,
   DeviceSettings,
   DeviceStatus,
@@ -17,6 +17,7 @@ import type {
   DeviceRebootParams,
 } from '../../api/protocol-v2/helpers';
 import type { DeviceInfoGetParams } from '../../api/protocol-v2/DeviceInfoGet';
+import type { DeviceSessionOpenParams } from '../../api/protocol-v2/DeviceSessionOpen';
 import type { DeviceSettingsSetParams } from '../../api/protocol-v2/DeviceSettingsSet';
 import type { DeviceSettingsPageShowParams } from '../../api/protocol-v2/DeviceSettingsPageShow';
 import type {
@@ -38,6 +39,7 @@ export type {
   DeviceInfoGetTargets,
   DeviceInfoGetTypes,
 } from '../../api/protocol-v2/DeviceInfoGet';
+export type { DeviceSessionOpenParams } from '../../api/protocol-v2/DeviceSessionOpen';
 export type { DeviceSettingsSetParams } from '../../api/protocol-v2/DeviceSettingsSet';
 export type {
   DeviceSettingsPageShowParams,
@@ -117,9 +119,9 @@ export declare function deviceGetOnboardingStatus(
   params?: CommonParams
 ): Response<DevOnboardingStatus>;
 
-export declare function deviceSessionGet(
+export declare function deviceSessionOpen(
   connectId: string,
-  params?: CommonParams
+  params: CommonParams & DeviceSessionOpenParams
 ): Response<DeviceSession>;
 
 export declare function deviceFirmwareUpdate(

package/src/types/device.ts

@@ -2,7 +2,11 @@ import { EDeviceType, type EFirmwareType } from '@onekeyfe/hd-shared';
 
 import type { IVersionArray } from './settings';
 import type { PROTO } from '../constants';
-import type { OneKeyDeviceCommType, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type {
+  DeviceStatus as ProtocolV2DeviceStatus,
+  OneKeyDeviceCommType,
+  ProtocolV2DeviceInfo,
+} from '@onekeyfe/hd-transport';
 
 export type DeviceStatus = 'available' | 'occupied' | 'used';
 
@@ -127,6 +131,7 @@ export type DeviceFeaturesRaw = {
   protocolV1Features?: PROTO.Features;
   protocolV1OneKeyFeatures?: OnekeyFeatures;
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
+  protocolV2DeviceStatus?: ProtocolV2DeviceStatus;
 };
 
 export type NormalizedFeatures = {

package/src/utils/deviceFeaturesUtils.ts

@@ -30,6 +30,17 @@ export const getSupportProtocolV1MessageSchema = (
   const currentDeviceVersion = getDeviceFirmwareVersion(features).join('.');
   const deviceType = getDeviceType(features);
 
+  if (
+    features.bootloaderMode === true &&
+    features.firmwarePresent === false &&
+    DeviceModelToTypes.model_mini.includes(deviceType)
+  ) {
+    return {
+      messages: DataManager.messages.v1CurrentSchema,
+      protocolV1MessageSchema: 'v1CurrentSchema',
+    };
+  }
+
   const deviceVersionConfigs =
     PROTOBUF_MESSAGE_CONFIG[deviceType] ||
     (DeviceTypeToModels[deviceType] &&
@@ -104,6 +115,7 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     return getProtocolV2WalletSession(device, {
       initSession: options?.initSession,
       expectedPassphraseState: options?.expectPassphraseState,
+      onlyMainPin: options?.onlyMainPin,
     });
   }
 
@@ -183,6 +195,7 @@ export const getPassphraseState = async (
     return getProtocolV2WalletSession(device, {
       initSession: options?.initSession,
       expectedPassphraseState: options?.expectPassphraseState,
+      onlyMainPin: options?.onlyMainPin,
     });
   }
 

package/src/utils/homescreen.ts

@@ -3,6 +3,7 @@ import { EDeviceType } from '@onekeyfe/hd-shared';
 
 import { getDeviceType } from './deviceInfoUtils';
 import { getDeviceFirmwareVersion } from './deviceVersionUtils';
+import { PRO2_WALLPAPER_HEIGHT, PRO2_WALLPAPER_WIDTH } from './pro2Wallpaper';
 
 import type { Features, IDeviceType } from '../types';
 
@@ -310,6 +311,15 @@ export const getHomeScreenSize = ({
   homeScreenType: 'WallPaper' | 'Nft';
   thumbnail?: boolean;
 }) => {
+  if (deviceType === EDeviceType.Pro2) {
+    return thumbnail
+      ? undefined
+      : {
+          width: PRO2_WALLPAPER_WIDTH,
+          height: PRO2_WALLPAPER_HEIGHT,
+        };
+  }
+
   const sizes: Partial<
     Record<
       IDeviceType,

package/dist/api/protocol-v2/DeviceSessionGet.d.ts

@@ -1,6 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-export default class DeviceSessionGet extends BaseMethod {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").DeviceSession>;
-}
-//# sourceMappingURL=DeviceSessionGet.d.ts.map

package/dist/api/protocol-v2/DeviceSessionGet.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DeviceSessionGet.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceSessionGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU;IACtD,IAAI;IAOE,GAAG;CAIV"}

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

@@ -1,15 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-
-export default class DeviceSessionGet extends BaseMethod {
-  init() {
-    this.requireProtocolV2 = true;
-    this.useDevicePassphraseState = false;
-    this.skipForceUpdateCheck = true;
-    this.params = undefined;
-  }
-
-  async run() {
-    const { message } = await this.device.commands.typedCall('DeviceSessionGet', 'DeviceSession', {});
-    return message;
-  }
-}