Merge remote-tracking branch 'origin/main' into jb/missed-notification

EspressoSystems · Oct 30, 2024 · ba15807 · ba15807
2 parents 1e1cbeb + bf491a1
commit ba15807
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 102 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -74,9 +74,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",
@@ -119,7 +119,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 }
@@ -140,7 +140,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/api/explorer.toml b/api/explorer.toml
@@ -135,7 +135,7 @@ Returns
 
 [route.get_search_result]
 PATH = ["search/:query"]
-":query" = "Literal"
+":query" = "TaggedBase64"
 DOC = """
 Retrieve search results for blocks or transactions that can be identified in some what by the given string ":query".
 At the moment the only field this matches against is the hash of the Block or Transaction.

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/data_source/extension.rs b/src/data_source/extension.rs
@@ -31,6 +31,7 @@ use async_trait::async_trait;
 use hotshot_types::traits::node_implementation::NodeType;
 use jf_merkle_tree::prelude::MerkleProof;
 use std::ops::RangeBounds;
+use tagged_base64::TaggedBase64;
 
 /// Wrapper to add extensibility to an existing data source.
 ///
@@ -390,7 +391,7 @@ where
 
     async fn get_search_results(
         &self,
-        query: String,
+        query: TaggedBase64,
     ) -> Result<
         explorer::query_data::SearchResult<Types>,
         explorer::query_data::GetSearchResultsError,

diff --git a/src/data_source/fetching.rs b/src/data_source/fetching.rs
@@ -122,6 +122,7 @@ use std::{
     ops::{Bound, Range, RangeBounds},
     time::Duration,
 };
+use tagged_base64::TaggedBase64;
 use tracing::Instrument;
 
 mod block;
@@ -1477,7 +1478,7 @@ where
 
     async fn get_search_results(
         &self,
-        query: String,
+        query: TaggedBase64,
     ) -> Result<
         explorer::query_data::SearchResult<Types>,
         explorer::query_data::GetSearchResultsError,

diff --git a/src/data_source/storage.rs b/src/data_source/storage.rs
@@ -81,6 +81,7 @@ use futures::future::Future;
 use hotshot_types::traits::node_implementation::NodeType;
 use jf_merkle_tree::prelude::MerkleProof;
 use std::ops::RangeBounds;
+use tagged_base64::TaggedBase64;
 
 pub mod fail_storage;
 pub mod fs;
@@ -256,7 +257,7 @@ where
     /// query string.
     async fn get_search_results(
         &mut self,
-        query: String,
+        query: TaggedBase64,
     ) -> Result<SearchResult<Types>, GetSearchResultsError>;
 }