From 30dc57e439fa0438abe234a51a15726852f45541 Mon Sep 17 00:00:00 2001 From: Jarred Parr Date: Fri, 28 Jun 2024 12:03:38 -0600 Subject: [PATCH] update :facepalm: --- Cargo.lock | 115 +++++++---------------------------------------------- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fab16a2..210a3d10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1289,7 +1289,7 @@ version = "0.4.0" source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.0#fdcf88863147173fb270e830abbbb24308268087" dependencies = [ "async-std", - "cdn-proto 0.4.0", + "cdn-proto", "clap", "console-subscriber 0.3.0", "dashmap 5.5.3", @@ -1313,7 +1313,7 @@ version = "0.4.0" source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.0#fdcf88863147173fb270e830abbbb24308268087" dependencies = [ "async-std", - "cdn-proto 0.4.0", + "cdn-proto", "clap", "jf-signature", "rand 0.8.5", @@ -1328,7 +1328,7 @@ version = "0.4.0" source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.0#fdcf88863147173fb270e830abbbb24308268087" dependencies = [ "async-std", - "cdn-proto 0.4.0", + "cdn-proto", "clap", "jf-signature", "tokio", @@ -1336,39 +1336,6 @@ dependencies = [ "tracing-subscriber 0.3.18", ] -[[package]] -name = "cdn-proto" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.3.12#7bf490b34fb5b996d7e98d3d4be6d88028a076ac" -dependencies = [ - "anyhow", - "ark-serialize", - "async-trait", - "capnp", - "capnpc", - "derivative", - "jf-signature", - "kanal", - "lazy_static", - "mnemonic", - "num_enum", - "pem", - "quinn", - "rand 0.8.5", - "rcgen 0.13.1", - "redis", - "rkyv", - "rustls 0.23.10", - "rustls-pki-types", - "sqlx", - "thiserror", - "tokio", - "tokio-rustls", - "tracing", - "url", - "warp", -] - [[package]] name = "cdn-proto" version = "0.4.0" @@ -3130,7 +3097,7 @@ dependencies = [ "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.60)", + "hotshot-types", "jf-signature", "libp2p-identity", "libp2p-networking", @@ -3158,7 +3125,7 @@ dependencies = [ "committable", "derive_more", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.60)", + "hotshot-types", "serde", "snafu", "tagged-base64", @@ -3185,7 +3152,7 @@ dependencies = [ "hotshot-builder-api", "hotshot-events-service", "hotshot-example-types", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.60)", + "hotshot-types", "serde", "sha2 0.10.8", "snafu", @@ -3200,7 +3167,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" version = "0.1.27" -source = "git+https://github.com/EspressoSystems/hotshot-events-service.git#b489e6e675da630308f086ee8163f5479a7b34f1" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=rc-0.1.30#52fefe35f129176d73527a4e53fc6cecc5da2180" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -3212,7 +3179,7 @@ dependencies = [ "derive_more", "either", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.59)", + "hotshot-types", "serde", "snafu", "tagged-base64", @@ -3241,7 +3208,7 @@ dependencies = [ "hotshot", "hotshot-task", "hotshot-task-impls", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.60)", + "hotshot-types", "rand 0.8.5", "serde", "sha2 0.10.8", @@ -3268,7 +3235,7 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.60)", + "hotshot-types", "libp2p", "multiaddr", "serde", @@ -3312,14 +3279,14 @@ dependencies = [ "async-trait", "bincode", "bitvec", - "cdn-proto 0.4.0", + "cdn-proto", "chrono", "committable", "either", "futures", "hotshot-builder-api", "hotshot-task", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.60)", + "hotshot-types", "jf-signature", "jf-vid", "rand 0.8.5", @@ -3334,60 +3301,6 @@ dependencies = [ "vbs", ] -[[package]] -name = "hotshot-types" -version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.59#b9329c30b25dcbda5018a36ee06ee4294111778f" -dependencies = [ - "anyhow", - "ark-bls12-381", - "ark-bn254", - "ark-ec", - "ark-ed-on-bn254", - "ark-ff", - "ark-serialize", - "ark-srs", - "ark-std", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "async-trait", - "bincode", - "bitvec", - "blake3", - "cdn-proto 0.1.0", - "committable", - "custom_debug", - "derivative", - "digest 0.10.7", - "displaydoc", - "dyn-clone 1.0.17 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.17)", - "either", - "espresso-systems-common", - "ethereum-types", - "futures", - "generic-array", - "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", - "tagged-base64", - "time 0.3.36", - "tokio", - "tracing", - "typenum", - "url", - "vbs", - "vec1", -] - [[package]] name = "hotshot-types" version = "0.1.11" @@ -3409,7 +3322,7 @@ dependencies = [ "bincode", "bitvec", "blake3", - "cdn-proto 0.4.0", + "cdn-proto", "committable", "custom_debug", "derivative", @@ -4528,7 +4441,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=rc-0.5.60)", + "hotshot-types", "lazy_static", "libp2p", "libp2p-identity", diff --git a/Cargo.toml b/Cargo.toml index 30925bb0..5818721c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ derivative = "2.2" futures = "0.3" hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.60" } hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.60" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", rc = "rc-0.1.30" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "rc-0.1.30" } hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.60" } serde = { version = "1.0", features = ["derive"] } sha2 = "0.10"