diff --git a/Cargo.lock b/Cargo.lock index 9b451c54..06ec1e4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1127,11 +1127,13 @@ dependencies = [ [[package]] name = "blst" -version = "0.3.10" -source = "git+https://github.com/EspressoSystems/blst.git?branch=no-std#faefc7fcb21864aaf4f6f443636ce8924108fcbd" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" dependencies = [ "cc", "glob", + "threadpool", "zeroize", ] @@ -2760,15 +2762,15 @@ dependencies = [ "either", "embed-doc-image", "futures", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-constants", "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-types", + "hotshot-utils", "hotshot-web-server", "libp2p-identity", - "libp2p-networking 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "libp2p-networking", "lru", "portpicker", "rand 0.8.5", @@ -2780,14 +2782,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hotshot-constants" -version = "0.3.3" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13#e4b699c49a86246145838012e15ffafdfec61ef1" -dependencies = [ - "serde", -] - [[package]] name = "hotshot-constants" version = "0.3.3" @@ -2812,12 +2806,12 @@ dependencies = [ "ethereum-types", "futures", "hotshot", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-constants", "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-types", + "hotshot-utils", "rand 0.8.5", "serde", "sha2 0.10.8", @@ -2838,7 +2832,7 @@ dependencies = [ "blake3", "clap", "futures", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-types", "libp2p", "serde", "serde-inline-default", @@ -2879,10 +2873,10 @@ dependencies = [ "commit", "either", "futures", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-constants", "hotshot-task", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-types", + "hotshot-utils", "sha2 0.10.8", "snafu", "time 0.3.34", @@ -2906,13 +2900,13 @@ dependencies = [ "ethereum-types", "futures", "hotshot", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-constants", "hotshot-example-types", "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-types", + "hotshot-utils", "rand 0.8.5", "serde", "sha2 0.10.8", @@ -2922,51 +2916,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hotshot-types" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13#e4b699c49a86246145838012e15ffafdfec61ef1" -dependencies = [ - "ark-bls12-381", - "ark-ed-on-bn254", - "ark-ff", - "ark-serialize", - "ark-std", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bincode", - "bitvec", - "blake3", - "commit", - "custom_debug", - "derivative", - "digest 0.10.7", - "displaydoc", - "dyn-clone 1.0.16 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.16)", - "either", - "espresso-systems-common 0.4.1", - "ethereum-types", - "generic-array", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13)", - "jf-plonk", - "jf-primitives", - "jf-utils", - "libp2p-networking 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13)", - "rand 0.8.5", - "rand_chacha 0.3.1", - "serde", - "sha2 0.10.8", - "snafu", - "tagged-base64", - "time 0.3.34", - "tokio", - "tracing", - "typenum", -] - [[package]] name = "hotshot-types" version = "0.1.0" @@ -2994,12 +2943,12 @@ dependencies = [ "espresso-systems-common 0.4.1", "ethereum-types", "generic-array", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-constants", + "hotshot-utils", "jf-plonk", "jf-primitives", "jf-utils", - "libp2p-networking 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "libp2p-networking", "rand 0.8.5", "rand_chacha 0.3.1", "serde", @@ -3012,22 +2961,13 @@ dependencies = [ "typenum", ] -[[package]] -name = "hotshot-utils" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13#e4b699c49a86246145838012e15ffafdfec61ef1" -dependencies = [ - "bincode", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13)", -] - [[package]] name = "hotshot-utils" version = "0.1.0" source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14#696de65a40c42accc589a368cbbe218bdec90aa3" dependencies = [ "bincode", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-constants", ] [[package]] @@ -3040,7 +2980,7 @@ dependencies = [ "async-std", "clap", "futures", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-types", "rand 0.8.5", "tide-disco", "tokio", @@ -3051,13 +2991,13 @@ dependencies = [ [[package]] name = "hs-builder-api" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/hs-builder-api?branch=main#b1af16712d1c867f4227b7e12e84880fefe52330" +source = "git+https://github.com/EspressoSystems/hs-builder-api?branch=main#7ed5ba213f3dacdb57a52ab35d221323c4aaf839" dependencies = [ "async-trait", "clap", "derive_more", "futures", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13)", + "hotshot-types", "serde", "snafu", "tagged-base64", @@ -3082,8 +3022,8 @@ dependencies = [ "hotshot-task", "hotshot-task-impls", "hotshot-testing", - "hotshot-types 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-types", + "hotshot-utils", "hs-builder-api", "serde", "sha2 0.10.8", @@ -3518,7 +3458,7 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jf-plonk" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish#34df5ce03ff313054b7408107e46ae2c5e6c74c1" dependencies = [ "ark-ec", "ark-ff", @@ -3547,7 +3487,7 @@ dependencies = [ [[package]] name = "jf-primitives" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish#34df5ce03ff313054b7408107e46ae2c5e6c74c1" dependencies = [ "anyhow", "ark-bls12-377", @@ -3592,7 +3532,7 @@ dependencies = [ [[package]] name = "jf-relation" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish#34df5ce03ff313054b7408107e46ae2c5e6c74c1" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -3618,7 +3558,7 @@ dependencies = [ [[package]] name = "jf-utils" version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish#d9c1b634a96256b9adf92f549fb87e0167adfae4" +source = "git+https://github.com/EspressoSystems/jellyfish#34df5ce03ff313054b7408107e46ae2c5e6c74c1" dependencies = [ "ark-ec", "ark-ff", @@ -3997,39 +3937,6 @@ dependencies = [ "prometheus-client", ] -[[package]] -name = "libp2p-networking" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13#e4b699c49a86246145838012e15ffafdfec61ef1" -dependencies = [ - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bincode", - "blake3", - "custom_debug", - "dashmap", - "derive_builder", - "either", - "futures", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.13)", - "lazy_static", - "libp2p", - "libp2p-identity", - "libp2p-swarm-derive", - "rand 0.8.5", - "serde", - "serde_json", - "snafu", - "tokio", - "tokio-stream", - "tracing", - "unsigned-varint 0.7.2", - "void", -] - [[package]] name = "libp2p-networking" version = "0.1.0" @@ -4046,8 +3953,8 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-constants 0.3.3 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", - "hotshot-utils 0.1.0 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.14)", + "hotshot-constants", + "hotshot-utils", "lazy_static", "libp2p", "libp2p-identity", @@ -6739,6 +6646,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "tide" version = "0.16.0"