Merge remote-tracking branch 'origin/main' into 2023-update-the-deplo…

…yrs-script
EspressoSystems · Sep 19, 2024 · ce7a756 · ce7a756
2 parents 2caea19 + 95b3e0b
commit ce7a756
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -58,7 +58,7 @@ hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.74",
 # Hotshot imports
 hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.74" }
 hotshot-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.47" }
-marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.47" }
+marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.48" }
 hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.46" }
 hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.74" }
 hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.57" }

diff --git a/data/genesis/staging.toml b/data/genesis/staging.toml
@@ -1,14 +1,15 @@
-base_version = "0.1"
-upgrade_version = "0.2"
+base_version = "0.2"
+upgrade_version = "0.3"
 
 [stake_table]
 capacity = 200
 
 [chain_config]
 chain_id = 888888888
-base_fee = '0 wei'
-max_block_size = '30mb'
+base_fee = '1 wei'
+max_block_size = '1mb'
 fee_recipient = '0x0000000000000000000000000000000000000000'
+fee_contract = '0xa15bb66138824a1c7167f5e85b957d04dd34e468'
 
 [header]
 timestamp = "1970-01-01T00:00:00Z"
diff --git a/marketplace-builder/src/builder.rs b/marketplace-builder/src/builder.rs
@@ -581,7 +581,7 @@ mod test {
                 let bundle = builder_client
                     .get::<Bundle<SeqTypes>>(
                         format!(
-                            "block_info/bundle/{parent_view_number}/{parent_commitment}/{}",
+                            "bundle_info/bundle/{parent_view_number}/{parent_commitment}/{}",
                             parent_view_number + 1
                         )
                         .as_str(),
@@ -671,7 +671,7 @@ mod test {
                 let bundle = builder_client
                     .get::<Bundle<SeqTypes>>(
                         format!(
-                            "block_info/bundle/{parent_view_number}/{parent_commitment}/{}",
+                            "bundle_info/bundle/{parent_view_number}/{parent_commitment}/{}",
                             parent_view_number + 1
                         )
                         .as_str(),

diff --git a/sequencer/src/api.rs b/sequencer/src/api.rs
@@ -529,32 +529,30 @@ pub mod test_helpers {
         ) -> Self {
             let mut cfg = cfg;
             let mut builder_tasks = Vec::new();
-            let mut legacy_builder_url = "http://example.com".parse().unwrap();
             let mut marketplace_builder_url = "http://example.com".parse().unwrap();
 
             if <V as Versions>::Base::VERSION < MarketplaceVersion::VERSION {
                 let (task, url) =
                     run_test_builder::<{ NUM_NODES }>(cfg.network_config.builder_port()).await;
                 builder_tasks.push(task);
-                legacy_builder_url = url;
+                cfg.network_config.set_builder_urls(vec1::vec1![url]);
             };
 
             if <V as Versions>::Upgrade::VERSION >= MarketplaceVersion::VERSION
                 || <V as Versions>::Base::VERSION >= MarketplaceVersion::VERSION
             {
                 let (task, url) = run_marketplace_builder::<{ NUM_NODES }>(
                     cfg.network_config.marketplace_builder_port(),
-                    NodeState::default(),
+                    NodeState::default().with_current_version(V::Base::VERSION),
                     cfg.state[0].clone(),
                 )
                 .await;
                 builder_tasks.push(task);
+                cfg.network_config
+                    .set_builder_urls(vec1::vec1![url.clone()]);
                 marketplace_builder_url = url;
             }
 
-            cfg.network_config
-                .set_builder_urls(vec1::vec1![legacy_builder_url]);
-
             let mut nodes = join_all(
                 izip!(cfg.state, cfg.persistence, cfg.catchup)
                     .enumerate()

diff --git a/sequencer/src/bin/espresso-dev-node.rs b/sequencer/src/bin/espresso-dev-node.rs
@@ -4,13 +4,12 @@ use async_std::task::spawn;
 use async_trait::async_trait;
 use clap::Parser;
 use contract_bindings::light_client_mock::LightClientMock;
-use espresso_types::{parse_duration, MockSequencerVersions};
-use ethers::types::H160;
+use espresso_types::{parse_duration, MarketplaceVersion, SequencerVersions, V0_1};
 use ethers::{
     middleware::{MiddlewareBuilder, SignerMiddleware},
     providers::{Http, Middleware, Provider},
     signers::{coins_bip39::English, MnemonicBuilder, Signer},
-    types::{Address, U256},
+    types::{Address, H160, U256},
 };
 use futures::{future::BoxFuture, stream::FuturesUnordered, FutureExt, StreamExt};
 use hotshot_state_prover::service::{
@@ -195,7 +194,7 @@ async fn main() -> anyhow::Result<()> {
         .unwrap();
 
     let network_config = TestConfigBuilder::default()
-        .builder_port(builder_port)
+        .marketplace_builder_port(builder_port)
         .state_relay_url(relay_server_url.clone())
         .l1_url(l1_url.clone())
         .build();
@@ -206,7 +205,8 @@ async fn main() -> anyhow::Result<()> {
         .network_config(network_config)
         .build();
 
-    let network = TestNetwork::new(config, MockSequencerVersions::new()).await;
+    let network =
+        TestNetwork::new(config, SequencerVersions::<MarketplaceVersion, V0_1>::new()).await;
     let st = network.cfg.stake_table();
     let total_stake = st.total_stake(SnapshotVersion::LastEpochStart).unwrap();
     let config = network.cfg.hotshot_config();
@@ -351,6 +351,7 @@ async fn main() -> anyhow::Result<()> {
 
     let dev_info = DevInfo {
         builder_url: network.cfg.hotshot_config().builder_urls[0].clone(),
+        sequencer_api_port,
         l1_prover_port,
         l1_url,
         l1_light_client_address: l1_lc,
@@ -501,6 +502,7 @@ async fn run_dev_node_server<ApiVer: StaticVersionType + 'static, S: Signer + Cl
 #[derive(Debug, Clone, Serialize, Deserialize)]
 struct DevInfo {
     pub builder_url: Url,
+    pub sequencer_api_port: u16,
     pub l1_prover_port: u16,
     pub l1_url: Url,
     pub l1_light_client_address: Address,
@@ -632,18 +634,10 @@ mod tests {
             Client::new(format!("http://localhost:{builder_port}").parse().unwrap());
         builder_api_client.connect(None).await;
 
-        let builder_address = builder_api_client
-            .get::<String>("block_info/builderaddress")
-            .send()
-            .await
-            .unwrap();
-
-        assert!(!builder_address.is_empty());
-
         let tx = Transaction::new(100_u32.into(), vec![1, 2, 3]);
 
-        let hash: Commitment<Transaction> = api_client
-            .post("submit/submit")
+        let hash: Commitment<Transaction> = builder_api_client
+            .post("txn_submit/submit")
             .body_json(&tx)
             .unwrap()
             .send()
@@ -661,6 +655,7 @@ mod tests {
             .await;
         while tx_result.is_err() {
             sleep(Duration::from_secs(1)).await;
+            tracing::warn!("waiting for tx");
 
             tx_result = api_client
                 .get::<TransactionQueryData<SeqTypes>>(&format!(

diff --git a/sequencer/src/lib.rs b/sequencer/src/lib.rs
@@ -503,7 +503,7 @@ pub mod testing {
         instance_state: NodeState,
         validated_state: ValidatedState,
     ) -> (Box<dyn BuilderTask<SeqTypes>>, Url) {
-        let builder_key_pair = EthKeyPair::random();
+        let builder_key_pair = TestConfig::<0>::builder_key();
         let port = port.unwrap_or_else(|| pick_unused_port().expect("No ports available"));
 
         // This should never fail.
@@ -575,7 +575,14 @@ pub mod testing {
         .into_app()
         .expect("Failed to create builder tide-disco app");
 
-        async_spawn(app.serve(url.clone(), MarketplaceVersion::instance()));
+        async_spawn(
+            app.serve(
+                format!("http://0.0.0.0:{port}")
+                    .parse::<Url>()
+                    .expect("Failed to parse builder listener"),
+                MarketplaceVersion::instance(),
+            ),
+        );
 
         (
             Box::new(MarketplaceBuilderImplementation { hooks, senders }),