From 8cbc0e0787ebcfef750c0b4f2f9f7f16d8ea21a8 Mon Sep 17 00:00:00 2001 From: ss-es <155648797+ss-es@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:35:49 -0400 Subject: [PATCH] [WEEKLY RELEASE] HotShot - rc-0.5.78 (#115) --- Cargo.lock | 99 ++++++++++++++--------------------------------------- Cargo.toml | 4 +-- src/test.rs | 2 +- 3 files changed, 29 insertions(+), 76 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e910c1..052b073 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1795,27 +1795,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - [[package]] name = "ctr" version = "0.6.0" @@ -2974,8 +2953,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" +version = "0.5.78" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e" dependencies = [ "anyhow", "async-broadcast", @@ -2997,7 +2976,6 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", "hotshot-types", @@ -3011,8 +2989,8 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.8", - "snafu", "surf-disco", + "thiserror", "time 0.3.36", "tokio", "tracing", @@ -3023,7 +3001,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e" dependencies = [ "async-trait", "clap", @@ -3032,8 +3010,8 @@ dependencies = [ "futures", "hotshot-types", "serde", - "snafu", "tagged-base64", + "thiserror", "tide-disco", "toml", "vbs", @@ -3069,8 +3047,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" +version = "0.5.78" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e" dependencies = [ "anyhow", "async-broadcast", @@ -3092,7 +3070,7 @@ dependencies = [ "serde", "sha2 0.10.8", "sha3", - "snafu", + "thiserror", "time 0.3.36", "tokio", "tracing", @@ -3100,40 +3078,10 @@ dependencies = [ "vbs", ] -[[package]] -name = "hotshot-orchestrator" -version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" -dependencies = [ - "anyhow", - "async-compatibility-layer", - "async-lock 2.8.0", - "async-std", - "bincode", - "blake3", - "clap", - "csv", - "futures", - "hotshot-types", - "libp2p", - "multiaddr", - "serde", - "serde-inline-default", - "serde_json", - "surf-disco", - "thiserror", - "tide-disco", - "tokio", - "toml", - "tracing", - "vbs", - "vec1", -] - [[package]] name = "hotshot-task" -version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" +version = "0.5.78" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e" dependencies = [ "anyhow", "async-broadcast", @@ -3147,8 +3095,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" +version = "0.5.78" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e" dependencies = [ "anyhow", "async-broadcast", @@ -3171,9 +3119,9 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.8", - "snafu", "surf-disco", "tagged-base64", + "thiserror", "time 0.3.36", "tokio", "tracing", @@ -3185,7 +3133,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e" dependencies = [ "anyhow", "ark-bn254", @@ -3202,6 +3150,7 @@ dependencies = [ "bitvec", "blake3", "cdn-proto", + "clap", "committable", "custom_debug", "derivative", @@ -3223,12 +3172,16 @@ dependencies = [ "rand_chacha 0.3.1", "reqwest", "serde", + "serde-inline-default", "serde_bytes", + "serde_json", "sha2 0.10.8", - "snafu", + "surf-disco", "tagged-base64", + "thiserror", "time 0.3.36", "tokio", + "toml", "tracing", "typenum", "url", @@ -4236,8 +4189,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" +version = "0.5.78" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4262,7 +4215,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "snafu", + "thiserror", "tokio", "tokio-stream", "tracing", @@ -6286,13 +6239,13 @@ dependencies = [ [[package]] name = "serde-inline-default" -version = "0.1.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa824cde50b5f01ff28a955114d8152a07cd62d81f53459dad0f2610136be844" +checksum = "b3acbd21cb24261fc36f595b38d3b34d0ff4e31a6b42edd6a43387d27c5787c8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3b1989a..fdb8dd9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ derivative = "2.2" derive_more = "0.99" either = { version = "1.12", features = ["serde"] } futures = "0.3" -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" } rand = "0.8.5" serde = { version = "1.0", features = ["derive"] } snafu = "0.8" @@ -28,6 +28,6 @@ tracing = "0.1" vbs = "0.1.4" [dev-dependencies] -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" } portpicker = "0.1.1" surf-disco = "0.9" diff --git a/src/test.rs b/src/test.rs index 9d46dd5..3313bff 100644 --- a/src/test.rs +++ b/src/test.rs @@ -29,7 +29,7 @@ mod tests { use crate::events_source::{EventConsumer, EventsStreamer, StartupInfo}; // EventsUpdater}; // return a empty transaction event - fn generate_event>(view_number: u64) -> Event { + fn generate_event>(view_number: u64) -> Event { Event { view_number: ViewNumber::new(view_number), event: EventType::Transactions {