diff --git a/Cargo.lock b/Cargo.lock index 1a1ab03646..72a25dfa27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -48,6 +48,27 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "ansi_term" version = "0.12.1" @@ -57,6 +78,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + [[package]] name = "ark-algebra-test-templates" version = "0.4.2" @@ -100,7 +127,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools", + "itertools 0.10.5", "num-traits", "rayon", "zeroize", @@ -118,7 +145,7 @@ dependencies = [ "ark-std", "derivative", "digest", - "itertools", + "itertools 0.10.5", "num-bigint", "num-traits", "paste", @@ -133,7 +160,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote 1.0.29", + "quote", "syn 1.0.109", ] @@ -145,8 +172,8 @@ checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ "num-bigint", "num-traits", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -182,8 +209,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -227,7 +254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" dependencies = [ "askama_shared", - "proc-macro2 1.0.64", + "proc-macro2", "syn 1.0.109", ] @@ -250,8 +277,8 @@ dependencies = [ "nom", "num-traits", "percent-encoding", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "serde", "syn 1.0.109", "toml", @@ -295,6 +322,12 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bcs" version = "0.1.5" @@ -373,9 +406,12 @@ dependencies = [ [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] [[package]] name = "bumpalo" @@ -430,6 +466,46 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.52.6", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "clap" version = "2.34.0" @@ -454,24 +530,43 @@ dependencies = [ "atty", "bitflags 1.3.2", "clap_derive", - "clap_lex", - "indexmap", + "clap_lex 0.2.4", + "indexmap 1.9.3", "once_cell", "strsim 0.10.0", "termcolor", "textwrap 0.16.0", ] +[[package]] +name = "clap" +version = "4.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +dependencies = [ + "anstyle", + "clap_lex 0.7.2", +] + [[package]] name = "clap_derive" version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -484,6 +579,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + [[package]] name = "colored" version = "2.0.4" @@ -546,6 +647,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.9" @@ -566,24 +673,24 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ - "atty", + "anes", "cast", - "clap 2.34.0", + "ciborium", + "clap 4.5.17", "criterion-plot", - "csv", - "itertools", - "lazy_static", + "is-terminal", + "itertools 0.10.5", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -592,12 +699,12 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -659,27 +766,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "csv" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - [[package]] name = "cty" version = "0.2.2" @@ -692,8 +778,18 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -704,31 +800,66 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "strsim 0.10.0", "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.32", +] + [[package]] name = "darling_macro" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", - "quote 1.0.29", + "darling_core 0.13.4", + "quote", "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + [[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -761,6 +892,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.1" @@ -795,7 +932,7 @@ dependencies = [ "rand", "serde", "serde_json", - "serde_with", + "serde_with 1.14.0", ] [[package]] @@ -925,9 +1062,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if 1.0.0", + "crunchy", +] [[package]] name = "hashbrown" @@ -947,12 +1088,24 @@ dependencies = [ "ahash 0.8.3", ] +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + [[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -998,6 +1151,29 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678" +[[package]] +name = "iana-time-zone" +version = "0.1.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1012,6 +1188,18 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", + "serde", ] [[package]] @@ -1099,6 +1287,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.8" @@ -1107,9 +1304,9 @@ checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -1141,7 +1338,7 @@ dependencies = [ "hex", "iai", "internal-tracing", - "itertools", + "itertools 0.12.1", "mina-curves", "mina-poseidon", "num-bigint", @@ -1162,7 +1359,7 @@ dependencies = [ "secp256k1", "serde", "serde_json", - "serde_with", + "serde_with 3.9.0", "strum", "strum_macros", "thiserror", @@ -1183,7 +1380,7 @@ dependencies = [ "poly-commitment", "serde", "serde_json", - "serde_with", + "serde_with 3.9.0", "tinytemplate", ] @@ -1285,8 +1482,8 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b5bc45b761bcf1b5e6e6c4128cd93b84c218721a8d9b894aa0aff4ed180174c" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1359,7 +1556,7 @@ dependencies = [ "rayon", "serde", "serde_json", - "serde_with", + "serde_with 3.9.0", ] [[package]] @@ -1490,15 +1687,21 @@ dependencies = [ "serde", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -1551,7 +1754,7 @@ dependencies = [ "rmp-serde", "secp256k1", "serde", - "serde_with", + "serde_with 3.9.0", "sha2", "thiserror", ] @@ -1592,8 +1795,8 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b40aa99a001268b85eb18414ecd190dc21fceaeaf81214ca28233b6feb25a998" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", "synstructure", ] @@ -1617,8 +1820,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1894efdef5c9d83d17932c5f5db16d16eb5c8ae1a625ce44d9d1715e85d9d8dc" dependencies = [ "convert_case", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -1728,9 +1931,9 @@ checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -1756,8 +1959,8 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64", - "indexmap", + "base64 0.21.2", + "indexmap 1.9.3", "line-wrap", "quick-xml", "serde", @@ -1804,7 +2007,7 @@ dependencies = [ "blake2", "colored", "groupmap", - "itertools", + "itertools 0.12.1", "mina-curves", "mina-poseidon", "o1-utils", @@ -1817,10 +2020,16 @@ dependencies = [ "rayon", "rmp-serde", "serde", - "serde_with", + "serde_with 3.9.0", "thiserror", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1834,8 +2043,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -1846,8 +2055,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "version_check", ] @@ -1857,15 +2066,6 @@ version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - [[package]] name = "proc-macro2" version = "1.0.64" @@ -1897,13 +2097,13 @@ dependencies = [ [[package]] name = "proptest-derive" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc" +checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -1921,22 +2121,13 @@ dependencies = [ "memchr", ] -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - [[package]] name = "quote" version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ - "proc-macro2 1.0.64", + "proc-macro2", ] [[package]] @@ -2170,18 +2361,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] @@ -2194,32 +2385,22 @@ checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] @@ -2240,7 +2421,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" dependencies = [ "serde", - "serde_with_macros", + "serde_with_macros 1.5.2", +] + +[[package]] +name = "serde_with" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.5.0", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros 3.9.0", + "time", ] [[package]] @@ -2249,12 +2448,24 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling", - "proc-macro2 1.0.64", - "quote 1.0.29", + "darling 0.13.4", + "proc-macro2", + "quote", "syn 1.0.109", ] +[[package]] +name = "serde_with_macros" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "sha2" version = "0.10.7" @@ -2305,23 +2516,29 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" -version = "0.24.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", - "proc-macro2 1.0.64", - "quote 1.0.29", + "heck 0.5.0", + "proc-macro2", + "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.32", ] [[package]] @@ -2358,36 +2575,25 @@ dependencies = [ "atty", ] -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.25" +version = "2.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "unicode-ident", ] @@ -2397,10 +2603,10 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", + "proc-macro2", + "quote", "syn 1.0.109", - "unicode-xid 0.2.4", + "unicode-xid", ] [[package]] @@ -2506,18 +2712,21 @@ version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2", + "quote", + "syn 2.0.32", ] [[package]] name = "time" -version = "0.3.23" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -2525,16 +2734,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2557,13 +2767,28 @@ dependencies = [ "serde_json", ] +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "toml" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "indexmap", + "indexmap 1.9.3", "serde", ] @@ -2639,12 +2864,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - [[package]] name = "unicode-xid" version = "0.2.4" @@ -2696,9 +2915,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2706,47 +2925,47 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2", + "quote", + "syn 2.0.32", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ - "quote 1.0.29", + "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2", + "quote", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "web-sys" @@ -2801,13 +3020,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -2816,13 +3044,29 @@ version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -2831,42 +3075,90 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + [[package]] name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + [[package]] name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + [[package]] name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + [[package]] name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + [[package]] name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -2919,7 +3211,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.64", - "quote 1.0.29", - "syn 2.0.25", + "proc-macro2", + "quote", + "syn 2.0.32", ] diff --git a/Cargo.toml b/Cargo.toml index 3d0d91c9cb..6b2b0e1b74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,77 @@ members = [ ] resolver = "2" +[workspace.dependencies] +ark-algebra-test-templates = "0.4.2" +ark-bn254 = { version = "0.4.0" } +ark-ec = { version = "0.4.2", features = ["parallel"] } +ark-ff = { version = "0.4.2", features = ["parallel", "asm"] } +ark-poly = { version = "0.4.2", features = ["parallel"] } +ark-serialize = "0.4.2" +ark-std = "0.4.0" +ark-test-curves = "0.4.2" +base64 = "0.21.5" +bcs = "0.1.3" +bitvec = "1.0.0" +blake2 = "0.10.0" +bs58 = "0.5.0" +clap = "4.4.6" +colored = "2.0.0" +command-fds = "0.3" +convert_case = "0.6.0" +criterion = "0.5" +elf = "0.7.2" +env_logger = "0.11.1" +hex = { version = "0.4", features = ["serde"] } +iai = "0.1" +itertools = "0.12.1" +kimchi = { path = "./kimchi", version = "0.1.0", features = ["bn254"] } +libc = "0.2.62" +libflate = "2" +log = "0.4.20" +num-bigint = { version = "0.4.3", features = ["rand", "serde"] } +num-derive = "0.4" +num-integer = "0.1.45" +num-traits = "0.2" +ocaml = { version = "0.22.2" } +ocaml-gen = { version = "0.1.5" } +once_cell = "1.10.0" +os_pipe = { version = "1.1.4", features = ["io_safety"] } +proc-macro2 = "1.0.43" +proptest = "1.0.0" +proptest-derive = "0.4.0" +quote = "1.0.21" +rand = { version = "0.8.5", features = ["std_rng"] } +rand_chacha = { version = "0.3.0" } +rand_core = { version = "0.6.3" } +rayon = "1.5.0" +regex = "1.10.2" +rmp-serde = "1.1.1" +secp256k1 = "0.28.2" +serde = { version = "1.0.130", features = ["derive"] } +serde_json = "1.0.79" +serde_with = "3.6.0" +sha2 = "0.10.2" +strum = "0.26.1" +strum_macros = "0.26.1" +syn = { version = "1.0.109", features = ["full"] } +thiserror = "1.0.30" +tinytemplate = "1.1" +wasm-bindgen = "=0.2.90" + +o1-utils = { path = "./utils", version = "0.1.0" } +mina-curves = { path = "./curves", version = "0.1.0" } +groupmap = { path = "./groupmap", version = "0.1.0" } +mina-hasher = { path = "./hasher", version = "0.1.0" } +internal-tracing = { path = "./internal-tracing", version = "0.1.0" } +optimism = { path = "./optimism", version = "0.1.0" } +poly-commitment = { path = "./poly-commitment", version = "0.1.0" } +mina-poseidon = { path = "./poseidon", version = "0.1.0" } +signer = { path = "./signer", version = "0.1.0" } +kimchi-visu = { path = "./tools/kimchi-visu", version = "0.1.0" } +utils = { path = "./utils", version = "0.1.0" } +turshi = { path = "./turshi", version = "0.1.0" } + [profile.release] lto = true panic = 'abort' diff --git a/curves/Cargo.toml b/curves/Cargo.toml index 1015d8e47d..2116b66c86 100644 --- a/curves/Cargo.toml +++ b/curves/Cargo.toml @@ -10,12 +10,12 @@ edition = "2021" license = "Apache-2.0" [dependencies] -ark-ec = { version = "0.4.2", features = ["parallel"] } -ark-ff = { version = "0.4.2", features = ["parallel", "asm"] } +ark-ec.workspace = true +ark-ff.workspace = true [dev-dependencies] -rand = { version = "0.8.5", default-features = false } -ark-test-curves = "0.4.2" -ark-algebra-test-templates = "0.4.2" -ark-serialize="0.4.2" -ark-std = "0.4.0" +rand.workspace = true +ark-test-curves.workspace = true +ark-algebra-test-templates.workspace = true +ark-serialize.workspace = true +ark-std.workspace = true diff --git a/groupmap/Cargo.toml b/groupmap/Cargo.toml index d639095573..4178d0fbbf 100644 --- a/groupmap/Cargo.toml +++ b/groupmap/Cargo.toml @@ -13,9 +13,9 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] } -ark-ec = { version = "0.4.2", features = [ "parallel" ] } -rand = "0.8.4" +ark-ff.workspace = true +ark-ec.workspace = true +rand.workspace = true [dev-dependencies] -mina-curves = { path = "../curves", version = "0.1.0" } +mina-curves.workspace = true \ No newline at end of file diff --git a/hasher/Cargo.toml b/hasher/Cargo.toml index 4ce6257214..fa715d46bd 100644 --- a/hasher/Cargo.toml +++ b/hasher/Cargo.toml @@ -13,14 +13,14 @@ license = "Apache-2.0" path = "src/lib.rs" [dependencies] -mina-poseidon = { path = "../poseidon", version = "0.1.0" } -mina-curves = { path = "../curves", version = "0.1.0" } -o1-utils = { path = "../utils", version = "0.1.0" } +mina-poseidon.workspace = true +mina-curves.workspace = true +o1-utils.workspace = true -ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] } +ark-ff.workspace = true -bitvec = "1.0.0" -serde = { version = "1.0", features = ["derive"] } +bitvec.workspace = true +serde.workspace = true [dev-dependencies] -serde_json = { version = "1.0" } +serde_json.workspace = true \ No newline at end of file diff --git a/internal-tracing/Cargo.toml b/internal-tracing/Cargo.toml index b0539c7394..5d8355386b 100644 --- a/internal-tracing/Cargo.toml +++ b/internal-tracing/Cargo.toml @@ -5,10 +5,10 @@ edition = "2021" license = "Apache-2.0" [dependencies] -serde = { version = "*", features = ["derive"], optional = true } -serde_json = { version = "*", optional = true } -ocaml = { version = "0.22.2", optional = true } -ocaml-gen = { version = "0.1.5", optional = true } +serde = { workspace = true, features = ["derive"], optional = true } +serde_json = { workspace = true, optional = true } +ocaml = { workspace = true, optional = true } +ocaml-gen = { workspace = true, optional = true } [features] enabled = [ "serde", "serde_json" ] diff --git a/kimchi/Cargo.toml b/kimchi/Cargo.toml index fec0d61716..bf3ab6c136 100644 --- a/kimchi/Cargo.toml +++ b/kimchi/Cargo.toml @@ -11,60 +11,62 @@ license = "Apache-2.0" [lib] path = "src/lib.rs" -bench = false # needed for criterion (https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options) +bench = false # needed for criterion (https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options) [dependencies] -ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] } -ark-ec = { version = "0.4.2", features = [ "parallel" ] } -ark-poly = { version = "0.4.2", features = [ "parallel" ] } -ark-serialize = "0.4.2" -ark-bn254 = { version = "0.4.0", optional = true } -blake2 = "0.10.0" -num-bigint = { version = "0.4.3", features = ["rand", "serde"]} -num-derive = "0.3" -num-integer = "0.1.45" -num-traits = "0.2" -itertools = "0.10.3" -rand = { version = "0.8.0", features = ["std_rng"] } -rand_core = "0.6.3" -rayon = "1.5.0" -rmp-serde = "1.1.1" -serde = "1.0.130" -serde_with = "1.10.0" -thiserror = "1.0.30" -once_cell = "1.10.0" -hex = "0.4" -strum = "0.24.0" -strum_macros = "0.24.0" +ark-ff.workspace = true +ark-ec.workspace = true +ark-poly.workspace = true +ark-serialize.workspace = true +ark-bn254 = { workspace = true, optional = true } +blake2.workspace = true +num-bigint.workspace = true +num-derive.workspace = true +num-integer.workspace = true +num-traits.workspace = true +itertools.workspace = true +rand = { workspace = true, features = ["std_rng"] } +rand_core.workspace = true +rayon.workspace = true +rmp-serde.workspace = true +serde.workspace = true +serde_with.workspace = true +thiserror.workspace = true +once_cell.workspace = true +hex.workspace = true +strum.workspace = true +strum_macros.workspace = true + # TODO: audit this disjoint-set = "0.0.2" -turshi = { path = "../turshi", version = "0.1.0" } -poly-commitment = { path = "../poly-commitment", version = "0.1.0" } -groupmap = { path = "../groupmap", version = "0.1.0" } -mina-curves = { path = "../curves", version = "0.1.0" } -o1-utils = { path = "../utils", version = "0.1.0" } -mina-poseidon = { path = "../poseidon", version = "0.1.0" } -ocaml = { version = "0.22.2", optional = true } -ocaml-gen = { version = "0.1.5", optional = true } +turshi.workspace = true +poly-commitment.workspace = true +groupmap.workspace = true +mina-curves.workspace = true +o1-utils.workspace = true +mina-poseidon.workspace = true + +ocaml = { workspace = true, optional = true } +ocaml-gen = { workspace = true, optional = true } -wasm-bindgen = { version = "=0.2.87", optional = true } +wasm-bindgen = { workspace = true, optional = true } -internal-tracing = { path = "../internal-tracing", version = "0.1.0" } +internal-tracing.workspace = true [dev-dependencies] -proptest = "1.0.0" -proptest-derive = "0.3.0" -colored = "2.0.0" -serde_json = { version = "1.0" } -num-bigint = { version = "0.4.3", features = ["rand"] } -secp256k1 = "0.24.2" +proptest.workspace = true +proptest-derive.workspace = true +colored.workspace = true +serde_json.workspace = true +num-bigint.workspace = true +secp256k1.workspace = true # benchmarks -criterion = "0.3" -iai = "0.1" +criterion.workspace = true +iai.workspace = true [[bench]] name = "proof_criterion" @@ -80,8 +82,14 @@ harness = false [features] default = [] -internal_tracing = [ "internal-tracing/enabled" ] -ocaml_types = [ "ocaml", "ocaml-gen", "poly-commitment/ocaml_types", "mina-poseidon/ocaml_types", "internal-tracing/ocaml_types" ] -bn254 = [ "ark-bn254" ] -wasm_types = [ "wasm-bindgen" ] +internal_tracing = ["internal-tracing/enabled"] +ocaml_types = [ + "ocaml", + "ocaml-gen", + "poly-commitment/ocaml_types", + "mina-poseidon/ocaml_types", + "internal-tracing/ocaml_types", +] +bn254 = ["ark-bn254"] +wasm_types = ["wasm-bindgen"] check_feature_flags = [] diff --git a/poly-commitment/Cargo.toml b/poly-commitment/Cargo.toml index fbd169ae2e..3fc226584e 100644 --- a/poly-commitment/Cargo.toml +++ b/poly-commitment/Cargo.toml @@ -10,34 +10,34 @@ edition = "2021" license = "Apache-2.0" [dependencies] -ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] } -ark-ec = { version = "0.4.2", features = [ "parallel" ] } -ark-poly = { version = "0.4.2", features = [ "parallel" ] } -ark-serialize = "0.4.2" +ark-ff.workspace = true +ark-ec.workspace = true +ark-poly.workspace = true +ark-serialize.workspace = true -blake2 = "0.10.0" -itertools = "0.10.3" -once_cell = "1.10.0" -rand = "0.8.0" -rand_core = { version = "0.6.0" } -rayon = { version = "1" } -rmp-serde = "1.1.1" -serde = "1.0.130" -serde_with = "1.10.0" -thiserror = "1.0.31" +blake2.workspace = true +itertools.workspace = true +once_cell.workspace = true +rand.workspace = true +rand_core.workspace = true +rayon.workspace = true +rmp-serde.workspace = true +serde.workspace = true +serde_with.workspace = true +thiserror.workspace = true -groupmap = { path = "../groupmap", version = "0.1.0" } -mina-curves = { path = "../curves", version = "0.1.0" } -o1-utils = { path = "../utils", version = "0.1.0" } -mina-poseidon = { path = "../poseidon", version = "0.1.0" } +groupmap.workspace = true +mina-curves.workspace = true +o1-utils.workspace = true +mina-poseidon.workspace = true -ocaml = { version = "0.22.2", optional = true } -ocaml-gen = { version = "0.1.5", optional = true } +ocaml = { workspace = true, optional = true } +ocaml-gen = { workspace = true, optional = true } [dev-dependencies] -colored = "2.0.0" -rand_chacha = { version = "0.3.0" } -ark-bn254 = { version = "0.4.0" } +colored.workspace = true +rand_chacha.workspace = true +ark-bn254.workspace = true [features] -ocaml_types = [ "ocaml", "ocaml-gen" ] +ocaml_types = ["ocaml", "ocaml-gen"] diff --git a/poseidon/Cargo.toml b/poseidon/Cargo.toml index 9256552934..2cade52759 100644 --- a/poseidon/Cargo.toml +++ b/poseidon/Cargo.toml @@ -13,27 +13,26 @@ license = "Apache-2.0" path = "src/lib.rs" [dependencies] -ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] } -ark-ec = { version = "0.4.2", features = [ "parallel" ] } -ark-poly = { version = "0.4.2", features = [ "parallel" ] } -ark-serialize = { version = "0.4.2", features = ["derive"]} -rand = "0.8.0" -rayon = "1" -serde = { version = "1.0", features = ["derive"] } -serde_with = "1.10.0" -once_cell = "1.10.0" +ark-ff.workspace = true +ark-ec.workspace = true +ark-poly.workspace = true +rand.workspace = true +rayon.workspace = true +serde.workspace = true +serde_with.workspace = true +once_cell.workspace = true -mina-curves = { path = "../curves", version = "0.1.0" } -o1-utils = { path = "../utils", version = "0.1.0" } +mina-curves.workspace = true +o1-utils.workspace = true # for ocaml -ocaml = { version = "0.22.2", optional = true } -ocaml-gen = { version = "0.1.5", optional = true } +ocaml = { workspace = true, optional = true } +ocaml-gen = { workspace = true, optional = true } [dev-dependencies] -serde_json = "1.0" -hex = "0.4" -ark-serialize = "0.4.2" +serde_json.workspace = true +hex.workspace = true +ark-serialize.workspace = true [features] default = [] diff --git a/signer/Cargo.toml b/signer/Cargo.toml index 059d830a28..db3dc3e985 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -13,18 +13,17 @@ license = "Apache-2.0" path = "src/lib.rs" [dependencies] -mina-curves = { path = "../curves", version = "0.1.0" } -mina-hasher = { path = "../hasher", version = "0.1.0" } -o1-utils = { path = "../utils", version = "0.1.0" } +mina-curves.workspace = true +mina-hasher.workspace = true +o1-utils.workspace = true -ark-ec = { version = "0.4.2", features = [ "parallel" ] } -ark-ff = { version = "0.4.2", features = ["parallel", "asm"] } - -rand = "0.8.0" -blake2 = "0.10.0" -hex = "0.4" -bitvec = "1.0.0" -sha2 = "0.10.0" -bs58 = "0.4.0" -thiserror = "1.0.30" +ark-ec.workspace = true +ark-ff.workspace = true +rand.workspace = true +blake2.workspace = true +hex.workspace = true +bitvec.workspace = true +sha2.workspace = true +bs58.workspace = true +thiserror.workspace = true diff --git a/tools/kimchi-visu/Cargo.toml b/tools/kimchi-visu/Cargo.toml index 89c5ec76ed..01982d3794 100644 --- a/tools/kimchi-visu/Cargo.toml +++ b/tools/kimchi-visu/Cargo.toml @@ -13,15 +13,15 @@ license = "Apache-2.0" path = "src/lib.rs" [dependencies] -ark-ec = "0.4.2" -ark-ff = "0.4.2" -serde = { version = "1.0.136", features = ["derive"] } -serde_json = "1.0.79" -serde_with = "1.10.0" -tinytemplate = "1.1" +ark-ec.workspace = true +ark-ff.workspace = true +serde.workspace = true +serde_json.workspace = true +serde_with.workspace = true +tinytemplate.workspace = true -mina-curves = { path = "../../curves", version = "0.1.0" } -kimchi = { path = "../../kimchi", version = "0.1.0" } -o1-utils = { path = "../../utils", version = "0.1.0" } -mina-poseidon = { path = "../../poseidon", version = "0.1.0" } -poly-commitment = { path = "../../poly-commitment", version = "0.1.0" } +mina-curves.workspace = true +kimchi.workspace = true +o1-utils.workspace = true +mina-poseidon.workspace = true +poly-commitment.workspace = true \ No newline at end of file diff --git a/turshi/Cargo.toml b/turshi/Cargo.toml index d725b6e759..64bbebf2d6 100644 --- a/turshi/Cargo.toml +++ b/turshi/Cargo.toml @@ -13,12 +13,12 @@ license = "Apache-2.0" path = "src/lib.rs" [dependencies] -ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] } -hex = "0.4" +ark-ff.workspace = true +hex.workspace = true -o1-utils = { path = "../utils", version = "0.1.0" } +o1-utils.workspace = true [dev-dependencies] -ark-ec = { version = "0.4.2", features = [ "parallel" ] } +ark-ec.workspace = true -mina-curves = { path = "../curves", version = "0.1.0" } +mina-curves.workspace = true \ No newline at end of file diff --git a/utils/Cargo.toml b/utils/Cargo.toml index b5af2aff8d..dfe5b9d70e 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -10,27 +10,27 @@ edition = "2021" license = "Apache-2.0" [dependencies] -ark-ec = { version = "0.4.2", features = [ "parallel" ] } -ark-ff = { version = "0.4.2", features = [ "parallel", "asm" ] } -ark-poly = { version = "0.4.2", features = [ "parallel" ] } -ark-serialize = "0.4.2" -bcs = "0.1.3" -rayon = "1.3.0" -serde = "1.0.130" -serde_with = "1.10.0" -hex = { version = "0.4", features = ["serde"] } -num-bigint = { version = "0.4.3", features = ["rand"]} -num-integer = "0.1.45" -num-traits = "0.2" -rmp-serde = "1.1.1" -sha2 = "0.10.2" -thiserror = "1.0.30" -rand = "0.8.0" -rand_core = "0.6.3" -mina-curves = { path = "../curves", version = "0.1.0" } +ark-ec.workspace = true +ark-ff.workspace = true +ark-poly.workspace = true +ark-serialize.workspace = true +bcs.workspace = true +rayon.workspace = true +serde.workspace = true +serde_with.workspace = true +hex.workspace = true +num-bigint.workspace = true +num-integer.workspace = true +num-traits.workspace = true +rmp-serde.workspace = true +sha2.workspace = true +thiserror.workspace = true +rand.workspace = true +rand_core.workspace = true +mina-curves.workspace = true [dev-dependencies] -ark-ec = { version = "0.4.2", features = [ "parallel" ] } -mina-curves = { path = "../curves", version = "0.1.0" } -num-bigint = { version = "0.4.3", features = ["rand"] } -secp256k1 = "0.24.2" +ark-ec.workspace = true +mina-curves.workspace = true +num-bigint.workspace = true +secp256k1.workspace = true