@onekeyfe/hd-core 1.2.2-alpha.100 → 1.2.2-alpha.102

package/src/data/messages/messages.json

@@ -10243,7 +10243,8 @@
     },
     "SolanaOffChainMessageVersion": {
       "values": {
-        "MESSAGE_VERSION_0": 0
+        "MESSAGE_VERSION_0": 0,
+        "MESSAGE_VERSION_1": 1
       }
     },
     "SolanaOffChainMessageFormat": {
@@ -10276,14 +10277,16 @@
         },
         "message_format": {
           "type": "SolanaOffChainMessageFormat",
-          "id": 4,
-          "options": {
-            "default": "V0_RESTRICTED_ASCII"
-          }
+          "id": 4
         },
         "application_domain": {
           "type": "bytes",
           "id": 5
+        },
+        "required_signers": {
+          "rule": "repeated",
+          "type": "bytes",
+          "id": 7
         }
       }
     },

package/src/device/Device.ts

@@ -2005,7 +2005,8 @@ export class Device extends EventEmitter {
     passphraseState?: string,
     useEmptyPassphrase?: boolean,
     skipPassphraseCheck?: boolean,
-    deriveCardano?: boolean
+    deriveCardano?: boolean,
+    mainPinSelected?: boolean
   ) {
     if (this.isUnacquired()) return false;
 
@@ -2016,6 +2017,7 @@ export class Device extends EventEmitter {
         onlyMainPin: useEmptyPassphrase,
         deriveCardano,
         rejectAttachPinForMainWallet: useEmptyPassphrase === true,
+        mainPinSelected,
       });
 
     // Main wallet and unlock Attach Pin, throw safe error

package/src/device/DeviceConnector.ts

@@ -96,7 +96,8 @@ export default class DeviceConnector {
     forceCleanRunPromise?: boolean,
     expectedProtocol?: HardwareConnectProtocol,
     protocolHint?: HardwareConnectProtocol,
-    forceProtocolDetection?: boolean
+    forceProtocolDetection?: boolean,
+    skipProtocolProbe?: boolean
   ) {
     Log.debug('acquire', path, session, expectedProtocol, protocolHint);
     const env = DataManager.getSettings('env');
@@ -104,13 +105,15 @@ export default class DeviceConnector {
       const transport = this.getActiveTransport();
       let res;
       if (DataManager.isBleConnect(env)) {
-        res = await transport.acquire({
+        const acquireInput: Parameters<Transport['acquire']>[0] = {
           uuid: path,
           forceCleanRunPromise,
           expectedProtocol,
           protocolHint,
           forceProtocolDetection,
-        });
+          skipProtocolProbe,
+        };
+        res = await transport.acquire(acquireInput);
       } else {
         res = await transport.acquire({
           path,
@@ -118,6 +121,7 @@ export default class DeviceConnector {
           expectedProtocol,
           protocolHint,
           forceProtocolDetection,
+          skipProtocolProbe,
         });
       }
       if (expectedProtocol) {

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/events/ui-request.ts

@@ -189,6 +189,9 @@ export interface FirmwareProgress {
     totalBytes?: number;
     rateBytesPerSecond?: number;
     elapsedMs?: number;
+    installTargetId?: number;
+    installPhase?: 'prepare' | 'install' | 'verify';
+    installPhaseProgress?: number;
   };
 }
 

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

@@ -59,7 +59,15 @@ export function isProtocolV2ResourceArchiveEntryName(entryName: string): boolean
   return (
     fileName.length > 0 &&
     !fileName.startsWith('.') &&
-    !parts.some(part => part === '__MACOSX' || part === '.' || part === '..' || part === '')
+    !parts.some(
+      part =>
+        !part ||
+        part === '.' ||
+        part === '..' ||
+        part === '.DS_Store' ||
+        part.startsWith('._') ||
+        part.toUpperCase() === '__MACOSX'
+    )
   );
 }
 

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

@@ -14,10 +14,14 @@ const Log = getLogger(LoggerNames.Core);
 
 export type ProtocolV2UnlockContext = {
   preflightCompleted: boolean;
+  preflightStatusRefreshed?: boolean;
+  preflightMainPinSelected?: boolean;
 };
 
 export const createProtocolV2UnlockContext = (): ProtocolV2UnlockContext => ({
   preflightCompleted: false,
+  preflightStatusRefreshed: false,
+  preflightMainPinSelected: false,
 });
 
 type RunnableMethod = Pick<
@@ -100,11 +104,12 @@ export async function runMethodWithUnlockPolicy<T = unknown>(
     await afterStatusBeforeUnlock?.();
 
     if (!status.unlocked) {
+      const preUnlockPinType = resolvePreUnlockPinType(method);
       const unlockInteraction: HardwareUiInteractionMeta | undefined = shouldCoordinateUi
         ? uiCoordinator.enterUnlockInteraction(method.name)
         : undefined;
       const unlockedStatus = await device.unlockDevice(
-        resolvePreUnlockPinType(method),
+        preUnlockPinType,
         shouldCoordinateUi
           ? { emitUiEvent: false, interaction: unlockInteraction }
           : {
@@ -120,9 +125,11 @@ export async function runMethodWithUnlockPolicy<T = unknown>(
           'Protocol V2 device remained locked after the unlock flow.'
         );
       }
+      context.preflightMainPinSelected = preUnlockPinType === DeviceSessionPinType.Main;
       Log.debug('Protocol V2 pre-unlock completed', { method: method.name });
     }
 
+    context.preflightStatusRefreshed = true;
     context.preflightCompleted = true;
   }