From e6ca92a4b96fa25af699a65bdbfc1f359baff2f3 Mon Sep 17 00:00:00 2001 From: Andrei Smirnov Date: Thu, 29 Jan 2026 16:42:38 +0300 Subject: [PATCH 1/2] cmd: testnet flags precedence --- cmd/createcluster.go | 7 ++++--- cmd/createdkg.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/createcluster.go b/cmd/createcluster.go index 86adabd01..61c7d17d1 100644 --- a/cmd/createcluster.go +++ b/cmd/createcluster.go @@ -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") } diff --git a/cmd/createdkg.go b/cmd/createdkg.go index e03e1b255..a5f73067c 100644 --- a/cmd/createdkg.go +++ b/cmd/createdkg.go @@ -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") } From 9040f7803c073a629c627d321abb5f36cb151485 Mon Sep 17 00:00:00 2001 From: Andrei Smirnov Date: Thu, 29 Jan 2026 18:17:47 +0300 Subject: [PATCH 2/2] cmd: testnet flags precedence --- cmd/createcluster.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/createcluster.go b/cmd/createcluster.go index 61c7d17d1..8a0403482 100644 --- a/cmd/createcluster.go +++ b/cmd/createcluster.go @@ -1225,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 @@ -1233,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") }