fix: unrecognized/unsupported public key type: *secp256k1.PubKey for multisign (#288)

* Revert "Fix keyring options in add command (#196)"

This reverts commit 4f9b8c2.

* allow unsupported public key type when send from old multisign addr

* Revert "Fix keyring options in add command (#196)"

This reverts commit 4f9b8c2.

* resolve multisign

---------

Co-authored-by: Alex | Interchain Labs <[email protected]>

Author: mmsqe

ante/sigverify.go

@@ -9,6 +9,7 @@ import (
 	storetypes "cosmossdk.io/store/types"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/crypto/types/multisig"
 	errortypes "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
@@ -29,6 +30,8 @@ const (
 //
 // - ethsecp256k1 (Ethereum keys)
 //
+// - secp256k1 (Cosmos keys)
+//
 // - ed25519 (Validators)
 //
 // - multisig (Cosmos SDK multisigs)
@@ -42,6 +45,10 @@ func SigVerificationGasConsumer(
 		// Ethereum keys
 		meter.ConsumeGas(Secp256k1VerifyCost, "ante verify: eth_secp256k1")
 		return nil
+	case *secp256k1.PubKey:
+		// Cosmos keys
+		meter.ConsumeGas(params.SigVerifyCostSecp256k1, "ante verify: secp256k1")
+		return nil
 	case *ed25519.PubKey:
 		// Validator keys
 		meter.ConsumeGas(params.SigVerifyCostED25519, "ante verify: ed25519")

ante/sigverify_test.go

@@ -76,7 +76,7 @@ func TestConsumeSignatureVerificationGas(t *testing.T) {
 			"PubKeySecp256k1",
 			args{storetypes.NewInfiniteGasMeter(), nil, secp256k1.GenPrivKey().PubKey(), params},
 			p.SigVerifyCostSecp256k1,
-			true,
+			false,
 		},
 		{
 			"PubKeySecp256r1",

client/keys.go

@@ -9,7 +9,6 @@ import (
 
 	clientkeys "github.com/cosmos/evm/client/keys"
 	"github.com/cosmos/evm/crypto/hd"
-	cosmosevmkeyring "github.com/cosmos/evm/crypto/keyring"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -92,7 +91,7 @@ The pass backend requires GnuPG: https://gnupg.org/
 }
 
 func runAddCmd(cmd *cobra.Command, args []string) error {
-	clientCtx := client.GetClientContextFromCmd(cmd).WithKeyringOptions(cosmosevmkeyring.Option())
+	clientCtx := client.GetClientContextFromCmd(cmd).WithKeyringOptions(hd.EthSecp256k1Option())
 	clientCtx, err := client.ReadPersistentCommandFlags(clientCtx, cmd.Flags())
 	if err != nil {
 		return err