@onekeyfe/hd-transport 1.2.8-alpha.10 → 1.2.8-alpha.100

package/messages-protocol-v2.json

@@ -11034,6 +11034,61 @@
         }
       }
     },
+    "ZcashSignPczt": {
+      "fields": {
+        "pczt_length": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 1
+        },
+        "pczt_initial_chunk": {
+          "rule": "required",
+          "type": "bytes",
+          "id": 2
+        }
+      }
+    },
+    "ZcashPcztChunkRequest": {
+      "fields": {
+        "chunk_length": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 1
+        }
+      }
+    },
+    "ZcashPcztChunkAck": {
+      "fields": {
+        "data_chunk": {
+          "rule": "required",
+          "type": "bytes",
+          "id": 1
+        }
+      }
+    },
+    "ZcashSignedPczt": {
+      "fields": {
+        "pczt_length": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 1
+        },
+        "pczt_initial_chunk": {
+          "rule": "required",
+          "type": "bytes",
+          "id": 2
+        }
+      }
+    },
+    "ZcashSignedPcztChunkRequest": {
+      "fields": {
+        "chunk_length": {
+          "rule": "required",
+          "type": "uint32",
+          "id": 1
+        }
+      }
+    },
     "wire_in": {
       "type": "bool",
       "id": 50002,
@@ -11459,6 +11514,11 @@
         "MessageType_NeoAddress": 12302,
         "MessageType_NeoSignTx": 12303,
         "MessageType_NeoSignedTx": 12304,
+        "MessageType_ZcashSignPczt": 12402,
+        "MessageType_ZcashSignedPczt": 12403,
+        "MessageType_ZcashPcztChunkRequest": 12404,
+        "MessageType_ZcashPcztChunkAck": 12405,
+        "MessageType_ZcashSignedPcztChunkRequest": 12406,
         "MessageType_DeviceFactoryInfoSet": 60000,
         "MessageType_DeviceFactoryInfoGet": 60001,
         "MessageType_DeviceFactoryInfo": 60002,
@@ -11511,7 +11571,9 @@
         "MessageType_PortfolioUpdate": 61400,
         "MessageType_NftUpdate": 61500,
         "MessageType_OnboardingStatusGet": 61600,
-        "MessageType_OnboardingStatus": 61601
+        "MessageType_OnboardingStatus": 61601,
+        "MessageType_ZcashGetAddress": 12400,
+        "MessageType_ZcashAddress": 12401
       },
       "reserved": [
         [90, 92],
@@ -13730,6 +13792,81 @@
           }
         }
       }
+    },
+    "ZcashAddressType": {
+      "values": {
+        "UNIFIED_ORCHARD_P2PKH": 0,
+        "TRANSPARENT_P2PKH": 1,
+        "UNIFIED_ORCHARD": 2
+      }
+    },
+    "ZcashAddressScope": {
+      "values": {
+        "EXTERNAL": 0,
+        "INTERNAL": 1
+      }
+    },
+    "ZcashGetAddress": {
+      "fields": {
+        "address_n": {
+          "rule": "repeated",
+          "type": "uint32",
+          "id": 1,
+          "options": {
+            "packed": false
+          }
+        },
+        "show_display": {
+          "type": "bool",
+          "id": 2
+        },
+        "include_seed_fingerprint": {
+          "type": "bool",
+          "id": 3
+        },
+        "include_ufvk": {
+          "type": "bool",
+          "id": 4
+        },
+        "diversifier_index": {
+          "type": "uint32",
+          "id": 5,
+          "options": {
+            "default": 0
+          }
+        },
+        "address_type": {
+          "type": "ZcashAddressType",
+          "id": 6,
+          "options": {
+            "default": "UNIFIED_ORCHARD_P2PKH"
+          }
+        },
+        "scope": {
+          "type": "ZcashAddressScope",
+          "id": 7,
+          "options": {
+            "default": "EXTERNAL"
+          }
+        }
+      }
+    },
+    "ZcashAddress": {
+      "fields": {
+        "address": {
+          "rule": "required",
+          "type": "string",
+          "id": 1
+        },
+        "ufvk": {
+          "type": "string",
+          "id": 2
+        },
+        "seed_fingerprint": {
+          "type": "bytes",
+          "id": 3
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport",
-  "version": "1.2.8-alpha.10",
+  "version": "1.2.8-alpha.100",
   "description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -11,9 +11,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "node scripts/protobuf-static.js && rimraf dist && rollup -c ../../build/rollup.config.js -w",
-    "build": "node scripts/protobuf-static.js && rimraf dist && rollup -c ../../build/rollup.config.js",
-    "test": "node scripts/protobuf-static.js && jest",
+    "dev": "rimraf dist && rollup -c ../../build/rollup.config.js -w",
+    "build": "rimraf dist && rollup -c ../../build/rollup.config.js",
+    "test": "jest",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "update:protobuf": "./scripts/protobuf-build.sh"
@@ -28,5 +28,5 @@
     "long": "^4.0.0",
     "protobufjs": "^6.11.2"
   },
-  "gitHead": "47d2f63acb8e5fa9ee623c060af7c9f83ad6f939"
+  "gitHead": "53ada5b79a51f0edf8a7392f70c8da063144d33c"
 }

package/src/protocols/index.ts

@@ -1,17 +1,12 @@
 import ByteBuffer from 'bytebuffer';
-import { Reader } from 'protobufjs/light';
+import { Reader, Type } from 'protobufjs/light';
 
 import { encodeEnvelopeMessage, encodeMessageChunks, encodeTransportPackets } from './v1/packets';
 import { decodeFirstChunk } from './v1/decode';
 import { decodeMessage as decodeV1Message } from './v1/receive';
-import {
-  createMessageFromName,
-  createMessageFromType,
-  parseConfigure,
-} from '../serialization/protobuf/messages';
+import { createMessageFromName, createMessageFromType } from '../serialization/protobuf/messages';
 import { encode as encodeProtobuf } from '../serialization/protobuf/encode';
 import { decode as decodeProtobuf } from '../serialization/protobuf/decode';
-import { legacyProtocolInfoSchema } from '../../lib/protobuf-static';
 import {
   decodeFrame as decodeV2Frame,
   encodeProtobufFrame,
@@ -35,8 +30,27 @@ type ProtocolV2FrameOptions = {
   seq?: number;
 };
 
-const LEGACY_PROTOCOL_V2_PROTOCOL_INFO =
-  parseConfigure(legacyProtocolInfoSchema).lookupType('LegacyProtocolInfo');
+const LEGACY_PROTOCOL_V2_PROTOCOL_INFO = Type.fromJSON('LegacyProtocolInfo', {
+  fields: {
+    version: {
+      rule: 'required',
+      type: 'uint32',
+      id: 1,
+    },
+    supported_messages: {
+      rule: 'repeated',
+      type: 'uint32',
+      id: 2,
+      options: {
+        packed: false,
+      },
+    },
+    protobuf_definition: {
+      type: 'string',
+      id: 3,
+    },
+  },
+});
 
 const decodeLegacyProtocolV2ProtocolInfo = (pbPayload: Uint8Array) => {
   const byteBuffer = ByteBuffer.wrap(Buffer.from(pbPayload) as unknown as ArrayBuffer);

package/src/serialization/protobuf/messages.ts

@@ -1,42 +1,11 @@
 import * as protobuf from 'protobufjs/light';
 
-import { schemaKey, schemas } from '../../../lib/protobuf-static';
-
 export function parseConfigure(data: protobuf.INamespace) {
   // @ts-ignore [compatiblity]: connect is sending stringified json
-  const schema = typeof data === 'string' ? JSON.parse(data) : data;
-  const key = schemaKey(schema);
-  const createConstructors = schemas[key];
-  // Field resolution mutates options; keep built-in descriptors reusable across connections.
-  const messages = protobuf.Root.fromJSON(
-    createConstructors ? JSON.parse(JSON.stringify(schema)) : schema
-  );
-  if (createConstructors) {
-    const constructors = createConstructors();
-    const types: protobuf.Type[] = [];
-    const collect = (namespace: protobuf.Namespace) => {
-      if (namespace instanceof protobuf.Type) types.push(namespace);
-      namespace.nestedArray.forEach(child => {
-        if (child instanceof protobuf.Namespace) collect(child);
-      });
-    };
-    collect(messages);
-    // Register every constructor before resolving fields, which access parent.ctor.
-    types.forEach(type => {
-      type.ctor = constructors[type.fullName];
-    });
-    types.forEach(type => {
-      const constructor = constructors[type.fullName];
-      type.encode = constructor.encode;
-      type.decode = constructor.decode;
-      type.verify = constructor.verify;
-      type.fromObject = constructor.fromObject;
-      type.toObject = constructor.toObject;
-      type.setup = () => type;
-    });
-    messages.resolveAll();
+  if (typeof data === 'string') {
+    return protobuf.Root.fromJSON(JSON.parse(data));
   }
-  return messages;
+  return protobuf.Root.fromJSON(data);
 }
 
 export const createMessageFromName = (messages: protobuf.Root, name: string) => {

package/src/types/messages.ts

@@ -4680,6 +4680,33 @@ export type UiAnimationRequest = {
   type?: UiAnimationType;
 };
 
+// ZcashSignPczt
+export type ZcashSignPczt = {
+  pczt_length: number;
+  pczt_initial_chunk: string;
+};
+
+// ZcashPcztChunkRequest
+export type ZcashPcztChunkRequest = {
+  chunk_length: number;
+};
+
+// ZcashPcztChunkAck
+export type ZcashPcztChunkAck = {
+  data_chunk: string;
+};
+
+// ZcashSignedPczt
+export type ZcashSignedPczt = {
+  pczt_length: number;
+  pczt_initial_chunk: string;
+};
+
+// ZcashSignedPcztChunkRequest
+export type ZcashSignedPcztChunkRequest = {
+  chunk_length: number;
+};
+
 // experimental_message
 export type experimental_message = {};
 
@@ -5374,6 +5401,35 @@ export type ViewVerifyPage = {
   content?: ViewContentPreview;
 };
 
+export enum ZcashAddressType {
+  UNIFIED_ORCHARD_P2PKH = 0,
+  TRANSPARENT_P2PKH = 1,
+  UNIFIED_ORCHARD = 2,
+}
+
+export enum ZcashAddressScope {
+  EXTERNAL = 0,
+  INTERNAL = 1,
+}
+
+// ZcashGetAddress
+export type ZcashGetAddress = {
+  address_n: number[];
+  show_display?: boolean;
+  include_seed_fingerprint?: boolean;
+  include_ufvk?: boolean;
+  diversifier_index?: number;
+  address_type?: ZcashAddressType;
+  scope?: ZcashAddressScope;
+};
+
+// ZcashAddress
+export type ZcashAddress = {
+  address: string;
+  ufvk?: string;
+  seed_fingerprint?: string;
+};
+
 export enum ProtocolV2FailureType {
   Failure_InvalidMessage = 1,
   Failure_UndefinedError = 2,
@@ -5988,6 +6044,11 @@ export type MessageType = {
   UnlockPath: UnlockPath;
   UnlockedPathRequest: UnlockedPathRequest;
   UiAnimationRequest: UiAnimationRequest;
+  ZcashSignPczt: ZcashSignPczt;
+  ZcashPcztChunkRequest: ZcashPcztChunkRequest;
+  ZcashPcztChunkAck: ZcashPcztChunkAck;
+  ZcashSignedPczt: ZcashSignedPczt;
+  ZcashSignedPcztChunkRequest: ZcashSignedPcztChunkRequest;
   experimental_message: experimental_message;
   experimental_field: experimental_field;
   ProtocolInfoRequest: ProtocolInfoRequest;
@@ -6064,6 +6125,8 @@ export type MessageType = {
   ViewSignPage: ViewSignPage;
   ViewWarningPage: ViewWarningPage;
   ViewVerifyPage: ViewVerifyPage;
+  ZcashGetAddress: ZcashGetAddress;
+  ZcashAddress: ZcashAddress;
 };
 
 export type MessageKey = keyof MessageType;

package/src/utils/transportLog.ts

@@ -7,6 +7,7 @@ const SENSITIVE_LOG_KEYS = new Set([
   'address',
   'apikey',
   'connectid',
+  'datachunk',
   'devicestate',
   'deviceid',
   'entropy',
@@ -15,16 +16,20 @@ const SENSITIVE_LOG_KEYS = new Set([
   'passphrase',
   'passphrasestate',
   'password',
+  'pczt',
   'pin',
   'privatekey',
   'publickey',
   'seed',
   'secret',
+  'seedfingerprint',
   'serialnumber',
   'session',
   'sessionid',
   'signature',
+  'signedpczt',
   'token',
+  'ufvk',
   'uuid',
   'walletsessionid',
   'xprv',
@@ -45,7 +50,7 @@ const isSensitiveLogKey = (key: string) => {
 };
 
 const isSigningMessage = (messageName?: string) =>
-  Boolean(messageName && /(?:sign|txack|transaction)/i.test(messageName));
+  Boolean(messageName && /(?:sign|txack|transaction|pczt)/i.test(messageName));
 
 const redactLogValue = (value: unknown, seen: WeakSet<object>): unknown => {
   if (ArrayBuffer.isView(value)) {

package/lib/protobuf-static.d.ts

@@ -1,5 +0,0 @@
-import type { Constructor, INamespace, Type } from 'protobufjs/light';
-type StaticMessageConstructor = Constructor<{}> & Pick<Type, 'encode' | 'decode' | 'verify' | 'fromObject' | 'toObject'>;
-export function schemaKey(schema: INamespace): string;
-export const schemas: Partial<Record<string, () => Record<string, StaticMessageConstructor>>>;
-export const legacyProtocolInfoSchema: INamespace;