@onekeyfe/hd-core 1.2.2-alpha.10 → 1.2.2-alpha.101

package/src/events/logBlockEvent.ts

@@ -8,8 +8,9 @@ export const LogBlockEvent: Set<string> = new Set([
   UI_RESPONSE.RECEIVE_PASSPHRASE,
 ]);
 
-const LogLabelMethod: Set<string> = new Set([
-  'openWalletSession',
+// These resource/file APIs did not exist in 1.1.32. Skip the payload so
+// the log layer does not copy huge Base64 or binary data.
+const LogPayloadBlockMethod: Set<string> = new Set([
   'deviceUploadNft',
   'deviceUploadWallpaper',
   'uploadPortfolio',
@@ -17,61 +18,6 @@ const LogLabelMethod: Set<string> = new Set([
   'fileRead',
 ]);
 
-// 资源上传参数可能包含很大的 Base64 字符串。这里按方法整段跳过，避免日志层
-// 递归复制和序列化这些数据；资源 API 与传输内容本身保持不变。
-const LogPayloadBlockMethod: Set<string> = new Set([
-  'deviceUploadNft',
-  'deviceUploadWallpaper',
-  'uploadPortfolio',
-]);
-
-const SensitiveLogKeys: Set<string> = new Set([
-  'devicestate',
-  'entropy',
-  'expectedpassphrasestate',
-  'mnemonic',
-  'passphrase',
-  'passphrasestate',
-  'password',
-  'pin',
-  'privatekey',
-  'seed',
-  'session',
-  'sessionid',
-  'walletsessionid',
-  'xprv',
-]);
-
-const normalizeLogKey = (key: string) => key.replace(/[_-]/g, '').toLowerCase();
-
-const isSigningMethod = (methodName: string) => /sign/i.test(methodName);
-
-const redactLogValue = (value: unknown, seen: WeakSet<object>): unknown => {
-  if (ArrayBuffer.isView(value)) {
-    return `[BINARY:${value.byteLength}]`;
-  }
-  if (value instanceof ArrayBuffer) {
-    return `[BINARY:${value.byteLength}]`;
-  }
-  if (Array.isArray(value)) {
-    return value.map(item => redactLogValue(item, seen));
-  }
-  if (!value || typeof value !== 'object') return value;
-  if (seen.has(value)) return '[CIRCULAR]';
-
-  seen.add(value);
-  const redacted = Object.fromEntries(
-    Object.entries(value as Record<string, unknown>).map(([key, item]) => [
-      key,
-      SensitiveLogKeys.has(normalizeLogKey(key)) && item !== null && item !== undefined
-        ? '[REDACTED]'
-        : redactLogValue(item, seen),
-    ])
-  );
-  seen.delete(value);
-  return redacted;
-};
-
 export function getLogBlockLabel(message: unknown): string | undefined {
   if (!message || typeof message !== 'object') return undefined;
 
@@ -86,7 +32,7 @@ export function getLogBlockLabel(message: unknown): string | undefined {
   }
 
   const methodName = method ?? payload?.method;
-  if (methodName && (LogLabelMethod.has(methodName) || isSigningMethod(methodName))) {
+  if (methodName && LogPayloadBlockMethod.has(methodName)) {
     return methodName;
   }
 
@@ -94,25 +40,10 @@ export function getLogBlockLabel(message: unknown): string | undefined {
 }
 
 export function getSafeLogPayload(value: unknown, blockLabel?: string): unknown {
-  if (
-    blockLabel &&
-    (LogBlockEvent.has(blockLabel) ||
-      LogPayloadBlockMethod.has(blockLabel) ||
-      isSigningMethod(blockLabel))
-  ) {
+  if (blockLabel) {
     return { method: blockLabel, payload: '[REDACTED]' };
   }
-
-  const redactedValue = redactLogValue(value, new WeakSet());
-  if (
-    blockLabel &&
-    redactedValue &&
-    typeof redactedValue === 'object' &&
-    !Array.isArray(redactedValue)
-  ) {
-    return { ...redactedValue, method: blockLabel };
-  }
-  return redactedValue;
+  return value;
 }
 
 export function formatLogMethodLabel(label: string, methodName?: string): string {

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

@@ -234,9 +234,9 @@ export async function getProtocolV2WalletSession(
   const forceWalletSelection =
     options?.forceWalletSelection === true || options?.initSession === true;
   const readCurrentAttachPinSession = options?.readCurrentAttachPinSession === true;
-  const sessionIsAttachPinWallet = (session?: { viaAttachPin?: boolean }) =>
+  const sessionIsAttachPinWallet = (session?: unknown) =>
     readCurrentAttachPinSession ||
-    session?.viaAttachPin === true ||
+    (session as { viaAttachPin?: boolean } | undefined)?.viaAttachPin === true ||
     device.features?.unlockedAttachPin === true;
 
   if (forceWalletSelection) {
@@ -455,6 +455,11 @@ export async function getProtocolV2WalletSession(
         throw error;
       }
       resumed = false;
+      if (device.features?.unlockedAttachPin === true) {
+        // Locking invalidates the old handle, but Attach PIN already selected the wallet.
+        // Read the current session and validate its passphrase state below.
+        response = await getDeviceSession(device, sessionGetRequest());
+      }
     }
   } else if (expectedPassphraseState) {
     try {

package/src/types/api/protocolV2.ts

@@ -1,6 +1,7 @@
 import type { CommonParams, Response } from '../params';
 import type { OnboardingStatus, Success } from '@onekeyfe/hd-transport';
 import type { DeviceRebootParams } from '../../api/protocol-v2/helpers';
+import type { UploadPortfolioParams } from '../../api/UploadPortfolio';
 import type {
   DeviceUploadWallpaperParams,
   DeviceUploadWallpaperResponse,
@@ -12,6 +13,7 @@ import type {
 
 // Re-export implementation parameter types as the single source of truth.
 export type { DeviceRebootParams, RebootTypeInput } from '../../api/protocol-v2/helpers';
+export type { UploadPortfolioParams } from '../../api/UploadPortfolio';
 export type {
   DeviceUploadWallpaperParams,
   DeviceUploadWallpaperResponse,
@@ -67,8 +69,5 @@ export declare function deviceUploadNft(
 
 export declare function uploadPortfolio(
   connectId: string,
-  params: {
-    packageBase64: string;
-    timeoutMs?: number | string;
-  }
+  params: UploadPortfolioParams
 ): Response<FileInfo & { portfolioUpdated: true }>;

package/src/types/api/solSignOffchainMessage.ts

@@ -15,6 +15,9 @@ export type SolSignOffchainMessageParams = {
   messageVersion?: SolanaOffChainMessageVersion;
   messageFormat?: SolanaOffChainMessageFormat;
   applicationDomainHex?: string;
+  sourceFingerprint?: number;
+  /** 32-byte public keys encoded as hex, strictly sorted and unique. */
+  requiredSigners?: string[];
 };
 
 export declare function solSignOffchainMessage(