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.

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

refactor: repurpose --builder flag to alias maxprofit builder.selection and turn builder off by default #6081

Merged
merged 3 commits into from
Nov 3, 2023
Merged
Changes from 1 commit
Commits
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
Next Next commit
refac: repurpose --builder flag to alias maxprofit builder.selection …
…and turn builder off by default
g11tech committed Nov 3, 2023
commit abc1625fc6a42721b50e57d50681a69717281bdc
12 changes: 10 additions & 2 deletions packages/cli/src/cmds/validator/handler.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import path from "node:path";
import {setMaxListeners} from "node:events";
import {LevelDbController} from "@lodestar/db";
import {ProcessShutdownCallback, SlashingProtection, Validator, ValidatorProposerConfig} from "@lodestar/validator";
import {
ProcessShutdownCallback,
SlashingProtection,
Validator,
ValidatorProposerConfig,
defaultOptions,
} from "@lodestar/validator";
import {routes} from "@lodestar/api";
import {getMetrics, MetricsRegister} from "@lodestar/validator";
import {
@@ -216,7 +222,9 @@ function getProposerConfigFromArgs(
feeRecipient: args.suggestedFeeRecipient ? parseFeeRecipient(args.suggestedFeeRecipient) : undefined,
builder: {
gasLimit: args.defaultGasLimit,
selection: parseBuilderSelection(args["builder.selection"]),
selection: parseBuilderSelection(
args["builder.selection"] ?? (args["builder"] ? defaultOptions.builderAliasSelection : undefined)
),
},
};

5 changes: 2 additions & 3 deletions packages/cli/src/cmds/validator/options.ts
Original file line number Diff line number Diff line change
@@ -233,14 +233,13 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {

builder: {
type: "boolean",
description: "Enable execution payload production via a builder for better rewards",
description: `An alias for \`--builder.selection ${defaultOptions.builderAliasSelection}\` for the builder flow, ignored if \`--builder.selection\` explicitly provided`,
group: "builder",
deprecated: "enabling or disabling builder flow is now solely managed by `builder.selection` flag",
},

"builder.selection": {
type: "string",
description: "Default builder block selection strategy: `maxprofit`, `builderalways`, or `builderonly`",
description: "Builder block selection strategy `maxprofit`, `builderalways`, `builderonly` or `executiononly`",
defaultDescription: `\`${defaultOptions.builderSelection}\``,
group: "builder",
},
3 changes: 2 additions & 1 deletion packages/validator/src/services/validatorStore.ts
Original file line number Diff line number Diff line change
@@ -122,7 +122,8 @@ type ValidatorData = ProposerConfig & {
export const defaultOptions = {
suggestedFeeRecipient: "0x0000000000000000000000000000000000000000",
defaultGasLimit: 30_000_000,
builderSelection: routes.validator.BuilderSelection.MaxProfit,
builderSelection: routes.validator.BuilderSelection.ExecutionOnly,
builderAliasSelection: routes.validator.BuilderSelection.MaxProfit,
// turn it off by default, turn it back on once other clients support v3 api
useProduceBlockV3: false,
};