@onekeyfe/hd-core 1.2.10-alpha.1 → 1.2.10-alpha.2

package/src/api/zcash/helpers.ts

@@ -0,0 +1,16 @@
+import { toHardened, validateStrictPath } from '../helpers/pathUtils';
+import { invalidParameter } from '../helpers/paramsValidator';
+
+// ZIP-32 account path: m/32'/133'/account'
+export function validateZcashAccountPath(path: string | number[]): number[] {
+  const addressN = validateStrictPath(path, 3);
+  if (
+    addressN.length !== 3 ||
+    addressN[0] !== toHardened(32) ||
+    addressN[1] !== toHardened(133) ||
+    addressN[2] < toHardened(0)
+  ) {
+    throw invalidParameter("Zcash requires a ZIP-32 account path m/32'/133'/account'");
+  }
+  return addressN;
+}

package/src/data/messages/messages-protocol-v2.json

@@ -11034,6 +11034,94 @@
         }
       }
     },
+    "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": {
@@ -11514,11 +11602,15 @@
         "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,
@@ -11571,9 +11663,7 @@
         "MessageType_PortfolioUpdate": 61400,
         "MessageType_NftUpdate": 61500,
         "MessageType_OnboardingStatusGet": 61600,
-        "MessageType_OnboardingStatus": 61601,
-        "MessageType_ZcashGetAddress": 12400,
-        "MessageType_ZcashAddress": 12401
+        "MessageType_OnboardingStatus": 61601
       },
       "reserved": [
         [90, 92],
@@ -13792,81 +13882,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
-        },
-        "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/src/events/logBlockEvent.ts

@@ -19,6 +19,7 @@ const LogPayloadBlockMethod: Set<string> = new Set([
   'fileWrite',
   'fileRead',
   'zcashGetAddress',
+  'zcashGetFullViewingKey',
   'zcashSignPczt',
   'moneroGetAddress',
   'moneroGetWatchKey',

package/src/inject.ts

@@ -506,6 +506,8 @@ export const createCoreApi = (
     call({ ...params, connectId, deviceId, method: 'neoSignTransaction' }),
   zcashGetAddress: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'zcashGetAddress' }),
+  zcashGetFullViewingKey: (connectId, deviceId, params) =>
+    call({ ...params, connectId, deviceId, method: 'zcashGetFullViewingKey' }),
   zcashSignPczt: (connectId, deviceId, params) =>
     call({ ...params, connectId, deviceId, method: 'zcashSignPczt' }),
 

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

@@ -71,7 +71,7 @@ const getDisplayState = (value: unknown) => {
   return { seen, enabled };
 };
 
-const createMethodInteraction = (
+export const createMethodInteraction = (
   reason: 'address-confirmation' | 'public-key-confirmation' | 'signing-confirmation',
   operation: string
 ): ProtocolV2InteractionDescriptor => ({

package/src/types/api/allNetworkGetAddress.ts

@@ -71,7 +71,6 @@ type AllNetworkAddressPayload =
   | {
       // Zcash
       address: string;
-      ufvk?: string;
       seedFingerprint?: string;
     }
   | {

package/src/types/api/export.ts

@@ -228,6 +228,7 @@ export type { BenfenPublicKey, BenfenGetPublicKeyParams } from './benfenGetPubli
 export type { BenfenSignMessageParams } from './benfenSignMessage';
 export type { BenfenSignedTx, BenfenSignTransactionParams } from './benfenSignTransaction';
 export type { ZcashAddress, ZcashGetAddressParams } from './zcashGetAddress';
+export type { ZcashFullViewingKey, ZcashGetFullViewingKeyParams } from './zcashGetFullViewingKey';
 export type { ZcashSignedPczt, ZcashSignPcztParams } from './zcashSignPczt';
 
 export type { MoneroAddress, MoneroGetAddressParams } from './moneroGetAddress';

package/src/types/api/index.ts

@@ -155,6 +155,7 @@ import type { benfenSignMessage } from './benfenSignMessage';
 import type { neoGetAddress } from './neoGetAddress';
 import type { neoSignTransaction } from './neoSignTransaction';
 import type { zcashGetAddress } from './zcashGetAddress';
+import type { zcashGetFullViewingKey } from './zcashGetFullViewingKey';
 import type { zcashSignPczt } from './zcashSignPczt';
 import type { moneroGetAddress } from './moneroGetAddress';
 import type { moneroGetWatchKey } from './moneroGetWatchKey';
@@ -483,6 +484,7 @@ export type CoreApi = {
    * Zcash
    */
   zcashGetAddress: typeof zcashGetAddress;
+  zcashGetFullViewingKey: typeof zcashGetFullViewingKey;
   zcashSignPczt: typeof zcashSignPczt;
 
   /**

package/src/types/api/zcashGetAddress.ts

@@ -5,8 +5,6 @@ export type ZcashAddress = {
   path: string;
   // ZIP-316 unified address or transparent P2PKH address
   address: string;
-  // ZIP-316 unified full viewing key, present when includeUfvk was requested
-  ufvk?: string;
   // ZIP-32 seed fingerprint (hex), present when includeSeedFingerprint was requested
   seedFingerprint?: string;
 };
@@ -18,7 +16,6 @@ export type ZcashGetAddressParams = {
   diversifierIndex?: number;
   addressType?: ZcashAddressType;
   scope?: ZcashAddressScope;
-  includeUfvk?: boolean;
   includeSeedFingerprint?: boolean;
 };
 

package/src/types/api/zcashGetFullViewingKey.ts

@@ -0,0 +1,24 @@
+import type { CommonParams, Response } from '../params';
+
+export type ZcashFullViewingKey = {
+  path: string;
+  // ZIP-316 unified full viewing key with transparent and Orchard components
+  ufvk: string;
+};
+
+export type ZcashGetFullViewingKeyParams = {
+  // ZIP-32 account path, m/32'/133'/account'
+  path: string | number[];
+};
+
+export declare function zcashGetFullViewingKey(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & ZcashGetFullViewingKeyParams
+): Response<ZcashFullViewingKey>;
+
+export declare function zcashGetFullViewingKey(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & { bundle?: ZcashGetFullViewingKeyParams[] }
+): Response<Array<ZcashFullViewingKey>>;