From b344b0f87b8a68bfde86f161fe1eea4e978e2a8b Mon Sep 17 00:00:00 2001 From: ss-es <155648797+ss-es@users.noreply.github.com> Date: Mon, 21 Oct 2024 12:34:35 -0400 Subject: [PATCH] [WEEKLY RELEASE] HotShot - rc-0.5.78 (#710) --- Cargo.lock | 68 +++++++++++++++++++++------------------ Cargo.toml | 10 +++--- examples/simple-server.rs | 1 + src/testing/consensus.rs | 1 + src/testing/mocks.rs | 3 +- 5 files changed, 45 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1fe06ced..411f69f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3062,8 +3062,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", @@ -3085,7 +3085,6 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", "hotshot-types", @@ -3099,8 +3098,8 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.8", - "snafu 0.8.4", "surf-disco", + "thiserror", "time 0.3.36", "tokio", "tracing", @@ -3111,7 +3110,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", @@ -3120,8 +3119,8 @@ dependencies = [ "futures", "hotshot-types", "serde", - "snafu 0.8.4", "tagged-base64", + "thiserror", "tide-disco", "toml", "vbs", @@ -3129,8 +3128,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", @@ -3152,7 +3151,7 @@ dependencies = [ "serde", "sha2 0.10.8", "sha3", - "snafu 0.8.4", + "thiserror", "time 0.3.36", "tokio", "tracing", @@ -3162,10 +3161,11 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" -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", "async-lock 2.8.0", "async-trait", "futures", @@ -3181,8 +3181,8 @@ dependencies = [ [[package]] name = "hotshot-macros" -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 = [ "derive_builder", "proc-macro2", @@ -3192,8 +3192,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -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", @@ -3208,7 +3208,6 @@ dependencies = [ "libp2p", "multiaddr", "serde", - "serde-inline-default", "serde_json", "surf-disco", "thiserror", @@ -3278,8 +3277,8 @@ dependencies = [ [[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", @@ -3293,8 +3292,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", @@ -3317,9 +3316,9 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.8", - "snafu 0.8.4", "surf-disco", "tagged-base64", + "thiserror", "time 0.3.36", "tokio", "tracing", @@ -3330,8 +3329,8 @@ dependencies = [ [[package]] name = "hotshot-testing" -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", @@ -3364,8 +3363,8 @@ dependencies = [ "serde", "sha2 0.10.8", "sha3", - "snafu 0.8.4", "tagged-base64", + "thiserror", "tide-disco", "tokio", "tracing", @@ -3377,7 +3376,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", @@ -3394,6 +3393,7 @@ dependencies = [ "bitvec", "blake3", "cdn-proto", + "clap", "committable", "custom_debug 0.5.1", "derivative", @@ -3415,12 +3415,16 @@ dependencies = [ "rand_chacha 0.3.1", "reqwest", "serde", + "serde-inline-default", "serde_bytes", + "serde_json", "sha2 0.10.8", - "snafu 0.8.4", + "surf-disco", "tagged-base64", + "thiserror", "time 0.3.36", "tokio", + "toml", "tracing", "typenum", "url", @@ -4438,8 +4442,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", @@ -4464,7 +4468,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "snafu 0.8.4", + "thiserror", "tokio", "tokio-stream", "tracing", @@ -6611,13 +6615,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 19de234e..5b812fbf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,9 +72,9 @@ derivative = "2.2" derive_more = "0.99" either = "1.12" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77", features = ["dependency-tasks"] } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" } itertools = "0.12.1" jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [ "std", @@ -116,7 +116,7 @@ sqlx = { version = "0.8", features = [ # Dependencies enabled by feature "testing". espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0", optional = true } -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78", optional = true } portpicker = { version = "0.1", optional = true } rand = { version = "0.8", optional = true } spin_sleep = { version = "1.2", optional = true } @@ -137,7 +137,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true } clap = { version = "4.5", features = ["derive", "env"] } espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" } generic-array = "0.14" -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" rand = "0.8" reqwest = "0.12.3" diff --git a/examples/simple-server.rs b/examples/simple-server.rs index 93fefac7..9d8e36a6 100644 --- a/examples/simple-server.rs +++ b/examples/simple-server.rs @@ -225,6 +225,7 @@ async fn init_consensus( stop_proposing_time: 0, start_voting_time: 0, stop_voting_time: 0, + epoch_height: 0, }; let nodes = join_all(priv_keys.into_iter().zip(data_sources).enumerate().map( diff --git a/src/testing/consensus.rs b/src/testing/consensus.rs index bc5c5e9c..ab734d3b 100644 --- a/src/testing/consensus.rs +++ b/src/testing/consensus.rs @@ -154,6 +154,7 @@ impl MockNetwork { stop_proposing_time: 0, start_voting_time: 0, stop_voting_time: 0, + epoch_height: 0, }; update_config(&mut config); diff --git a/src/testing/mocks.rs b/src/testing/mocks.rs index dd22961e..5a91dc24 100644 --- a/src/testing/mocks.rs +++ b/src/testing/mocks.rs @@ -125,7 +125,8 @@ impl QueryablePayload for MockPayload { pub struct MockTypes; impl NodeType for MockTypes { - type Time = ViewNumber; + type View = ViewNumber; + type Epoch = ViewNumber; type BlockHeader = MockHeader; type BlockPayload = MockPayload; type SignatureKey = BLSPubKey;