Merge pull request #720 from EspressoSystems/hotshot/rc-0.5.79

[WEEKLY RELEASE] HotShot - rc-0.5.79
EspressoSystems · Oct 30, 2024 · bf491a1 · bf491a1
2 parents 0969bba + 3f06d03
commit bf491a1
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,9 +73,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.78-patch4" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
 itertools = "0.12.1"
 jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
 	"std",
@@ -118,7 +118,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.78-patch4", optional = true }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79", optional = true }
 portpicker = { version = "0.1", optional = true }
 rand = { version = "0.8", optional = true }
 spin_sleep = { version = "1.2", optional = true }
@@ -139,7 +139,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.78-patch4" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
 portpicker = "0.1"
 rand = "0.8"
 reqwest = "0.12.3"

diff --git a/examples/simple-server.rs b/examples/simple-server.rs
@@ -46,7 +46,7 @@ use hotshot_types::{
     light_client::StateKeyPair,
     signature_key::BLSPubKey,
     traits::{election::Membership, network::Topic},
-    ExecutionType, HotShotConfig, PeerConfig, ValidatorConfig,
+    HotShotConfig, PeerConfig, ValidatorConfig,
 };
 use std::{num::NonZeroUsize, str::FromStr, time::Duration};
 use url::Url;
@@ -200,13 +200,8 @@ async fn init_consensus(
         fixed_leader_for_gpuvid: 0,
         num_nodes_with_stake,
         known_nodes_with_stake: known_nodes_with_stake.clone(),
-        known_nodes_without_stake: vec![],
-        start_delay: 0,
-        round_start_delay: 0,
         next_view_timeout: 10000,
-        timeout_ratio: (11, 10),
         num_bootstrap: 0,
-        execution_type: ExecutionType::Continuous,
         known_da_nodes: known_nodes_with_stake.clone(),
         da_staked_committee_size: pub_keys.len(),
         my_own_validator_config: Default::default(),

diff --git a/src/testing/consensus.rs b/src/testing/consensus.rs
@@ -41,7 +41,7 @@ use hotshot_types::{
     light_client::StateKeyPair,
     signature_key::BLSPubKey,
     traits::{election::Membership, network::Topic, signature_key::SignatureKey as _},
-    ExecutionType, HotShotConfig, PeerConfig, ValidatorConfig,
+    HotShotConfig, PeerConfig, ValidatorConfig,
 };
 use std::num::NonZeroUsize;
 use std::time::Duration;
@@ -129,14 +129,9 @@ impl<D: DataSourceLifeCycle + UpdateStatusData> MockNetwork<D> {
             fixed_leader_for_gpuvid: 0,
             num_nodes_with_stake: num_staked_nodes,
             known_nodes_with_stake: known_nodes_with_stake.clone(),
-            known_nodes_without_stake: vec![],
             my_own_validator_config: Default::default(),
-            start_delay: 0,
-            round_start_delay: 0,
             next_view_timeout: 10000,
-            timeout_ratio: (11, 10),
             num_bootstrap: 0,
-            execution_type: ExecutionType::Continuous,
             da_staked_committee_size: pub_keys.len(),
             known_da_nodes: known_nodes_with_stake.clone(),
             data_request_delay: Duration::from_millis(200),