builder changes/update hotshot (#1369)

* builder changes

* increase timeout in test

* prefix timeout

* wait for builder service

* put Jeb's work

* increase wait

* one more try

* try adding sleep in permissioned_test

.env

@@ -102,6 +102,8 @@ ESPRESSO_BUILDER_PRIVATE_STAKING_KEY=BLS_SIGNING_KEY~tI9He_sCnEbfEajycUXz9Scfy6o
 ESPRESSO_BUILDER_PRIVATE_STATE_KEY=SCHNORR_SIGNING_KEY~IftHINvgzqcd9agX13HHY3Uhz8vsH46i8soKgV7ZUQV-
 ESPRESSO_BUILDER_CHANNEL_CAPACITY=1024
 ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW=0
+ESPRESSO_BUILDER_WEBSERVER_RESPONSE_TIMEOUT_DURATION=1s
+ESPRESSO_BUILDER_BUFFER_VIEW_NUM_COUNT=15
 
 # Load generator
 ESPRESSO_SUBMIT_TRANSACTIONS_DELAY=1s

Cargo.toml

@@ -47,18 +47,18 @@ ethers = { version = "2.0", features = ["solc"] }
 futures = "0.3"
 
 # Hotshot imports
-hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.40" }
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.40" }
-hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "0.1.7" }
-hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.40" }
-hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.9" }
-hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.40" }
+hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.41" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.41" }
+hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", tag = "0.1.9" }
+hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.41" }
+hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.10" }
+hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.41" }
 hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" }
-hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.40" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.40" }
-hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.40" }
-hotshot-web-server = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.40" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.9" }
+hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.41" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.41" }
+hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.41" }
+hotshot-web-server = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.41" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.10" }
 
 # Push CDN imports
 cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [

builder/src/bin/permissioned-builder.rs

@@ -133,24 +133,43 @@ pub struct PermissionedBuilderOptions {
     pub state_peers: Vec<Url>,
 
     /// Port to run the builder server on.
-    #[clap(short, long, env = "BUILDER_SERVER_PORT")]
+    #[clap(short, long, env = "ESPRESSO_BUILDER_SERVER_PORT")]
     pub port: u16,
 
     /// Port to run the builder server on.
-    #[clap(short, long, env = "BUILDER_ADDRESS")]
+    #[clap(short, long, env = "ESPRESSO_BUILDER_ADDRESS")]
     pub address: Address,
 
     /// Bootstrapping View number
-    #[clap(short, long, env = "BUILDER_BOOTSTRAPPED_VIEW")]
+    #[clap(short, long, env = "ESPRESSO_BUILDER_BOOTSTRAPPED_VIEW")]
     pub view_number: u64,
 
     /// BUILDER CHANNEL CAPACITY
-    #[clap(long, env = "BUILDER_CHANNEL_CAPACITY")]
+    #[clap(long, env = "ESPRESSO_BUILDER_CHANNEL_CAPACITY")]
     pub channel_capacity: NonZeroUsize,
 
-    /// Url a builder can use to stream hotshot events
+    /// Url a sequencer can use to stream hotshot events
     #[clap(long, env = "ESPRESSO_SEQUENCER_HOTSHOT_EVENTS_PROVIDER")]
     pub hotshot_events_streaming_server_url: Url,
+
+    /// The amount of time a builder can wait before timing out a request to the API.
+    #[clap(
+        short,
+        long,
+        env = "ESPRESSO_BUILDER_WEBSERVER_RESPONSE_TIMEOUT_DURATION",
+        default_value = "1s",
+        value_parser = parse_duration
+    )]
+    pub max_api_timeout_duration: Duration,
+
+    /// The number of views to buffer before a builder garbage collects its state
+    #[clap(
+        short,
+        long,
+        env = "ESPRESSO_BUILDER_BUFFER_VIEW_NUM_COUNT",
+        default_value = "15"
+    )]
+    pub buffer_view_num_count: usize,
 }
 
 #[derive(Clone, Debug, Snafu)]
@@ -242,6 +261,10 @@ async fn main() -> anyhow::Result<()> {
 
     let bootstrapped_view = ViewNumber::new(opt.view_number);
 
+    let max_response_timeout = opt.max_api_timeout_duration;
+
+    let buffer_view_num_count = opt.buffer_view_num_count;
+
     // it will internally spawn the builder web server
     let ctx = init_node(
         network_params,
@@ -254,6 +277,8 @@ async fn main() -> anyhow::Result<()> {
         opt.channel_capacity,
         sequencer_version,
         NoStorage,
+        max_response_timeout,
+        buffer_view_num_count,
     )
     .await?;