fix: multisig works with only multisig name as argument, not its address

client/keys/show.go

@@ -3,7 +3,6 @@ package keys
 import (
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/libs/cli"
@@ -166,23 +165,20 @@ func runShowCmd(cmd *cobra.Command, args []string) (err error) {
 func fetchKey(kb keyring.Keyring, keyref string) (*keyring.Record, error) {
 	// firstly check if the keyref is a key name of a key registered in a keyring.
 	k, err := kb.Key(keyref)
-	if (strings.HasPrefix(keyref, sdk.Bech32PrefixAccAddr)) && (len(keyref) > 6) {
-		accAddr, err := sdk.AccAddressFromBech32(keyref)
-		if err != nil {
-			return k, err
-		}
-
-		k, err = kb.KeyByAddress(accAddr)
-		return k, sdkerr.Wrap(err, "Invalid key")
-	}
 	// if the key is not there or if we have a problem with a keyring itself then we move to a
 	// fallback: searching for key by address.
 
 	if err == nil || !sdkerr.IsOf(err, sdkerr.ErrIO, sdkerr.ErrKeyNotFound) {
 		return k, err
 	}
-	return k, err
 
+	accAddr, err := sdk.AccAddressFromBech32(keyref)
+	if err != nil {
+		return k, err
+	}
+
+	k, err = kb.KeyByAddress(accAddr)
+	return k, sdkerr.Wrap(err, "Invalid key")
 }
 
 func validateMultisigThreshold(k, nKeys int) error {

crypto/keyring/keyring.go

@@ -890,9 +890,7 @@ func (ks keystore) MigrateAll() (bool, error) {
 
 // migrate converts keyring.Item from amino to proto serialization format.
 func (ks keystore) migrate(key string) (*Record, bool, error) {
-	if ((strings.HasPrefix(key, sdk.Bech32PrefixAccAddr)) && (len(key) == 6)) || (strings.HasSuffix(key, infoSuffix) && len(key) == 4) {
-		key = infoKey(key)
-	} else if !(strings.HasSuffix(key, infoSuffix)) && !(strings.HasPrefix(key, sdk.Bech32PrefixAccAddr)) {
+	if !(strings.HasSuffix(key, infoSuffix)) && !(strings.HasPrefix(key, sdk.Bech32PrefixAccAddr)) {
 		key = infoKey(key)
 	}
 	item, err := ks.db.Get(key)

x/auth/client/cli/tx_sign.go

@@ -9,6 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
 )
 
@@ -240,10 +241,15 @@ func makeSignCmd() func(cmd *cobra.Command, args []string) error {
 		}
 
 		overwrite, _ := f.GetBool(flagOverwrite)
+		var multisigAddr sdk.AccAddress
 		if multisig != "" {
-			multisigAddr, _, _, err := client.GetFromFields(txFactory.Keybase(), multisig, clientCtx.GenerateOnly)
-			if err != nil {
-				return fmt.Errorf("error getting account from keybase: %w", err)
+			if multisigAddr, err = sdk.AccAddressFromBech32(multisig); err != nil {
+				if err != nil {
+					multisigAddr, _, _, err = client.GetFromFields(txFactory.Keybase(), multisig, clientCtx.GenerateOnly)
+					if err != nil {
+						return fmt.Errorf("error getting account from keybase: %w", err)
+					}
+				}
 			}
 			err = authclient.SignTxWithSignerAddress(
 				txF, clientCtx, multisigAddr, fromName, txBuilder, clientCtx.Offline, overwrite)