[WEEKLY RELEASE] HotShot - rc-0.5.78 (#710)

EspressoSystems · Oct 21, 2024 · b344b0f · b344b0f
1 parent 38c9df5
commit b344b0f
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -154,6 +154,7 @@ impl<D: DataSourceLifeCycle + UpdateStatusData> MockNetwork<D> {
             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
@@ -125,7 +125,8 @@ impl<Types: NodeType> QueryablePayload<Types> 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;