Skip to content

Commit a712190

Browse files
authored
Update loggings to make sure builders are run correctly (#1867)
Closes EspressoSystems/marketplace-builder-core#42. ### This PR: * Updates loggings to make sure we are running fallback and/or reserve builders correctly. ### This PR does not: * Change any logic. ### How to test this PR: * Run the two builders on demo-native and observe the different loggings. <!-- ### 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 -->
2 parents 036d0a9 + 7ba5f0e commit a712190

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

data/genesis/demo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fee_contract = '0xa15bb66138824a1c7167f5e85b957d04dd34e468'
1212
timestamp = "1970-01-01T00:00:00Z"
1313

1414
[[upgrade]]
15-
version = "0.2"
15+
version = "0.3"
1616
start_proposing_view = 5
1717
stop_proposing_view = 15
1818

marketplace-builder/src/builder.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,26 +206,29 @@ impl BuilderConfig {
206206
let res =
207207
run_non_permissioned_standalone_builder_service(hooks, senders, events_url)
208208
.await;
209-
tracing::error!(?res, "builder service exited");
209+
tracing::error!(?res, "Reserve builder service exited");
210210
if res.is_err() {
211-
panic!("Builder should restart.");
211+
panic!("Reserve builder should restart.");
212212
}
213213
});
214+
215+
tracing::info!("Reserve builder init finished");
214216
} else {
215217
let hooks = hooks::EspressoFallbackHooks { solver_api_url };
216218

217219
async_spawn(async move {
218220
let res =
219221
run_non_permissioned_standalone_builder_service(hooks, senders, events_url)
220222
.await;
221-
tracing::error!(?res, "builder service exited");
223+
tracing::error!(?res, "Fallback builder service exited");
222224
if res.is_err() {
223-
panic!("Builder should restart.");
225+
panic!("Fallback builder should restart.");
224226
}
225227
});
228+
229+
tracing::info!("Fallback builder init finished");
226230
}
227231

228-
tracing::info!("Builder init finished");
229232
Ok(Self {
230233
global_state,
231234
hotshot_events_api_url,

process-compose.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,7 @@ processes:
367367
path: /healthcheck
368368
failure_threshold: 100
369369

370-
371-
# We use KeyDB (a Redis variant) to maintain consistency between
370+
# We use KeyDB (a Redis variant) to maintain consistency between
372371
# different parts of the CDN
373372
# Cheating a bit here too, but KeyDB is not available as a Nix package.
374373
# Could do local (SQLite) discovery, but removes some of the spirit
@@ -491,7 +490,7 @@ processes:
491490
failure_threshold: 100
492491

493492
marketplace-reserve-builder:
494-
disabled: true
493+
# disabled: true
495494
command: marketplace-builder
496495
ports:
497496
- "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT"
@@ -516,7 +515,7 @@ processes:
516515
failure_threshold: 100
517516

518517
marketplace-fallback-builder:
519-
disabled: true
518+
# disabled: true
520519
command: marketplace-builder
521520
ports:
522521
- "$ESPRESSO_FALLBACK_BUILDER_SERVER_PORT:$ESPRESSO_FALLBACK_BUILDER_SERVER_PORT"
@@ -542,6 +541,7 @@ processes:
542541
failure_threshold: 100
543542

544543
permissionless-builder:
544+
disabled: true
545545
command: permissionless-builder
546546
ports:
547547
- "$ESPRESSO_BUILDER_SERVER_PORT:$ESPRESSO_BUILDER_SERVER_PORT"

types/src/v0/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl NodeType for SeqTypes {
131131
type Membership = GeneralStaticCommittee<Self, PubKey>;
132132
type BuilderSignatureKey = FeeAccount;
133133
type Base = StaticVersion<0, 1>;
134-
type Upgrade = StaticVersion<0, 2>;
134+
type Upgrade = StaticVersion<0, 3>;
135135
type AuctionResult = SolverAuctionResults;
136136
const UPGRADE_HASH: [u8; 32] = [
137137
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,

0 commit comments

Comments
 (0)