cherry pick all reference PRs

x/accounts/module.go

@@ -9,12 +9,12 @@ import (
 
 	"cosmossdk.io/collections"
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/schema"
 	"cosmossdk.io/x/accounts/cli"
 	v1 "cosmossdk.io/x/accounts/v1"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/address"
 	"github.com/cosmos/cosmos-sdk/types/msgservice"
 )
@@ -66,7 +66,11 @@ func (am AppModule) RegisterServices(registrar grpc.ServiceRegistrar) error {
 // App module genesis
 
 func (am AppModule) DefaultGenesis() json.RawMessage {
-	return am.cdc.MustMarshalJSON(&v1.GenesisState{})
+	data, err := am.cdc.MarshalJSON(&v1.GenesisState{})
+	if err != nil {
+		panic(err)
+	}
+	return data
 }
 
 func (am AppModule) ValidateGenesis(message json.RawMessage) error {

x/bank/types/genesis.go

@@ -5,7 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/cosmos/cosmos-sdk/codec"
+	"cosmossdk.io/core/codec"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -101,7 +102,9 @@ func GetGenesisStateFromAppState(cdc codec.JSONCodec, appState map[string]json.R
 	var genesisState GenesisState
 
 	if appState[ModuleName] != nil {
-		cdc.MustUnmarshalJSON(appState[ModuleName], &genesisState)
+		if err := cdc.UnmarshalJSON(appState[ModuleName], &genesisState); err != nil {
+			panic(err)
+		}
 	}
 
 	return &genesisState

x/bank/v2/module.go

@@ -8,12 +8,11 @@ import (
 	"github.com/spf13/cobra"
 
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/x/bank/v2/client/cli"
 	"cosmossdk.io/x/bank/v2/keeper"
 	"cosmossdk.io/x/bank/v2/types"
-
-	"github.com/cosmos/cosmos-sdk/codec"
 )
 
 // ConsensusVersion defines the current x/bank/v2 module consensus version.
@@ -58,7 +57,11 @@ func (AppModule) RegisterInterfaces(registrar registry.InterfaceRegistrar) {
 
 // DefaultGenesis returns default genesis state as raw bytes for the bank module.
 func (am AppModule) DefaultGenesis() json.RawMessage {
-	return am.cdc.MustMarshalJSON(types.DefaultGenesisState())
+	data, err := am.cdc.MarshalJSON(types.DefaultGenesisState())
+	if err != nil {
+		panic(err)
+	}
+	return data
 }
 
 // ValidateGenesis performs genesis state validation for the bank module.

x/circuit/module.go

@@ -11,6 +11,7 @@ import (
 	"cosmossdk.io/collections"
 	"cosmossdk.io/core/appmodule"
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/core/transaction"
 	"cosmossdk.io/schema"
@@ -19,7 +20,6 @@ import (
 	"cosmossdk.io/x/circuit/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/module"
 )
 
@@ -81,7 +81,11 @@ func (AppModule) ConsensusVersion() uint64 { return ConsensusVersion }
 
 // DefaultGenesis returns default genesis state as raw bytes for the circuit module.
 func (am AppModule) DefaultGenesis() json.RawMessage {
-	return am.cdc.MustMarshalJSON(types.DefaultGenesisState())
+	data, err := am.cdc.MarshalJSON(types.DefaultGenesisState())
+	if err != nil {
+		panic(err)
+	}
+	return data
 }
 
 // ValidateGenesis performs genesis state validation for the circuit module.

x/consensus/module.go

@@ -9,13 +9,13 @@ import (
 
 	"cosmossdk.io/collections"
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/schema"
 	"cosmossdk.io/x/consensus/keeper"
 	"cosmossdk.io/x/consensus/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/module"
 )
 

x/distribution/migrations/v4/migrate.go

@@ -7,9 +7,9 @@ import (
 	gogotypes "github.com/cosmos/gogoproto/types"
 
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/store"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -46,6 +46,9 @@ func GetPreviousProposerConsAddr(ctx context.Context, storeService store.KVStore
 // SetPreviousProposerConsAddr set the proposer public key for this block.
 func SetPreviousProposerConsAddr(ctx context.Context, storeService store.KVStoreService, cdc codec.BinaryCodec, consAddr sdk.ConsAddress) error {
 	kvStore := storeService.OpenKVStore(ctx)
-	bz := cdc.MustMarshal(&gogotypes.BytesValue{Value: consAddr})
+	bz, err := cdc.Marshal(&gogotypes.BytesValue{Value: consAddr})
+	if err != nil {
+		panic(err)
+	}
 	return kvStore.Set(OldProposerKey, bz)
 }

x/distribution/module.go

@@ -11,6 +11,7 @@ import (
 
 	"cosmossdk.io/collections"
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/schema"
 	"cosmossdk.io/x/distribution/client/cli"
@@ -19,7 +20,6 @@ import (
 	"cosmossdk.io/x/distribution/types"
 
 	sdkclient "github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/simsx"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
@@ -115,7 +115,11 @@ func (am AppModule) RegisterMigrations(mr appmodule.MigrationRegistrar) error {
 
 // DefaultGenesis returns default genesis state as raw bytes for the distribution module.
 func (am AppModule) DefaultGenesis() json.RawMessage {
-	return am.cdc.MustMarshalJSON(types.DefaultGenesisState())
+	data, err := am.cdc.MarshalJSON(types.DefaultGenesisState())
+	if err != nil {
+		panic(err)
+	}
+	return data
 }
 
 // ValidateGenesis performs genesis state validation for the distribution module.

x/distribution/simulation/decoder.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"fmt"
 
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/x/distribution/types"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/kv"
 )
@@ -18,47 +18,75 @@ func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string {
 		switch {
 		case bytes.Equal(kvA.Key[:1], types.FeePoolKey):
 			var feePoolA, feePoolB types.FeePool
-			cdc.MustUnmarshal(kvA.Value, &feePoolA)
-			cdc.MustUnmarshal(kvB.Value, &feePoolB)
+			if err := cdc.Unmarshal(kvA.Value, &feePoolA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &feePoolB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", feePoolA, feePoolB)
 
 		case bytes.Equal(kvA.Key[:1], types.ValidatorOutstandingRewardsPrefix):
 			var rewardsA, rewardsB types.ValidatorOutstandingRewards
-			cdc.MustUnmarshal(kvA.Value, &rewardsA)
-			cdc.MustUnmarshal(kvB.Value, &rewardsB)
+			if err := cdc.Unmarshal(kvA.Value, &rewardsA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &rewardsB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", rewardsA, rewardsB)
 
 		case bytes.Equal(kvA.Key[:1], types.DelegatorWithdrawAddrPrefix):
 			return fmt.Sprintf("%v\n%v", sdk.AccAddress(kvA.Value), sdk.AccAddress(kvB.Value))
 
 		case bytes.Equal(kvA.Key[:1], types.DelegatorStartingInfoPrefix):
 			var infoA, infoB types.DelegatorStartingInfo
-			cdc.MustUnmarshal(kvA.Value, &infoA)
-			cdc.MustUnmarshal(kvB.Value, &infoB)
+			if err := cdc.Unmarshal(kvA.Value, &infoA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &infoB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", infoA, infoB)
 
 		case bytes.Equal(kvA.Key[:1], types.ValidatorHistoricalRewardsPrefix):
 			var rewardsA, rewardsB types.ValidatorHistoricalRewards
-			cdc.MustUnmarshal(kvA.Value, &rewardsA)
-			cdc.MustUnmarshal(kvB.Value, &rewardsB)
+			if err := cdc.Unmarshal(kvA.Value, &rewardsA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &rewardsB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", rewardsA, rewardsB)
 
 		case bytes.Equal(kvA.Key[:1], types.ValidatorCurrentRewardsPrefix):
 			var rewardsA, rewardsB types.ValidatorCurrentRewards
-			cdc.MustUnmarshal(kvA.Value, &rewardsA)
-			cdc.MustUnmarshal(kvB.Value, &rewardsB)
+			if err := cdc.Unmarshal(kvA.Value, &rewardsA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &rewardsB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", rewardsA, rewardsB)
 
 		case bytes.Equal(kvA.Key[:1], types.ValidatorAccumulatedCommissionPrefix):
 			var commissionA, commissionB types.ValidatorAccumulatedCommission
-			cdc.MustUnmarshal(kvA.Value, &commissionA)
-			cdc.MustUnmarshal(kvB.Value, &commissionB)
+			if err := cdc.Unmarshal(kvA.Value, &commissionA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &commissionB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", commissionA, commissionB)
 
 		case bytes.Equal(kvA.Key[:1], types.ValidatorSlashEventPrefix):
 			var eventA, eventB types.ValidatorSlashEvent
-			cdc.MustUnmarshal(kvA.Value, &eventA)
-			cdc.MustUnmarshal(kvB.Value, &eventB)
+			if err := cdc.Unmarshal(kvA.Value, &eventA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &eventB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", eventA, eventB)
 
 		default:

x/epochs/module.go

@@ -10,14 +10,14 @@ import (
 
 	"cosmossdk.io/collections"
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/schema"
 	"cosmossdk.io/x/epochs/keeper"
 	"cosmossdk.io/x/epochs/simulation"
 	"cosmossdk.io/x/epochs/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 )
@@ -75,7 +75,11 @@ func (am AppModule) RegisterServices(registrar grpc.ServiceRegistrar) error {
 
 // DefaultGenesis returns the epochs module's default genesis state.
 func (am AppModule) DefaultGenesis() json.RawMessage {
-	return am.cdc.MustMarshalJSON(types.DefaultGenesis())
+	data, err := am.cdc.MarshalJSON(types.DefaultGenesis())
+	if err != nil {
+		panic(err)
+	}
+	return data
 }
 
 // ValidateGenesis performs genesis state validation for the epochs module.

x/evidence/module.go

@@ -10,6 +10,7 @@ import (
 	"google.golang.org/grpc"
 
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/comet"
 	"cosmossdk.io/core/registry"
 	eviclient "cosmossdk.io/x/evidence/client"
@@ -19,7 +20,6 @@ import (
 	"cosmossdk.io/x/evidence/types"
 
 	"github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 )
@@ -100,7 +100,11 @@ func (am AppModule) RegisterServices(registrar grpc.ServiceRegistrar) error {
 
 // DefaultGenesis returns the evidence module's default genesis state.
 func (am AppModule) DefaultGenesis() json.RawMessage {
-	return am.cdc.MustMarshalJSON(types.DefaultGenesisState())
+	data, err := am.cdc.MarshalJSON(types.DefaultGenesisState())
+	if err != nil {
+		panic(err)
+	}
+	return data
 }
 
 // ValidateGenesis performs genesis state validation for the evidence module.

x/feegrant/migrations/v2/store.go

@@ -4,11 +4,11 @@ import (
 	"context"
 
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/store/prefix"
 	"cosmossdk.io/x/feegrant"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/runtime"
 )
 

x/feegrant/module/module.go

@@ -10,14 +10,14 @@ import (
 	"google.golang.org/grpc"
 
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/core/registry"
 	"cosmossdk.io/errors"
 	"cosmossdk.io/x/feegrant"
 	"cosmossdk.io/x/feegrant/client/cli"
 	"cosmossdk.io/x/feegrant/keeper"
 
 	sdkclient "github.com/cosmos/cosmos-sdk/client"
-	"github.com/cosmos/cosmos-sdk/codec"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 )
@@ -103,7 +103,11 @@ func (am AppModule) RegisterMigrations(mr appmodule.MigrationRegistrar) error {
 
 // DefaultGenesis returns default genesis state as raw bytes for the feegrant module.
 func (am AppModule) DefaultGenesis() json.RawMessage {
-	return am.cdc.MustMarshalJSON(feegrant.DefaultGenesisState())
+	data, err := am.cdc.MarshalJSON(feegrant.DefaultGenesisState())
+	if err != nil {
+		panic(err)
+	}
+	return data
 }
 
 // ValidateGenesis performs genesis state validation for the feegrant module.

x/feegrant/simulation/decoder.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"fmt"
 
+	"cosmossdk.io/core/codec"
 	"cosmossdk.io/x/feegrant"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/kv"
 )
 
@@ -17,8 +17,12 @@ func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string {
 		switch {
 		case bytes.Equal(kvA.Key[:1], feegrant.FeeAllowanceKeyPrefix):
 			var grantA, grantB feegrant.Grant
-			cdc.MustUnmarshal(kvA.Value, &grantA)
-			cdc.MustUnmarshal(kvB.Value, &grantB)
+			if err := cdc.Unmarshal(kvA.Value, &grantA); err != nil {
+				panic(err)
+			}
+			if err := cdc.Unmarshal(kvB.Value, &grantB); err != nil {
+				panic(err)
+			}
 			return fmt.Sprintf("%v\n%v", grantA, grantB)
 		default:
 			panic(fmt.Sprintf("invalid feegrant key %X", kvA.Key))