diff --git a/shared/featureconfig/config.go b/shared/featureconfig/config.go index 7e240f726d..09d7ebe1d0 100644 --- a/shared/featureconfig/config.go +++ b/shared/featureconfig/config.go @@ -32,11 +32,6 @@ var log = logrus.WithField("prefix", "flags") // Flags is a struct to represent which features the client will perform on runtime. type Flags struct { // Testnet Flags. - AltonaTestnet bool // AltonaTestnet defines the flag through which we can enable the node to run on the Altona testnet. - OnyxTestnet bool // OnyxTestnet defines the flag through which we can enable the node to run on the Onyx testnet. - MedallaTestnet bool // MedallaTestnet defines the flag through which we can enable the node to run on the Medalla testnet. - SpadinaTestnet bool // SpadinaTestnet defines the flag through which we can enable the node to run on the Spadina testnet. - ZinkenTestnet bool // ZinkenTestnet defines the flag through which we can enable the node to run on the Zinken testnet. 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. @@ -110,32 +105,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(AltonaTestnet.Name) { - log.Warn("Running on Altona Testnet") - params.UseAltonaConfig() - params.UseAltonaNetworkConfig() - cfg.AltonaTestnet = true - } else if ctx.Bool(OnyxTestnet.Name) { - log.Warn("Running on Onyx Testnet") - params.UseOnyxConfig() - params.UseOnyxNetworkConfig() - cfg.OnyxTestnet = true - } else if ctx.Bool(MedallaTestnet.Name) { - log.Warn("Running on Medalla Testnet") - params.UseMedallaConfig() - params.UseMedallaNetworkConfig() - cfg.MedallaTestnet = true - } else if ctx.Bool(SpadinaTestnet.Name) { - log.Warn("Running on Spadina Testnet") - params.UseSpadinaConfig() - params.UseSpadinaNetworkConfig() - cfg.SpadinaTestnet = true - } else if ctx.Bool(ZinkenTestnet.Name) { - log.Warn("Running on Zinken Testnet") - params.UseZinkenConfig() - params.UseZinkenNetworkConfig() - cfg.ZinkenTestnet = true - } else if ctx.Bool(ToledoTestnet.Name) { + if ctx.Bool(ToledoTestnet.Name) { log.Warn("Running on Toledo Testnet") params.UseToledoConfig() params.UseToledoNetworkConfig() diff --git a/shared/featureconfig/config_test.go b/shared/featureconfig/config_test.go index 699d9efb71..d18e3bc803 100644 --- a/shared/featureconfig/config_test.go +++ b/shared/featureconfig/config_test.go @@ -11,44 +11,44 @@ import ( func TestInitFeatureConfig(t *testing.T) { defer Init(&Flags{}) cfg := &Flags{ - MedallaTestnet: true, + PyrmontTestnet: true, } Init(cfg) c := Get() - assert.Equal(t, true, c.MedallaTestnet) + assert.Equal(t, true, c.PyrmontTestnet) // Reset back to false for the follow up tests. - cfg = &Flags{MedallaTestnet: false} + cfg = &Flags{PyrmontTestnet: false} Init(cfg) } func TestInitWithReset(t *testing.T) { defer Init(&Flags{}) Init(&Flags{ - OnyxTestnet: true, + PyrmontTestnet: true, }) - assert.Equal(t, false, Get().AltonaTestnet) - assert.Equal(t, true, Get().OnyxTestnet) + 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{ - OnyxTestnet: false, + PyrmontTestnet: false, }) - assert.Equal(t, false, Get().AltonaTestnet) - assert.Equal(t, false, Get().OnyxTestnet) + 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().AltonaTestnet) - assert.Equal(t, true, Get().OnyxTestnet) + assert.Equal(t, false, Get().ToledoTestnet) + assert.Equal(t, true, Get().PyrmontTestnet) } func TestConfigureBeaconConfig(t *testing.T) { app := cli.App{} set := flag.NewFlagSet("test", 0) - set.Bool(MedallaTestnet.Name, true, "test") + set.Bool(PyrmontTestnet.Name, true, "test") context := cli.NewContext(&app, set, nil) ConfigureBeaconChain(context) c := Get() - assert.Equal(t, true, c.MedallaTestnet) + assert.Equal(t, true, c.PyrmontTestnet) } diff --git a/shared/featureconfig/flags.go b/shared/featureconfig/flags.go index c409beab87..50025c0dc8 100644 --- a/shared/featureconfig/flags.go +++ b/shared/featureconfig/flags.go @@ -5,21 +5,6 @@ import ( ) var ( - // AltonaTestnet flag for the multiclient eth2 testnet configuration. - AltonaTestnet = &cli.BoolFlag{ - Name: "altona", - Usage: "This defines the flag through which we can run on the Altona Multiclient Testnet", - } - // OnyxTestnet flag for the Prysmatic Labs single-client testnet configuration. - OnyxTestnet = &cli.BoolFlag{ - Name: "onyx", - Usage: "This defines the flag through which we can run on the Onyx Prysm Testnet", - } - // MedallaTestnet flag for the multiclient eth2 testnet. - MedallaTestnet = &cli.BoolFlag{ - Name: "medalla", - Usage: "This defines the flag through which we can run on the Medalla Multiclient Testnet", - } // ToledoTestnet flag for the multiclient eth2 testnet. ToledoTestnet = &cli.BoolFlag{ Name: "toledo", @@ -30,16 +15,6 @@ var ( Name: "pyrmont", Usage: "This defines the flag through which we can run on the Pyrmont Multiclient Testnet", } - // SpadinaTestnet flag for the multiclient eth2 testnet. - SpadinaTestnet = &cli.BoolFlag{ - Name: "spadina", - Usage: "This defines the flag through which we can run on the Spadina Multiclient Testnet", - } - // ZinkenTestnet flag for the multiclient eth2 testnet. - ZinkenTestnet = &cli.BoolFlag{ - Name: "zinken", - Usage: "This defines the flag through which we can run on the Zinken Multiclient Testnet", - } // Mainnet flag for easier tooling, no-op Mainnet = &cli.BoolFlag{ Value: true, @@ -120,12 +95,7 @@ var devModeFlags = []cli.Flag{ var ValidatorFlags = append(deprecatedFlags, []cli.Flag{ enableExternalSlasherProtectionFlag, waitForSyncedFlag, - AltonaTestnet, - OnyxTestnet, - MedallaTestnet, ToledoTestnet, - SpadinaTestnet, - ZinkenTestnet, PyrmontTestnet, Mainnet, disableAccountsV2, @@ -135,12 +105,7 @@ 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, - AltonaTestnet, - OnyxTestnet, - MedallaTestnet, ToledoTestnet, - SpadinaTestnet, - ZinkenTestnet, PyrmontTestnet, Mainnet, }...) @@ -158,12 +123,7 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{ waitForSyncedFlag, disableGRPCConnectionLogging, attestationAggregationStrategy, - AltonaTestnet, - OnyxTestnet, - MedallaTestnet, ToledoTestnet, - SpadinaTestnet, - ZinkenTestnet, PyrmontTestnet, Mainnet, enableBlst, diff --git a/shared/params/BUILD.bazel b/shared/params/BUILD.bazel index b9d671d8a0..1f11f479a6 100644 --- a/shared/params/BUILD.bazel +++ b/shared/params/BUILD.bazel @@ -10,14 +10,9 @@ go_library( "mainnet_config.go", "minimal_config.go", "network_config.go", - "testnet_altona_config.go", "testnet_e2e_config.go", - "testnet_medalla_config.go", - "testnet_onyx_config.go", "testnet_pyrmont_config.go", - "testnet_spadina_config.go", "testnet_toledo_config.go", - "testnet_zinken_config.go", "testutils.go", ], importpath = "github.com/prysmaticlabs/prysm/shared/params", diff --git a/shared/params/testnet_altona_config.go b/shared/params/testnet_altona_config.go deleted file mode 100644 index c86f9d0359..0000000000 --- a/shared/params/testnet_altona_config.go +++ /dev/null @@ -1,41 +0,0 @@ -package params - -// UseAltonaNetworkConfig uses the Altona specific -// network config. -func UseAltonaNetworkConfig() { - cfg := BeaconNetworkConfig().Copy() - cfg.ContractDeploymentBlock = 2917810 - cfg.DepositContractAddress = "0x16e82D77882A663454Ef92806b7DeCa1D394810f" - cfg.ChainID = 5 // Chain ID of eth1 goerli testnet. - cfg.NetworkID = 5 // Network ID of eth1 goerli testnet. - cfg.BootstrapNodes = []string{ - "enr:-LK4QFtV7Pz4reD5a7cpfi1z6yPrZ2I9eMMU5mGQpFXLnLoKZW8TXvVubShzLLpsEj6aayvVO1vFx-MApijD3HLPhlECh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD6etXjAAABIf__________gmlkgnY0gmlwhDMPYfCJc2VjcDI1NmsxoQIerw_qBc9apYfZqo2awiwS930_vvmGnW2psuHsTzrJ8YN0Y3CCIyiDdWRwgiMo", - "enr:-LK4QPVkFd_MKzdW0219doTZryq40tTe8rwWYO75KDmeZM78fBskGsfCuAww9t8y3u0Q0FlhXOhjE1CWpx3SGbUaU80Ch2F0dG5ldHOIAAAAAAAAAACEZXRoMpD6etXjAAABIf__________gmlkgnY0gmlwhDMPRgeJc2VjcDI1NmsxoQNHu-QfNgzl8VxbMiPgv6wgAljojnqAOrN18tzJMuN8oYN0Y3CCIyiDdWRwgiMo", - "enr:-LK4QHe52XPPrcv6-MvcmN5GqDe_sgCwo24n_2hedlfwD_oxNt7cXL3tXJ7h9aYv6CTS1C_H2G2_dkeqm_LBO9nrpiYBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhANzD9uJc2VjcDI1NmsxoQJX7zMnRU3szfGfS8MAIfPaQKOBpu3sBVTXf4Qq0b_m-4N0Y3CCIyiDdWRwgiMo", - "enr:-LK4QLkbbq7xuRa_EnWd_kc0TkQk0pd0B0cZYR5LvBsncFQBDyPbGdy8d24TzRVeK7ZWwM5_2EcSJK223f8TYUOQYfwBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhAPsjtOJc2VjcDI1NmsxoQJNw_aZgWXl2SstD--WAjooGudjWLjEbbCIddJuEPxzWYN0Y3CCIyiDdWRwgiMo", - "enr:-LK4QHy-glnxN1WTk5f6d7-xXwy_UKJLs5k7p_S4KRY9I925KTzW_kQLjfFriIpH0de7kygBwrSl726ukq9_OG_sgKMCh2F0dG5ldHOIUjEAIQEAFMiEZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhBLmhrCJc2VjcDI1NmsxoQNlU7gT0HUvpLA41n-P5GrCgjwMwtG02YsRRO0lAmpmBYN0Y3CCIyiDdWRwgiMo", - "enr:-LK4QDz0n0vpyOpuStB8e22h9ayHVcvmN7o0trC7eC0DnZV9GYGzK5uKv7WlzpMQM2nDTG43DWvF_DZYwJOZCbF4iCQBh2F0dG5ldHOI__________-EZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhBKN136Jc2VjcDI1NmsxoQP5gcOUcaruHuMuTv8ht7ZEawp3iih7CmeLqcoY1hxOnoN0Y3CCIyiDdWRwgiMo", - "enr:-LK4QOScOZ35sOXEH6CEW15lfv7I3DhqQAzCPQ_nRav95otuSh4yi9ol0AruKDiIk9qqGXyD-wQDaBAPLhwl4t-rUSQBh2F0dG5ldHOI__________-EZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhCL68KuJc2VjcDI1NmsxoQK5fYR3Ipoc01dz0d2-EcL7m26zKQSkAbf4rwcMMM09CoN0Y3CCIyiDdWRwgiMo", - "enr:-Ku4QMqmWPFkgM58F16wxB50cqWDaWaIsyANHL8wUNSB4Cy1TP9__uJQNRODvx_dvO6rY-BT3psrYTMAaxnMGXb6DuoBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQNoed9JnQh7ltcAacHEGOjwocL1BhMQbYTgaPX0kFuXtIN1ZHCCE4g", - } - - OverrideBeaconNetworkConfig(cfg) -} - -// UseAltonaConfig sets the main beacon chain -// config for altona. -func UseAltonaConfig() { - beaconConfig = AltonaConfig() -} - -// AltonaConfig defines the config for the -// altona testnet. -func AltonaConfig() *BeaconChainConfig { - altCfg := MainnetConfig().Copy() - altCfg.MinGenesisActiveValidatorCount = 640 - altCfg.MinGenesisTime = 1593433800 - altCfg.GenesisForkVersion = []byte{0x00, 0x00, 0x01, 0x21} - altCfg.NetworkName = "Altona" - altCfg.SecondsPerETH1Block = 14 - return altCfg -} diff --git a/shared/params/testnet_medalla_config.go b/shared/params/testnet_medalla_config.go deleted file mode 100644 index 14c8c9cdaf..0000000000 --- a/shared/params/testnet_medalla_config.go +++ /dev/null @@ -1,40 +0,0 @@ -package params - -// UseMedallaNetworkConfig uses the Medalla specific -// network config. -func UseMedallaNetworkConfig() { - cfg := BeaconNetworkConfig().Copy() - cfg.ContractDeploymentBlock = 3085928 - cfg.DepositContractAddress = "0x07b39F4fDE4A38bACe212b546dAc87C58DfE3fDC" - cfg.ChainID = 5 // Chain ID of eth1 goerli testnet. - cfg.NetworkID = 5 // Network ID of eth1 goerli testnet. - // Medalla Bootstrap Nodes - cfg.BootstrapNodes = []string{ - // Prylabs Bootnodes - "enr:-Ku4QOnVSyvzS3VbF87J8MubaRuTyfPi6B67XQg6-5eAV_uILAhn9geTTQmfqDIOcIeAxWHUUajQp6lYniAXPWncp6UBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAYrkzLAAAAAf__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQKekYKqUtwbaJKKCct_srE5-g7tBUm68mj_jpeSb7CCqYN1ZHCCC7g", - "enr:-Ku4QOdk3u7rXI5YvqwmEbApW_OLlRkq_yzmmhdlrJMcfviacLWwSm-tr1BOvamuRQqfc6lnMeec4E4ddOhd3KqCB98Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAYrkzLAAAAAf__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQKH3lxnglLqrA7L6sl5r7XFnckr3XCnlZMaBTYSdE8SHIN1ZHCCG1g", - "enr:-Ku4QHWezvidY_m0dWEwERrNrqjEQWrlIx7b8K4EIxGgTrLmUxHCZPW5-t8PsS8nFxAJ8k8YacKP5zPRk5gbsTSsRTQBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAYrkzLAAAAAf__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQMypP_ODwTuBq2v0oIdjPGCEyu9Hb_jHDbuIX_iNvBRGoN1ZHCCGWQ", - // External Bootnodes - "enr:-Ku4QFVactU18ogiqPPasKs3jhUm5ISszUrUMK2c6SUPbGtANXVJ2wFapsKwVEVnVKxZ7Gsr9yEc4PYF-a14ahPa1q0Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAYrkzLAAAAAf__________gmlkgnY0gmlwhGQbAHyJc2VjcDI1NmsxoQILF-Ya2i5yowVkQtlnZLjG0kqC4qtwmSk8ha7tKLuME4N1ZHCCIyg", - "enr:-KG4QFuKQ9eeXDTf8J4tBxFvs3QeMrr72mvS7qJgL9ieO6k9Rq5QuGqtGK4VlXMNHfe34Khhw427r7peSoIbGcN91fUDhGV0aDKQD8XYjwAAAAH__________4JpZIJ2NIJpcIQDhMExiXNlY3AyNTZrMaEDESplmV9c2k73v0DjxVXJ6__2bWyP-tK28_80lf7dUhqDdGNwgiMog3VkcIIjKA", - } - - OverrideBeaconNetworkConfig(cfg) -} - -// MedallaConfig defines the config for the -// medalla testnet. -func MedallaConfig() *BeaconChainConfig { - cfg := MainnetConfig().Copy() - cfg.MinGenesisTime = 1596546000 - cfg.GenesisForkVersion = []byte{0x00, 0x00, 0x00, 0x01} - cfg.NetworkName = "Medalla" - cfg.SecondsPerETH1Block = 14 - return cfg -} - -// UseMedallaConfig sets the main beacon chain -// config for medalla. -func UseMedallaConfig() { - beaconConfig = MedallaConfig() -} diff --git a/shared/params/testnet_onyx_config.go b/shared/params/testnet_onyx_config.go deleted file mode 100644 index bce7d408a3..0000000000 --- a/shared/params/testnet_onyx_config.go +++ /dev/null @@ -1,18 +0,0 @@ -package params - -// UseOnyxNetworkConfig uses the Onyx specific network config. -func UseOnyxNetworkConfig() { - cfg := BeaconNetworkConfig().Copy() - cfg.ContractDeploymentBlock = 2844925 - cfg.DepositContractAddress = "0x0F0F0fc0530007361933EaB5DB97d09aCDD6C1c8" - cfg.ChainID = 5 // Chain ID of eth1 goerli testnet. - cfg.NetworkID = 5 // Network ID of eth1 goerli testnet. - cfg.BootstrapNodes = []string{"enr:-Ku4QMKVC_MowDsmEa20d5uGjrChI0h8_KsKXDmgVQbIbngZV0idV6_RL7fEtZGo-kTNZ5o7_EJI_vCPJ6scrhwX0Z4Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQJxCnE6v_x2ekgY_uoE1rtwzvGy40mq9eD66XfHPBWgIIN1ZHCCD6A"} - OverrideBeaconNetworkConfig(cfg) -} - -// UseOnyxConfig for beacon chain services. Currently, Onyx uses the unchanged mainnet -// configuration. -func UseOnyxConfig() { - beaconConfig = MainnetConfig().Copy() -} diff --git a/shared/params/testnet_spadina_config.go b/shared/params/testnet_spadina_config.go deleted file mode 100644 index 69b3819ee2..0000000000 --- a/shared/params/testnet_spadina_config.go +++ /dev/null @@ -1,36 +0,0 @@ -package params - -// UseSpadinaNetworkConfig uses the Spadina specific -// network config. -func UseSpadinaNetworkConfig() { - cfg := BeaconNetworkConfig().Copy() - cfg.ContractDeploymentBlock = 3384340 - cfg.ChainID = 5 - cfg.NetworkID = 5 - cfg.DepositContractAddress = "0x48B597F4b53C21B48AD95c7256B49D1779Bd5890" - cfg.BootstrapNodes = []string{ - // Prysm Bootnode 1 - "enr:-Ku4QGQJf2bcDAwVGvbvtq3AB4KKwAvStTenY-i_QnW2ABNRRBncIU_5qR_e_um-9t3s9g-Y5ZfFATj1nhtzq6lvgc4Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDEqCQNAAAAAv__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQNoed9JnQh7ltcAacHEGOjwocL1BhMQbYTgaPX0kFuXtIN1ZHCCE4g", - // Teku Bootnode 1 - "enr:-KG4QA-EcFfXQsL2dcneG8vp8HTWLrpwHQ5HhfyIytfpeKOISzROy2kYSsf_v-BZKnIx5XHDjqJ-ttz0hoz6qJA7tasEhGV0aDKQxKgkDQAAAAL__________4JpZIJ2NIJpcIQDFt-UiXNlY3AyNTZrMaECkR4C5DVO_9rB48eHTY4kdyOHsguTEDlvb7Ce0_mvghSDdGNwgiMog3VkcIIjKA", - } - OverrideBeaconNetworkConfig(cfg) -} - -// UseSpadinaConfig sets the main beacon chain -// config for Spadina. -func UseSpadinaConfig() { - beaconConfig = SpadinaConfig() -} - -// SpadinaConfig defines the config for the -// Spadina testnet. -func SpadinaConfig() *BeaconChainConfig { - cfg := MainnetConfig().Copy() - cfg.MinGenesisTime = 1601380800 - cfg.GenesisForkVersion = []byte{0x00, 0x00, 0x00, 0x02} - cfg.NetworkName = "Spadina" - cfg.MinGenesisActiveValidatorCount = 1024 - cfg.SecondsPerETH1Block = 14 - return cfg -} diff --git a/shared/params/testnet_zinken_config.go b/shared/params/testnet_zinken_config.go deleted file mode 100644 index 00332831fd..0000000000 --- a/shared/params/testnet_zinken_config.go +++ /dev/null @@ -1,35 +0,0 @@ -package params - -// UseZinkenNetworkConfig uses the Zinken specific -// network config. -func UseZinkenNetworkConfig() { - cfg := BeaconNetworkConfig().Copy() - cfg.ContractDeploymentBlock = 3488417 - cfg.ChainID = 5 - cfg.NetworkID = 5 - cfg.DepositContractAddress = "0x99F0Ec06548b086E46Cb0019C78D0b9b9F36cD53" - cfg.BootstrapNodes = []string{ - // Prysm Bootnode 1 - "enr:-Ku4QH63huZ12miIY0kLI9dunG5fwKpnn-zR3XyA_kH6rQpRD1VoyLyzIcFysCJ09JDprdX-EzXp-Nc8swYqBznkXggBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDaNQiCAAAAA___________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQILqxBY-_SF8o_5FjFD3yM92s50zT_ciFi8hStde5AEjIN1ZHCCH0A", - } - OverrideBeaconNetworkConfig(cfg) -} - -// UseZinkenConfig sets the main beacon chain -// config for Zinken. -func UseZinkenConfig() { - beaconConfig = ZinkenConfig() -} - -// ZinkenConfig defines the config for the -// Zinken testnet. -func ZinkenConfig() *BeaconChainConfig { - cfg := MainnetConfig().Copy() - cfg.MinGenesisTime = 1602504000 - cfg.GenesisDelay = 345600 - cfg.GenesisForkVersion = []byte{0x00, 0x00, 0x00, 0x03} - cfg.NetworkName = "zinken" - cfg.MinGenesisActiveValidatorCount = 1024 - cfg.SecondsPerETH1Block = 14 - return cfg -} diff --git a/tools/bootnode/bootnode.go b/tools/bootnode/bootnode.go index eb751676b1..dac0860f98 100644 --- a/tools/bootnode/bootnode.go +++ b/tools/bootnode/bootnode.go @@ -67,7 +67,7 @@ type handler struct { func main() { // Using Medalla as the default configuration. - params.UseMedallaConfig() + params.UsePyrmontConfig() flag.Parse() diff --git a/tools/cluster-pk-manager/client/main.go b/tools/cluster-pk-manager/client/main.go index 3abfbdf32d..6fd8879811 100644 --- a/tools/cluster-pk-manager/client/main.go +++ b/tools/cluster-pk-manager/client/main.go @@ -32,8 +32,7 @@ type UnencryptedKeys struct { } func main() { - // Using Medalla as the default configuration. - params.UseMedallaConfig() + params.UsePyrmontConfig() flag.Parse() diff --git a/tools/cluster-pk-manager/server/main.go b/tools/cluster-pk-manager/server/main.go index a8d8971ed9..4cc88dc61a 100644 --- a/tools/cluster-pk-manager/server/main.go +++ b/tools/cluster-pk-manager/server/main.go @@ -29,8 +29,7 @@ var ( ) func main() { - // Using Medalla as the default configuration. - params.UseMedallaConfig() + params.UsePyrmontConfig() flag.Parse() if *verbose { diff --git a/tools/sendDepositTx/sendDeposits.go b/tools/sendDepositTx/sendDeposits.go index b8c9823664..e9ab6fb8f4 100644 --- a/tools/sendDepositTx/sendDeposits.go +++ b/tools/sendDepositTx/sendDeposits.go @@ -48,7 +48,7 @@ func main() { customFormatter.FullTimestamp = true logrus.SetFormatter(customFormatter) - params.UseMedallaConfig() + params.UsePyrmontConfig() app := cli.App{} app.Name = "sendDepositTx" diff --git a/validator/accounts/cmd_accounts.go b/validator/accounts/cmd_accounts.go index 8656198687..ea39654f06 100644 --- a/validator/accounts/cmd_accounts.go +++ b/validator/accounts/cmd_accounts.go @@ -27,13 +27,8 @@ this command outputs a deposit data string which is required to become a validat flags.WalletDirFlag, flags.WalletPasswordFileFlag, flags.NumAccountsFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { @@ -57,13 +52,8 @@ this command outputs a deposit data string which is required to become a validat flags.WalletDirFlag, flags.WalletPasswordFileFlag, flags.DeletePublicKeysFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { @@ -88,13 +78,8 @@ this command outputs a deposit data string which is required to become a validat flags.WalletPasswordFileFlag, flags.ShowDepositDataFlag, flags.ShowPrivateKeysFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { @@ -123,13 +108,8 @@ this command outputs a deposit data string which is required to become a validat flags.BackupDirFlag, flags.BackupPublicKeysFlag, flags.BackupPasswordFile, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { @@ -155,13 +135,8 @@ this command outputs a deposit data string which is required to become a validat flags.WalletPasswordFileFlag, flags.AccountPasswordFileFlag, flags.ImportPrivateKeyFileFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { @@ -192,13 +167,8 @@ this command outputs a deposit data string which is required to become a validat flags.GrpcHeadersFlag, flags.GrpcRetriesFlag, flags.GrpcRetryDelayFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { diff --git a/validator/accounts/cmd_wallet.go b/validator/accounts/cmd_wallet.go index c91fd84a87..6871ba24e7 100644 --- a/validator/accounts/cmd_wallet.go +++ b/validator/accounts/cmd_wallet.go @@ -28,13 +28,8 @@ var WalletCommands = &cli.Command{ flags.WalletPasswordFileFlag, flags.Mnemonic25thWordFileFlag, flags.SkipMnemonic25thWordCheckFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { @@ -60,13 +55,8 @@ var WalletCommands = &cli.Command{ flags.RemoteSignerCertPathFlag, flags.RemoteSignerKeyPathFlag, flags.RemoteSignerCACertPathFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error { @@ -93,13 +83,8 @@ var WalletCommands = &cli.Command{ flags.NumAccountsFlag, flags.Mnemonic25thWordFileFlag, flags.SkipMnemonic25thWordCheckFlag, - featureconfig.AltonaTestnet, - featureconfig.OnyxTestnet, - featureconfig.MedallaTestnet, featureconfig.ToledoTestnet, featureconfig.PyrmontTestnet, - featureconfig.SpadinaTestnet, - featureconfig.ZinkenTestnet, cmd.AcceptTosFlag, }), Before: func(cliCtx *cli.Context) error {