Merge pull request #412 from persistenceOne/puneet/migrate-lsm

feat: wire gaia/liquid

Author: puneet2019

app/encoding.go

@@ -8,13 +8,14 @@ package app
 import (
 	"github.com/cosmos/cosmos-sdk/std"
 	sdkdistr "github.com/cosmos/cosmos-sdk/x/distribution"
+	grouptypes "github.com/cosmos/cosmos-sdk/x/group"
 	sdkslashing "github.com/cosmos/cosmos-sdk/x/slashing"
 	sdkstaking "github.com/cosmos/cosmos-sdk/x/staking"
-	interchainquerytypes "github.com/persistenceOne/persistence-sdk/v4/x/interchainquery/types"
-	oracletypes "github.com/persistenceOne/persistence-sdk/v4/x/oracle/types"
-	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v4/x/liquidstakeibc/types"
-	lscosmostypes "github.com/persistenceOne/pstake-native/v4/x/lscosmos/types"
-	ratesynctypes "github.com/persistenceOne/pstake-native/v4/x/ratesync/types"
+	interchainquerytypes "github.com/persistenceOne/persistence-sdk/v5/x/interchainquery/types"
+	oracletypes "github.com/persistenceOne/persistence-sdk/v5/x/oracle/types"
+	liquidstakeibctypes "github.com/persistenceOne/pstake-native/v5/x/liquidstakeibc/types"
+	lscosmostypes "github.com/persistenceOne/pstake-native/v5/x/lscosmos/types"
+	ratesynctypes "github.com/persistenceOne/pstake-native/v5/x/ratesync/types"
 
 	"github.com/persistenceOne/persistenceCore/v14/app/params"
 )
@@ -48,6 +49,10 @@ func MakeEncodingConfig() params.EncodingConfig {
 	// oracle, but was never used
 	oracletypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	oracletypes.RegisterLegacyAminoCodec(encodingConfig.Amino)
+
+	// group module,
+	grouptypes.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	grouptypes.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	//ibcfee, but was never used ...
 	return encodingConfig
 }

app/keepers/keepers.go

@@ -46,6 +46,8 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	liquidkeeper "github.com/cosmos/gaia/v24/x/liquid/keeper"
+	liquidtypes "github.com/cosmos/gaia/v24/x/liquid/types"
 	"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward"
 	packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward/keeper"
 	packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward/types"
@@ -67,12 +69,12 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
 	ibckeeper "github.com/cosmos/ibc-go/v10/modules/core/keeper"
 	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
-	epochskeeper "github.com/persistenceOne/persistence-sdk/v4/x/epochs/keeper"
-	epochstypes "github.com/persistenceOne/persistence-sdk/v4/x/epochs/types"
-	"github.com/persistenceOne/persistence-sdk/v4/x/halving"
-	halvingtypes "github.com/persistenceOne/persistence-sdk/v4/x/halving/types"
-	liquidstakekeeper "github.com/persistenceOne/pstake-native/v4/x/liquidstake/keeper"
-	liquidstaketypes "github.com/persistenceOne/pstake-native/v4/x/liquidstake/types"
+	epochskeeper "github.com/persistenceOne/persistence-sdk/v5/x/epochs/keeper"
+	epochstypes "github.com/persistenceOne/persistence-sdk/v5/x/epochs/types"
+	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
+	halvingtypes "github.com/persistenceOne/persistence-sdk/v5/x/halving/types"
+	liquidstakekeeper "github.com/persistenceOne/pstake-native/v5/x/liquidstake/keeper"
+	liquidstaketypes "github.com/persistenceOne/pstake-native/v5/x/liquidstake/types"
 	"github.com/spf13/cast"
 
 	"github.com/persistenceOne/persistenceCore/v14/app/constants"
@@ -104,6 +106,7 @@ type AppKeepers struct {
 	WasmKeeper            *wasmkeeper.Keeper
 	EpochsKeeper          *epochskeeper.Keeper
 	ICAControllerKeeper   *icacontrollerkeeper.Keeper
+	LiquidKeeper          *liquidkeeper.Keeper
 	LiquidStakeKeeper     *liquidstakekeeper.Keeper
 	ConsensusParamsKeeper *consensusparamskeeper.Keeper
 	PacketForwardKeeper   *packetforwardkeeper.Keeper
@@ -270,8 +273,21 @@ func NewAppKeeper(
 	)
 	appKeepers.HalvingKeeper = &halvingKeeper
 
+	appKeepers.LiquidKeeper = liquidkeeper.NewKeeper(
+		appCodec,
+		runtime.NewKVStoreService(appKeepers.keys[liquidtypes.StoreKey]),
+		appKeepers.AccountKeeper,
+		appKeepers.BankKeeper,
+		appKeepers.StakingKeeper,
+		appKeepers.DistributionKeeper,
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+
 	appKeepers.StakingKeeper.SetHooks(
-		stakingtypes.NewMultiStakingHooks(appKeepers.DistributionKeeper.Hooks(), appKeepers.SlashingKeeper.Hooks()),
+		stakingtypes.NewMultiStakingHooks(
+			appKeepers.DistributionKeeper.Hooks(),
+			appKeepers.SlashingKeeper.Hooks(),
+			appKeepers.LiquidKeeper.Hooks()),
 	)
 
 	appKeepers.EpochsKeeper = epochskeeper.NewKeeper(appKeepers.keys[epochstypes.StoreKey])
@@ -356,6 +372,7 @@ func NewAppKeeper(
 		*appKeepers.MintKeeper,
 		appKeepers.DistributionKeeper,
 		appKeepers.SlashingKeeper,
+		*appKeepers.LiquidKeeper,
 		bApp.MsgServiceRouter(),
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)

app/keepers/keys.go

@@ -17,15 +17,16 @@ import (
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	liquidtypes "github.com/cosmos/gaia/v24/x/liquid/types"
 	packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward/types"
 	ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v10/types"
 	icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
 	icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
 	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
-	epochstypes "github.com/persistenceOne/persistence-sdk/v4/x/epochs/types"
-	"github.com/persistenceOne/persistence-sdk/v4/x/halving"
-	liquidstaketypes "github.com/persistenceOne/pstake-native/v4/x/liquidstake/types"
+	epochstypes "github.com/persistenceOne/persistence-sdk/v5/x/epochs/types"
+	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
+	liquidstaketypes "github.com/persistenceOne/pstake-native/v5/x/liquidstake/types"
 )
 
 func (appKeepers *AppKeepers) GenerateKeys() {
@@ -48,6 +49,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 		ibctransfertypes.StoreKey,
 		icacontrollertypes.StoreKey,
 		icahosttypes.StoreKey,
+		liquidtypes.StoreKey,
 		liquidstaketypes.StoreKey,
 		minttypes.StoreKey,
 		paramstypes.StoreKey,

app/keepers/modules.go

@@ -17,27 +17,23 @@ import (
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"
-	groupmodule "github.com/cosmos/cosmos-sdk/x/group/module"
 	"github.com/cosmos/cosmos-sdk/x/mint"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
 	"github.com/cosmos/cosmos-sdk/x/staking"
+	"github.com/cosmos/gaia/v24/x/liquid"
 	"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward"
 	ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v10"
 	ica "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts"
 	"github.com/cosmos/ibc-go/v10/modules/apps/transfer"
 	ibc "github.com/cosmos/ibc-go/v10/modules/core"
 	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
-	"github.com/persistenceOne/persistence-sdk/v4/x/epochs"
-	"github.com/persistenceOne/persistence-sdk/v4/x/halving"
-	"github.com/persistenceOne/pstake-native/v4/x/liquidstake"
+	"github.com/persistenceOne/persistence-sdk/v5/x/epochs"
+	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
+	"github.com/persistenceOne/pstake-native/v5/x/liquidstake"
 )
 
-var DeprecatedAppModuleBasics = []module.AppModuleBasic{
-	groupmodule.AppModuleBasic{},
-}
-
 // AppModuleBasics defines the module BasicManager is in charge of setting up basic,
 // non-dependant module elements, such as codec registration
 // and genesis verification.
@@ -68,8 +64,9 @@ var AppModuleBasics = append([]module.AppModuleBasic{
 	halving.AppModuleBasic{},
 	ica.AppModuleBasic{},
 	epochs.AppModuleBasic{},
+	liquid.AppModuleBasic{},
 	liquidstake.AppModuleBasic{},
 	consensus.AppModuleBasic{},
 	ibchooks.AppModuleBasic{},
 	packetforward.AppModuleBasic{},
-}, DeprecatedAppModuleBasics...)
+})

app/modules.go

@@ -36,6 +36,8 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	"github.com/cosmos/gaia/v24/x/liquid"
+	liquidtypes "github.com/cosmos/gaia/v24/x/liquid/types"
 	packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward"
 	packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v10/packetforward/types"
 	ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v10"
@@ -46,12 +48,12 @@ import (
 	ibc "github.com/cosmos/ibc-go/v10/modules/core"
 	ibcexported "github.com/cosmos/ibc-go/v10/modules/core/exported"
 	ibctm "github.com/cosmos/ibc-go/v10/modules/light-clients/07-tendermint"
-	"github.com/persistenceOne/persistence-sdk/v4/x/epochs"
-	epochstypes "github.com/persistenceOne/persistence-sdk/v4/x/epochs/types"
-	"github.com/persistenceOne/persistence-sdk/v4/x/halving"
+	"github.com/persistenceOne/persistence-sdk/v5/x/epochs"
+	epochstypes "github.com/persistenceOne/persistence-sdk/v5/x/epochs/types"
+	"github.com/persistenceOne/persistence-sdk/v5/x/halving"
 	appparams "github.com/persistenceOne/persistenceCore/v14/app/params"
-	"github.com/persistenceOne/pstake-native/v4/x/liquidstake"
-	liquidstaketypes "github.com/persistenceOne/pstake-native/v4/x/liquidstake/types"
+	"github.com/persistenceOne/pstake-native/v5/x/liquidstake"
+	liquidstaketypes "github.com/persistenceOne/pstake-native/v5/x/liquidstake/types"
 )
 
 var ModuleAccountPermissions = map[string][]string{
@@ -104,6 +106,7 @@ func appModules(
 		ica.NewAppModule(app.ICAControllerKeeper, app.ICAHostKeeper),
 		wasm.NewAppModule(appCodec, app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasm.ModuleName)),
 		epochs.NewAppModule(*app.EpochsKeeper),
+		liquid.NewAppModule(appCodec, app.LiquidKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
 		liquidstake.NewAppModule(*app.LiquidStakeKeeper),
 		crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), // always be last to make sure that it checks for all invariants and not only part of them
 		ibctm.NewAppModule(app.TMLightClientModule),
@@ -148,6 +151,7 @@ func orderBeginBlockers() []string {
 		ibchookstypes.ModuleName,
 		packetforwardtypes.ModuleName,
 		wasmtypes.ModuleName,
+		liquidtypes.ModuleName,
 		liquidstaketypes.ModuleName,
 	}
 }
@@ -178,6 +182,7 @@ func orderEndBlockers() []string {
 		packetforwardtypes.ModuleName,
 		wasmtypes.ModuleName,
 		epochstypes.ModuleName,
+		liquidtypes.ModuleName,
 		liquidstaketypes.ModuleName,
 	}
 }
@@ -213,6 +218,7 @@ func orderInitGenesis() []string {
 		packetforwardtypes.ModuleName,
 		wasmtypes.ModuleName,
 		epochstypes.ModuleName,
+		liquidtypes.ModuleName,
 		liquidstaketypes.ModuleName,
 	}
 }

app/upgrades/testnet/v14.0.0-rc0/constants.go

@@ -2,6 +2,7 @@ package v14_0_0_rc0
 
 import (
 	store "cosmossdk.io/store/types"
+	liquidtypes "github.com/cosmos/gaia/v24/x/liquid/types"
 	"github.com/persistenceOne/persistenceCore/v14/app/upgrades"
 )
 
@@ -14,7 +15,7 @@ var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,
 	CreateUpgradeHandler: CreateUpgradeHandler,
 	StoreUpgrades: store.StoreUpgrades{
-		Added:   []string{},
+		Added:   []string{liquidtypes.ModuleName},
 		Deleted: []string{},
 	},
 }