Merge pull request #772 from EspressoSystems/hotshot/rc-0.5.84

[WEEKLY RELEASE] HotShot 0.5.84

Cargo.toml

@@ -41,7 +41,7 @@ testing = [
     "portpicker",
     "rand",
     "spin_sleep",
-    "tempfile",
+    "tempfile"
 ]
 
 [[example]]
@@ -62,9 +62,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.83" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.83" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.83" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.84" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.84" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.84" }
 itertools = "0.12.1"
 jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [
     "std",
@@ -115,7 +115,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.83", optional = true }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.84", optional = true }
 portpicker = { version = "0.1", optional = true }
 rand = { version = "0.8", optional = true }
 spin_sleep = { version = "1.2", optional = true }
@@ -136,7 +136,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.83" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.84" }
 portpicker = "0.1"
 rand = "0.8"
 reqwest = "0.12.3"

examples/simple-server.rs

@@ -243,9 +243,12 @@ async fn init_consensus(
                     config,
                     Arc::new(RwLock::new(membership)),
                     network,
-                    HotShotInitializer::from_genesis::<MockVersions>(TestInstanceState::default())
-                        .await
-                        .unwrap(),
+                    HotShotInitializer::from_genesis::<MockVersions>(
+                        TestInstanceState::default(),
+                        0,
+                    )
+                    .await
+                    .unwrap(),
                     ConsensusMetricsValue::new(&*data_source.populate_metrics()),
                     storage,
                     MarketplaceConfig {

rust-toolchain.toml

@@ -0,0 +1,9 @@
+[toolchain]
+# TODO: Compilation of jf-pcs with rust 1.84 takes a very long time, while this
+# is being fixed we use rust 1.83. See
+# https://github.com/rust-lang/rust/issues/135457 for upstream issue.
+#
+# channel = "stable"
+channel = "1.83"
+components = ["rustfmt", "llvm-tools-preview", "rust-src", "clippy"]
+profile = "minimal"

src/testing/consensus.rs

@@ -181,6 +181,7 @@ impl<D: DataSourceLifeCycle + UpdateStatusData> MockNetwork<D> {
                             network,
                             HotShotInitializer::from_genesis::<MockVersions>(
                                 TestInstanceState::default(),
+                                0,
                             )
                             .await
                             .unwrap(),