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

…" (#1869)

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

Closes #<ISSUE_NUMBER>
<!-- These comments should help create a useful PR message, please
delete any remaining comments before opening the PR. -->
<!-- If there is no issue number make sure to describe clearly *why*
this PR is necessary. -->
<!-- Mention open questions, remaining TODOs, if any -->

### This PR:
<!-- Describe what this PR adds to this repo and why -->
<!-- E.g. -->
<!-- * Implements feature 1 -->
<!-- * Fixes bug 3 -->

### This PR does not:
<!-- Describe what is out of scope for this PR, if applicable. Leave
this section blank if it's not applicable -->
<!-- This section helps avoid the reviewer having to needlessly point
out missing parts -->
<!-- * Implement feature 3 because that feature is blocked by Issue 4
-->
<!-- * Implement xyz because that is tracked in issue #123. -->
<!-- * Address xzy for which I opened issue #456 -->

### Key places to review:
<!-- Describe key places for reviewers to pay close attention to -->
<!-- * file.rs, `add_integers` function -->
<!-- Or directly comment on those files/lines to make it easier for the
reviewers -->

<!-- ### How to test this PR:  -->
<!-- Optional, uncomment the above line if this is relevant to your PR
-->
<!-- If your PR is fully tested through CI there is no need to add this
section -->
<!-- * E.g. `just test` -->

<!-- ### Things tested -->
<!-- Anything that was manually tested (that is not tested in CI). -->
<!-- E.g. building/running of docker containers. Changes to docker demo,
... -->
<!-- Especially mention anything untested, with reasoning and link an
issue to resolve this. -->

<!-- Complete the following items before creating this PR -->
<!-- [ ] Issue linked or PR description mentions why this change is
necessary. -->
<!-- [ ] PR description is clear enough for reviewers. -->
<!-- [ ] Documentation for changes (additions) has been updated (added).
-->
<!-- [ ] If this is a draft it is marked as "draft".  -->

<!-- To make changes to this template edit
https://github.com/EspressoSystems/.github/blob/main/PULL_REQUEST_TEMPLATE.md
-->

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,