fix legacy codecs and signbytes for amino. (#352)

* fix legacy codecs and signbytes for amino.

* fix test

Author: puneet2019

x/lscosmos/module.go

@@ -44,12 +44,8 @@ func (AppModuleBasic) Name() string {
 	return types.ModuleName
 }
 
-func (AppModuleBasic) RegisterCodec(cdc *codec.LegacyAmino) {
-	types.RegisterCodec(cdc)
-}
-
 func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
-	types.RegisterCodec(cdc)
+	types.RegisterLegacyAminoCodec(cdc)
 }
 
 // RegisterInterfaces registers the module's interface types

x/lscosmos/types/codec.go

@@ -3,12 +3,13 @@ package types
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
+	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 )
 
-func RegisterCodec(cdc *codec.LegacyAmino) {
+func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 	cdc.RegisterConcrete(&RegisterHostChainProposal{}, "cosmos/RegisterHostChainProposal", nil)
 	cdc.RegisterConcrete(&MinDepositAndFeeChangeProposal{}, "cosmos/MinDepositAndFeeChangeProposal", nil)
 	cdc.RegisterConcrete(&PstakeFeeAddressChangeProposal{}, "cosmos/PstakeFeeAddressChangeProposal", nil)
@@ -45,4 +46,11 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 var (
 	Amino     = codec.NewLegacyAmino()
 	ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+	AminoCdc  = codec.NewAminoCodec(Amino)
 )
+
+func init() {
+	RegisterLegacyAminoCodec(Amino)
+	cryptocodec.RegisterCrypto(Amino)
+	Amino.Seal()
+}

x/lscosmos/types/msgs.go

@@ -51,7 +51,7 @@ func (m *MsgLiquidStake) ValidateBasic() error {
 
 // GetSignBytes encodes the message for signing
 func (m *MsgLiquidStake) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(m))
+	return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(m))
 }
 
 // GetSigners defines whose signature is required
@@ -97,7 +97,7 @@ func (m *MsgJuice) ValidateBasic() error {
 
 // GetSignBytes encodes the message for signing
 func (m *MsgJuice) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(m))
+	return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(m))
 }
 
 // GetSigners defines whose signature is required
@@ -139,7 +139,7 @@ func (m *MsgLiquidUnstake) ValidateBasic() error {
 }
 
 func (m *MsgLiquidUnstake) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(m))
+	return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(m))
 
 }
 
@@ -181,7 +181,7 @@ func (m *MsgRedeem) ValidateBasic() error {
 }
 
 func (m *MsgRedeem) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(m))
+	return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(m))
 
 }
 
@@ -219,7 +219,7 @@ func (m *MsgClaim) ValidateBasic() error {
 
 // GetSignBytes encodes the message for signing
 func (m *MsgClaim) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(m))
+	return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(m))
 }
 
 // GetSigners defines whose signature is required
@@ -285,7 +285,7 @@ func (m *MsgJumpStart) ValidateBasic() error {
 
 // GetSignBytes encodes the message for signing
 func (m *MsgJumpStart) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(m))
+	return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(m))
 }
 
 // GetSigners defines whose signature is required

x/lscosmos/types/msgs_test.go

@@ -61,7 +61,7 @@ func TestNewMsgLiquidStakeGetSignBytes(t *testing.T) {
 	coin := sdk.NewInt64Coin("atom", 10)
 	var msg = types.NewMsgLiquidStake(coin, addr)
 	res := msg.GetSignBytes()
-	excepted := `{"amount":{"amount":"10","denom":"atom"},"delegator_address":"persistence1d9h8qat5et0urd"}`
+	excepted := `{"type":"cosmos/MsgLiquidStake","value":{"amount":{"amount":"10","denom":"atom"},"delegator_address":"persistence1d9h8qat5et0urd"}}`
 	require.Equal(t, excepted, string(res))
 
 }