Skip to content

cmd: testnet flags precedence #4266

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

Open
pinebit wants to merge 2 commits into
base: main
Choose a base branch
from
Open

cmd: testnet flags precedence #4266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ca92a
cmd: testnet flags precedence
pinebit Jan 29, 2026
9040f78
cmd: testnet flags precedence
pinebit Jan 29, 2026
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
23 changes: 12 additions & 11 deletions cmd/createcluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,13 +905,14 @@ func newDefFromConfig(ctx context.Context, conf clusterConfig) (cluster.Definiti
}

var forkVersion string
if conf.Network != "" {
if conf.testnetConfig.IsNonZero() {
// Custom testnet config takes precedence (already registered in validateCreateConfig via validateNetworkConfig).
forkVersion = conf.testnetConfig.GenesisForkVersionHex
} else if conf.Network != "" {
forkVersion, err = eth2util.NetworkToForkVersion(conf.Network)
if err != nil {
return cluster.Definition{}, err
}
} else if conf.testnetConfig.GenesisForkVersionHex != "" {
forkVersion = conf.testnetConfig.GenesisForkVersionHex
} else {
return cluster.Definition{}, errors.New("network not specified, missing --network or --testnet-fork-version")
}
Expand Down Expand Up @@ -1224,6 +1225,14 @@ func builderRegistrationFromETH2(reg core.VersionedSignedValidatorRegistration)

// validateNetworkConfig returns an error if the network configuration is invalid in the given cluster configuration.
func validateNetworkConfig(network string, testnet eth2util.Network) error {
// Check if custom testnet configuration is provided first (takes precedence over default network).
if testnet.IsNonZero() {
// Add testnet config to supported networks.
eth2util.AddTestNetwork(testnet)

return nil
}

if network != "" {
if eth2util.ValidNetwork(network) {
return nil
Expand All @@ -1232,13 +1241,5 @@ func validateNetworkConfig(network string, testnet eth2util.Network) error {
return errors.New("invalid network specified", z.Str("network", network))
}

// Check if custom testnet configuration is provided.
if testnet.IsNonZero() {
// Add testnet config to supported networks.
eth2util.AddTestNetwork(testnet)

return nil
}

return errors.New("missing --network flag or testnet config flags")
}
7 changes: 4 additions & 3 deletions cmd/createdkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,14 @@ func runCreateDKG(ctx context.Context, conf createDKGConfig) (err error) {
}

var forkVersion string
if conf.Network != "" {
if conf.testnetConfig.IsNonZero() {
// Custom testnet config takes precedence (already registered in validateDKGConfig via validateNetworkConfig).
forkVersion = conf.testnetConfig.GenesisForkVersionHex
} else if conf.Network != "" {
forkVersion, err = eth2util.NetworkToForkVersion(conf.Network)
if err != nil {
return err
}
} else if conf.testnetConfig.GenesisForkVersionHex != "" {
forkVersion = conf.testnetConfig.GenesisForkVersionHex
} else {
return errors.New("network not specified, missing --network or --testnet-fork-version")
}
Expand Down
Loading