hackfix for weekly release

Author: jparr721

Cargo.lock

@@ -52,22 +52,22 @@ dotenvy = "0.15"
 ethers = { version = "2.0", features = ["solc"] }
 futures = "0.3"
 
-hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" }
+hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" }
 # Hotshot imports
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.68" }
-hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "0.1.39" }
-marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.0.2" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.38" }
-hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" }
-hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.50" }
-hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/0.5.69" }
+hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "hotshot/rc-0.5.69" }
+marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", branch = "hotshot/rc-0.5.69" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.69" }
+hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" }
+hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "hotshot/rc-0.5.69" }
+hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" }
 hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" }
-hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" }
-hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.68" }
+hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" }
+hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" }
 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 = "0.5.68" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "bump/0.5.69" }
 
 # Push CDN imports
 cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [

Cargo.toml

@@ -6,6 +6,7 @@ use std::{
     mem,
     net::{IpAddr, Ipv4Addr},
     num::NonZeroUsize,
+    str::FromStr,
     thread::Builder,
     time::Duration,
 };
@@ -46,7 +47,7 @@ use hotshot::{
         BlockPayload,
     },
     types::{SignatureKey, SystemContextHandle},
-    HotShotInitializer, Memberships, SystemContext,
+    HotShotInitializer, MarketplaceConfig, Memberships, SystemContext,
 };
 use hotshot_builder_api::v0_1::builder::{
     BuildError, Error as BuilderApiError, Options as HotshotBuilderApiOptions,
@@ -80,6 +81,7 @@ use hotshot_types::{
     light_client::StateKeyPair,
     signature_key::{BLSPrivKey, BLSPubKey},
     traits::{
+        auction_results_provider::AuctionResultsProvider,
         block_contents::{vid_commitment, GENESIS_VID_NUM_STORAGE_NODES},
         election::Membership,
         metrics::Metrics,
@@ -384,7 +386,10 @@ pub async fn init_hotshot<
             .unwrap(),
         ConsensusMetricsValue::new(metrics),
         da_storage,
-        TestAuctionResultsProvider::default(),
+        MarketplaceConfig {
+            auction_results_provider: Arc::new(TestAuctionResultsProvider::default()),
+            generic_builder_url: Url::from_str("http://localhost").unwrap(),
+        },
     )
     .await
     .unwrap()

builder/src/permissioned.rs

@@ -88,6 +88,7 @@ impl<N: ConnectedNetwork<PubKey>, P: SequencerPersistence, Ver: StaticVersionTyp
         metrics: &dyn Metrics,
         stake_table_capacity: u64,
         public_api_url: Option<Url>,
+        generic_builder_url: Url,
         _: Ver,
     ) -> anyhow::Result<Self> {
         let config = &network_config.config;
@@ -150,7 +151,10 @@ impl<N: ConnectedNetwork<PubKey>, P: SequencerPersistence, Ver: StaticVersionTyp
             initializer,
             ConsensusMetricsValue::new(metrics),
             persistence.clone(),
-            TestAuctionResultsProvider::default(),
+            hotshot::MarketplaceConfig {
+                auction_results_provider: Arc::new(TestAuctionResultsProvider::default()),
+                generic_builder_url,
+            },
         )
         .await?
         .0;

sequencer/src/context.rs

@@ -31,7 +31,10 @@ pub mod state;
 
 #[cfg(feature = "libp2p")]
 use std::time::Duration;
-use std::{collections::BTreeMap, fmt::Debug, marker::PhantomData, net::SocketAddr, sync::Arc};
+use std::{
+    collections::BTreeMap, fmt::Debug, marker::PhantomData, net::SocketAddr, str::FromStr,
+    sync::Arc,
+};
 
 use derivative::Derivative;
 use espresso_types::v0::traits::{PersistenceOptions, SequencerPersistence};
@@ -404,6 +407,7 @@ pub async fn init_node<P: PersistenceOptions, Ver: StaticVersionType + 'static>(
         metrics,
         genesis.stake_table.capacity,
         network_params.public_api_url,
+        Url::from_str("http://localhost").unwrap(),
         bind_version,
     )
     .await?;
@@ -752,6 +756,7 @@ pub mod testing {
                 metrics,
                 stake_table_capacity,
                 None, // The public API URL
+                Url::from_str("http://localhost").unwrap(),
                 bind_version,
             )
             .await

sequencer/src/lib.rs

@@ -738,6 +738,7 @@ impl BlockHeader<SeqTypes> for Header {
         instance_state: &<<SeqTypes as NodeType>::ValidatedState as hotshot_types::traits::ValidatedState<SeqTypes>>::Instance,
         parent_leaf: &hotshot_types::data::Leaf<SeqTypes>,
         payload_commitment: VidCommitment,
+        builder_commitment: BuilderCommitment,
         metadata: <<SeqTypes as NodeType>::BlockPayload as BlockPayload<SeqTypes>>::Metadata,
         builder_fee: Vec<BuilderFee<SeqTypes>>,
         _vid_common: VidCommon,