Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: reorder block production log statements #6601

Merged
merged 4 commits into from
Mar 27, 2024
Merged

chore: reorder block production log statements #6601

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce39f03
chore: reorder log statements
jeluard Mar 27, 2024
cca6e84
chore: address comments
jeluard Mar 27, 2024
2b9739b
chore: address comments
jeluard Mar 27, 2024
59bbc3f
chore: address comments
jeluard Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions packages/beacon-node/src/api/impl/validator/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,11 +588,9 @@ export function getValidatorApi({
});

if (builder.status === "pending" && engine.status === "pending") {
throw Error("Builder and engine both failed to produce the block within timeout");
}

if (builder.status === "rejected" && engine.status === "rejected") {
throw Error("Builder and engine both failed to produce the block");
const failureSource =
isEngineEnabled && isBuilderEnabled ? "Builder and engine both" : isEngineEnabled ? "Engine" : "Builder";
throw Error(`${failureSource} both failed to produce the block within timeout`);
jeluard marked this conversation as resolved.
Show resolved Hide resolved
}

if (engine.status === "rejected" && isEngineEnabled) {
Expand All @@ -617,6 +615,12 @@ export function getValidatorApi({
);
}

if (builder.status === "rejected" && engine.status === "rejected") {
const failureSource =
isEngineEnabled && isBuilderEnabled ? "Builder and engine both" : isEngineEnabled ? "Engine" : "Builder";
jeluard marked this conversation as resolved.
Show resolved Hide resolved
throw Error(`${failureSource} failed to produce the block`);
jeluard marked this conversation as resolved.
Show resolved Hide resolved
}

// handle shouldOverrideBuilder separately
if (engine.status === "fulfilled" && engine.value.shouldOverrideBuilder) {
logger.info("Selected engine block: censorship suspected in builder blocks", {
Expand Down
Loading