fix!: Fix foundation amino codec (#833) (#862)

* Add foundation amino codec * Update CHANGELOG.md Co-authored-by: Youngtaek Yoon <[email protected]>
Finschia · Jan 25, 2023 · df3df2f · df3df2f
1 parent 1deccf3
commit df3df2f
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Breaking Changes
 * (rest) [\#807](https://github.com/line/lbm-sdk/pull/807) remove legacy REST API
 
+* (codec) [#833](https://github.com/line/lbm-sdk/pull/833) Fix foundation amino codec
+
 ### Build, CI
 * (ci) [\#829](https://github.com/line/lbm-sdk/pull/829) automate release process
 

diff --git a/x/auth/types/codec.go b/x/auth/types/codec.go
@@ -7,6 +7,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/x/auth/legacy/legacytx"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -54,4 +55,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/auth/vesting/types/codec.go b/x/auth/vesting/types/codec.go
@@ -10,6 +10,7 @@ import (
 	authtypes "github.com/line/lbm-sdk/x/auth/types"
 	"github.com/line/lbm-sdk/x/auth/vesting/exported"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -77,4 +78,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/authz/codec.go b/x/authz/codec.go
@@ -7,6 +7,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -42,4 +43,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/bank/types/codec.go b/x/bank/types/codec.go
@@ -9,6 +9,7 @@ import (
 	"github.com/line/lbm-sdk/types/msgservice"
 	"github.com/line/lbm-sdk/x/authz"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -47,4 +48,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/collection/codec.go b/x/collection/codec.go
@@ -8,6 +8,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -94,4 +95,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/crisis/types/codec.go b/x/crisis/types/codec.go
@@ -8,6 +8,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -39,4 +40,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/distribution/types/codec.go b/x/distribution/types/codec.go
@@ -8,6 +8,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 	govtypes "github.com/line/lbm-sdk/x/gov/types"
 )
@@ -53,4 +54,5 @@ func init() {
 	// instances.
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/evidence/types/codec.go b/x/evidence/types/codec.go
@@ -9,6 +9,7 @@ import (
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
 	"github.com/line/lbm-sdk/x/evidence/exported"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -45,4 +46,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/feegrant/codec.go b/x/feegrant/codec.go
@@ -8,6 +8,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -62,4 +63,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/foundation/codec.go b/x/foundation/codec.go
@@ -4,10 +4,10 @@ import (
 	"github.com/line/lbm-sdk/codec"
 	"github.com/line/lbm-sdk/codec/legacy"
 	"github.com/line/lbm-sdk/codec/types"
-	cryptocodec "github.com/line/lbm-sdk/crypto/codec"
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -67,18 +67,10 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 	)
 }
 
-var (
-	Amino     = codec.NewLegacyAmino()
-	ModuleCdc = codec.NewAminoCodec(Amino)
-)
-
 func init() {
-	RegisterLegacyAminoCodec(Amino)
-	cryptocodec.RegisterCrypto(Amino)
-	sdk.RegisterLegacyAminoCodec(Amino)
-
 	// Register all Amino interfaces and concrete types on the authz and gov Amino codec so that this can later be
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/foundation/codec/cdc.go b/x/foundation/codec/cdc.go
@@ -0,0 +1,18 @@
+package codec
+
+import (
+	"github.com/line/lbm-sdk/codec"
+	cryptocodec "github.com/line/lbm-sdk/crypto/codec"
+	sdk "github.com/line/lbm-sdk/types"
+)
+
+var (
+	Amino     = codec.NewLegacyAmino()
+	ModuleCdc = codec.NewAminoCodec(Amino)
+)
+
+func init() {
+	cryptocodec.RegisterCrypto(Amino)
+	codec.RegisterEvidences(Amino)
+	sdk.RegisterLegacyAminoCodec(Amino)
+}
diff --git a/x/foundation/keeper/keeper.go b/x/foundation/keeper/keeper.go
@@ -34,7 +34,6 @@ type Keeper struct {
 	// - MsgGrant
 	// - MsgRevoke
 	// - MsgWithdrawFromTreasury
-	// - MsgGovMint
 	//
 	// Typically, this should be the x/foundation module account.
 	authority string

diff --git a/x/foundation/msgs.go b/x/foundation/msgs.go
@@ -6,6 +6,7 @@ import (
 	codectypes "github.com/line/lbm-sdk/codec/types"
 	sdk "github.com/line/lbm-sdk/types"
 	sdkerrors "github.com/line/lbm-sdk/types/errors"
+	"github.com/line/lbm-sdk/x/foundation/codec"
 )
 
 var _ sdk.Msg = (*MsgUpdateParams)(nil)
@@ -41,7 +42,7 @@ func (m MsgUpdateParams) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgUpdateParams) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgFundTreasury)(nil)
@@ -77,7 +78,7 @@ func (m MsgFundTreasury) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgFundTreasury) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgWithdrawFromTreasury)(nil)
@@ -117,7 +118,7 @@ func (m MsgWithdrawFromTreasury) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgWithdrawFromTreasury) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgUpdateMembers)(nil)
@@ -157,7 +158,7 @@ func (m MsgUpdateMembers) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgUpdateMembers) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgUpdateDecisionPolicy)(nil)
@@ -196,7 +197,7 @@ func (m MsgUpdateDecisionPolicy) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgUpdateDecisionPolicy) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 func (m MsgUpdateDecisionPolicy) GetDecisionPolicy() DecisionPolicy {
@@ -293,7 +294,7 @@ func (m MsgSubmitProposal) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgSubmitProposal) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgWithdrawProposal)(nil)
@@ -329,7 +330,7 @@ func (m MsgWithdrawProposal) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgWithdrawProposal) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgVote)(nil)
@@ -373,7 +374,7 @@ func (m MsgVote) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgVote) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgExec)(nil)
@@ -409,7 +410,7 @@ func (m MsgExec) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgExec) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgLeaveFoundation)(nil)
@@ -441,7 +442,7 @@ func (m MsgLeaveFoundation) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgLeaveFoundation) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgGrant)(nil)
@@ -512,7 +513,7 @@ func (m MsgGrant) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgGrant) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
 
 var _ sdk.Msg = (*MsgRevoke)(nil)
@@ -552,5 +553,5 @@ func (m MsgRevoke) Route() string {
 
 // GetSignBytes implements the LegacyMsg.GetSignBytes method.
 func (m MsgRevoke) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m))
+	return sdk.MustSortJSON(codec.ModuleCdc.MustMarshalJSON(&m))
 }
diff --git a/x/gov/types/codec.go b/x/gov/types/codec.go
@@ -7,6 +7,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -42,4 +43,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/slashing/types/codec.go b/x/slashing/types/codec.go
@@ -8,6 +8,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -38,4 +39,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/staking/types/codec.go b/x/staking/types/codec.go
@@ -9,6 +9,7 @@ import (
 	"github.com/line/lbm-sdk/types/msgservice"
 	"github.com/line/lbm-sdk/x/authz"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -58,4 +59,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/stakingplus/codec.go b/x/stakingplus/codec.go
@@ -5,6 +5,7 @@ import (
 	"github.com/line/lbm-sdk/codec/types"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
 	"github.com/line/lbm-sdk/x/foundation"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -26,6 +27,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
-
-	RegisterLegacyAminoCodec(foundation.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/token/codec.go b/x/token/codec.go
@@ -8,6 +8,7 @@ import (
 	sdk "github.com/line/lbm-sdk/types"
 	"github.com/line/lbm-sdk/types/msgservice"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 )
 
@@ -58,4 +59,5 @@ func init() {
 	// used to properly serialize MsgGrant, MsgExec and MsgSubmitProposal instances
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }
diff --git a/x/upgrade/types/codec.go b/x/upgrade/types/codec.go
@@ -6,6 +6,7 @@ import (
 	cryptocodec "github.com/line/lbm-sdk/crypto/codec"
 	sdk "github.com/line/lbm-sdk/types"
 	authzcodec "github.com/line/lbm-sdk/x/authz/codec"
+	fdncodec "github.com/line/lbm-sdk/x/foundation/codec"
 	govcodec "github.com/line/lbm-sdk/x/gov/codec"
 	govtypes "github.com/line/lbm-sdk/x/gov/types"
 )
@@ -40,4 +41,5 @@ func init() {
 	// instances.
 	RegisterLegacyAminoCodec(authzcodec.Amino)
 	RegisterLegacyAminoCodec(govcodec.Amino)
+	RegisterLegacyAminoCodec(fdncodec.Amino)
 }