Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,6 @@ debug = true
[patch.crates-io]
sinsemilla = { git = "https://github.com/zcash/sinsemilla", rev = "aabb707e862bc3d7b803c77d14e5a771bcee3e8c" }
zcash_note_encryption = { git = "https://github.com/zcash/zcash_note_encryption", rev = "9f7e93d42cef839d02b9d75918117941d453f8cb" }
halo2_proofs = { git = "https://github.com/zcash/halo2", rev = "2308caf68c48c02468b66cfc452dad54e355e32f" }
halo2_gadgets = { git = "https://github.com/QED-it/halo2", rev = "bbc42b6313936e164bb50c6fe3b627184e890af3" }
halo2_proofs = { git = "https://github.com/QED-it/halo2", rev = "bbc42b6313936e164bb50c6fe3b627184e890af3" }
zcash_spec = { git = "https://github.com/QED-it/zcash_spec", rev = "d5e84264d2ad0646b587a837f4e2424ca64d3a05" }
2 changes: 1 addition & 1 deletion src/bundle/commitments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ mod tests {
let orchard_auth_digest = hash_bundle_auth_data(&bundle, test_sighash_info_for_kind);
assert_eq!(
orchard_auth_digest.to_hex().as_str(),
"0c29408a07863016f5b4c5c0ccc5b944f24c686d06035945c5514f8b8c195a99"
"105be0833fc1942cb49bf4f5f8adb3ae0dafd96c538ad991c784d2e9d3012dc8"
);
}

Expand Down
10 changes: 5 additions & 5 deletions src/circuit/circuit_description_zsa
Original file line number Diff line number Diff line change
Expand Up @@ -28917,7 +28917,7 @@ PinnedVerificationKey {
(0x0decb727cf32e573604ae3928a761b450d9460f2a7283c8cf88a2b38b796e575, 0x044c0a88bc6aa468e75fc709f9eb21b6e309dd8a6ca62f7a3da86299141ea3a9),
(0x285e16cead69d5fef9441d4d4ac695fe8880120d209e1e631d8a4bc5f55e90e6, 0x3700fd2dfcfac5b2cb6d33c60ac79dfac3fb95518cd0aa97c75a51d62281f2c1),
(0x2dc11f4f0000da15c59cd395ea5f32b4e79783d958c290c821c89e0bcb50eaf1, 0x2c53e12ce0a2022516ef31f0224b0bc1b119861078358f78d245ba5d2f180099),
(0x17e9ee15383a32a80bd1d4b3ae53c19389748922e9bf4dbc4884e20a472b10ef, 0x1947806a1f43a3f2b675ec6d46d1678d1f18374ef89ec2654152e454346b3add),
(0x2cc50f65f81c76c89def64a765921c586a39bb88456a8b91a386da1245cf4388, 0x1f801c4538f421ece924e9addb7a1709cf5ec7b1226baf1f7c398b4c76972370),
(0x365c3f7dfaa40ec708988a9392112df6725a65eb5f70b809025ee47e9dae145b, 0x1661613acd8709d05038f6d5ca5a8508c0dd881d5879d85dcd4ea48aa12875fc),
(0x178d86d072746921f193c4a1f24e0bc252c810e7fb4ca7dbb8258f7dfb45a547, 0x153d91d5ea619d522d5a4dfdbcef80686ed1328980f1dab8aea30357ce57bd0a),
(0x35d8b6e2ebbc57d08dea9e510d450b40b5a3dd4359f9f2a888610aff29ee3c23, 0x360e4b2ce85b08d0a9576207382c26de7ad35ce33f582b6eeedd72d406ff9cef),
Expand Down Expand Up @@ -28950,17 +28950,17 @@ PinnedVerificationKey {
permutation: VerifyingKey {
commitments: [
(0x08c7dcef56c18bf78f712fe2c16781929e03b64117550c39e17bf2383084a262, 0x3e0484351466570def03cfba67249d1319bbc6ddd25bf83ebc7d86e502c099af),
(0x3bac5ab5303fbedef8955951cb40620418d47d813aedd62f5e8250b5d2e61d6e, 0x20da35a54cef9724662e2cb262954cfe6edd83bba4a5da78e963ef4a115f0ea8),
(0x1364f575d78b2fcc8227f020b97377aa6e5656b39538e62cb07ffcd523a0e8c4, 0x379bc25e8b3eaff7b52780614a6baf84bd9a114b51596cbf20d8ce5030059939),
(0x11e702bb679aaa1a0c6b0489dbd95ad28a5ebb52dff3f7e9b95365ad6060ea0d, 0x0be56e764284689cdfddc01860d33112783c4f5c4bda4ec196d716e4aee3d04a),
(0x0b555721ddc281f4e52f9d4f38dd78889f2ac7a8e7ff961d4f0f61ba576fe10a, 0x3825d97541243f9b5de2fd51e912c4fabadcee80680b0f4d96aa71a39e3747ca),
(0x30dba0200970e98364c2d8d911700e12e648b1b530ec8f5959ebc9480bc9bdce, 0x1b50964ecea23e32fb3ee2c09e2898d14b293781750bbb3c237df8cfcd62fb93),
(0x346924d8eb634112cdadc6efddcdf33b8c7ca0d1d1ce6e08ca448403094ff556, 0x18f016b8560913fae264ad71a172935b88e044e1b8b147fa7dc7c63b56bf8351),
(0x1af9c9e534c43e4c3d1508bfd77b7d16cd764df511682f7ab2cd9dad9f918762, 0x36f70dcd60250de9208d26e0988e608e873df83d2484ff31ecf9fbfe23f391b3),
(0x01dda2447cbb6875d7600645c36341f692fe9255586eff537aa09b0c922436f3, 0x10d86b9d008679bbc1a8b657e2bd5fa7c5f59fd6c7ce8a911d3fe6820bded560),
(0x0198f863c3b0bb695922e22db57de978aa6a473524720a3411b195ba18206889, 0x223e3135e0dc4ee6e37b96c3a4bbf31522a250a2fbf3d46ba6305b24b8856d2d),
(0x227b5e52351a78a543ec665cba5c8d0f68a676c32b5ff5756bccb9185725b118, 0x3eb92023a61cccd8b150c223b22d73f0ab93a986b1898737f01cad79d1154aaa),
(0x06a4d7a90016ab77a50c8b62ee2406e28aaa19eae367e0898c28671691d9182f, 0x2580100de1db3945fa17446530ad9612cffb79ce2ef3a958f4fa3aa6caaa1695),
(0x024b6a9c117a288e3bae8949a94061ff99bc1d9419d663fed2382925ac6d74f4, 0x0d4da543cd644e5340091759177e3eb31a080909f24b0e606dafc701608fe6aa),
(0x04201f7a9c50a80bf2bd23957dbc2d45982fb413015aeedf32333957b0a65774, 0x31f8f5844762616c90a802a85bf658effdf70a2523a94e812ae9063640488075),
(0x025d5b5d61ee86b24b39c72544e48d7f39650ffbaa77b6da70dfa6dcd2f3a4ae, 0x12130eb48f7bbe8802d70eb787d4f07f254e749978fa1396aba165403522dcd9),
(0x0b7cb7a6d1bbd7ffeb7a5cab5a038eaa309055b5c2ec4fee5e34fdd54ee53594, 0x36fd62a11241d0e3c70d16b37da1a18c925c56036713657d9dcac9f03b07fe7b),
(0x21d210b41675a1eae44cbd0f3fd27d69e30716c71873f6089cee61acacd403ab, 0x2275e97c7e84f68bfaa528a9d8be4e059f7abefd80d03fbfca774e8414a9b7c1),
(0x0f9e7de28e0f650d99d99d95c0fcd39c9dac9db5aa1973319f66922d6eb9f7d5, 0x1ba644ecc18ad711ddd33af7f695f6834e9f35c93d47a6a5273dabbe800fc7e6),
(0x0aab3ab73afac76277cd94a891de15e42ceb09f3a9865dab5c814bebfbb4453f, 0x27119fec3736d99abeeef1ad7b857db7e754e0c158780ed3dd0cdd4dc2453e10),
Expand Down
Binary file modified src/circuit/circuit_proof_test_case_zsa.bin
Binary file not shown.
8 changes: 4 additions & 4 deletions src/circuit/note_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2144,16 +2144,16 @@ pub(in crate::circuit) mod gadgets {
// q_init = q_init_zec if is_zatoshi_asset is true
// q_init = q_init_zsa if is_zatoshi_asset is false
let q_init = {
let q_init_zec = NonIdentityPoint::new(
let q_init_zec = NonIdentityPoint::new_from_constant(
ecc_chip.clone(),
layouter.namespace(|| "q_init_zec"),
Value::known(zec_domain.q_init()),
zec_domain.q_init(),
)?;

let q_init_zsa = NonIdentityPoint::new(
let q_init_zsa = NonIdentityPoint::new_from_constant(
ecc_chip.clone(),
layouter.namespace(|| "q_init_zsa"),
Value::known(zsa_domain.q_init()),
zsa_domain.q_init(),
)?;

zsa_params.cond_swap_chip.mux_on_non_identity_points(
Expand Down
Loading