bump hotshot

Cargo.toml

@@ -48,21 +48,21 @@ dotenvy = "0.15"
 ethers = { version = "2.0", features = ["solc"] }
 futures = "0.3"
 
-hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" }
+hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" }
 # Hotshot imports
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.61" }
-hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "rc-0.1.33" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "rc-0.1.32" }
-hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" }
-hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "rc-0.1.44" }
-hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "rc-0.5.63" }
+hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "rc-0.1.34" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "rc-0.1.33" }
+hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" }
+hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "rc-0.1.45" }
+hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" }
 hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" }
-hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" }
-hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" }
+hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" }
+hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" }
 hotshot-contract-adapter = { version = "0.1.0", path = "contracts/rust/adapter" }
 # Temporary, used to pull in the mock auction results provider
-hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.61" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "rc-0.5.63" }
 
 # Push CDN imports
 cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [

builder/src/lib.rs

@@ -32,7 +32,7 @@ use hotshot::{
     types::{SignatureKey, SystemContextHandle},
     HotShotInitializer, Memberships, SystemContext,
 };
-use hotshot_builder_api::builder::{
+use hotshot_builder_api::v0_2::builder::{
     BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions,
 };
 use hotshot_builder_core::service::{GlobalState, ProxyGlobalState};
@@ -76,15 +76,14 @@ pub mod permissioned;
 // It runs the api service for the builder
 pub fn run_builder_api_service(url: Url, source: ProxyGlobalState<SeqTypes>) {
     // it is to serve hotshot
-    let builder_api = hotshot_builder_api::builder::define_api::<
+    let builder_api = hotshot_builder_api::v0_2::builder::define_api::<
         ProxyGlobalState<SeqTypes>,
         SeqTypes,
-        <SeqTypes as NodeType>::Base,
     >(&HotshotBuilderApiOptions::default())
     .expect("Failed to construct the builder APIs");
 
     // it enables external clients to submit txn to the builder's private mempool
-    let private_mempool_api = hotshot_builder_api::builder::submit_api::<
+    let private_mempool_api = hotshot_builder_api::v0_2::builder::submit_api::<
         ProxyGlobalState<SeqTypes>,
         SeqTypes,
         <SeqTypes as NodeType>::Base,
@@ -138,7 +137,7 @@ pub mod testing {
         },
         types::{EventType::Decide, Message},
     };
-    use hotshot_builder_api::builder::{
+    use hotshot_builder_api::v0_2::builder::{
         BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions,
     };
     use hotshot_builder_core::{
@@ -676,7 +675,7 @@ mod test {
     use ethers::providers::Quorum;
     use futures::StreamExt;
     use hotshot::types::EventType::Decide;
-    use hotshot_builder_api::block_info::AvailableBlockData;
+    use hotshot_builder_api::v0_2::block_info::AvailableBlockData;
     use hotshot_builder_core::service::GlobalState;
     use sequencer::{
         empty_builder_commitment,

builder/src/non_permissioned.rs

@@ -19,7 +19,7 @@ use ethers::{
     types::{Address, U256},
 };
 use hotshot::traits::BlockPayload;
-use hotshot_builder_api::builder::{
+use hotshot_builder_api::v0_2::builder::{
     BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions,
 };
 use hotshot_builder_core::{
@@ -34,7 +34,7 @@ use hotshot_builder_core::{
 };
 use hotshot_events_service::{
     events::{Error as EventStreamApiError, Options as EventStreamingApiOptions},
-    events_source::{BuilderEvent, EventConsumer, EventsStreamer},
+    events_source::{EventConsumer, EventsStreamer},
 };
 use hotshot_types::{
     data::{fake_commitment, Leaf, ViewNumber},
@@ -232,7 +232,7 @@ mod test {
     use async_std::task;
     use es_version::SequencerVersion;
     use espresso_types::{FeeAccount, NamespaceId, Transaction};
-    use hotshot_builder_api::{
+    use hotshot_builder_api::v0_2::{
         block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo},
         builder::BuildError,
     };
@@ -245,7 +245,7 @@ mod test {
     };
     use hotshot_events_service::{
         events::{Error as EventStreamApiError, Options as EventStreamingApiOptions},
-        events_source::{BuilderEvent, EventConsumer, EventsStreamer},
+        events_source::{EventConsumer, EventsStreamer},
     };
     use hotshot_types::{
         signature_key::BLSPubKey,
@@ -318,7 +318,7 @@ mod test {
 
         // Start a builder api client
         let builder_client = Client::<
-            hotshot_builder_api::builder::Error,
+            hotshot_builder_api::v0_2::builder::Error,
             <SeqTypes as NodeType>::Base,
         >::new(hotshot_builder_api_url.clone());
         assert!(builder_client.connect(Some(Duration::from_secs(60))).await);