Accounts v2 as default (#6784)

* Featureconfig: invert accounts v2
* Test: fixing validator node
* Test: Fixed node test
* Merge refs/heads/master into account-v2-default
* Merge refs/heads/master into account-v2-default
* Merge refs/heads/master into account-v2-default
* Merge refs/heads/master into account-v2-default
* Merge refs/heads/master into account-v2-default
* Merge refs/heads/master into account-v2-default

shared/featureconfig/config.go

@@ -282,9 +282,10 @@ func ConfigureValidator(ctx *cli.Context) {
 	} else {
 		log.Warn("Validator slashing protection not enabled!")
 	}
-	if ctx.Bool(enableAccountsV2.Name) {
-		log.Warn("Enabling v2 of Prysm validator accounts")
-		cfg.EnableAccountsV2 = true
+	cfg.EnableAccountsV2 = true
+	if ctx.Bool(disableAccountsV2.Name) {
+		log.Warn("Disabling v2 of Prysm validator accounts")
+		cfg.EnableAccountsV2 = false
 	}
 	if ctx.Bool(enableExternalSlasherProtectionFlag.Name) {
 		log.Warn("Enabled validator attestation and block slashing protection using an external slasher.")

shared/featureconfig/flags.go

@@ -141,10 +141,6 @@ var (
 		Name:  "attestation-aggregation-force-maxcover",
 		Usage: "When enabled, forces --attestation-aggregation-strategy=max_cover setting.",
 	}
-	enableAccountsV2 = &cli.BoolFlag{
-		Name:  "enable-accounts-v2",
-		Usage: "Enables usage of v2 for Prysm validator accounts",
-	}
 	batchBlockVerify = &cli.BoolFlag{
 		Name:  "batch-block-verify",
 		Usage: "When enabled we will perform full signature verification of blocks in batches instead of singularly.",
@@ -161,6 +157,10 @@ var (
 		Name:  "enable-eth1-data-majority-vote",
 		Usage: "When enabled, voting on eth1 data will use the Voting With The Majority algorithm.",
 	}
+	disableAccountsV2 = &cli.BoolFlag{
+		Name:  "disable-accounts-v2",
+		Usage: "Disables usage of v2 for Prysm validator accounts",
+	}
 )
 
 // devModeFlags holds list of flags that are set when development mode is on.
@@ -500,6 +500,11 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedEnableAccountsV2 = &cli.BoolFlag{
+		Name:   "enable-accounts-v2",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 )
 
 var deprecatedFlags = []cli.Flag{
@@ -568,6 +573,7 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedInitSyncVerifyEverythingFlag,
 	deprecatedSkipRegenHistoricalStates,
 	deprecatedMedallaTestnet,
+	deprecatedEnableAccountsV2,
 }
 
 // ValidatorFlags contains a list of all the feature flags that apply to the validator client.
@@ -577,7 +583,7 @@ var ValidatorFlags = append(deprecatedFlags, []cli.Flag{
 	disableDomainDataCacheFlag,
 	waitForSyncedFlag,
 	AltonaTestnet,
-	enableAccountsV2,
+	disableAccountsV2,
 }...)
 
 // SlasherFlags contains a list of all the feature flags that apply to the slasher client.
@@ -589,6 +595,7 @@ var SlasherFlags = append(deprecatedFlags, []cli.Flag{
 var E2EValidatorFlags = []string{
 	"--wait-for-synced",
 	"--enable-local-protection",
+	"--disable-accounts-v2",
 }
 
 // BeaconChainFlags contains a list of all the feature flags that apply to the beacon-chain client.

validator/node/node_test.go

@@ -30,6 +30,7 @@ func TestNode_Builds(t *testing.T) {
 	set.String("keystore-path", dir, "path to keystore")
 	set.String("password", "1234", "validator account password")
 	set.String("verbosity", "debug", "log verbosity")
+	set.Bool("disable-accounts-v2", true, "disabling accounts v2")
 	context := cli.NewContext(&app, set, nil)
 
 	require.NoError(t, v1.NewValidatorAccount(dir, "1234"), "Could not create validator account")