Remove Accounts Enable/Disable Code (#8576)

* rem

* remove all enable disable code

* fix broken build

* fix more tests

* fix broken tests

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>

validator/accounts/BUILD.bazel

@@ -7,7 +7,6 @@ go_library(
         "accounts.go",
         "accounts_backup.go",
         "accounts_delete.go",
-        "accounts_enable_disable.go",
         "accounts_exit.go",
         "accounts_helper.go",
         "accounts_import.go",
@@ -63,7 +62,6 @@ go_test(
     srcs = [
         "accounts_backup_test.go",
         "accounts_delete_test.go",
-        "accounts_enable_disable_test.go",
         "accounts_exit_test.go",
         "accounts_import_test.go",
         "accounts_list_test.go",

validator/accounts/accounts.go

@@ -11,11 +11,9 @@ var (
 	ErrCouldNotInitializeKeymanager = "could not initialize keymanager"
 )
 
-// Config specifies parameters to run to delete, enable, disable accounts.
+// Config specifies parameters for accounts commands.
 type Config struct {
-	Wallet            *wallet.Wallet
-	Keymanager        keymanager.IKeymanager
-	DisablePublicKeys [][]byte
-	EnablePublicKeys  [][]byte
-	DeletePublicKeys  [][]byte
+	Wallet           *wallet.Wallet
+	Keymanager       keymanager.IKeymanager
+	DeletePublicKeys [][]byte
 }

validator/accounts/accounts_backup.go

@@ -56,7 +56,7 @@ func BackupAccountsCli(cliCtx *cli.Context) error {
 	if err != nil {
 		return errors.Wrap(err, ErrCouldNotInitializeKeymanager)
 	}
-	pubKeys, err := km.FetchAllValidatingPublicKeys(cliCtx.Context)
+	pubKeys, err := km.FetchValidatingPublicKeys(cliCtx.Context)
 	if err != nil {
 		return errors.Wrap(err, "could not fetch validating public keys")
 	}

validator/accounts/accounts_delete.go

@@ -32,7 +32,7 @@ func DeleteAccountCli(cliCtx *cli.Context) error {
 	if err != nil {
 		return errors.Wrap(err, ErrCouldNotInitializeKeymanager)
 	}
-	validatingPublicKeys, err := kManager.FetchAllValidatingPublicKeys(cliCtx.Context)
+	validatingPublicKeys, err := kManager.FetchValidatingPublicKeys(cliCtx.Context)
 	if err != nil {
 		return err
 	}

validator/accounts/accounts_enable_disable.go

@@ -1,173 +0,0 @@
-package accounts
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/pkg/errors"
-	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
-	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/promptutil"
-	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
-	"github.com/prysmaticlabs/prysm/validator/accounts/prompt"
-	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
-	"github.com/prysmaticlabs/prysm/validator/keymanager/imported"
-	"github.com/urfave/cli/v2"
-)
-
-// DisableAccountsCli disables via CLI the accounts that the user requests to be disabled from the wallet
-func DisableAccountsCli(cliCtx *cli.Context) error {
-	w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-		return nil, wallet.ErrNoWalletFound
-	})
-	if err != nil {
-		return errors.Wrap(err, "could not open wallet")
-	}
-	km, err := w.InitializeKeymanager(cliCtx.Context, iface.InitKeymanagerConfig{ListenForChanges: false})
-	if err != nil {
-		return errors.Wrap(err, ErrCouldNotInitializeKeymanager)
-	}
-	validatingPublicKeys, err := km.FetchValidatingPublicKeys(cliCtx.Context)
-	if err != nil {
-		return err
-	}
-	if len(validatingPublicKeys) == 0 {
-		return errors.New("wallet is empty, no accounts to disable")
-	}
-	// Allow the user to interactively select the accounts to disable or optionally
-	// provide them via cli flags as a string of comma-separated, hex strings.
-	filteredPubKeys, err := filterPublicKeysFromUserInput(
-		cliCtx,
-		flags.DisablePublicKeysFlag,
-		validatingPublicKeys,
-		prompt.SelectAccountsDisablePromptText,
-	)
-	if err != nil {
-		return errors.Wrap(err, "could not filter public keys for deactivation")
-	}
-	rawPublicKeys := make([][]byte, len(filteredPubKeys))
-	formattedPubKeys := make([]string, len(filteredPubKeys))
-	for i, pk := range filteredPubKeys {
-		pubKeyBytes := pk.Marshal()
-		rawPublicKeys[i] = pubKeyBytes
-		formattedPubKeys[i] = fmt.Sprintf("%#x", bytesutil.Trunc(pubKeyBytes))
-	}
-	allAccountStr := strings.Join(formattedPubKeys, ", ")
-	if !cliCtx.IsSet(flags.DisablePublicKeysFlag.Name) {
-		if len(filteredPubKeys) == 1 {
-			promptText := "Are you sure you want to disable 1 account? (%s) Y/N"
-			resp, err := promptutil.ValidatePrompt(
-				os.Stdin, fmt.Sprintf(promptText, au.BrightGreen(formattedPubKeys[0])), promptutil.ValidateYesOrNo,
-			)
-			if err != nil {
-				return err
-			}
-			if strings.EqualFold(resp, "n") {
-				return nil
-			}
-		} else {
-			promptText := "Are you sure you want to disable %d accounts? (%s) Y/N"
-			if len(filteredPubKeys) == len(validatingPublicKeys) {
-				promptText = fmt.Sprintf("Are you sure you want to disable all accounts? Y/N (%s)", au.BrightGreen(allAccountStr))
-			} else {
-				promptText = fmt.Sprintf(promptText, len(filteredPubKeys), au.BrightGreen(allAccountStr))
-			}
-			resp, err := promptutil.ValidatePrompt(os.Stdin, promptText, promptutil.ValidateYesOrNo)
-			if err != nil {
-				return err
-			}
-			if strings.EqualFold(resp, "n") {
-				return nil
-			}
-		}
-	}
-	importedKM, ok := km.(*imported.Keymanager)
-	if !ok {
-		return errors.New("can only disable accounts for imported wallets")
-	}
-	if err := importedKM.DisableAccounts(cliCtx.Context, rawPublicKeys); err != nil {
-		return err
-	}
-	log.WithField("publicKeys", allAccountStr).Info("Accounts disabled")
-	return nil
-}
-
-// EnableAccountsCli enables via CLI the accounts that the user requests to be enabled from the wallet
-func EnableAccountsCli(cliCtx *cli.Context) error {
-	w, err := wallet.OpenWalletOrElseCli(cliCtx, func(cliCtx *cli.Context) (*wallet.Wallet, error) {
-		return nil, wallet.ErrNoWalletFound
-	})
-	if err != nil {
-		return errors.Wrap(err, "could not open wallet")
-	}
-	km, err := w.InitializeKeymanager(cliCtx.Context, iface.InitKeymanagerConfig{ListenForChanges: false})
-	if err != nil {
-		return errors.Wrap(err, ErrCouldNotInitializeKeymanager)
-	}
-	importedKM, ok := km.(*imported.Keymanager)
-	if !ok {
-		return errors.New("can only enable/disable accounts for imported wallets")
-	}
-	disabledPublicKeys := importedKM.DisabledPublicKeys()
-	if len(disabledPublicKeys) == 0 {
-		return errors.New("no accounts are disabled")
-	}
-	disabledPublicKeys48 := make([][48]byte, len(disabledPublicKeys))
-	for i := range disabledPublicKeys {
-		disabledPublicKeys48[i] = bytesutil.ToBytes48(disabledPublicKeys[i])
-	}
-
-	// Allow the user to interactively select the accounts to enable or optionally
-	// provide them via cli flags as a string of comma-separated, hex strings.
-	filteredPubKeys, err := filterPublicKeysFromUserInput(
-		cliCtx,
-		flags.EnablePublicKeysFlag,
-		disabledPublicKeys48,
-		prompt.SelectAccountsEnablePromptText,
-	)
-	if err != nil {
-		return errors.Wrap(err, "could not filter public keys for activation")
-	}
-	rawPublicKeys := make([][]byte, len(filteredPubKeys))
-	formattedPubKeys := make([]string, len(filteredPubKeys))
-	for i, pk := range filteredPubKeys {
-		pubKeyBytes := pk.Marshal()
-		rawPublicKeys[i] = pubKeyBytes
-		formattedPubKeys[i] = fmt.Sprintf("%#x", bytesutil.Trunc(pubKeyBytes))
-	}
-	allAccountStr := strings.Join(formattedPubKeys, ", ")
-	if !cliCtx.IsSet(flags.EnablePublicKeysFlag.Name) {
-		if len(filteredPubKeys) == 1 {
-			promptText := "Are you sure you want to enable 1 account? (%s) Y/N"
-			resp, err := promptutil.ValidatePrompt(
-				os.Stdin, fmt.Sprintf(promptText, au.BrightGreen(formattedPubKeys[0])), promptutil.ValidateYesOrNo,
-			)
-			if err != nil {
-				return err
-			}
-			if strings.EqualFold(resp, "n") {
-				return nil
-			}
-		} else {
-			promptText := "Are you sure you want to enable %d accounts? (%s) Y/N"
-			if len(filteredPubKeys) == len(disabledPublicKeys48) {
-				promptText = fmt.Sprintf("Are you sure you want to enable all accounts? Y/N (%s)", au.BrightGreen(allAccountStr))
-			} else {
-				promptText = fmt.Sprintf(promptText, len(filteredPubKeys), au.BrightGreen(allAccountStr))
-			}
-			resp, err := promptutil.ValidatePrompt(os.Stdin, promptText, promptutil.ValidateYesOrNo)
-			if err != nil {
-				return err
-			}
-			if strings.EqualFold(resp, "n") {
-				return nil
-			}
-		}
-	}
-	if err := importedKM.EnableAccounts(cliCtx.Context, rawPublicKeys); err != nil {
-		return err
-	}
-	log.WithField("publicKeys", allAccountStr).Info("Accounts enabled")
-	return nil
-}

validator/accounts/accounts_enable_disable_test.go

@@ -1,143 +0,0 @@
-package accounts
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"fmt"
-	"math/big"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/prysmaticlabs/prysm/shared/bytesutil"
-	"github.com/prysmaticlabs/prysm/shared/testutil/assert"
-	"github.com/prysmaticlabs/prysm/shared/testutil/require"
-	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
-	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
-	"github.com/prysmaticlabs/prysm/validator/keymanager"
-)
-
-func TestDisableAccounts_Noninteractive(t *testing.T) {
-	walletDir, _, passwordFilePath := setupWalletAndPasswordsDir(t)
-	randPath, err := rand.Int(rand.Reader, big.NewInt(1000000))
-	require.NoError(t, err, "Could not generate random file path")
-	// Write a directory where we will import keys from.
-	keysDir := filepath.Join(t.TempDir(), fmt.Sprintf("/%d", randPath), "keysDir")
-	require.NoError(t, os.MkdirAll(keysDir, os.ModePerm))
-
-	// Create 3 keystore files in the keys directory we can then
-	// import from in our wallet.
-	k1, _ := createKeystore(t, keysDir)
-	time.Sleep(time.Second)
-	k2, _ := createKeystore(t, keysDir)
-	time.Sleep(time.Second)
-	k3, _ := createKeystore(t, keysDir)
-	generatedPubKeys := []string{k1.Pubkey, k2.Pubkey, k3.Pubkey}
-	// Only disable keys 0 and 1.
-	disablePublicKeys := strings.Join(generatedPubKeys[0:2], ",")
-	// We initialize a wallet with a imported keymanager.
-	cliCtx := setupWalletCtx(t, &testWalletConfig{
-		// Wallet configuration flags.
-		walletDir:           walletDir,
-		keymanagerKind:      keymanager.Imported,
-		walletPasswordFile:  passwordFilePath,
-		accountPasswordFile: passwordFilePath,
-		// Flags required for ImportAccounts to work.
-		keysDir: keysDir,
-		// Flags required for DisableAccounts to work.
-		disablePublicKeys: disablePublicKeys,
-	})
-	w, err := CreateWalletWithKeymanager(cliCtx.Context, &CreateWalletConfig{
-		WalletCfg: &wallet.Config{
-			WalletDir:      walletDir,
-			KeymanagerKind: keymanager.Imported,
-			WalletPassword: password,
-		},
-	})
-	require.NoError(t, err)
-
-	// We attempt to import accounts.
-	require.NoError(t, ImportAccountsCli(cliCtx))
-
-	// We attempt to disable the accounts specified.
-	require.NoError(t, DisableAccountsCli(cliCtx))
-
-	keymanager, err := w.InitializeKeymanager(cliCtx.Context, iface.InitKeymanagerConfig{ListenForChanges: false})
-	require.NoError(t, err)
-	remainingAccounts, err := keymanager.FetchValidatingPublicKeys(cliCtx.Context)
-	require.NoError(t, err)
-	require.Equal(t, len(remainingAccounts), 1)
-	remainingPublicKey, err := hex.DecodeString(k3.Pubkey)
-	require.NoError(t, err)
-	assert.DeepEqual(t, remainingAccounts[0], bytesutil.ToBytes48(remainingPublicKey))
-}
-
-func TestEnableAccounts_Noninteractive(t *testing.T) {
-	walletDir, _, passwordFilePath := setupWalletAndPasswordsDir(t)
-	randPath, err := rand.Int(rand.Reader, big.NewInt(1000000))
-	require.NoError(t, err, "Could not generate random file path")
-	// Write a directory where we will import keys from.
-	keysDir := filepath.Join(t.TempDir(), fmt.Sprintf("/%d", randPath), "keysDir")
-	require.NoError(t, os.MkdirAll(keysDir, os.ModePerm))
-
-	// Create 3 keystore files in the keys directory we can then
-	// import from in our wallet.
-	k1, _ := createKeystore(t, keysDir)
-	time.Sleep(time.Second)
-	k2, _ := createKeystore(t, keysDir)
-	time.Sleep(time.Second)
-	k3, _ := createKeystore(t, keysDir)
-	generatedPubKeys := []string{k1.Pubkey, k2.Pubkey, k3.Pubkey}
-	// Disable all keys.
-	disablePublicKeys := strings.Join(generatedPubKeys, ",")
-	// Only enable keys 0 and 1.
-	enablePublicKeys := strings.Join(generatedPubKeys[0:2], ",")
-	// We initialize a wallet with a imported keymanager.
-	cliCtx := setupWalletCtx(t, &testWalletConfig{
-		walletDir:           walletDir,
-		keymanagerKind:      keymanager.Imported,
-		walletPasswordFile:  passwordFilePath,
-		accountPasswordFile: passwordFilePath,
-		keysDir:             keysDir,
-		disablePublicKeys:   disablePublicKeys,
-		// Flags required for EnableAccounts to work.
-		enablePublicKeys: enablePublicKeys,
-	})
-	w, err := CreateWalletWithKeymanager(cliCtx.Context, &CreateWalletConfig{
-		WalletCfg: &wallet.Config{
-			WalletDir:      walletDir,
-			KeymanagerKind: keymanager.Imported,
-			WalletPassword: password,
-		},
-	})
-	require.NoError(t, err)
-
-	// We attempt to import accounts.
-	require.NoError(t, ImportAccountsCli(cliCtx))
-
-	// We attempt to disable the accounts specified.
-	require.NoError(t, DisableAccountsCli(cliCtx))
-
-	km, err := w.InitializeKeymanager(cliCtx.Context, iface.InitKeymanagerConfig{ListenForChanges: false})
-	require.NoError(t, err)
-	remainingAccounts, err := km.FetchValidatingPublicKeys(cliCtx.Context)
-	require.NoError(t, err)
-	require.Equal(t, len(remainingAccounts), 0)
-
-	// We attempt to enable the accounts specified.
-	require.NoError(t, EnableAccountsCli(cliCtx))
-
-	km, err = w.InitializeKeymanager(cliCtx.Context, iface.InitKeymanagerConfig{ListenForChanges: false})
-	require.NoError(t, err)
-	remainingAccounts, err = km.FetchValidatingPublicKeys(cliCtx.Context)
-	require.NoError(t, err)
-	require.Equal(t, len(remainingAccounts), 2)
-	remainingPublicKey1, err := hex.DecodeString(k1.Pubkey)
-	require.NoError(t, err)
-	remainingPublicKey2, err := hex.DecodeString(k2.Pubkey)
-	require.NoError(t, err)
-	assert.DeepEqual(t, remainingAccounts[0], bytesutil.ToBytes48(remainingPublicKey1))
-	assert.DeepEqual(t, remainingAccounts[1], bytesutil.ToBytes48(remainingPublicKey2))
-}

validator/accounts/accounts_list.go

@@ -11,7 +11,6 @@ import (
 	"github.com/pkg/errors"
 	ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
 	"github.com/prysmaticlabs/prysm/cmd/validator/flags"
-	"github.com/prysmaticlabs/prysm/shared/bytesutil"
 	"github.com/prysmaticlabs/prysm/shared/petnames"
 	"github.com/prysmaticlabs/prysm/validator/accounts/iface"
 	"github.com/prysmaticlabs/prysm/validator/accounts/wallet"
@@ -104,12 +103,7 @@ func listImportedKeymanagerAccounts(
 			"by running `validator accounts list --show-deposit-data`"),
 	)
 
-	pubKeys, err := keymanager.FetchAllValidatingPublicKeys(ctx)
-	disabledPublicKeys := keymanager.DisabledPublicKeys()
-	existingDisabledPk := make(map[[48]byte]bool, len(disabledPublicKeys))
-	for _, dpk := range disabledPublicKeys {
-		existingDisabledPk[bytesutil.ToBytes48(dpk)] = true
-	}
+	pubKeys, err := keymanager.FetchValidatingPublicKeys(ctx)
 	if err != nil {
 		return errors.Wrap(err, "could not fetch validating public keys")
 	}
@@ -122,11 +116,7 @@ func listImportedKeymanagerAccounts(
 	}
 	for i := 0; i < len(accountNames); i++ {
 		fmt.Println("")
-		if existingDisabledPk[pubKeys[i]] {
-			fmt.Printf("%s | %s (%s)\n", au.BrightBlue(fmt.Sprintf("Account %d", i)).Bold(), au.BrightRed(accountNames[i]).Bold(), au.BrightRed("disabled").Bold())
-		} else {
-			fmt.Printf("%s | %s\n", au.BrightBlue(fmt.Sprintf("Account %d", i)).Bold(), au.BrightGreen(accountNames[i]).Bold())
-		}
+		fmt.Printf("%s | %s\n", au.BrightBlue(fmt.Sprintf("Account %d", i)).Bold(), au.BrightGreen(accountNames[i]).Bold())
 		fmt.Printf("%s %#x\n", au.BrightMagenta("[validating public key]").Bold(), pubKeys[i])
 		if showPrivateKeys {
 			if len(privateKeys) > i {
@@ -155,7 +145,7 @@ func listDerivedKeymanagerAccounts(
 	au := aurora.NewAurora(true)
 	fmt.Printf("(keymanager kind) %s\n", au.BrightGreen("derived, (HD) hierarchical-deterministic").Bold())
 	fmt.Printf("(derivation format) %s\n", au.BrightGreen(derived.DerivationPathFormat).Bold())
-	validatingPubKeys, err := keymanager.FetchAllValidatingPublicKeys(ctx)
+	validatingPubKeys, err := keymanager.FetchValidatingPublicKeys(ctx)
 	if err != nil {
 		return errors.Wrap(err, "could not fetch validating public keys")
 	}
@@ -210,7 +200,7 @@ func listRemoteKeymanagerAccounts(
 	fmt.Println(" ")
 	fmt.Printf("%s\n", au.BrightGreen("Configuration options").Bold())
 	fmt.Println(opts)
-	validatingPubKeys, err := keymanager.FetchAllValidatingPublicKeys(ctx)
+	validatingPubKeys, err := keymanager.FetchValidatingPublicKeys(ctx)
 	if err != nil {
 		return errors.Wrap(err, "could not fetch validating public keys")
 	}

validator/accounts/accounts_list_test.go

@@ -40,10 +40,6 @@ func (m *mockRemoteKeymanager) FetchValidatingPublicKeys(_ context.Context) ([][
 	return m.publicKeys, nil
 }
 
-func (m *mockRemoteKeymanager) FetchAllValidatingPublicKeys(_ context.Context) ([][48]byte, error) {
-	return m.publicKeys, nil
-}
-
 func (m *mockRemoteKeymanager) Sign(context.Context, *validatorpb.SignRequest) (bls.Signature, error) {
 	return nil, nil
 }

validator/accounts/prompt/prompt.go

@@ -30,10 +30,6 @@ const (
 	SelectAccountsBackupPromptText = "Select the account(s) you wish to backup"
 	// SelectAccountsVoluntaryExitPromptText --
 	SelectAccountsVoluntaryExitPromptText = "Select the account(s) on which you wish to perform a voluntary exit"
-	// SelectAccountsDisablePromptText --
-	SelectAccountsDisablePromptText = "Select the account(s) you would like to disable"
-	// SelectAccountsEnablePromptText --
-	SelectAccountsEnablePromptText = "Select the account(s) you would like to enable"
 )
 
 var au = aurora.NewAurora(true)

validator/accounts/wallet_create_test.go

@@ -48,8 +48,6 @@ type testWalletConfig struct {
 	backupPasswordFile      string
 	backupPublicKeys        string
 	voluntaryExitPublicKeys string
-	disablePublicKeys       string
-	enablePublicKeys        string
 	deletePublicKeys        string
 	keysDir                 string
 	backupDir               string
@@ -67,8 +65,6 @@ func setupWalletCtx(
 	set.String(flags.KeysDirFlag.Name, cfg.keysDir, "")
 	set.String(flags.KeymanagerKindFlag.Name, cfg.keymanagerKind.String(), "")
 	set.String(flags.DeletePublicKeysFlag.Name, cfg.deletePublicKeys, "")
-	set.String(flags.DisablePublicKeysFlag.Name, cfg.disablePublicKeys, "")
-	set.String(flags.EnablePublicKeysFlag.Name, cfg.enablePublicKeys, "")
 	set.String(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys, "")
 	set.String(flags.BackupDirFlag.Name, cfg.backupDir, "")
 	set.String(flags.BackupPasswordFile.Name, cfg.backupPasswordFile, "")
@@ -90,8 +86,6 @@ func setupWalletCtx(
 	assert.NoError(tb, set.Set(flags.KeysDirFlag.Name, cfg.keysDir))
 	assert.NoError(tb, set.Set(flags.KeymanagerKindFlag.Name, cfg.keymanagerKind.String()))
 	assert.NoError(tb, set.Set(flags.DeletePublicKeysFlag.Name, cfg.deletePublicKeys))
-	assert.NoError(tb, set.Set(flags.DisablePublicKeysFlag.Name, cfg.disablePublicKeys))
-	assert.NoError(tb, set.Set(flags.EnablePublicKeysFlag.Name, cfg.enablePublicKeys))
 	assert.NoError(tb, set.Set(flags.VoluntaryExitPublicKeysFlag.Name, cfg.voluntaryExitPublicKeys))
 	assert.NoError(tb, set.Set(flags.BackupDirFlag.Name, cfg.backupDir))
 	assert.NoError(tb, set.Set(flags.BackupPublicKeysFlag.Name, cfg.backupPublicKeys))