Merge pull request #130 from EspressoSystems/jb/update-hotshot

Update HotShot 0.5.50

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hotshot-builder-core"
-version = "0.1.17"
+version = "0.1.18"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,10 +16,10 @@ clap = { version = "4.4", features = ["derive", "env"] }
 committable = "0.2"
 derivative = "2.2"
 futures = "0.3"
-hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.48" }
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.48" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.18" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.48" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.19" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }
 serde = { version = "1.0", features = ["derive"] }
 sha2 = "0.10"
 snafu = "0.8"
@@ -30,4 +30,4 @@ tracing = "0.1"
 vbs = "0.1"
 
 [dev-dependencies]
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.48" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.50" }

src/builder_state.rs

@@ -5,7 +5,6 @@ use hotshot_types::{
     traits::{
         block_contents::precompute_vid_commitment,
         node_implementation::{ConsensusTime, NodeType},
-        states::InstanceState,
     },
     utils::BuilderCommitment,
     vid::{VidCommitment, VidPrecomputeData},
@@ -181,7 +180,7 @@ pub struct BuilderState<TYPES: NodeType> {
     pub base_fee: u64,
 
     /// instance state to enfoce max_block_size
-    pub instance_state: Arc<dyn InstanceState>,
+    pub instance_state: Arc<TYPES::InstanceState>,
 }
 
 /// Trait to hold the helper functions for the builder
@@ -692,7 +691,7 @@ impl<TYPES: NodeType> BuilderProgress<TYPES> for BuilderState<TYPES> {
                     .get(tx_hash)
                     .map(|(_ts, tx, _source)| tx.clone())
             }),
-            self.instance_state.clone(),
+            &self.instance_state,
         ) {
             let builder_hash = payload.builder_commitment(&metadata);
             // count the number of txns
@@ -969,7 +968,7 @@ impl<TYPES: NodeType> BuilderState<TYPES> {
         buffer_view_num_count: u64,
         maximize_txn_capture_timeout: Duration,
         base_fee: u64,
-        instance_state: Arc<dyn InstanceState>,
+        instance_state: Arc<TYPES::InstanceState>,
     ) -> Self {
         BuilderState {
             timestamp_to_tx: BTreeMap::new(),

src/testing/basic_test.rs

@@ -169,7 +169,7 @@ mod tests {
 
             let (block_payload, metadata) = <TestBlockPayload as BlockPayload>::from_transactions(
                 vec![tx.clone()],
-                Arc::new(TestInstanceState {}),
+                &TestInstanceState {},
             )
             .unwrap();