Add test vectors for ZIP 316 Revision 2 addresses, UFVKs and UIVKs

pyproject.toml

@@ -28,9 +28,9 @@ dependencies = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/zcash-hackworks/zcash-test-vectors/"
-Repository = "https://github.com/zcash-hackworks/zcash-test-vectors/"
-Documentation = "https://github.com/zcash-hackworks/zcash-test-vectors/"
+Homepage = "https://github.com/zcash/zcash-test-vectors/"
+Repository = "https://github.com/zcash/zcash-test-vectors/"
+Documentation = "https://github.com/zcash/zcash-test-vectors/"
 
 [project.scripts]
 # General test vectors
@@ -39,6 +39,8 @@ f4jumble_long = "zcash_test_vectors.f4jumble:long_test_vectors"
 unified_address = "zcash_test_vectors.unified_address:main"
 unified_full_viewing_keys = "zcash_test_vectors.unified_full_viewing_keys:main"
 unified_incoming_viewing_keys = "zcash_test_vectors.unified_incoming_viewing_keys:main"
+unified_address_r2 = "zcash_test_vectors.unified_address_r2:main"
+unified_viewing_keys_r2 = "zcash_test_vectors.unified_viewing_keys_r2:main"
 zip_0032_registered = "zcash_test_vectors.zip_0032:registered_key_derivation_tvs"
 zip_0032_arbitrary = "zcash_test_vectors.zip_0032:arbitrary_key_derivation_tvs"
 zip_0143 = "zcash_test_vectors.zip_0143:main"

regenerate.sh

@@ -49,11 +49,14 @@ case "$2" in
         sapling_zip32
         sapling_zip32_hard
         unified_address
+        unified_address_r2
         unified_full_viewing_keys
         unified_incoming_viewing_keys
+        unified_viewing_keys_r2
         zip_0032_registered
         zip_0032_arbitrary
         zip_0143
+        zip_0233
         zip_0243
         zip_0244
         zip_0316
@@ -83,7 +86,7 @@ do
   do
       echo "# $generator"
       if [ "$gen_type" = "rust" ]; then
-          uv run $generator -t $gen_type | rustfmt >test-vectors/$gen_type/$generator.$extension
+          uv run $generator -t $gen_type | rustfmt --edition 2021 >test-vectors/$gen_type/$generator.$extension
       else
           uv run $generator -t $gen_type >test-vectors/$gen_type/$generator.$extension
       fi

test-vectors/json/bip_0032.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/bip_0032.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/transparent/bip_0032.py"],
     ["c, pk, address, external_ovk, internal_ovk, account"],
     ["9ba0439c6a2d3d903883d4537c362288626da62c6299012e362d8fb6efebab47", "02ed638532c475f67400350fb1d6eda559cdc289a19b4319eb175140aa86893836", "6725f262bba6422fd47c305b8378c4994241c442", "d486352dd1d66698a61634ab219a2a6ea3c2ee9879cc828403ba9969505774dd", "7390ae2df31ceeb264cfbbcbbffd2d973db68cf572a756d32d5bd3ec0046597f", 0],
     ["fa9291b353be21ac452f85cb96e4fc978d352e34c5c0259ac28d0beab1b8e298", "03fc399e613d010865d5a1fa8765b7109f9db1ed56218983f9bd54b8c712478829", "04631ad8902ad2fc5641bbe935dea67950bb9c59", "d2bd69a3d3e825e3633f497fc1b504baf67329a9167487d0fd98cae5d1a96613", "c801859bd2fb9f090d6518e1fe192784e75ab769c8ec6621f7bc0c1320820b0a", 1],

test-vectors/json/f4jumble.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/f4jumble.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/f4jumble.py"],
     ["normal, jumbled"],
     ["5d7a8f739a2d9e945b0ce152a8049e294c4d6e66b164939daffa2ef6ee6921481cdd86b3cc4318d9614fc820905d042b", "0304d029141b995da5387c125970673504d6c764d91ea6c082123770c7139ccd88ee27368cd0c0921a0444c8e5858d22"],
     ["b1ef9ca3f24988c7b3534201cfb1cd8dbf69b8250c18ef41294ca97993db546c1fe01f7e9c8e36d6a5e29d4e30a73594bf5098421c69378af1e40f64e125946f", "5271fa3321f3adbcfb075196883d542b438ec6339176537daf859841fe6a56222bff76d1662b5509a9e1079e446eeedd2e683c31aae3ee1851d7954328526be1"],

test-vectors/json/f4jumble_long.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/f4jumble_long.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/f4jumble.py"],
     ["length, jumbled_hash"],
     [3246395, "3fc2ecdfb68696571d89e8beddb647e6990b63a0171c36442273d687bd99257ec5002ec8197801b621732d6b05b8d70f688620a4c08873c12e4439a0127dc945"],
     [4194368, "a5f18f163e598d4adb6ea7248057e24c1b61f29b33b7abcdabd420a0f2ee6c3ed31394652f28b59c44d3ea9ecf85f4d501e6aac14df288efd62cf80d1829d025"]

test-vectors/json/orchard_empty_roots.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/orchard_empty_roots.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/orchard/empty_roots.py"],
     ["empty_roots"],
     [["0200000000000000000000000000000000000000000000000000000000000000", "d1ab2507c809c2713c000f525e9fbdcb06c958384e51b9cc7f792dde6c97f411", "c7413f4614cd64043abbab7cc1095c9bb104231cea89e2c3e0df83769556d030", "2111fc397753e5fd50ec74816df27d6ada7ed2a9ac3816aab2573c8fac794204", "806afbfeb45c64d4f2384c51eff30764b84599ae56a7ab3d4a46d9ce3aeab431", "873e4157f2c0f0c645e899360069fcc9d2ed9bc11bf59827af0230ed52edab18", "27ab1320953ae1ad70c8c15a1253a0a86fbc8a0aa36a84207293f8a495ffc402", "4e14563df191a2a65b4b37113b5230680555051b22d74a8e1f1d706f90f3133b", "b3bbe4f993d18a0f4eb7f4174b1d8555ce3396855d04676f1ce4f06dda07371f", "4ef5bde9c6f0d76aeb9e27e93fba28c679dfcb991cbcb8395a2b57924cbd170e", "a3c02568acebf5ca1ec30d6a7d7cd217a47d6a1b8311bf9462a5f939c6b74307", "3ef9b30bae6122da1605bad6ec5d49b41d4d40caa96c1cf6302b66c5d2d10d39", "22ae2800cb93abe63b70c172de70362d9830e53800398884a7a64ff68ed99e0b", "187110d92672c24cedb0979cdfc917a6053b310d145c031c7292bb1d65b7661b", "3f98adbe364f148b0cc2042cafc6be1166fae39090ab4b354bfb6217b964453b", "63f8dbd10df936f1734973e0b3bd25f4ed440566c923085903f696bc6347ec0f", "2182163eac4061885a313568148dfae564e478066dcbe389a0ddb1ecb7f5dc34", "bd9dc0681918a3f3f9cd1f9e06aa1ad68927da63acc13b92a2578b2738a6d331", "ca2ced953b7fb95e3ba986333da9e69cd355223c929731094b6c2174c7638d2e", "55354b96b56f9e45aae1e0094d71ee248dabf668117778bdc3c19ca5331a4e1a", "7097b04c2aa045a0deffcaca41c5ac92e694466578f5909e72bb78d33310f705", "e81d6821ff813bd410867a3f22e8e5cb7ac5599a610af5c354eb392877362e01", "157de8567f7c4996b8c4fdc94938fd808c3b2a5ccb79d1a63858adaa9a6dd824", "fe1fce51cd6120c12c124695c4f98b275918fceae6eb209873ed73fe73775d0b", "1f91982912012669f74d0cfa1030ff37b152324e5b8346b3335a0aaeb63a0a2d", "5dec15f52af17da3931396183cbbbfbea7ed950714540aec06c645c754975522", "e8ae2ad91d463bab75ee941d33cc5817b613c63cda943a4c07f600591b088a25", "d53fdee371cef596766823f4a518a583b1158243afe89700f0da76da46d0060f", "15d2444cefe7914c9a61e829c730eceb216288fee825f6b3b6298f6f6b6bd62e", "4c57a617a0aa10ea7a83aa6b6b0ed685b6a3d9e5b8fd14f56cdc18021b12253f", "3fd4915c19bd831a7920be55d969b2ac23359e2559da77de2373f06ca014ba27", "87d063cd07ee4944222b7762840eb94c688bec743fa8bdf7715c8fe29f104c2a", "ae2935f1dfd8a24aed7c70df7de3a668eb7a49b1319880dde2bbd9031ae5d82f"]]
 ]

test-vectors/json/orchard_generators.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/orchard_generators.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/orchard/generators.py"],
     ["skb, nkb, vcvb, vcrb, cmb, cmq, ivkb, ivkq, mcq"],
     ["63c975b884721a8d0ca1707be30c7f0c5f445f3e7c188d3b06d6f128b32355b7", "75ca47e4a76a6fd39bdbb5cc92b17e5ecfc9f4fa7155372e8d19a89c16aae725", "6743f93a6ebda72a8c7c5a2b7fa304fe32b29b4f706aa8f7420f3d8e7a59702f", "915a3c8868c6c30e2f8090ee45d76e4048208dea5b23664fbb09a40f5544f407", "136efc0f482c022c7ca414fc5cc59e23f23d6f93ab9f23cd3345a928c306b2a6", "5d74a84009ba0e322add46fd5a0f96c55dedb079b4f29ff70dcdfb56a0078097", "18a1f85f6e482398c7ed1ad3e27f9502488980400a2934164e137050cd2ca2a5", "f2820f79922fcb6b32a2285124cc1b42fa41a25ab881cc7d11c8a94af10cbc05", "a0c6297ff9c7b9f870108dc055b9bec9990e89ef5a360fa0b918a86396d21616"]
 ]

test-vectors/json/orchard_group_hash.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/orchard_group_hash.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/orchard/group_hash.py"],
     ["domain, msg, point"],
     ["7a2e636173683a74657374", "5472616e7320726967687473206e6f7721", "d36b0b649b5c6936027a180f7d254023956fc2883ddf23ffc3c8fd1fa3cd1818"],
     ["7a2e636173683a746573742d6c6f6e676572", "8f739a2d9e945b0ce152a8049e294c4d6e66b164939daffa2ef6ee6921481cdd86b3cc4318d9614fc820905d042bb1ef9ca3f24988c7b3534201cfb1cd8dbf69b8250c18ef41294ca97993db546c1fe01f7e9c8e36d6a5e29d4e30a73594bf5098421c69378af1e40f64e125946f62c2fa7b2fecbcb64b696891", "d3603e4f2667e77c77248fd5be8d807723d727e22fc4a11d1ff557dd61dd4db4"],

test-vectors/json/orchard_key_components.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/orchard_key_components.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/orchard/key_components.py"],
     ["sk, ask, ak, nk, rivk, ivk, ovk, dk, default_d, default_pk_d, internal_rivk, internal_ivk, internal_ovk, internal_dk, note_v, note_rho, note_rseed, note_cmx, note_nf"],
     ["5d7a8f739a2d9e945b0ce152a8049e294c4d6e66b164939daffa2ef6ee692148", "8eb8c401c287a6c13a2c345ad82172d86be4a8853525db602d14f630f4e61c17", "740bbe5d0580b2cad430180d02cc128b9a140d5e07c151721dc16d25d4e20f15", "9f2f826738945ad01f47f70db0c367c246c20c61ff5583948c39dea968fefd1b", "021ccf89604f5f7cc6e034b32d338908b819fbe325fee6458b56b4ca71a7e43d", "85c8b5cd1ac3ec3ad7092132f97f0178b075c81a139fd460bbe0dfcd75514724", "bcc7065e59910b35993f59505be209b14bf02488750bbc8b1acdcf108c362004", "31d6a685be570f9faf3ca8b052e887840b2c9f8d67224ca82aefb9e2ee5bedaf", "8ff3386971cb64b8e77899", "08dd8ebd7de92a68e586a34db8fea999efd2016fae76750afae7ee941646bcb9", "901a30b99ae1570cb80bb616aeef3bb916c640c4cc620f9b4b4499c74332eb2a", "906e2d20d00dc0bf7c520687d9df3ce9814d30ee05c215f8764a32c362f9262f", "d7268bebbee692286252ac60bd4df405ea499d697c454773c5c43cb170930123", "6d61a03f746ba93b932402ac1071fc2759d4f4d684b2c5056d5b177af0fa8aa9", 15643327852135767324, "2cb5b406ed8985e18130ab33362697b0e4e4c763ccb8f676495c222f7fba1e31", "defa3d5a57efc2e1e9b01a035587d5fb1a38e01d94903d3c3e0ad3360c1d3710", "4502e339901e397717839167cbb4037e0ecf6813b51c81fe085a7b782f124228", "1b32edbbe4d18f28876de262518ad31122701f8c0a52e98047a337876e7eea19"],
     ["acd20b183e31d49f25c9a138f49b1a537edcf04be34a9851a7af9db6990ed83d", "41d47cc96313b4821dfc129651c3137f44d9cad16b3dc08133c3d2df0d0c5320", "6de1349830d66d7b97fe231fc7b02ad64323629cfed1e3aa24ef052f56e4002a", "a8b73d979b6eaada8924bcbdc63a9ef4e87346f230aba6bbe1e2b43c5bea6b22", "dacb2f2a9ced363171821aaf5d8cd902bc5e3a5a41fb51ae61a9f02dc89d1d12", "563a6db60c74c2db08492cbae3bb083f1aeabffbcf42551d0ac64f2690536711", "71cd30640fdb63f8d1305029e940e53fd5ec04a8ccad419578c242fec05b9af7", "9d9bd44525e7ae06b03ae6d4aecde6ae0927a7c667d5d9f8176b544695dfec11", "7807ca650858814d5022a8", "3d3de4d52c77fd0b630a40dc38212487b2ff6eeef56d8c6a6163e854aff04189", "8a22a7f5a1e91a92ad394b18eb7338b592470dd42be8ef84c93e7cd845ecfa32", "121183cb3b8d06f599bb38b37322851e5fc95ad0c9707ee85fb65e21f1a30d13", "93252b24b491d9c9c99765c84d4ac7c2bff054cd9cadcd3e01b26f21e2840909", "6eea18fd0d50707f90df002cbf309eca3c00d398aede1fdc2abffc88353859af", 4481649511318637270, "a51b0052ad8084a8b9da948d320dadd64f5431e61ddf658d24ae67c22c8d1309", "131fc00fe7f235734276d38d47f1e191e00c7a1d48af046827591e9733a97fa6", "c7ad794c563e32cad47d47dcda7884692848dce29ba4febd93202b7305f90300", "2cf067bc21d66320e51b9fbdc8ae031c2c96373db43b7b1a45056c00c65d4320"],

test-vectors/json/orchard_map_to_curve.json

@@ -1,5 +1,5 @@
 [
-    ["From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/orchard_map_to_curve.py"],
+    ["From https://github.com/zcash/zcash-test-vectors/blob/master/zcash_test_vectors/orchard/group_hash.py"],
     ["u, point"],
     ["0000000000000000000000000000000000000000000000000000000000000000", "0038a6bc533233af74b6e2e05c6ecaf66071c6a0f15b58e93df06bd23107152c"],
     ["0100000000000000000000000000000000000000000000000000000000000000", "20a13bbf7d671dce4ac9fcd9f9f50714392c28c4e1e9e0373378c972fb22b28b"],