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

package/src/protocols/v2/session.ts

@@ -71,15 +71,6 @@ export function bytesToHex(bytes: Uint8Array): string {
     .join('');
 }
 
-// Frame header bytes worth logging: SOF, len lo/hi, header CRC, router, attr, seq.
-// The rest of the frame is protobuf payload and may contain sensitive fields
-// (mnemonic words via WordAck, PINs, seeds via LoadDevice, ...), so raw frame
-// hex logs must never include it.
-const PROTOCOL_V2_DEBUG_HEADER_BYTES = 7;
-const PROTOCOL_V2_DEBUG_ARRAY_ITEMS_LIMIT = 20;
-const PROTOCOL_V2_DEBUG_OBJECT_KEYS_LIMIT = 40;
-const PROTOCOL_V2_DEBUG_STRING_LIMIT = 512;
-const PROTOCOL_V2_DEBUG_DEPTH_LIMIT = 4;
 const HIGH_VOLUME_PROTOCOL_V2_CALLS = new Set([
   ...LogBlockCommand,
   'FilesystemFileRead',
@@ -91,102 +82,6 @@ function shouldReduceProtocolV2Debug(name: string) {
   return HIGH_VOLUME_PROTOCOL_V2_CALLS.has(name);
 }
 
-function frameHeaderDebugHex(frame: Uint8Array): string {
-  // Only the frame header is dumped as hex; the payload is logged separately
-  // in sanitized/structured form (sanitizeProtocolV2DebugPayload).
-  return bytesToHex(frame.slice(0, PROTOCOL_V2_DEBUG_HEADER_BYTES));
-}
-
-function getBinaryByteLength(value: unknown): number | undefined {
-  if (value instanceof ArrayBuffer) {
-    return value.byteLength;
-  }
-
-  if (ArrayBuffer.isView(value)) {
-    return value.byteLength;
-  }
-
-  if (typeof Blob !== 'undefined' && value instanceof Blob) {
-    return value.size;
-  }
-
-  return undefined;
-}
-
-function summarizeRedactedData(value: unknown): string {
-  const byteLength = getBinaryByteLength(value);
-  if (byteLength !== undefined) {
-    return `[redacted data: ${byteLength} bytes]`;
-  }
-
-  if (typeof value === 'string') {
-    return `[redacted data: string length=${value.length}]`;
-  }
-
-  if (Array.isArray(value)) {
-    return `[redacted data: array length=${value.length}]`;
-  }
-
-  if (value && typeof value === 'object') {
-    return `[redacted data: object keys=${Object.keys(value).length}]`;
-  }
-
-  return `[redacted data: ${typeof value}]`;
-}
-
-function sanitizeProtocolV2DebugPayload(value: unknown, key = '', depth = 0): unknown {
-  if (/^(data|payload)$/i.test(key) && value !== null && value !== undefined) {
-    return summarizeRedactedData(value);
-  }
-
-  if (/(passphrase|pin|mnemonic|seed|private)/i.test(key)) {
-    return '[redacted sensitive value]';
-  }
-
-  const byteLength = getBinaryByteLength(value);
-  if (byteLength !== undefined) {
-    return `[binary: ${byteLength} bytes]`;
-  }
-
-  if (typeof value === 'string') {
-    return value.length > PROTOCOL_V2_DEBUG_STRING_LIMIT
-      ? `${value.slice(0, PROTOCOL_V2_DEBUG_STRING_LIMIT)}... (len=${value.length})`
-      : value;
-  }
-
-  if (!value || typeof value !== 'object') {
-    return value;
-  }
-
-  if (depth >= PROTOCOL_V2_DEBUG_DEPTH_LIMIT) {
-    return Array.isArray(value)
-      ? `[array length=${value.length}]`
-      : `[object keys=${Object.keys(value).length}]`;
-  }
-
-  if (Array.isArray(value)) {
-    const items = value
-      .slice(0, PROTOCOL_V2_DEBUG_ARRAY_ITEMS_LIMIT)
-      .map(item => sanitizeProtocolV2DebugPayload(item, key, depth + 1));
-    if (value.length > PROTOCOL_V2_DEBUG_ARRAY_ITEMS_LIMIT) {
-      items.push(`... (${value.length - PROTOCOL_V2_DEBUG_ARRAY_ITEMS_LIMIT} more)`);
-    }
-    return items;
-  }
-
-  const entries = Object.entries(value).slice(0, PROTOCOL_V2_DEBUG_OBJECT_KEYS_LIMIT);
-  const sanitized: Record<string, unknown> = {};
-  entries.forEach(([entryKey, entryValue]) => {
-    sanitized[entryKey] = sanitizeProtocolV2DebugPayload(entryValue, entryKey, depth + 1);
-  });
-  if (Object.keys(value).length > PROTOCOL_V2_DEBUG_OBJECT_KEYS_LIMIT) {
-    sanitized.__truncated__ = `${
-      Object.keys(value).length - PROTOCOL_V2_DEBUG_OBJECT_KEYS_LIMIT
-    } more keys`;
-  }
-  return sanitized;
-}
-
 const COMMON_TERMINAL_RESPONSE_TYPES = new Set([
   'Failure',
   'ButtonRequest',
@@ -305,11 +200,8 @@ export class ProtocolV2Session {
       packetSrc,
       router,
       seq: protoSeq,
-      logger: shouldReduceDebug ? undefined : logger,
-      logPrefix,
-      context: `tx:${name}`,
     });
-    const expectedSeq = frame[6];
+    const txMetadata = ProtocolV2.inspectFrame(schemas, frame);
 
     if (maxFrameBytes !== undefined && frame.length > maxFrameBytes) {
       throw new Error(
@@ -318,15 +210,13 @@ export class ProtocolV2Session {
     }
 
     if (!shouldReduceDebug) {
-      logger?.debug?.(
-        `[${logPrefix}] TX payload name=${name}`,
-        sanitizeProtocolV2DebugPayload(data)
-      );
-      logger?.debug?.(
-        `[${logPrefix}] TX frame name=${name} len=${frame.length} router=${frame[4]} attr=${
-          frame[5]
-        } seq=${expectedSeq} headerHex=${frameHeaderDebugHex(frame)}`
-      );
+      logger?.debug?.(`[${logPrefix}] TX`, {
+        method: name,
+        type: name,
+        typeId: txMetadata.messageTypeId,
+        seq: txMetadata.seq,
+        bytes: frame.length,
+      });
     }
 
     // Lenient watchdog on the write phase only — see
@@ -356,40 +246,22 @@ export class ProtocolV2Session {
           // Timed out while waiting: drop the late frame and stop reading.
           break;
         }
-        if (!shouldReduceDebug) {
-          logger?.debug?.(
-            `[${logPrefix}] RX frame len=${rxFrame.length} router=${rxFrame[4]} attr=${
-              rxFrame[5]
-            } seq=${rxFrame[6]} headerHex=${frameHeaderDebugHex(rxFrame)}`
-          );
-        }
         const isAck = ProtocolV2.isAckFrame(rxFrame);
-        if (isAck) {
-          if (!shouldReduceDebug) {
-            logger?.debug?.(`[${logPrefix}] skip Proto Link ACK seq=${rxFrame[6]}`);
-          }
-        }
         if (!isAck) {
-          const decoded = ProtocolV2.decodeFrame(schemas, rxFrame, {
-            logger: shouldReduceDebug ? undefined : logger,
-            logPrefix,
-            context: `rx:${name}`,
-          });
-          if (!shouldReduceDebug && decoded.seq !== expectedSeq) {
-            logger?.debug?.(
-              `[${logPrefix}] seq differs for ${name}: tx=${expectedSeq}, rx=${decoded.seq}`
-            );
-          }
+          const rxMetadata = ProtocolV2.inspectFrame(schemas, rxFrame);
+
           if (!shouldReduceDebug) {
-            logger?.debug?.(
-              `[${logPrefix}] TX name=${name} seq=${expectedSeq} | RX seq=${decoded.seq} messageTypeId=${decoded.messageTypeId} pbPayload=${decoded.pbPayload.length}B`
-            );
-            logger?.debug?.(
-              `[${logPrefix}] RX payload type=${decoded.type} messageTypeId=${decoded.messageTypeId}`,
-              sanitizeProtocolV2DebugPayload(decoded.message)
-            );
+            logger?.debug?.(`[${logPrefix}] RX`, {
+              method: name,
+              type: rxMetadata.type,
+              typeId: rxMetadata.messageTypeId,
+              seq: rxMetadata.seq,
+              bytes: rxFrame.length,
+            });
           }
 
+          const decoded = ProtocolV2.decodeFrame(schemas, rxFrame);
+
           const response = check.call(decoded);
           if (callOptions.intermediateTypes?.includes(response.type)) {
             callOptions.onIntermediateResponse?.(response);

package/src/types/messages.ts

@@ -2412,6 +2412,19 @@ export type Features = {
   onekey_se04_state?: string | null;
   attach_to_pin_user?: boolean;
   unlocked_attach_pin?: boolean;
+  coprocessor_bt_name?: string;
+  coprocessor_version?: string;
+  coprocessor_bt_enable?: boolean;
+  romloader_version?: string;
+  onekey_romloader_version?: string;
+  onekey_romloader_hash?: string;
+  onekey_bootloader_version?: string;
+  onekey_bootloader_hash?: string;
+  onekey_bootloader_build_id?: string;
+  onekey_coprocessor_bt_name?: string;
+  onekey_coprocessor_version?: string;
+  onekey_coprocessor_build_id?: string;
+  onekey_coprocessor_hash?: string;
 };
 
 // OnekeyFeatures
@@ -4607,6 +4620,9 @@ export type ViewRawData = {
 export enum ViewSignLayout {
   LayoutDefault = 0,
   LayoutSafeTxCreate = 1,
+  LayoutFinalConfirm = 2,
+  Layout7702 = 3,
+  LayoutFlat = 4,
 }
 
 // ViewSignPage
@@ -4948,12 +4964,9 @@ export type DeviceSession = {
 // DeviceSessionAskPin
 export type DeviceSessionAskPin = {};
 
-// DeviceSessionPinResult
-export type DeviceSessionPinResult = {
-  unlocked?: boolean;
-  unlocked_attach_pin?: boolean;
-  passphrase_protection?: boolean;
-};
+export enum DeviceSessionAskPin_FailureSubCodes {
+  UserCancel = 1,
+}
 
 // DeviceStatus
 export type DeviceStatus = {
@@ -5082,6 +5095,37 @@ export type FilesystemFormat = {
 // PortfolioUpdate
 export type PortfolioUpdate = {};
 
+export enum ProtocolV2FailureType {
+  Failure_InvalidMessage = 1,
+  Failure_UndefinedError = 2,
+  Failure_UsageError = 3,
+  Failure_DataError = 4,
+  Failure_ProcessError = 5,
+}
+
+export enum Enum_ProtocolV2Capability {
+  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,
+}
+export type ProtocolV2Capability = keyof typeof Enum_ProtocolV2Capability;
+
 // custom connect definitions
 export type MessageType = {
   AlephiumGetAddress: AlephiumGetAddress;
@@ -5701,7 +5745,6 @@ export type MessageType = {
   DeviceSessionGet: DeviceSessionGet;
   DeviceSession: DeviceSession;
   DeviceSessionAskPin: DeviceSessionAskPin;
-  DeviceSessionPinResult: DeviceSessionPinResult;
   DeviceStatus: DeviceStatus;
   DeviceStatusGet: DeviceStatusGet;
   DevGetOnboardingStatus: DevGetOnboardingStatus;

package/dist/protocols/v2/debug.d.ts

@@ -1,13 +0,0 @@
-export type ProtocolV2DebugLogger = {
-    debug?: (...args: unknown[]) => void;
-};
-export type ProtocolV2FrameDebugOptions = {
-    logger?: ProtocolV2DebugLogger;
-    logPrefix?: string;
-    context?: string;
-    messageName?: string;
-    messageTypeId?: number;
-    pbPayloadLength?: number;
-};
-export declare function logProtocolV2Debug(options: ProtocolV2FrameDebugOptions | undefined, stage: string, details: Record<string, unknown>): void;
-//# sourceMappingURL=debug.d.ts.map

package/dist/protocols/v2/debug.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"debug.d.ts","sourceRoot":"","sources":["../../../src/protocols/v2/debug.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,CAAC,EAAE,qBAAqB,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,2BAA2B,GAAG,SAAS,EAChD,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QASjC"}

package/src/protocols/v2/debug.ts

@@ -1,26 +0,0 @@
-export type ProtocolV2DebugLogger = {
-  debug?: (...args: unknown[]) => void;
-};
-
-export type ProtocolV2FrameDebugOptions = {
-  logger?: ProtocolV2DebugLogger;
-  logPrefix?: string;
-  context?: string;
-  messageName?: string;
-  messageTypeId?: number;
-  pbPayloadLength?: number;
-};
-
-export function logProtocolV2Debug(
-  options: ProtocolV2FrameDebugOptions | undefined,
-  stage: string,
-  details: Record<string, unknown>
-) {
-  options?.logger?.debug?.(`[${options.logPrefix ?? 'ProtocolV2'}] ${stage}`, {
-    ...(options.context ? { context: options.context } : {}),
-    ...(options.messageName ? { messageName: options.messageName } : {}),
-    ...(options.messageTypeId !== undefined ? { messageTypeId: options.messageTypeId } : {}),
-    ...(options.pbPayloadLength !== undefined ? { pbPayloadLength: options.pbPayloadLength } : {}),
-    ...details,
-  });
-}