Revert "Update loggings to make sure builders are run correctly (#1867)"

This reverts commit a712190, reversing
changes made to 036d0a9.

Author: shenkeyao

data/genesis/demo.toml

@@ -12,7 +12,7 @@ fee_contract = '0xa15bb66138824a1c7167f5e85b957d04dd34e468'
 timestamp = "1970-01-01T00:00:00Z"
 
 [[upgrade]]
-version = "0.3"
+version = "0.2"
 start_proposing_view = 5
 stop_proposing_view = 15
 

marketplace-builder/src/builder.rs

@@ -206,29 +206,26 @@ impl BuilderConfig {
                 let res =
                     run_non_permissioned_standalone_builder_service(hooks, senders, events_url)
                         .await;
-                tracing::error!(?res, "Reserve builder service exited");
+                tracing::error!(?res, "builder service exited");
                 if res.is_err() {
-                    panic!("Reserve builder should restart.");
+                    panic!("Builder should restart.");
                 }
             });
-
-            tracing::info!("Reserve builder init finished");
         } else {
             let hooks = hooks::EspressoFallbackHooks { solver_api_url };
 
             async_spawn(async move {
                 let res =
                     run_non_permissioned_standalone_builder_service(hooks, senders, events_url)
                         .await;
-                tracing::error!(?res, "Fallback builder service exited");
+                tracing::error!(?res, "builder service exited");
                 if res.is_err() {
-                    panic!("Fallback builder should restart.");
+                    panic!("Builder should restart.");
                 }
             });
-
-            tracing::info!("Fallback builder init finished");
         }
 
+        tracing::info!("Builder init finished");
         Ok(Self {
             global_state,
             hotshot_events_api_url,

process-compose.yaml

@@ -367,7 +367,8 @@ processes:
         path: /healthcheck
       failure_threshold: 100
 
-  # We use KeyDB (a Redis variant) to maintain consistency between
+
+  # We use KeyDB (a Redis variant) to maintain consistency between 
   # different parts of the CDN
   # Cheating a bit here too, but KeyDB is not available as a Nix package.
   # Could do local (SQLite) discovery, but removes some of the spirit
@@ -490,7 +491,7 @@ processes:
       failure_threshold: 100
 
   marketplace-reserve-builder:
-    # disabled: true
+    disabled: true
     command: marketplace-builder
     ports:
       - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT"
@@ -515,7 +516,7 @@ processes:
       failure_threshold: 100
 
   marketplace-fallback-builder:
-    # disabled: true
+    disabled: true
     command: marketplace-builder
     ports:
       - "$ESPRESSO_FALLBACK_BUILDER_SERVER_PORT:$ESPRESSO_FALLBACK_BUILDER_SERVER_PORT"
@@ -541,7 +542,6 @@ processes:
       failure_threshold: 100
 
   permissionless-builder:
-    disabled: true
     command: permissionless-builder
     ports:
       - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT"

types/src/v0/mod.rs

@@ -131,7 +131,7 @@ impl NodeType for SeqTypes {
     type Membership = GeneralStaticCommittee<Self, PubKey>;
     type BuilderSignatureKey = FeeAccount;
     type Base = StaticVersion<0, 1>;
-    type Upgrade = StaticVersion<0, 3>;
+    type Upgrade = StaticVersion<0, 2>;
     type AuctionResult = SolverAuctionResults;
     const UPGRADE_HASH: [u8; 32] = [
         1, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,