From 48d3df14ae8cb2cb402101c60a396a333ebc85ce Mon Sep 17 00:00:00 2001 From: Dmitry Vdovin Date: Tue, 26 Dec 2023 22:36:51 +0400 Subject: [PATCH] Fix dependencies --- Cargo.lock | 299 +++++++++------------------------------ Cargo.toml | 1 + fawkes-crypto/Cargo.toml | 3 +- 3 files changed, 71 insertions(+), 232 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2e1da98..f80e5cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,7 +83,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -178,7 +178,7 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "syn 1.0.109", ] @@ -188,7 +188,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -199,7 +199,7 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -277,7 +277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote 1.0.33", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -314,21 +314,20 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.16" +version = "0.9.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", ] [[package]] name = "crossbeam-utils" -version = "0.8.17" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if 1.0.0", ] @@ -355,7 +354,7 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -379,26 +378,12 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "ecc" -version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" -dependencies = [ - "group 0.12.1", - "integer 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09)", - "num-bigint 0.4.4", - "num-integer", - "num-traits", - "rand 0.8.5", - "subtle", -] - [[package]] name = "ecc" version = "0.1.0" source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20#f72db265aa3cebe297c9b9816e940d0e1d400886" dependencies = [ - "integer 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20)", + "integer", "num-bigint 0.4.4", "num-integer", "num-traits", @@ -437,15 +422,14 @@ dependencies = [ "borsh", "brotli", "byteorder", - "ecc 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09)", + "ecc", "fawkes-crypto-bellman_ce", "fawkes-crypto_derive", - "ff 0.13.0", "ff-uint", "getrandom 0.2.11", "halo2_kzg_srs", - "halo2_proofs 0.2.0 (git+https://github.com/privacy-scaling-explorations/halo2?tag=v2023_04_20)", - "halo2curves 0.3.2", + "halo2_proofs", + "halo2curves", "impl-trait-for-tuples 0.1.3", "itertools", "linked-list", @@ -486,22 +470,11 @@ dependencies = [ name = "fawkes-crypto_derive" version = "4.3.0" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "bitvec", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "ff" version = "0.13.0" @@ -544,7 +517,7 @@ dependencies = [ "num-integer", "num-traits", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -639,24 +612,13 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", + "ff", "rand_core 0.6.4", "subtle", ] @@ -664,38 +626,24 @@ dependencies = [ [[package]] name = "halo2_kzg_srs" version = "0.1.0" -source = "git+https://github.com/han0110/halo2-kzg-srs?rev=ff65429#ff65429d69db3bf5575a3f011da34932af7a0325" +source = "git+https://github.com/zeropoolnetwork/halo2-kzg-srs?branch=main#d743fcbc5a48db31773a703909ef9c9a13a4a1e6" dependencies = [ "byteorder", - "halo2curves 0.2.1", + "halo2curves", "num-bigint 0.4.4", "rand_core 0.6.4", "rayon", ] -[[package]] -name = "halo2_proofs" -version = "0.2.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2?tag=v2022_09_10#a9e99a72a65d7c98e8a4258c2c94269c834d1c10" -dependencies = [ - "blake2b_simd", - "ff 0.12.1", - "group 0.12.1", - "halo2curves 0.2.1", - "rand_core 0.6.4", - "rayon", - "tracing", -] - [[package]] name = "halo2_proofs" version = "0.2.0" source = "git+https://github.com/privacy-scaling-explorations/halo2?tag=v2023_04_20#be955686f86eb618f55d2320c0e042485b313d22" dependencies = [ "blake2b_simd", - "ff 0.13.0", - "group 0.13.0", - "halo2curves 0.3.2", + "ff", + "group", + "halo2curves", "rand_chacha 0.3.1", "rand_core 0.6.4", "rayon", @@ -703,52 +651,18 @@ dependencies = [ "tracing", ] -[[package]] -name = "halo2curves" -version = "0.2.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2curves?tag=v0.2.0#bbd4cee10dbf9c51e0456ea67ec2b894b49f688c" -dependencies = [ - "ff 0.12.1", - "group 0.12.1", - "lazy_static", - "num-bigint 0.4.4", - "num-traits", - "pasta_curves 0.4.1", - "rand 0.8.5", - "rand_core 0.6.4", - "static_assertions", - "subtle", -] - -[[package]] -name = "halo2curves" -version = "0.2.1" -source = "git+https://github.com/privacy-scaling-explorations/halo2curves?tag=0.2.1#f75ed26c961179186e9cec02cc3f841ca9e3fec1" -dependencies = [ - "ff 0.12.1", - "group 0.12.1", - "lazy_static", - "num-bigint 0.4.4", - "num-traits", - "pasta_curves 0.4.1", - "rand 0.8.5", - "rand_core 0.6.4", - "static_assertions", - "subtle", -] - [[package]] name = "halo2curves" version = "0.3.2" source = "git+https://github.com/zeropoolnetwork/halo2curves?branch=zeropool-near#b1998472628f052dbf53dfab6a4c2b84be3ba7b3" dependencies = [ "borsh", - "ff 0.13.0", - "group 0.13.0", + "ff", + "group", "lazy_static", "num-bigint 0.4.4", "num-traits", - "pasta_curves 0.5.1", + "pasta_curves", "paste", "rand 0.8.5", "rand_core 0.6.4", @@ -756,24 +670,12 @@ dependencies = [ "subtle", ] -[[package]] -name = "halo2wrong" -version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" -dependencies = [ - "group 0.12.1", - "halo2_proofs 0.2.0 (git+https://github.com/privacy-scaling-explorations/halo2?tag=v2022_09_10)", - "num-bigint 0.4.4", - "num-integer", - "num-traits", -] - [[package]] name = "halo2wrong" version = "0.1.0" source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20#f72db265aa3cebe297c9b9816e940d0e1d400886" dependencies = [ - "halo2_proofs 0.2.0 (git+https://github.com/privacy-scaling-explorations/halo2?tag=v2023_04_20)", + "halo2_proofs", "num-bigint 0.4.4", "num-integer", "num-traits", @@ -839,7 +741,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -850,7 +752,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -865,26 +767,12 @@ dependencies = [ "hashbrown 0.14.3", ] -[[package]] -name = "integer" -version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" -dependencies = [ - "group 0.12.1", - "maingate 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09)", - "num-bigint 0.4.4", - "num-integer", - "num-traits", - "rand 0.8.5", - "subtle", -] - [[package]] name = "integer" version = "0.1.0" source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20#f72db265aa3cebe297c9b9816e940d0e1d400886" dependencies = [ - "maingate 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20)", + "maingate", "num-bigint 0.4.4", "num-integer", "num-traits", @@ -946,26 +834,12 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "maingate" -version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" -dependencies = [ - "group 0.12.1", - "halo2wrong 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09)", - "num-bigint 0.4.4", - "num-integer", - "num-traits", - "rand 0.8.5", - "subtle", -] - [[package]] name = "maingate" version = "0.1.0" source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20#f72db265aa3cebe297c9b9816e940d0e1d400886" dependencies = [ - "halo2wrong 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20)", + "halo2wrong", "num-bigint 0.4.4", "num-integer", "num-traits", @@ -979,15 +853,6 @@ version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "nodrop" version = "0.1.14" @@ -1109,7 +974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -1159,7 +1024,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -1171,26 +1036,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ "proc-macro-crate 2.0.1", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] -[[package]] -name = "pasta_curves" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc65faf8e7313b4b1fbaa9f7ca917a0eed499a9663be71477f87993604341d8" -dependencies = [ - "blake2b_simd", - "ff 0.12.1", - "group 0.12.1", - "lazy_static", - "rand 0.8.5", - "static_assertions", - "subtle", -] - [[package]] name = "pasta_curves" version = "0.5.1" @@ -1198,8 +1048,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" dependencies = [ "blake2b_simd", - "ff 0.13.0", - "group 0.13.0", + "ff", + "group", "lazy_static", "rand 0.8.5", "static_assertions", @@ -1223,17 +1073,7 @@ name = "poseidon" version = "0.2.0" source = "git+https://github.com/privacy-scaling-explorations/poseidon?tag=v2023_04_20#807f8f555313f726ca03bdf941f798098f488ba4" dependencies = [ - "halo2curves 0.3.2", - "subtle", -] - -[[package]] -name = "poseidon" -version = "0.2.0" -source = "git+https://github.com/privacy-scaling-explorations/poseidon.git?branch=padding#6a305ac124810a1eaf83ae7fafd520b19bfa304e" -dependencies = [ - "group 0.12.1", - "halo2curves 0.2.0", + "halo2curves", "subtle", ] @@ -1291,7 +1131,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", "version_check", @@ -1303,7 +1143,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "version_check", ] @@ -1319,9 +1159,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -1353,7 +1193,7 @@ version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", ] [[package]] @@ -1505,9 +1345,9 @@ version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2566c4bf6845f2c2e83b27043c3f5dfcd5ba8f2937d6c00dc009bfb51a079dc4" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -1618,7 +1458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "syn 1.0.109", ] @@ -1665,9 +1505,9 @@ version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -1710,16 +1550,16 @@ source = "git+https://github.com/zeropoolnetwork/snark-verifier?branch=zeropool- dependencies = [ "borsh", "bytes", - "ecc 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20)", - "halo2_proofs 0.2.0 (git+https://github.com/privacy-scaling-explorations/halo2?tag=v2023_04_20)", - "halo2curves 0.3.2", + "ecc", + "halo2_proofs", + "halo2curves", "hex 0.4.3", "itertools", "lazy_static", "num-bigint 0.4.4", "num-integer", "num-traits", - "poseidon 0.2.0 (git+https://github.com/privacy-scaling-explorations/poseidon?tag=v2023_04_20)", + "poseidon", "primitive-types", "rand 0.8.5", "revm", @@ -1775,18 +1615,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.41" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", "unicode-ident", ] @@ -1851,9 +1691,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", - "syn 2.0.41", + "syn 2.0.43", ] [[package]] @@ -1868,11 +1708,10 @@ dependencies = [ [[package]] name = "transcript" version = "0.1.0" -source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09#2d708b4453387f03059aad68d6d87441db112a2f" +source = "git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2023_04_20#f72db265aa3cebe297c9b9816e940d0e1d400886" dependencies = [ - "ecc 0.1.0 (git+https://github.com/privacy-scaling-explorations/halo2wrong?tag=v2022_09_09)", - "group 0.12.1", - "poseidon 0.2.0 (git+https://github.com/privacy-scaling-explorations/poseidon.git?branch=padding)", + "ecc", + "poseidon", "subtle", ] @@ -1943,9 +1782,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", - "syn 2.0.41", + "syn 2.0.43", "wasm-bindgen-shared", ] @@ -1965,9 +1804,9 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", - "syn 2.0.41", + "syn 2.0.43", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2030,20 +1869,20 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.31" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "proc-macro2 1.0.70", + "proc-macro2 1.0.71", "quote 1.0.33", - "syn 2.0.41", + "syn 2.0.43", ] diff --git a/Cargo.toml b/Cargo.toml index 9081338..1ad097c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "fawkes-crypto", "fawkes-crypto_derive", diff --git a/fawkes-crypto/Cargo.toml b/fawkes-crypto/Cargo.toml index d73e00c..49dbf59 100644 --- a/fawkes-crypto/Cargo.toml +++ b/fawkes-crypto/Cargo.toml @@ -28,7 +28,6 @@ itertools = "0.10.0" brotli = "3.3.2" halo2_curves = { git = "https://github.com/zeropoolnetwork/halo2curves", branch = "zeropool-near", package = "halo2curves", optional = true } -ff = "0.13.0" halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2", tag = "v2023_04_20", optional = true } halo2_wrong_ecc = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2023_04_20", package = "ecc", optional = true } halo2_wrong_transcript = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2023_04_20", package = "transcript", optional = true} @@ -52,7 +51,7 @@ optional = true [features] -default=["plonk", "borsh_support"] +default=["serde_support", "borsh_support"] # default=["plonk", "borsh_support", "serde_support", "heavy_tests"] r1cs=["linked-list"] plonk=["halo2_proofs", "halo2_curves", "halo2_wrong_ecc", "halo2_kzg_srs", "halo2_wrong_transcript", "halo2_rand", "plonk_verifier", "rand_support"]