merge abdul/move-chain-config, hotshot ss/fee-upgrade others abdul/up…

…date-hotshot
EspressoSystems · May 30, 2024 · 48ce9bd · 48ce9bd
1 parent 0b6bd2b
commit 48ce9bd
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,19 +47,19 @@ dotenvy = "0.15"
 ethers = { version = "2.0", features = ["solc"] }
 futures = "0.3"
 
-hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
+hotshot = { git = "https://github.com/EspressoSystems/hotshot", branch = "ss/fee-upgrade" }
 # Hotshot imports
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "main" }
-hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "daily-build" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "ss/fee-upgrade" }
+hotshot-builder-core = { git = "https://github.com/EspressoSystems/hotshot-builder-core", branch = "abdul/update-hotshot" }
 hotshot-contract-adapter = { version = "0.1.0", path = "contracts/rust/adapter" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "daily-build" }
-hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
-hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "daily-build" }
-hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "abdul/update-hotshot" }
+hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", branch = "ss/fee-upgrade" }
+hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", branch = "abdul/update-hotshot" }
+hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", branch = "ss/fee-upgrade" }
 hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" }
-hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
-hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "main" }
+hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", branch = "ss/fee-upgrade" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", branch = "ss/fee-upgrade" }
+hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", branch = "ss/fee-upgrade" }
 
 # Push CDN imports
 cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", features = [

diff --git a/builder/src/lib.rs b/builder/src/lib.rs
@@ -226,6 +226,10 @@ pub mod testing {
                     known_nodes_with_stake.clone().len() as u64,
                     known_nodes_with_stake.clone().len() as u64,
                 ),
+                start_proposing_view: 0,
+                stop_proposing_view: 0,
+                start_voting_view: 0,
+                stop_voting_view: 0,
             };
 
             Self {

diff --git a/sequencer/src/api/data_source.rs b/sequencer/src/api/data_source.rs
@@ -216,6 +216,10 @@ pub struct PublicHotShotConfig {
     pub builder_timeout: Duration,
     pub data_request_delay: Duration,
     pub builder_url: Url,
+    pub start_proposing_view: u64,
+    pub stop_proposing_view: u64,
+    pub start_voting_view: u64,
+    pub stop_voting_view: u64,
 }
 
 impl From<HotShotConfig<PubKey>> for PublicHotShotConfig {
@@ -244,6 +248,10 @@ impl From<HotShotConfig<PubKey>> for PublicHotShotConfig {
             builder_timeout,
             data_request_delay,
             builder_url,
+            start_proposing_view,
+            stop_proposing_view,
+            start_voting_view,
+            stop_voting_view,
         } = v;
 
         Self {
@@ -267,6 +275,10 @@ impl From<HotShotConfig<PubKey>> for PublicHotShotConfig {
             builder_timeout,
             data_request_delay,
             builder_url,
+            start_proposing_view,
+            stop_proposing_view,
+            start_voting_view,
+            stop_voting_view,
         }
     }
 }

diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs
@@ -599,6 +599,10 @@ pub mod testing {
                     known_nodes_with_stake.clone().len() as u64,
                     known_nodes_with_stake.clone().len() as u64,
                 ),
+                start_proposing_view: 0,
+                stop_proposing_view: 0,
+                start_voting_view: 0,
+                stop_voting_view: 0,
             };
 
             Self {