Merge pull request #848 from neutron-org/feat/metamask

feat: eip 191 signing #NTRN-454

Author: pr0n00gler

app/ante_handler.go

@@ -78,7 +78,7 @@ func NewAnteHandler(options HandlerOptions, _ log.Logger) (sdk.AnteHandler, erro
 		ante.NewSetPubKeyDecorator(options.AccountKeeper),
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
-		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
 	}

app/app.go

@@ -1186,7 +1186,7 @@ func New(
 			HandlerOptions: ante.HandlerOptions{
 				FeegrantKeeper:  app.FeeGrantKeeper,
 				SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
-				SigGasConsumer:  ante.DefaultSigVerificationGasConsumer,
+				SigGasConsumer:  DefaultSigVerificationGasConsumer,
 			},
 			BankKeeper:            app.BankKeeper,
 			AccountKeeper:         app.AccountKeeper,

app/encoding.go

@@ -3,6 +3,8 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 
+	ethcryptocodec "github.com/neutron-org/neutron/v6/x/crypto/codec"
+
 	"github.com/neutron-org/neutron/v6/app/params"
 )
 
@@ -11,6 +13,8 @@ func MakeEncodingConfig() params.EncodingConfig {
 	encodingConfig := params.MakeEncodingConfig()
 	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	ethcryptocodec.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	ethcryptocodec.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	return encodingConfig

app/params/encoding.go

@@ -2,13 +2,16 @@ package params
 
 import (
 	"cosmossdk.io/x/tx/signing"
+	"cosmossdk.io/x/tx/signing/aminojson"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/address"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	"github.com/cosmos/gogoproto/proto"
+
+	neutrontx "github.com/neutron-org/neutron/v6/tx"
 )
 
 // EncodingConfig specifies the concrete encoding types to use for a given app.
@@ -38,7 +41,18 @@ func MakeEncodingConfig() EncodingConfig {
 		panic(err)
 	}
 	marshaler := codec.NewProtoCodec(reg)
-	txCfg := tx.NewTxConfig(marshaler, tx.DefaultSignModes)
+
+	signingOptions, err := tx.NewDefaultSigningOptions()
+	if err != nil {
+		panic(err)
+	}
+	txCfg := tx.NewTxConfig(
+		marshaler,
+		tx.DefaultSignModes,
+		neutrontx.NewSignModeEIP191Handler(aminojson.SignModeHandlerOptions{
+			FileResolver: signingOptions.FileResolver,
+			TypeResolver: signingOptions.TypeResolver,
+		}))
 
 	return EncodingConfig{
 		InterfaceRegistry: reg,