diff --git a/Cargo.lock b/Cargo.lock index 51d7322760..737e4d42c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1228,14 +1228,14 @@ dependencies = [ [[package]] name = "cdn-broker" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1#af42143a60f86a12ff759b6ad9bd1577c2887871" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ "cdn-proto", "clap", "console-subscriber", "dashmap", "derivative", - "jf-signature 0.1.0", + "jf-signature", "lazy_static", "local-ip-address", "parking_lot", @@ -1251,11 +1251,12 @@ dependencies = [ [[package]] name = "cdn-client" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1#af42143a60f86a12ff759b6ad9bd1577c2887871" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ "cdn-proto", "clap", - "jf-signature 0.1.0", + "derive_more 1.0.0", + "jf-signature", "parking_lot", "rand 0.8.5", "tokio", @@ -1266,11 +1267,11 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1#af42143a60f86a12ff759b6ad9bd1577c2887871" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ "cdn-proto", "clap", - "jf-signature 0.1.0", + "jf-signature", "tokio", "tracing", "tracing-subscriber 0.3.18", @@ -1279,7 +1280,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1#af42143a60f86a12ff759b6ad9bd1577c2887871" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ "anyhow", "ark-serialize", @@ -1287,7 +1288,8 @@ dependencies = [ "capnp", "capnpc", "derivative", - "jf-signature 0.1.0", + "derive_more 1.0.0", + "jf-signature", "kanal", "lazy_static", "mnemonic", @@ -3079,7 +3081,7 @@ dependencies = [ "hotshot-types", "jf-crhf", "jf-rescue", - "jf-signature 0.2.0", + "jf-signature", "jf-utils", "rand_chacha 0.3.1", "serde", @@ -3200,7 +3202,7 @@ dependencies = [ "ethereum-types", "futures", "jf-pcs", - "jf-signature 0.2.0", + "jf-signature", "jf-utils", "jf-vid", "lazy_static", @@ -3977,35 +3979,6 @@ dependencies = [ "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-serialize", - "ark-std", - "blst", - "derivative", - "digest 0.10.7", - "displaydoc", - "hashbrown 0.14.5", - "itertools 0.12.1", - "jf-crhf", - "jf-relation", - "jf-rescue", - "jf-utils", - "num-bigint", - "num-traits", - "serde", - "sha3", - "tagged-base64", - "zeroize", -] - [[package]] name = "jf-signature" version = "0.2.0" @@ -6499,9 +6472,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", diff --git a/Cargo.toml b/Cargo.toml index 7a0f272fa2..98018b9d3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -116,10 +116,10 @@ anyhow = "1" # Push CDN imports -cdn-client = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.1" } -cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.1" } -cdn-marshal = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.1" } -cdn-proto = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.1" } +cdn-client = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.6" } +cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.6" } +cdn-marshal = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.6" } +cdn-proto = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.6" } ### Profiles ### diff --git a/crates/hotshot/src/traits/networking/push_cdn_network.rs b/crates/hotshot/src/traits/networking/push_cdn_network.rs index d3b948ce6c..553b2545ef 100644 --- a/crates/hotshot/src/traits/networking/push_cdn_network.rs +++ b/crates/hotshot/src/traits/networking/push_cdn_network.rs @@ -464,7 +464,7 @@ impl ConnectedNetwork for PushCdnNetwork { /// Wait for the client to initialize the connection async fn wait_for_ready(&self) { - self.client.ensure_initialized().await; + let _ = self.client.ensure_initialized().await; } /// TODO: shut down the networks. Unneeded for testing. @@ -473,7 +473,7 @@ impl ConnectedNetwork for PushCdnNetwork { 'a: 'b, Self: 'b, { - boxed_sync(async move {}) + boxed_sync(async move { self.client.close().await }) } /// Broadcast a message to all members of the quorum.