@onekeyfe/hd-transport 1.2.10-alpha.2 → 1.2.10-alpha.3

package/messages-protocol-v2.json

@@ -11034,94 +11034,6 @@
         }
       }
     },
-    "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
-        },
-        "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
-        },
-        "seed_fingerprint": {
-          "type": "bytes",
-          "id": 3
-        }
-      }
-    },
-    "ZcashGetFullViewingKey": {
-      "fields": {
-        "address_n": {
-          "rule": "repeated",
-          "type": "uint32",
-          "id": 1,
-          "options": {
-            "packed": false
-          }
-        }
-      }
-    },
-    "ZcashFullViewingKey": {
-      "fields": {
-        "ufvk": {
-          "rule": "required",
-          "type": "string",
-          "id": 1
-        }
-      }
-    },
     "ZcashSignPczt": {
       "fields": {
         "pczt_length": {
@@ -11602,15 +11514,11 @@
         "MessageType_NeoAddress": 12302,
         "MessageType_NeoSignTx": 12303,
         "MessageType_NeoSignedTx": 12304,
-        "MessageType_ZcashGetAddress": 12400,
-        "MessageType_ZcashAddress": 12401,
         "MessageType_ZcashSignPczt": 12402,
         "MessageType_ZcashSignedPczt": 12403,
         "MessageType_ZcashPcztChunkRequest": 12404,
         "MessageType_ZcashPcztChunkAck": 12405,
         "MessageType_ZcashSignedPcztChunkRequest": 12406,
-        "MessageType_ZcashGetFullViewingKey": 12407,
-        "MessageType_ZcashFullViewingKey": 12408,
         "MessageType_DeviceFactoryInfoSet": 60000,
         "MessageType_DeviceFactoryInfoGet": 60001,
         "MessageType_DeviceFactoryInfo": 60002,
@@ -11663,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],
@@ -13882,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.10-alpha.2",
+  "version": "1.2.10-alpha.3",
   "description": "Transport layer abstractions and utilities for OneKey hardware SDK.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -12,10 +12,8 @@
   },
   "scripts": {
     "dev": "rimraf dist && rollup -c ../../build/rollup.config.js -w",
-    "build": "node scripts/protobuf-static.js --check && rimraf dist && rollup -c ../../build/rollup.config.js",
+    "build": "rimraf dist && rollup -c ../../build/rollup.config.js",
     "test": "jest",
-    "test:static-csp": "node --disallow-code-generation-from-strings scripts/protobuf-static-csp.js",
-    "check:static": "node scripts/protobuf-static.js --check",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "update:protobuf": "./scripts/protobuf-build.sh"
@@ -28,7 +26,7 @@
   "dependencies": {
     "bytebuffer": "^5.0.1",
     "long": "^4.0.0",
-    "protobufjs": "6.11.6"
+    "protobufjs": "^6.11.2"
   },
-  "gitHead": "2bcc72a43379abb005405f18f914330f3f2dbfd7"
+  "gitHead": "7ea778fa7f33611198758436b09e26df68cbc0e8"
 }

package/scripts/protobuf-build.sh

@@ -7,11 +7,6 @@ PACKAGE_ROOT="$PARENT_PATH/.."
 REPO_ROOT="$PARENT_PATH/../../.."
 CORE_MESSAGES_DIR="$REPO_ROOT/packages/core/src/data/messages"
 
-if [[ "${1:-}" == "--static-only" ]]; then
-    node "$PARENT_PATH/protobuf-static.js"
-    exit 0
-fi
-
 SRC="../../submodules/firmware/common/protob"
 DIST="."
 LANG="typescript"
@@ -171,5 +166,3 @@ yarn --cwd "$PACKAGE_ROOT" prettier --write "$CORE_MESSAGES_DIR/messages.json"
 yarn --cwd "$PACKAGE_ROOT" prettier --write "$PACKAGE_ROOT/messages-protocol-v2.json"
 yarn --cwd "$PACKAGE_ROOT" prettier --write "$CORE_MESSAGES_DIR/messages-protocol-v2.json"
 yarn --cwd "$PACKAGE_ROOT" prettier --write "$PACKAGE_ROOT/src/types/messages.ts"
-
-node "$PARENT_PATH/protobuf-static.js"

package/src/protocols/index.ts

@@ -1,14 +1,10 @@
 import ByteBuffer from 'bytebuffer';
-import { Reader } from 'protobufjs/minimal';
+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 {
@@ -18,8 +14,6 @@ import {
   isAckFrame,
 } from './v2';
 
-import legacyProtocolInfo from '../serialization/protobuf/legacy-protocol-info.json';
-
 import type { Root } from 'protobufjs/light';
 
 export const PROTOCOL_V2_SYS_MESSAGE_THRESHOLD = 60000;
@@ -36,8 +30,27 @@ type ProtocolV2FrameOptions = {
   seq?: number;
 };
 
-const LEGACY_PROTOCOL_V2_PROTOCOL_INFO =
-  parseConfigure(legacyProtocolInfo).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,17 +1,11 @@
 import * as protobuf from 'protobufjs/light';
-import Long from 'long';
 
-import { installStaticCodecs } from './generated/codecs';
-
-// protobufjs optional dependency discovery uses Function, which CSP can disable.
-protobuf.util.Long = Long;
-protobuf.configure();
-
-export function parseConfigure(data: protobuf.INamespace | string) {
-  const root = protobuf.Root.fromJSON(typeof data === 'string' ? JSON.parse(data) : data);
-  // Unrecognized custom schemas retain the existing reflection-based API.
-  installStaticCodecs(root);
-  return root;
+export function parseConfigure(data: protobuf.INamespace) {
+  // @ts-ignore [compatiblity]: connect is sending stringified json
+  if (typeof data === 'string') {
+    return protobuf.Root.fromJSON(JSON.parse(data));
+  }
+  return protobuf.Root.fromJSON(data);
 }
 
 export const createMessageFromName = (messages: protobuf.Root, name: string) => {

package/src/types/messages.ts

@@ -4680,43 +4680,6 @@ export type UiAnimationRequest = {
   type?: UiAnimationType;
 };
 
-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;
-  diversifier_index?: number;
-  address_type?: ZcashAddressType;
-  scope?: ZcashAddressScope;
-};
-
-// ZcashAddress
-export type ZcashAddress = {
-  address: string;
-  seed_fingerprint?: string;
-};
-
-// ZcashGetFullViewingKey
-export type ZcashGetFullViewingKey = {
-  address_n: number[];
-};
-
-// ZcashFullViewingKey
-export type ZcashFullViewingKey = {
-  ufvk: string;
-};
-
 // ZcashSignPczt
 export type ZcashSignPczt = {
   pczt_length: number;
@@ -5438,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,
@@ -6052,10 +6044,6 @@ export type MessageType = {
   UnlockPath: UnlockPath;
   UnlockedPathRequest: UnlockedPathRequest;
   UiAnimationRequest: UiAnimationRequest;
-  ZcashGetAddress: ZcashGetAddress;
-  ZcashAddress: ZcashAddress;
-  ZcashGetFullViewingKey: ZcashGetFullViewingKey;
-  ZcashFullViewingKey: ZcashFullViewingKey;
   ZcashSignPczt: ZcashSignPczt;
   ZcashPcztChunkRequest: ZcashPcztChunkRequest;
   ZcashPcztChunkAck: ZcashPcztChunkAck;
@@ -6137,6 +6125,8 @@ export type MessageType = {
   ViewSignPage: ViewSignPage;
   ViewWarningPage: ViewWarningPage;
   ViewVerifyPage: ViewVerifyPage;
+  ZcashGetAddress: ZcashGetAddress;
+  ZcashAddress: ZcashAddress;
 };
 
 export type MessageKey = keyof MessageType;