chores: revert bls integration

baseapp/baseapp.go

@@ -705,21 +705,13 @@ func (app *BaseApp) runMsgs(ctx sdk.Context, msgs []sdk.Msg, mode runTxMode) (*s
 			err       error
 		)
 
-		if svcMsg, ok := msg.(sdk.ServiceMsg); ok { //nolint:gocritic
+		if svcMsg, ok := msg.(sdk.ServiceMsg); ok {
 			msgFqName = svcMsg.MethodName
 			handler := app.msgServiceRouter.Handler(msgFqName)
 			if handler == nil {
 				return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized message service method: %s; message index: %d", msgFqName, i)
 			}
 			msgResult, err = handler(ctx, svcMsg.Request)
-		} else if strings.Contains(msg.Type(), "fetchai.group.v1alpha1.Msg") {
-			// TODO: remove once cosmos-sdk is upgraded to v0.44
-			msgRoute := strings.Replace(msg.Type(), "fetchai.group.v1alpha1.Msg", "fetchai.group.v1alpha1.Msg/", 1)
-			handler := app.msgServiceRouter.Handler(msgRoute)
-			if handler == nil {
-				return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized message route: %s; message index: %d", msgRoute, i)
-			}
-			msgResult, err = handler(ctx, msg)
 		} else {
 			// legacy sdk.Msg routing
 			msgRoute := msg.Route()

client/flags/flags.go

@@ -15,7 +15,7 @@ const (
 	// failures due to state changes that might occur between the tx simulation
 	// and the actual run.
 	DefaultGasAdjustment = 1.0
-	DefaultGasLimit      = 210000
+	DefaultGasLimit      = 200000
 	GasFlagAuto          = "auto"
 
 	// DefaultKeyringBackend

crypto/codec/amino.go

@@ -1,7 +1,6 @@
 package codec
 
 import (
-	"github.com/cosmos/cosmos-sdk/crypto/keys/bls12381"
 	"github.com/tendermint/tendermint/crypto/sr25519"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -23,8 +22,6 @@ func RegisterCrypto(cdc *codec.LegacyAmino) {
 		secp256k1.PubKeyName, nil)
 	cdc.RegisterConcrete(&kmultisig.LegacyAminoPubKey{},
 		kmultisig.PubKeyAminoRoute, nil)
-	cdc.RegisterConcrete(&bls12381.PubKey{},
-		bls12381.PubKeyName, nil)
 
 	cdc.RegisterInterface((*cryptotypes.PrivKey)(nil), nil)
 	cdc.RegisterConcrete(sr25519.PrivKey{},
@@ -33,6 +30,4 @@ func RegisterCrypto(cdc *codec.LegacyAmino) {
 		ed25519.PrivKeyName, nil)
 	cdc.RegisterConcrete(&secp256k1.PrivKey{},
 		secp256k1.PrivKeyName, nil)
-	cdc.RegisterConcrete(&bls12381.PrivKey{},
-		bls12381.PrivKeyName, nil)
 }

crypto/codec/proto.go

@@ -2,7 +2,6 @@ package codec
 
 import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/cosmos-sdk/crypto/keys/bls12381"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
@@ -15,5 +14,4 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 	registry.RegisterImplementations((*cryptotypes.PubKey)(nil), &ed25519.PubKey{})
 	registry.RegisterImplementations((*cryptotypes.PubKey)(nil), &secp256k1.PubKey{})
 	registry.RegisterImplementations((*cryptotypes.PubKey)(nil), &multisig.LegacyAminoPubKey{})
-	registry.RegisterImplementations((*cryptotypes.PubKey)(nil), &bls12381.PubKey{})
 }

crypto/hd/algo.go

@@ -1,7 +1,6 @@
 package hd
 
 import (
-	"github.com/cosmos/cosmos-sdk/crypto/keys/bls12381"
 	bip39 "github.com/cosmos/go-bip39"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
@@ -21,15 +20,11 @@ const (
 	Ed25519Type = PubKeyType("ed25519")
 	// Sr25519Type represents the Sr25519Type signature system.
 	Sr25519Type = PubKeyType("sr25519")
-	// Bls12381Type represents the Bls12381Type signature system.
-	Bls12381Type = PubKeyType("bls12381")
 )
 
 var (
 	// Secp256k1 uses the Bitcoin secp256k1 ECDSA parameters.
 	Secp256k1 = secp256k1Algo{}
-	// Bls12381 uses blst implememtation of bls signatures
-	Bls12381 = bls12381Algo{}
 )
 
 type DeriveFn func(mnemonic string, bip39Passphrase, hdPath string) ([]byte, error)
@@ -74,40 +69,3 @@ func (s secp256k1Algo) Generate() GenerateFn {
 		return &secp256k1.PrivKey{Key: bzArr}
 	}
 }
-
-type bls12381Algo struct {
-}
-
-func (s bls12381Algo) Name() PubKeyType {
-	return Bls12381Type
-}
-
-// todo: replace bitcoin private key generation
-// Derive derives and returns the bls12381 private key for the given seed and HD path.
-func (s bls12381Algo) Derive() DeriveFn {
-	return func(mnemonic string, bip39Passphrase, hdPath string) ([]byte, error) {
-		seed, err := bip39.NewSeedWithErrorChecking(mnemonic, bip39Passphrase)
-		if err != nil {
-			return nil, err
-		}
-
-		masterPriv, ch := ComputeMastersFromSeed(seed)
-		if len(hdPath) == 0 {
-			return masterPriv[:], nil
-		}
-		derivedKey, err := DerivePrivateKeyForPath(masterPriv, ch, hdPath)
-
-		return derivedKey, err
-	}
-}
-
-// Generate generates a bls12381 private key from the given bytes.
-func (s bls12381Algo) Generate() GenerateFn {
-	return func(bz []byte) types.PrivKey {
-		var bzArr = make([]byte, bls12381.SeedSize)
-		copy(bzArr, bz)
-		sk := bls12381.GenPrivKeyFromSecret(bzArr)
-
-		return sk
-	}
-}

crypto/keyring/keyring.go

@@ -200,7 +200,7 @@ type keystore struct {
 func newKeystore(kr keyring.Keyring, opts ...Option) keystore {
 	// Default options for keybase
 	options := Options{
-		SupportedAlgos:       SigningAlgoList{hd.Secp256k1, hd.Bls12381},
+		SupportedAlgos:       SigningAlgoList{hd.Secp256k1},
 		SupportedAlgosLedger: SigningAlgoList{hd.Secp256k1},
 	}