From 51957db96c31c0f561549b03d2f56674d62ae42c Mon Sep 17 00:00:00 2001 From: Artemii Gerasimovich Date: Fri, 9 Aug 2024 22:04:22 +0200 Subject: [PATCH 1/2] Switch versions --- data/genesis/demo.toml | 2 +- process-compose.yaml | 8 ++++---- types/src/v0/mod.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/genesis/demo.toml b/data/genesis/demo.toml index 3493200e6..cae8a1b3d 100644 --- a/data/genesis/demo.toml +++ b/data/genesis/demo.toml @@ -12,7 +12,7 @@ fee_contract = '0xa15bb66138824a1c7167f5e85b957d04dd34e468' timestamp = "1970-01-01T00:00:00Z" [[upgrade]] -version = "0.2" +version = "0.3" start_proposing_view = 5 stop_proposing_view = 15 diff --git a/process-compose.yaml b/process-compose.yaml index afac841f2..f458e7d61 100644 --- a/process-compose.yaml +++ b/process-compose.yaml @@ -367,8 +367,7 @@ 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 @@ -491,7 +490,7 @@ processes: failure_threshold: 100 marketplace-reserve-builder: - disabled: true + # disabled: true command: marketplace-builder ports: - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" @@ -516,7 +515,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" @@ -542,6 +541,7 @@ processes: failure_threshold: 100 permissionless-builder: + disabled: true command: permissionless-builder ports: - "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT" diff --git a/types/src/v0/mod.rs b/types/src/v0/mod.rs index f9218e5e7..bdf7dff94 100644 --- a/types/src/v0/mod.rs +++ b/types/src/v0/mod.rs @@ -131,7 +131,7 @@ impl NodeType for SeqTypes { type Membership = GeneralStaticCommittee; type BuilderSignatureKey = FeeAccount; type Base = StaticVersion<0, 1>; - type Upgrade = StaticVersion<0, 2>; + type Upgrade = StaticVersion<0, 3>; 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, From 7ba5f0e35905a5f6a5060d502fff5f87655ab83b Mon Sep 17 00:00:00 2001 From: Keyao Shen Date: Wed, 14 Aug 2024 12:59:56 -0700 Subject: [PATCH 2/2] Update loggings --- marketplace-builder/src/builder.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/marketplace-builder/src/builder.rs b/marketplace-builder/src/builder.rs index 539fe962b..1464a9286 100644 --- a/marketplace-builder/src/builder.rs +++ b/marketplace-builder/src/builder.rs @@ -206,11 +206,13 @@ impl BuilderConfig { let res = run_non_permissioned_standalone_builder_service(hooks, senders, events_url) .await; - tracing::error!(?res, "builder service exited"); + tracing::error!(?res, "Reserve builder service exited"); if res.is_err() { - panic!("Builder should restart."); + panic!("Reserve builder should restart."); } }); + + tracing::info!("Reserve builder init finished"); } else { let hooks = hooks::EspressoFallbackHooks { solver_api_url }; @@ -218,14 +220,15 @@ impl BuilderConfig { let res = run_non_permissioned_standalone_builder_service(hooks, senders, events_url) .await; - tracing::error!(?res, "builder service exited"); + tracing::error!(?res, "Fallback builder service exited"); if res.is_err() { - panic!("Builder should restart."); + panic!("Fallback builder should restart."); } }); + + tracing::info!("Fallback builder init finished"); } - tracing::info!("Builder init finished"); Ok(Self { global_state, hotshot_events_api_url,