diff --git a/cmd/validator/accounts/accounts.go b/cmd/validator/accounts/accounts.go index 380ab572a4..c80efb84fd 100644 --- a/cmd/validator/accounts/accounts.go +++ b/cmd/validator/accounts/accounts.go @@ -29,7 +29,6 @@ var Commands = &cli.Command{ flags.DeletePublicKeysFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), @@ -64,7 +63,6 @@ var Commands = &cli.Command{ flags.GrpcRetryDelayFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), @@ -96,7 +94,6 @@ var Commands = &cli.Command{ flags.BackupPasswordFile, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), @@ -125,7 +122,6 @@ var Commands = &cli.Command{ flags.ImportPrivateKeyFileFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), @@ -160,7 +156,6 @@ var Commands = &cli.Command{ flags.ExitAllFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), diff --git a/cmd/validator/slashing-protection/slashing-protection.go b/cmd/validator/slashing-protection/slashing-protection.go index 2dd7924885..3e5bc66470 100644 --- a/cmd/validator/slashing-protection/slashing-protection.go +++ b/cmd/validator/slashing-protection/slashing-protection.go @@ -45,7 +45,6 @@ var Commands = &cli.Command{ flags.SlashingProtectionJSONFileFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), diff --git a/cmd/validator/wallet/wallet.go b/cmd/validator/wallet/wallet.go index 3880ab4189..2eb33bdc0b 100644 --- a/cmd/validator/wallet/wallet.go +++ b/cmd/validator/wallet/wallet.go @@ -35,7 +35,6 @@ var Commands = &cli.Command{ flags.SkipMnemonic25thWordCheckFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), @@ -66,7 +65,6 @@ var Commands = &cli.Command{ flags.RemoteSignerCACertPathFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), @@ -96,7 +94,6 @@ var Commands = &cli.Command{ flags.SkipMnemonic25thWordCheckFlag, featureconfig.Mainnet, featureconfig.PyrmontTestnet, - featureconfig.ToledoTestnet, featureconfig.PraterTestnet, cmd.AcceptTosFlag, }), diff --git a/shared/featureconfig/config.go b/shared/featureconfig/config.go index 86ec2d0d33..41a8909a22 100644 --- a/shared/featureconfig/config.go +++ b/shared/featureconfig/config.go @@ -36,7 +36,6 @@ const disabledFeatureFlag = "Disabled feature flag" // Flags is a struct to represent which features the client will perform on runtime. type Flags struct { // Testnet Flags. - ToledoTestnet bool // ToledoTestnet defines the flag through which we can enable the node to run on the Toledo testnet. PyrmontTestnet bool // PyrmontTestnet defines the flag through which we can enable the node to run on the Pyrmont testnet. // Feature related flags. @@ -121,12 +120,7 @@ func InitWithReset(c *Flags) func() { // configureTestnet sets the config according to specified testnet flag func configureTestnet(ctx *cli.Context, cfg *Flags) { - if ctx.Bool(ToledoTestnet.Name) { - log.Warn("Running on Toledo Testnet") - params.UseToledoConfig() - params.UseToledoNetworkConfig() - cfg.ToledoTestnet = true - } else if ctx.Bool(PyrmontTestnet.Name) { + if ctx.Bool(PyrmontTestnet.Name) { log.Warn("Running on Pyrmont Testnet") params.UsePyrmontConfig() params.UsePyrmontNetworkConfig() diff --git a/shared/featureconfig/config_test.go b/shared/featureconfig/config_test.go index d18e3bc803..d1b40f4de7 100644 --- a/shared/featureconfig/config_test.go +++ b/shared/featureconfig/config_test.go @@ -27,19 +27,16 @@ func TestInitWithReset(t *testing.T) { Init(&Flags{ PyrmontTestnet: true, }) - assert.Equal(t, false, Get().ToledoTestnet) assert.Equal(t, true, Get().PyrmontTestnet) // Overwrite previously set value (value that didn't come by default). resetCfg := InitWithReset(&Flags{ PyrmontTestnet: false, }) - assert.Equal(t, false, Get().ToledoTestnet) assert.Equal(t, false, Get().PyrmontTestnet) // Reset must get to previously set configuration (not to default config values). resetCfg() - assert.Equal(t, false, Get().ToledoTestnet) assert.Equal(t, true, Get().PyrmontTestnet) } diff --git a/shared/featureconfig/deprecated_flags.go b/shared/featureconfig/deprecated_flags.go index 3b11550be8..e76743408f 100644 --- a/shared/featureconfig/deprecated_flags.go +++ b/shared/featureconfig/deprecated_flags.go @@ -12,56 +12,8 @@ var ( Usage: deprecatedUsage, Hidden: true, } - deprecatedEnableSyncBacktracking = &cli.StringFlag{ - Name: "enable-sync-backtracking", - Usage: deprecatedUsage, - Hidden: true, - } - deprecatedDisableSyncBacktracking = &cli.StringFlag{ - Name: "disable-sync-backtracking", - Usage: deprecatedUsage, - Hidden: true, - } - deprecatedDisablePruningDepositProofs = &cli.BoolFlag{ - Name: "disable-pruning-deposit-proofs", - Usage: deprecatedUsage, - Hidden: true, - } - deprecatedDisableEth1DataMajorityVote = &cli.BoolFlag{ - Name: "disable-eth1-data-majority-vote", - Usage: deprecatedUsage, - Hidden: true, - } - deprecatedDisableBlst = &cli.BoolFlag{ - Name: "disable-blst", - Usage: deprecatedUsage, - Hidden: true, - } - deprecatedProposerAttsSelectionUsingMaxCover = &cli.BoolFlag{ - Name: "proposer-atts-selection-using-max-cover", - Usage: deprecatedUsage, - Hidden: true, - } - deprecatedUpdateHeadTimely = &cli.BoolFlag{ - Name: "update-head-timely", - Usage: deprecatedUsage, - Hidden: true, - } - deprecatedEnableOptimizedBalanceUpdate = &cli.BoolFlag{ - Name: "enable-optimized-balance-update", - Usage: deprecatedUsage, - Hidden: true, - } ) var deprecatedFlags = []cli.Flag{ exampleDeprecatedFeatureFlag, - deprecatedEnableSyncBacktracking, - deprecatedDisableSyncBacktracking, - deprecatedDisablePruningDepositProofs, - deprecatedDisableEth1DataMajorityVote, - deprecatedDisableBlst, - deprecatedProposerAttsSelectionUsingMaxCover, - deprecatedEnableOptimizedBalanceUpdate, - deprecatedUpdateHeadTimely, } diff --git a/shared/featureconfig/flags.go b/shared/featureconfig/flags.go index b158e1856e..49f5bdf75e 100644 --- a/shared/featureconfig/flags.go +++ b/shared/featureconfig/flags.go @@ -7,11 +7,6 @@ import ( ) var ( - // ToledoTestnet flag for the multiclient Ethereum consensus testnet. - ToledoTestnet = &cli.BoolFlag{ - Name: "toledo", - Usage: "This defines the flag through which we can run on the Toledo Multiclient Testnet", - } // PyrmontTestnet flag for the multiclient Ethereum consensus testnet. PyrmontTestnet = &cli.BoolFlag{ Name: "pyrmont", @@ -62,10 +57,6 @@ var ( Name: "attestation-aggregation-force-opt-maxcover", Usage: "When enabled, forces --attestation-aggregation-strategy=opt_max_cover setting.", } - disableAccountsV2 = &cli.BoolFlag{ - Name: "disable-accounts-v2", - Usage: "Disables usage of v2 for Prysm validator accounts", - } enablePeerScorer = &cli.BoolFlag{ Name: "enable-peer-scorer", Usage: "Enable experimental P2P peer scorer", @@ -116,7 +107,7 @@ var ( } enableSlashingProtectionPruning = &cli.BoolFlag{ Name: "enable-slashing-protection-pruning", - Usage: "Enables the pruning of the validator client's slashing protectin database", + Usage: "Enables the pruning of the validator client's slashing protection database", } disableOptimizedBalanceUpdate = &cli.BoolFlag{ Name: "disable-optimized-balance-update", @@ -165,11 +156,9 @@ var ValidatorFlags = append(deprecatedFlags, []cli.Flag{ writeWalletPasswordOnWebOnboarding, enableExternalSlasherProtectionFlag, disableAttestingHistoryDBCache, - ToledoTestnet, PyrmontTestnet, PraterTestnet, Mainnet, - disableAccountsV2, dynamicKeyReloadDebounceInterval, attestTimely, enableSlashingProtectionPruning, @@ -179,7 +168,6 @@ var ValidatorFlags = append(deprecatedFlags, []cli.Flag{ // SlasherFlags contains a list of all the feature flags that apply to the slasher client. var SlasherFlags = append(deprecatedFlags, []cli.Flag{ disableLookbackFlag, - ToledoTestnet, PyrmontTestnet, PraterTestnet, Mainnet, @@ -197,7 +185,6 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{ kafkaBootstrapServersFlag, disableGRPCConnectionLogging, attestationAggregationStrategy, - ToledoTestnet, PyrmontTestnet, PraterTestnet, Mainnet, diff --git a/shared/params/BUILD.bazel b/shared/params/BUILD.bazel index 9f501733fe..ea126ee5fa 100644 --- a/shared/params/BUILD.bazel +++ b/shared/params/BUILD.bazel @@ -14,7 +14,6 @@ go_library( "testnet_e2e_config.go", "testnet_prater_config.go", "testnet_pyrmont_config.go", - "testnet_toledo_config.go", "testutils.go", "values.go", ], diff --git a/shared/params/testnet_toledo_config.go b/shared/params/testnet_toledo_config.go deleted file mode 100644 index 21aee59a69..0000000000 --- a/shared/params/testnet_toledo_config.go +++ /dev/null @@ -1,34 +0,0 @@ -package params - -// UseToledoNetworkConfig uses the Toledo specific -// network config. -func UseToledoNetworkConfig() { - cfg := BeaconNetworkConfig().Copy() - cfg.ContractDeploymentBlock = 3702432 - cfg.BootstrapNodes = []string{ - // Prysm Bootnode 1 - "enr:-Ku4QL5E378NT4-vqP6v1mZ7kHxiTHJvuBvQixQsuTTCffa0PJNWMBlG3Mduvsvd6T2YP1U3l5tBKO5H-9wyX2SCtPkBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC4EvfsAHAe0P__________gmlkgnY0gmlwhDaetEeJc2VjcDI1NmsxoQKtGC2CAuba7goLLdle899M3esUmoWRvzi7GBVhq6ViCYN1ZHCCIyg", - } - OverrideBeaconNetworkConfig(cfg) -} - -// UseToledoConfig sets the main beacon chain -// config for Toledo testnet. -func UseToledoConfig() { - beaconConfig = ToledoConfig() -} - -// ToledoConfig defines the config for the -// Toledo testnet. -func ToledoConfig() *BeaconChainConfig { - cfg := MainnetConfig().Copy() - cfg.MinGenesisTime = 1605009600 - cfg.GenesisDelay = 86400 - cfg.GenesisForkVersion = []byte{0x00, 0x70, 0x1E, 0xD0} - cfg.ConfigName = ConfigNames[Toledo] - cfg.SecondsPerETH1Block = 14 - cfg.DepositChainID = 5 - cfg.DepositNetworkID = 5 - cfg.DepositContractAddress = "0x47709dC7a8c18688a1f051761fc34ac253970bC0" - return cfg -} diff --git a/shared/params/values.go b/shared/params/values.go index ad4e87f103..3a2c9ef051 100644 --- a/shared/params/values.go +++ b/shared/params/values.go @@ -5,7 +5,6 @@ const ( Minimal EndToEnd Pyrmont - Toledo Prater ) @@ -15,7 +14,6 @@ var ConfigNames = map[ConfigName]string{ Minimal: "minimal", EndToEnd: "end-to-end", Pyrmont: "pyrmont", - Toledo: "toledo", Prater: "prater", }