diff --git a/Cargo.lock b/Cargo.lock index 6f67a774f..2f3b7f26c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -811,7 +811,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" dependencies = [ - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-std 0.4.0", ] @@ -822,7 +822,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" dependencies = [ - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", @@ -834,11 +834,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" dependencies = [ - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-std 0.4.0", ] +[[package]] +name = "ark-bn254" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" +dependencies = [ + "ark-ec 0.5.0", + "ark-ff 0.5.0", + "ark-std 0.5.0", +] + [[package]] name = "ark-bw6-761" version = "0.4.0" @@ -846,7 +857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700" dependencies = [ "ark-bls12-377", - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-std 0.4.0", ] @@ -857,7 +868,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3a13b34da09176a8baba701233fdffbaa7c1b1192ce031a3da4e55ce1f1a56" dependencies = [ - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-relations", "ark-serialize 0.4.2", @@ -876,7 +887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", "derivative", @@ -887,6 +898,27 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" +dependencies = [ + "ahash 0.8.11", + "ark-ff 0.5.0", + "ark-poly 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe", + "fnv", + "hashbrown 0.15.2", + "itertools 0.13.0", + "num-bigint", + "num-integer", + "num-traits", + "zeroize", +] + [[package]] name = "ark-ed-on-bls12-377" version = "0.4.0" @@ -894,7 +926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6" dependencies = [ "ark-bls12-377", - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-std 0.4.0", ] @@ -906,7 +938,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6d678bb98a7e4f825bd4e332e93ac4f5a114ce2e3340dee4d7dc1c7ab5b323" dependencies = [ "ark-bls12-381", - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-std 0.4.0", ] @@ -917,12 +949,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71892f265d01650e34988a546b37ea1d2ba1da162a639597a03d1550f26004d8" dependencies = [ - "ark-bn254", - "ark-ec", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-std 0.4.0", ] +[[package]] +name = "ark-ed-on-bn254" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "962e24e25cbdcaabe619c281a62bccc885f778b188129d6a02875c2671666219" +dependencies = [ + "ark-bn254 0.5.0", + "ark-ec 0.5.0", + "ark-ff 0.5.0", + "ark-std 0.5.0", +] + [[package]] name = "ark-ff" version = "0.3.0" @@ -962,6 +1006,27 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ff" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" +dependencies = [ + "ark-ff-asm 0.5.0", + "ark-ff-macros 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "arrayvec", + "digest 0.10.7", + "educe", + "itertools 0.13.0", + "num-bigint", + "num-traits", + "paste", + "rayon", + "zeroize", +] + [[package]] name = "ark-ff-asm" version = "0.3.0" @@ -982,6 +1047,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-asm" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" +dependencies = [ + "quote", + "syn 2.0.95", +] + [[package]] name = "ark-ff-macros" version = "0.3.0" @@ -1007,6 +1082,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "ark-poly" version = "0.4.2" @@ -1021,6 +1109,21 @@ dependencies = [ "rayon", ] +[[package]] +name = "ark-poly" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" +dependencies = [ + "ahash 0.8.11", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", + "educe", + "fnv", + "hashbrown 0.15.2", +] + [[package]] name = "ark-poly-commit" version = "0.4.0" @@ -1028,9 +1131,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a741492629ffcd228337676dc223a28551aa6792eedb8a2a22c767f00df6c89" dependencies = [ "ark-crypto-primitives", - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-relations", "ark-serialize 0.4.2", "ark-std 0.4.0", @@ -1067,12 +1170,26 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ - "ark-serialize-derive", + "ark-serialize-derive 0.4.2", "ark-std 0.4.0", "digest 0.10.7", "num-bigint", ] +[[package]] +name = "ark-serialize" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" +dependencies = [ + "ark-serialize-derive 0.5.0", + "ark-std 0.5.0", + "arrayvec", + "digest 0.10.7", + "num-bigint", + "rayon", +] + [[package]] name = "ark-serialize-derive" version = "0.4.2" @@ -1084,6 +1201,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-serialize-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "ark-snark" version = "0.4.0" @@ -1103,8 +1231,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6e9a7036d369a637b2b9f871bc06cefe52a947c98e898dbafab26548f8aa22" dependencies = [ "anyhow", - "ark-bn254", - "ark-ec", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-poly-commit", "ark-serialize 0.4.2", @@ -1139,6 +1267,17 @@ dependencies = [ "rayon", ] +[[package]] +name = "ark-std" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" +dependencies = [ + "num-traits", + "rand 0.8.5", + "rayon", +] + [[package]] name = "arraydeque" version = "0.5.1" @@ -1806,7 +1945,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -3312,8 +3451,8 @@ name = "diff-test-bn254" version = "0.1.0" source = "git+https://github.com/EspressoSystems/solidity-bn254.git#050a98a3b389862c50d0bbbea620d8dc278c275a" dependencies = [ - "ark-bn254", - "ark-ec", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-std 0.4.0", "clap", @@ -3324,11 +3463,11 @@ dependencies = [ name = "diff-test-hotshot" version = "0.1.0" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ed-on-bn254", - "ark-ff 0.4.2", - "ark-poly", + "ark-bn254 0.5.0", + "ark-ec 0.5.0", + "ark-ed-on-bn254 0.5.0", + "ark-ff 0.5.0", + "ark-poly 0.5.0", "ark-std 0.4.0", "clap", "diff-test-bn254", @@ -3521,6 +3660,18 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3f497e87b038c09a155dfd169faa5ec940d0644635555ef6bd464ac20e97397" +[[package]] +name = "educe" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" +dependencies = [ + "enum-ordinalize", + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "either" version = "1.13.0" @@ -3603,6 +3754,26 @@ dependencies = [ "syn 2.0.95", ] +[[package]] +name = "enum-ordinalize" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.95", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -3662,7 +3833,7 @@ version = "0.1.0" dependencies = [ "alloy", "anyhow", - "ark-serialize 0.4.2", + "ark-serialize 0.5.0", "async-broadcast", "async-trait", "base64-bytes", @@ -5005,12 +5176,12 @@ name = "hotshot-contract-adapter" version = "0.1.0" dependencies = [ "anyhow", - "ark-bn254", - "ark-ec", - "ark-ed-on-bn254", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", + "ark-bn254 0.5.0", + "ark-ec 0.5.0", + "ark-ed-on-bn254 0.5.0", + "ark-ff 0.5.0", + "ark-poly 0.5.0", + "ark-serialize 0.5.0", "ark-std 0.4.0", "contract-bindings-alloy", "contract-bindings-ethers", @@ -5196,7 +5367,7 @@ name = "hotshot-query-service" version = "0.1.76" dependencies = [ "anyhow", - "ark-serialize 0.4.2", + "ark-serialize 0.5.0", "async-lock 3.4.0", "async-trait", "atomic_store", @@ -5252,10 +5423,10 @@ dependencies = [ name = "hotshot-stake-table" version = "0.1.0" dependencies = [ - "ark-bn254", - "ark-ed-on-bn254", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", + "ark-bn254 0.5.0", + "ark-ed-on-bn254 0.5.0", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", "ark-std 0.4.0", "digest 0.10.7", "hotshot-types", @@ -5275,10 +5446,10 @@ name = "hotshot-state-prover" version = "0.1.0" dependencies = [ "anyhow", - "ark-bn254", - "ark-ec", - "ark-ed-on-bn254", - "ark-ff 0.4.2", + "ark-bn254 0.5.0", + "ark-ec 0.5.0", + "ark-ed-on-bn254 0.5.0", + "ark-ff 0.5.0", "ark-srs", "ark-std 0.4.0", "clap", @@ -5404,10 +5575,10 @@ name = "hotshot-types" version = "0.1.11" dependencies = [ "anyhow", - "ark-bn254", - "ark-ed-on-bn254", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", + "ark-bn254 0.5.0", + "ark-ed-on-bn254 0.5.0", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", "ark-srs", "ark-std 0.4.0", "async-lock 3.4.0", @@ -5589,7 +5760,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.16", - "socket2 0.4.10", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -5722,7 +5893,7 @@ name = "icicle-bn254" version = "1.5.1" source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.5.1#3d1e43365c8508fed6dfc6ddc7cc0abeb0fc7b9a" dependencies = [ - "ark-bn254", + "ark-bn254 0.4.0", "cmake", "icicle-core", "icicle-cuda-runtime", @@ -5733,9 +5904,9 @@ name = "icicle-core" version = "1.5.1" source = "git+https://github.com/ingonyama-zk/icicle.git?tag=v1.5.1#3d1e43365c8508fed6dfc6ddc7cc0abeb0fc7b9a" dependencies = [ - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-std 0.4.0", "icicle-cuda-runtime", "rayon", @@ -6207,8 +6378,8 @@ source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14 dependencies = [ "ark-bls12-377", "ark-bls12-381", - "ark-bn254", - "ark-ec", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", @@ -6233,10 +6404,10 @@ version = "0.1.0" source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "anyhow", - "ark-bn254", - "ark-ec", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", "derivative", @@ -6255,9 +6426,9 @@ name = "jf-plonk" version = "0.5.1" source = "git+https://github.com/EspressoSystems/jellyfish?tag=jf-plonk-v0.5.1#7e2eeef8c06a12f17015d457f1b3ea80b0de3333" dependencies = [ - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", "derivative", @@ -6297,11 +6468,11 @@ source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14 dependencies = [ "ark-bls12-377", "ark-bls12-381", - "ark-bn254", + "ark-bn254 0.4.0", "ark-bw6-761", - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", "derivative", @@ -6323,12 +6494,12 @@ source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14 dependencies = [ "ark-bls12-377", "ark-bls12-381", - "ark-bn254", + "ark-bn254 0.4.0", "ark-bw6-761", "ark-crypto-primitives", "ark-ed-on-bls12-377", "ark-ed-on-bls12-381", - "ark-ed-on-bn254", + "ark-ed-on-bn254 0.4.0", "ark-ff 0.4.2", "ark-std 0.4.0", "displaydoc", @@ -6346,8 +6517,8 @@ version = "0.1.0" source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "ark-bls12-381", - "ark-bn254", - "ark-ec", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", @@ -6375,8 +6546,8 @@ version = "0.2.0" source = "git+https://github.com/EspressoSystems/jellyfish?tag=jf-signature-v0.2.0#ca160ce3452b560cad512b750a742a87c48c5881" dependencies = [ "ark-bls12-381", - "ark-bn254", - "ark-ec", + "ark-bn254 0.4.0", + "ark-ec 0.4.2", "ark-ff 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", @@ -6403,11 +6574,11 @@ name = "jf-utils" version = "0.4.4" source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ - "ark-ec", + "ark-ec 0.4.2", "ark-ed-on-bls12-377", "ark-ed-on-bls12-381", "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", "digest 0.10.7", @@ -6425,9 +6596,9 @@ version = "0.1.0" source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "anyhow", - "ark-ec", + "ark-ec 0.4.2", "ark-ff 0.4.2", - "ark-poly", + "ark-poly 0.4.2", "ark-serialize 0.4.2", "ark-std 0.4.0", "derivative", @@ -6591,7 +6762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -8660,7 +8831,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.95", @@ -9823,8 +9994,8 @@ name = "sequencer" version = "0.1.0" dependencies = [ "anyhow", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", "async-channel 2.3.1", "async-lock 3.4.0", "async-once-cell", @@ -9907,7 +10078,7 @@ version = "0.1.0" dependencies = [ "alloy", "anyhow", - "ark-serialize 0.4.2", + "ark-serialize 0.5.0", "async-trait", "clap", "committable", @@ -10322,7 +10493,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.95", @@ -12675,7 +12846,7 @@ version = "0.1.0" dependencies = [ "ark-bls12-377", "ark-bls12-381", - "ark-bn254", + "ark-bn254 0.4.0", "ark-bw6-761", "ark-crypto-primitives", "ark-ff 0.4.2", diff --git a/Cargo.toml b/Cargo.toml index d041a039c..16ab0e367 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,12 +70,12 @@ alloy = { version = "0.9", default-features = false, features = [ anyhow = "^1.0" ark-std = "0.4" ark-bls12-381 = "0.4" -ark-bn254 = "0.4" -ark-ec = "0.4" -ark-ed-on-bn254 = "0.4" -ark-ff = "0.4" -ark-poly = "0.4" -ark-serialize = "0.4" +ark-bn254 = "0.5" +ark-ec = "0.5" +ark-ed-on-bn254 = "0.5" +ark-ff = "0.5" +ark-poly = "0.5" +ark-serialize = "0.5" ark-srs = "0.3.1" async-broadcast = "0.7.0" async-channel = "2" diff --git a/hotshot-stake-table/Cargo.toml b/hotshot-stake-table/Cargo.toml index f5bcb9497..d1185d7d5 100644 --- a/hotshot-stake-table/Cargo.toml +++ b/hotshot-stake-table/Cargo.toml @@ -7,9 +7,9 @@ edition = { workspace = true } license = "MIT" [dependencies] -ark-bn254 = "0.4" -ark-ed-on-bn254 = "0.4" -ark-ff = "0.4" +ark-bn254 = "0.5" +ark-ed-on-bn254 = "0.5" +ark-ff = "0.5" ark-serialize = { workspace = true } ark-std = { workspace = true } digest = { workspace = true }