fix: amino messages registration

sge-network · Sep 29, 2023 · 9f0d0ad · 9f0d0ad
1 parent a144602
commit 9f0d0ad
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 62 deletions.
diff --git a/x/bet/module.go b/x/bet/module.go
@@ -41,11 +41,10 @@ func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { return AppModuleB
 // Name returns the module's name.
 func (AppModuleBasic) Name() string { return types.ModuleName }
 
-// RegisterCodec registers the codec for the app module basic
-func (AppModuleBasic) RegisterCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
-
 // RegisterLegacyAminoCodec registers the legacy amino codec for the app module basic
-func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
+func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	types.RegisterLegacyAminoCodec(cdc)
+}
 
 // RegisterInterfaces registers the module's interface types
 func (AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) {

diff --git a/x/bet/types/codec.go b/x/bet/types/codec.go
@@ -2,15 +2,18 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	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"
 )
 
-// RegisterCodec registers module codec to the app codec
-func RegisterCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(&MsgWager{}, "bet/Wager", nil)
+// RegisterLegacyAminoCodec registers the necessary x/bet interfaces and concrete types
+// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
+func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	legacy.RegisterAminoMsg(cdc, &MsgWager{}, "bet/Wager")
 }
 
 // RegisterInterfaces registers the module interface types
@@ -23,8 +26,14 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 }
 
 var (
-	// Amino is the legacy amino codec
-	Amino = codec.NewLegacyAmino()
+	// amino is the legacy amino codec
+	amino = codec.NewLegacyAmino()
 	// ModuleCdc is the codec of the module
-	ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+	ModuleCdc = codec.NewAminoCodec(amino)
 )
+
+func init() {
+	RegisterLegacyAminoCodec(amino)
+	cryptocodec.RegisterCrypto(amino)
+	sdk.RegisterLegacyAminoCodec(amino)
+}
diff --git a/x/house/types/codec.go b/x/house/types/codec.go
@@ -2,7 +2,9 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	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/x/authz"
 
@@ -12,8 +14,8 @@ import (
 // RegisterLegacyAminoCodec registers the necessary x/house interfaces and concrete types
 // on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
 func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(&MsgDeposit{}, "house/Deposit", nil)
-	cdc.RegisterConcrete(&MsgWithdraw{}, "house/Withdraw", nil)
+	legacy.RegisterAminoMsg(cdc, &MsgDeposit{}, "house/Deposit")
+	legacy.RegisterAminoMsg(cdc, &MsgWithdraw{}, "house/Withdraw")
 }
 
 // RegisterInterfaces registers the x/house interfaces types with the interface registry
@@ -32,8 +34,14 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 }
 
 var (
-	// Amino is the legacy amino codec
-	Amino = codec.NewLegacyAmino()
+	// amino is the legacy amino codec
+	amino = codec.NewLegacyAmino()
 	// ModuleCdc is the codec of the module
-	ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+	ModuleCdc = codec.NewAminoCodec(amino)
 )
+
+func init() {
+	RegisterLegacyAminoCodec(amino)
+	cryptocodec.RegisterCrypto(amino)
+	sdk.RegisterLegacyAminoCodec(amino)
+}
diff --git a/x/market/module.go b/x/market/module.go
@@ -45,14 +45,9 @@ func (AppModuleBasic) Name() string {
 	return types.ModuleName
 }
 
-// RegisterCodec registers the codec for the app module basic
-func (AppModuleBasic) RegisterCodec(cdc *codec.LegacyAmino) {
-	types.RegisterCodec(cdc)
-}
-
 // RegisterLegacyAminoCodec registers the legacy amino codec for the app module basic
 func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
-	types.RegisterCodec(cdc)
+	types.RegisterLegacyAminoCodec(cdc)
 }
 
 // RegisterInterfaces registers the module's interface types

diff --git a/x/market/types/codec.go b/x/market/types/codec.go
@@ -2,17 +2,20 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	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"
 )
 
-// RegisterCodec registers module codec to the app codec
-func RegisterCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(&MsgAdd{}, "market/Add", nil)
-	cdc.RegisterConcrete(&MsgResolve{}, "market/Resolve", nil)
-	cdc.RegisterConcrete(&MsgUpdate{}, "market/Update", nil)
+// RegisterLegacyAminoCodec registers the necessary x/market interfaces and concrete types
+// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
+func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	legacy.RegisterAminoMsg(cdc, &MsgAdd{}, "market/Add")
+	legacy.RegisterAminoMsg(cdc, &MsgResolve{}, "market/Resolve")
+	legacy.RegisterAminoMsg(cdc, &MsgUpdate{}, "market/Update")
 }
 
 // RegisterInterfaces registers the module interface types
@@ -32,8 +35,14 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 }
 
 var (
-	// Amino is the legacy amino codec
-	Amino = codec.NewLegacyAmino()
+	// amino is the legacy amino codec
+	amino = codec.NewLegacyAmino()
 	// ModuleCdc is the codec of the module
-	ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+	ModuleCdc = codec.NewAminoCodec(amino)
 )
+
+func init() {
+	RegisterLegacyAminoCodec(amino)
+	cryptocodec.RegisterCrypto(amino)
+	sdk.RegisterLegacyAminoCodec(amino)
+}
diff --git a/x/mint/module.go b/x/mint/module.go
@@ -43,11 +43,10 @@ func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic {
 // Name returns the module's name.
 func (AppModuleBasic) Name() string { return types.ModuleName }
 
-// RegisterCodec registers the codec for the app module basic
-func (AppModuleBasic) RegisterCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
-
 // RegisterLegacyAminoCodec registers the lagacy amino codec for the app module basic
-func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
+func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	types.RegisterLegacyAminoCodec(cdc)
+}
 
 // RegisterInterfaces registers the module's interface types
 func (AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) {

diff --git a/x/mint/types/codec.go b/x/mint/types/codec.go
@@ -3,11 +3,14 @@ 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"
 )
 
-// RegisterCodec registers module codec to the app codec
-func RegisterCodec(_ *codec.LegacyAmino) {
+// RegisterLegacyAminoCodec registers the necessary x/mint interfaces and concrete types
+// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
+func RegisterLegacyAminoCodec(_ *codec.LegacyAmino) {
 	// left empty because no message is available in this module
 }
 
@@ -17,8 +20,14 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 }
 
 var (
-	// Amino is the legacy amino codec
-	Amino = codec.NewLegacyAmino()
+	// amino is the legacy amino codec
+	amino = codec.NewLegacyAmino()
 	// ModuleCdc is the codec of the module
-	ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+	ModuleCdc = codec.NewAminoCodec(amino)
 )
+
+func init() {
+	RegisterLegacyAminoCodec(amino)
+	cryptocodec.RegisterCrypto(amino)
+	sdk.RegisterLegacyAminoCodec(amino)
+}
diff --git a/x/orderbook/module.go b/x/orderbook/module.go
@@ -41,11 +41,10 @@ func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { return AppModuleB
 // Name returns the orderbook module's name.
 func (AppModuleBasic) Name() string { return types.ModuleName }
 
-// RegisterCodec registers the codec for the app module basic
-func (AppModuleBasic) RegisterCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
-
 // RegisterLegacyAminoCodec registers the legacy amino codec for the app module basic
-func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
+func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	types.RegisterLegacyAminoCodec(cdc)
+}
 
 // RegisterInterfaces registers the module's interface types
 func (AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) {

diff --git a/x/orderbook/types/codec.go b/x/orderbook/types/codec.go
@@ -3,20 +3,30 @@ 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"
 )
 
-// RegisterCodec registers module codec to the app codec
-func RegisterCodec(_ *codec.LegacyAmino) {}
+// RegisterLegacyAminoCodec registers the necessary x/orderbook interfaces and concrete types
+// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
+func RegisterLegacyAminoCodec(_ *codec.LegacyAmino) {
+	// left empty because no message is available in this module
+}
 
 // RegisterInterfaces registers the module interface types
 func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 	registry.RegisterImplementations((*sdk.Msg)(nil))
 }
 
 var (
-	// Amino is the legacy amino codec
-	Amino = codec.NewLegacyAmino()
+	// amino is the legacy amino codec
+	amino = codec.NewLegacyAmino()
 	// ModuleCdc is the codec of the module
-	ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+	ModuleCdc = codec.NewAminoCodec(amino)
 )
+
+func init() {
+	RegisterLegacyAminoCodec(amino)
+	cryptocodec.RegisterCrypto(amino)
+	sdk.RegisterLegacyAminoCodec(amino)
+}
diff --git a/x/ovm/module.go b/x/ovm/module.go
@@ -39,11 +39,10 @@ func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { return AppModuleB
 // Name returns the module's name.
 func (AppModuleBasic) Name() string { return types.ModuleName }
 
-// RegisterCodec registers the codec for the app module basic
-func (AppModuleBasic) RegisterCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
-
 // RegisterLegacyAminoCodec registers the lagacy amino codec for the app module basic
-func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { types.RegisterCodec(cdc) }
+func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	types.RegisterLegacyAminoCodec(cdc)
+}
 
 // RegisterInterfaces registers the module's interface types
 func (AppModuleBasic) RegisterInterfaces(reg cdctypes.InterfaceRegistry) {

diff --git a/x/ovm/types/codec.go b/x/ovm/types/codec.go
@@ -2,19 +2,18 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	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"
 )
 
-// RegisterCodec registers module codec to the app codec
-func RegisterCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(
-		&MsgSubmitPubkeysChangeProposalRequest{},
-		"ovm/SubmitPubkeysChangeProposal",
-		nil,
-	)
-	cdc.RegisterConcrete(&MsgVotePubkeysChangeRequest{}, "ovm/VotePubkeysChange", nil)
+// RegisterLegacyAminoCodec registers the necessary x/ovm interfaces and concrete types
+// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
+func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	legacy.RegisterAminoMsg(cdc, &MsgSubmitPubkeysChangeProposalRequest{}, "ovm/SubmitPubkeysChangeProposal")
+	legacy.RegisterAminoMsg(cdc, &MsgVotePubkeysChangeRequest{}, "ovm/VotePubkeysChange")
 }
 
 // RegisterInterfaces registers the module interface types
@@ -27,8 +26,14 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 }
 
 var (
-	// Amino is the legacy amino codec
-	Amino = codec.NewLegacyAmino()
+	// amino is the legacy amino codec
+	amino = codec.NewLegacyAmino()
 	// ModuleCdc is the codec of the module
-	ModuleCdc = codec.NewProtoCodec(cdctypes.NewInterfaceRegistry())
+	ModuleCdc = codec.NewAminoCodec(amino)
 )
+
+func init() {
+	RegisterLegacyAminoCodec(amino)
+	cryptocodec.RegisterCrypto(amino)
+	sdk.RegisterLegacyAminoCodec(amino)
+}