Merge pull request #640 from maticnetwork/shivam/POS-1041

Shivam/pos 1041

internal/cli/server/config.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/fdlimit"
 	"github.com/ethereum/go-ethereum/eth/downloader"
@@ -720,10 +721,7 @@ func (c *Config) buildEth(stack *node.Node, accountManager *accounts.Manager) (*
 		}
 
 		for i, account := range c.Accounts.Unlock {
-			err = ks.Unlock(accounts.Account{Address: common.HexToAddress(account)}, passwords[i])
+			unlockAccount(ks, account, i, passwords)
-			if err != nil {
-				return nil, fmt.Errorf("could not unlock an account %q", account)
-			}
 		}
 	}
 
@@ -904,6 +902,75 @@ var (
 	gitDate          = "" // Git commit date YYYYMMDD of the release (set via linker flags)
 )
 
+// tries unlocking the specified account a few times.
+func unlockAccount(ks *keystore.KeyStore, address string, i int, passwords []string) (accounts.Account, string) {
+	account, err := utils.MakeAddress(ks, address)
+
+	if err != nil {
+		utils.Fatalf("Could not list accounts: %v", err)
+	}
+
+	for trials := 0; trials < 3; trials++ {
+		prompt := fmt.Sprintf("Unlocking account %s | Attempt %d/%d", address, trials+1, 3)
+		password := utils.GetPassPhraseWithList(prompt, false, i, passwords)
+		err = ks.Unlock(account, password)
+
+		if err == nil {
+			log.Info("Unlocked account", "address", account.Address.Hex())
+			return account, password
+		}
+
+		if err, ok := err.(*keystore.AmbiguousAddrError); ok {
+			log.Info("Unlocked account", "address", account.Address.Hex())
+			return ambiguousAddrRecovery(ks, err, password), password
+		}
+
+		if err != keystore.ErrDecrypt {
+			// No need to prompt again if the error is not decryption-related.
+			break
+		}
+	}
+	// All trials expended to unlock account, bail out
+	utils.Fatalf("Failed to unlock account %s (%v)", address, err)
+
+	return accounts.Account{}, ""
+}
+
+func ambiguousAddrRecovery(ks *keystore.KeyStore, err *keystore.AmbiguousAddrError, auth string) accounts.Account {
+	log.Warn("Multiple key files exist for", "address", err.Addr)
+
+	for _, a := range err.Matches {
+		log.Info("Multiple keys", "file", a.URL.String())
+	}
+
+	log.Info("Testing your password against all of them...")
+
+	var match *accounts.Account
+
+	for _, a := range err.Matches {
+		if err := ks.Unlock(a, auth); err == nil {
+			// nolint: gosec, exportloopref
+			match = &a
+			break
+		}
+	}
+
+	if match == nil {
+		utils.Fatalf("None of the listed files could be unlocked.")
+	}
+
+	log.Info("Your password unlocked", "key", match.URL.String())
+	log.Warn("In order to avoid this warning, you need to remove the following duplicate key files:")
+
+	for _, a := range err.Matches {
+		if a != *match {
+			log.Warn("Duplicate", "key", a.URL.String())
+		}
+	}
+
+	return *match
+}
+
 func (c *Config) buildNode() (*node.Config, error) {
 	ipcPath := ""
 	if !c.JsonRPC.IPCDisable {