From 8a2c3ba5d4d6d224ee1bc254cc7bd11289e3b585 Mon Sep 17 00:00:00 2001 From: MRain Date: Fri, 10 May 2024 14:23:29 +0800 Subject: [PATCH] bump hotshot version --- Cargo.lock | 468 ++++++++++++++++++----------------------------------- Cargo.toml | 10 +- 2 files changed, 165 insertions(+), 313 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b01c4d1d..4ddc3729 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -391,17 +391,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-pallas" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760ecac12a00211188c9101b63bd284b80da5abcc5d97d9d2b3803bca1f63a52" -dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", -] - [[package]] name = "ark-poly" version = "0.4.2" @@ -1071,12 +1060,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base64" version = "0.13.1" @@ -1306,7 +1289,7 @@ checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cdn-broker" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "async-std", "cdn-proto", @@ -1314,7 +1297,7 @@ dependencies = [ "console-subscriber", "dashmap", "derivative", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "lazy_static", "local-ip-address", "parking_lot", @@ -1330,12 +1313,12 @@ dependencies = [ [[package]] name = "cdn-client" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "async-std", "cdn-proto", "clap", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "rand 0.8.5", "tokio", "tracing", @@ -1345,12 +1328,12 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "async-std", "cdn-proto", "clap", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "tokio", "tracing", "tracing-subscriber 0.3.18", @@ -1359,7 +1342,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.2#c41604361b634830b5ba874e06b997993055c25c" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.6#569d6a6ec3ccbbd41c041a4c80bd260bc5c928ff" dependencies = [ "anyhow", "ark-serialize", @@ -1367,11 +1350,11 @@ dependencies = [ "capnp", "capnpc", "derivative", - "jf-primitives 0.4.0-pre.0", + "jf-signature", "kanal", "lazy_static", "mnemonic", - "mockall", + "num_enum", "pem", "prometheus", "quinn", @@ -1555,7 +1538,7 @@ dependencies = [ "hex", "serde", "sha3", - "tagged-base64 0.4.0", + "tagged-base64", ] [[package]] @@ -1844,18 +1827,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "crypto_kx" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704722d1d929489c8528bb1882805700f1ba20f54325704973e786352320b1ed" -dependencies = [ - "blake2", - "curve25519-dalek", - "rand_core 0.6.4", - "serdect", -] - [[package]] name = "csv" version = "1.3.0" @@ -2206,24 +2177,12 @@ dependencies = [ "const-random", ] -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "dotenvy" version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "downcast-rs" version = "1.2.1" @@ -2339,11 +2298,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "espresso-systems-common" -version = "0.4.0" -source = "git+https://github.com/espressosystems/espresso-systems-common?tag=0.4.0#5abd890f79014a86db31286e1f3a529f161e69de" - [[package]] name = "espresso-systems-common" version = "0.4.1" @@ -2547,12 +2501,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "funty" version = "2.0.0" @@ -3083,7 +3031,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-broadcast", @@ -3108,15 +3056,16 @@ dependencies = [ "hotshot-task", "hotshot-task-impls", "hotshot-types", - "jf-primitives 0.4.4", + "jf-signature", "libp2p-identity", "libp2p-networking", "lru 0.12.3", + "num_enum", "portpicker", "rand 0.8.5", "serde", "sha2 0.10.8", - "snafu 0.8.2", + "snafu", "surf-disco", "time 0.3.36", "tokio", @@ -3127,7 +3076,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "async-trait", "clap", @@ -3136,8 +3085,8 @@ dependencies = [ "futures", "hotshot-types", "serde", - "snafu 0.8.2", - "tagged-base64 0.4.0", + "snafu", + "tagged-base64", "tide-disco", "toml", "vbs", @@ -3164,9 +3113,9 @@ dependencies = [ "hotshot-types", "serde", "sha2 0.10.8", - "snafu 0.8.2", + "snafu", "surf-disco", - "tagged-base64 0.4.0", + "tagged-base64", "tide-disco", "tracing", "vbs", @@ -3175,7 +3124,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.19" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.19#b6b6ac5aa27742539bbc19eebe2e6a90b03a660c" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.20#f5f5ea98e438d8ee0f77c3d30b8fb6f362d8c818" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -3189,8 +3138,8 @@ dependencies = [ "futures", "hotshot-types", "serde", - "snafu 0.8.2", - "tagged-base64 0.4.0", + "snafu", + "tagged-base64", "tide-disco", "toml", "tracing", @@ -3200,7 +3149,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-broadcast", @@ -3221,7 +3170,7 @@ dependencies = [ "serde", "sha2 0.10.8", "sha3", - "snafu 0.8.2", + "snafu", "time 0.3.36", "tokio", "tracing", @@ -3230,7 +3179,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3259,7 +3208,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -3272,7 +3221,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-broadcast", @@ -3282,6 +3231,7 @@ dependencies = [ "async-trait", "bincode", "bitvec", + "cdn-proto", "chrono", "committable", "either", @@ -3289,13 +3239,14 @@ dependencies = [ "hotshot-builder-api", "hotshot-task", "hotshot-types", - "jf-primitives 0.4.4", + "jf-signature", + "jf-vid", "rand 0.8.5", "serde", "sha2 0.10.8", - "snafu 0.8.2", + "snafu", "surf-disco", - "tagged-base64 0.4.0", + "tagged-base64", "time 0.3.36", "tokio", "tracing", @@ -3305,7 +3256,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "ark-bls12-381", @@ -3331,21 +3282,22 @@ dependencies = [ "displaydoc", "dyn-clone 1.0.17 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.17)", "either", - "espresso-systems-common 0.4.1", + "espresso-systems-common", "ethereum-types", "futures", "generic-array", - "jf-plonk", - "jf-primitives 0.4.4", - "jf-utils 0.4.4", + "jf-pcs", + "jf-signature", + "jf-utils", + "jf-vid", "lazy_static", "memoize", "rand 0.8.5", "rand_chacha 0.3.1", "serde", "sha2 0.10.8", - "snafu 0.8.2", - "tagged-base64 0.4.0", + "snafu", + "tagged-base64", "time 0.3.36", "tokio", "tracing", @@ -3833,126 +3785,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] -name = "jf-plonk" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-commitment" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" +dependencies = [ + "ark-std", +] + +[[package]] +name = "jf-crhf" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ - "ark-ec", - "ark-ff", - "ark-poly", "ark-serialize", "ark-std", - "derivative", - "displaydoc", - "downcast-rs", - "dyn-clone 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", - "espresso-systems-common 0.4.0", - "hashbrown 0.14.3", - "itertools 0.12.1", - "jf-primitives 0.4.4", - "jf-relation 0.4.4", - "jf-utils 0.4.4", - "merlin", - "num-bigint", - "rand_chacha 0.3.1", - "rayon", - "serde", - "sha3", - "tagged-base64 0.4.0", ] [[package]] -name = "jf-primitives" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish.git?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +name = "jf-merkle-tree" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ - "anyhow", "ark-bls12-377", "ark-bls12-381", "ark-bn254", - "ark-bw6-761", - "ark-crypto-primitives", "ark-ec", - "ark-ed-on-bls12-377", - "ark-ed-on-bls12-381", - "ark-ed-on-bn254", "ark-ff", - "ark-pallas", - "ark-poly", "ark-serialize", "ark-std", - "blst", - "chacha20poly1305", - "crypto_kx", "derivative", "digest 0.10.7", "displaydoc", - "espresso-systems-common 0.4.0", - "generic-array", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-relation 0.4.0-pre.0", - "jf-utils 0.4.0-pre.0", - "merlin", + "jf-rescue", + "jf-utils", "num-bigint", "num-traits", - "rand_chacha 0.3.1", "serde", - "sha2 0.10.8", "sha3", - "tagged-base64 0.3.4", - "typenum", - "zeroize", + "tagged-base64", ] [[package]] -name = "jf-primitives" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-pcs" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ - "anyhow", - "ark-bls12-377", - "ark-bls12-381", - "ark-bn254", - "ark-bw6-761", - "ark-crypto-primitives", "ark-ec", - "ark-ed-on-bls12-377", - "ark-ed-on-bls12-381", - "ark-ed-on-bn254", "ark-ff", - "ark-pallas", "ark-poly", "ark-serialize", "ark-std", - "blst", - "chacha20poly1305", - "crypto_kx", "derivative", - "digest 0.10.7", "displaydoc", - "espresso-systems-common 0.4.0", - "generic-array", - "hashbrown 0.14.3", "itertools 0.12.1", - "jf-relation 0.4.4", - "jf-utils 0.4.4", + "jf-utils", "merlin", - "num-bigint", - "num-traits", - "rand_chacha 0.3.1", "rayon", - "serde", - "sha2 0.10.8", - "sha3", - "tagged-base64 0.4.0", - "zeroize", +] + +[[package]] +name = "jf-prf" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" +dependencies = [ + "ark-serialize", + "ark-std", ] [[package]] name = "jf-relation" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish.git?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +version = "0.4.4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "ark-bls12-377", "ark-bls12-381", @@ -3969,66 +3874,108 @@ dependencies = [ "dyn-clone 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-utils 0.4.0-pre.0", + "jf-utils", "num-bigint", "rand_chacha 0.3.1", + "rayon", ] [[package]] -name = "jf-relation" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-rescue" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "ark-bls12-377", "ark-bls12-381", "ark-bn254", "ark-bw6-761", + "ark-crypto-primitives", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-381", + "ark-ed-on-bn254", + "ark-ff", + "ark-std", + "displaydoc", + "itertools 0.12.1", + "jf-commitment", + "jf-crhf", + "jf-prf", + "jf-relation", + "jf-utils", +] + +[[package]] +name = "jf-signature" +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-ff", - "ark-poly", "ark-serialize", "ark-std", + "blst", "derivative", + "digest 0.10.7", "displaydoc", - "downcast-rs", - "dyn-clone 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "hashbrown 0.14.3", "itertools 0.12.1", - "jf-utils 0.4.4", + "jf-crhf", + "jf-relation", + "jf-rescue", + "jf-utils", "num-bigint", - "rand_chacha 0.3.1", - "rayon", + "num-traits", + "serde", + "sha3", + "tagged-base64", + "zeroize", ] [[package]] name = "jf-utils" -version = "0.4.0-pre.0" -source = "git+https://github.com/EspressoSystems/jellyfish.git?tag=0.4.2#f85f9024ef42ab8be95b2c81bd15fd6cbadeafbf" +version = "0.4.4" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-381", "ark-ff", + "ark-poly", "ark-serialize", "ark-std", "digest 0.10.7", + "displaydoc", + "rand_chacha 0.3.1", + "rayon", "serde", "sha2 0.10.8", - "tagged-base64 0.3.4", + "tagged-base64", ] [[package]] -name = "jf-utils" -version = "0.4.4" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.4#8f48813ca52d964090dbf0de62f07f5e0c7e22c6" +name = "jf-vid" +version = "0.1.0" +source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" dependencies = [ + "anyhow", "ark-ec", "ark-ff", + "ark-poly", "ark-serialize", "ark-std", + "derivative", "digest 0.10.7", + "displaydoc", + "generic-array", + "itertools 0.12.1", + "jf-merkle-tree", + "jf-pcs", + "jf-utils", "rayon", "serde", - "sha2 0.10.8", - "tagged-base64 0.4.0", + "tagged-base64", ] [[package]] @@ -4409,7 +4356,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.43" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.50#6facd5bb4c5800486dd427c84b5de607f17b4224" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4430,7 +4377,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "snafu 0.8.2", + "snafu", "tokio", "tokio-stream", "tracing", @@ -5042,33 +4989,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b8f3a258db515d5e91a904ce4ae3f73e091149b90cadbdb93d210bee07f63b" -[[package]] -name = "mockall" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 2.0.60", -] - [[package]] name = "multiaddr" version = "0.18.1" @@ -5365,6 +5285,27 @@ dependencies = [ "libc", ] +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.60", +] + [[package]] name = "object" version = "0.32.2" @@ -5778,32 +5719,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "predicates" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" -dependencies = [ - "anstyle", - "predicates-core", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "primitive-types" version = "0.12.2" @@ -6865,16 +6780,6 @@ dependencies = [ "syn 2.0.60", ] -[[package]] -name = "serdect" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177" -dependencies = [ - "base16ct", - "serde", -] - [[package]] name = "sha-1" version = "0.9.8" @@ -7065,36 +6970,13 @@ dependencies = [ "futures-lite 1.13.0", ] -[[package]] -name = "snafu" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" -dependencies = [ - "backtrace", - "doc-comment", - "snafu-derive 0.7.5", -] - [[package]] name = "snafu" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" dependencies = [ - "snafu-derive 0.8.2", -] - -[[package]] -name = "snafu-derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "snafu-derive", ] [[package]] @@ -7665,21 +7547,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tagged-base64" -version = "0.3.4" -source = "git+https://github.com/EspressoSystems/tagged-base64.git?tag=0.3.4#93be6f0f5c0ec8458f13dede3d2b68dcce12a608" -dependencies = [ - "ark-serialize", - "ark-std", - "base64 0.21.7", - "crc-any", - "serde", - "snafu 0.7.5", - "tagged-base64-macros 0.3.3", - "wasm-bindgen", -] - [[package]] name = "tagged-base64" version = "0.4.0" @@ -7691,20 +7558,11 @@ dependencies = [ "base64 0.22.0", "crc-any", "serde", - "snafu 0.8.2", - "tagged-base64-macros 0.4.0", + "snafu", + "tagged-base64-macros", "wasm-bindgen", ] -[[package]] -name = "tagged-base64-macros" -version = "0.3.3" -source = "git+https://github.com/EspressoSystems/tagged-base64.git?tag=0.3.4#93be6f0f5c0ec8458f13dede3d2b68dcce12a608" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "tagged-base64-macros" version = "0.4.0" @@ -7733,12 +7591,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - [[package]] name = "thiserror" version = "1.0.59" @@ -7836,10 +7688,10 @@ dependencies = [ "shellexpand", "signal-hook", "signal-hook-async-std", - "snafu 0.8.2", + "snafu", "strum", "strum_macros", - "tagged-base64 0.4.0", + "tagged-base64", "tide", "tide-websockets", "toml", diff --git a/Cargo.toml b/Cargo.toml index cfe98331..f1e23150 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,10 @@ clap = { version = "4.4", features = ["derive", "env"] } committable = "0.2" derivative = "2.2" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } -hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.19" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.20" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" } serde = { version = "1.0", features = ["derive"] } sha2 = "0.10" snafu = "0.8" @@ -31,4 +31,4 @@ tracing = "0.1" vbs = "0.1" [dev-dependencies] -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" }