Added liquidity module

app/app.go

@@ -344,9 +344,9 @@ func (app *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.Res
 	}
 
 	// custom initialization
-	//var bankGenesisState banktypes.GenesisState
-	//app.appCodec.MustUnmarshalJSON(genesisState["bank"], &bankGenesisState)
-	//app.BandwidthMeter.AddToDesirableBandwidth(ctx, bankGenesisState.Supply.AmountOf(ctypes.VOLT).Uint64())
+	// var bankGenesisState banktypes.GenesisState
+	// app.appCodec.MustUnmarshalJSON(genesisState["bank"], &bankGenesisState)
+	// app.BandwidthMeter.AddToDesirableBandwidth(ctx, bankGenesisState.Supply.AmountOf(ctypes.VOLT).Uint64())
 
 	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap())
 	resp := app.ModuleManager.InitGenesis(ctx, app.appCodec, genesisState)

app/keepers/keepers.go

@@ -57,10 +57,11 @@ import (
 
 	//"github.com/cybercongress/go-cyber/v4/app"
 
-	// liquiditykeeper "github.com/gravity-devs/liquidity/x/liquidity/keeper"
-	// liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types"
 	"github.com/spf13/cast"
 
+	liquiditykeeper "github.com/cybercongress/go-cyber/v4/x/liquidity/keeper"
+	liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types"
+
 	wasmplugins "github.com/cybercongress/go-cyber/v4/plugins"
 	"github.com/cybercongress/go-cyber/v4/x/bandwidth"
 	bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper"
@@ -97,9 +98,9 @@ var maccPerms = map[string][]string{
 	ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
 	ibcfeetypes.ModuleName:         nil,
 	wasmtypes.ModuleName:           {authtypes.Burner},
-	// liquiditytypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
-	gridtypes.GridPoolName:       nil,
-	resourcestypes.ResourcesName: {authtypes.Minter, authtypes.Burner},
+	liquiditytypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
+	gridtypes.GridPoolName:         nil,
+	resourcestypes.ResourcesName:   {authtypes.Minter, authtypes.Burner},
 }
 
 type AppKeepers struct {
@@ -129,8 +130,8 @@ type AppKeepers struct {
 
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
 
-	WasmKeeper wasmkeeper.Keeper
-	// LiquidityKeeper liquiditykeeper.Keeper
+	WasmKeeper      wasmkeeper.Keeper
+	LiquidityKeeper liquiditykeeper.Keeper
 	BandwidthMeter  *bandwidthkeeper.BandwidthMeter
 	CyberbankKeeper *cyberbankkeeper.IndexedKeeper
 	GraphKeeper     *graphkeeper.GraphKeeper
@@ -354,14 +355,14 @@ func NewAppKeepers(
 		govModAddress,
 	)
 
-	//appKeepers.LiquidityKeeper = liquiditykeeper.NewKeeper(
-	//	appCodec,
-	//	keys[liquiditytypes.StoreKey],
-	//	appKeepers.GetSubspace(liquiditytypes.ModuleName),
-	//	appKeepers.CyberbankKeeper.Proxy,
-	//	appKeepers.AccountKeeper,
-	//	appKeepers.DistrKeeper,
-	//)
+	appKeepers.LiquidityKeeper = liquiditykeeper.NewKeeper(
+		appCodec,
+		keys[liquiditytypes.StoreKey],
+		appKeepers.CyberbankKeeper.Proxy,
+		appKeepers.AccountKeeper,
+		appKeepers.DistrKeeper,
+		govModAddress,
+	)
 
 	// End cyber's keepers configuration
 
@@ -462,7 +463,7 @@ func NewAppKeepers(
 		appKeepers.DmnKeeper,
 		appKeepers.GridKeeper,
 		appKeepers.BandwidthMeter,
-		// appKeepers.LiquidityKeeper,
+		appKeepers.LiquidityKeeper,
 	)
 	wasmOpts = append(wasmOpts, cyberOpts...)
 
@@ -536,7 +537,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(gridtypes.ModuleName)
 	paramsKeeper.Subspace(dmntypes.ModuleName)
 	paramsKeeper.Subspace(resourcestypes.ModuleName)
-	// paramsKeeper.Subspace(liquiditytypes.ModuleName)
+	paramsKeeper.Subspace(liquiditytypes.ModuleName)
 
 	return paramsKeeper
 }

app/keepers/keys.go

@@ -23,7 +23,7 @@ import (
 	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 
-	// liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types"
+	liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types"
 
 	bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types"
 	dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types"
@@ -48,7 +48,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 		ibcfeetypes.StoreKey,
 		wasmtypes.StoreKey,
 		// our additions
-		// liquiditytypes.StoreKey,
+		liquiditytypes.StoreKey,
 		bandwidthtypes.StoreKey,
 		graphtypes.StoreKey,
 		ranktypes.StoreKey,

app/modules.go

@@ -45,8 +45,8 @@ import (
 	ibc "github.com/cosmos/ibc-go/v7/modules/core"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 
-	//"github.com/gravity-devs/liquidity/x/liquidity"
-	//liquiditytypes "github.com/gravity-devs/liquidity/x/liquidity/types"
+	"github.com/cybercongress/go-cyber/v4/x/liquidity"
+	liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types"
 
 	"github.com/cybercongress/go-cyber/v4/app/params"
 	"github.com/cybercongress/go-cyber/v4/x/bandwidth"
@@ -93,7 +93,7 @@ var ModuleBasics = module.NewBasicManager(
 	ibcfee.AppModuleBasic{},
 	transfer.AppModuleBasic{},
 	consensus.AppModuleBasic{},
-	// liquidity.AppModuleBasic{},
+	liquidity.AppModuleBasic{},
 	wasm.AppModuleBasic{},
 	bandwidth.AppModuleBasic{},
 	cyberbank.AppModuleBasic{},
@@ -137,7 +137,7 @@ func appModules(
 		crisis.NewAppModule(app.AppKeepers.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)),
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.CyberbankKeeper.Proxy, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)),
 		consensus.NewAppModule(appCodec, app.AppKeepers.ConsensusParamsKeeper),
-		// liquidity.NewAppModule(appCodec, app.LiquidityKeeper, app.AccountKeeper, app.CyberbankKeeper.Proxy, app.DistrKeeper),
+		liquidity.NewAppModule(appCodec, app.LiquidityKeeper, app.AccountKeeper, app.CyberbankKeeper.Proxy, app.DistrKeeper, app.GetSubspace(liquiditytypes.ModuleName)),
 		cyberbank.NewAppModule(appCodec, app.CyberbankKeeper),
 		bandwidth.NewAppModule(appCodec, app.AccountKeeper, app.BandwidthMeter, app.GetSubspace(bandwidthtypes.ModuleName)),
 		graph.NewAppModule(
@@ -189,7 +189,7 @@ func orderBeginBlockers() []string {
 		upgradetypes.ModuleName,
 		capabilitytypes.ModuleName,
 		stakingtypes.ModuleName,
-		// liquiditytypes.ModuleName,
+		liquiditytypes.ModuleName,
 		distrtypes.ModuleName,
 		slashingtypes.ModuleName,
 		minttypes.ModuleName,
@@ -223,7 +223,7 @@ func orderEndBlockers() []string {
 		crisistypes.ModuleName,
 		govtypes.ModuleName,
 		stakingtypes.ModuleName,
-		// liquiditytypes.ModuleName,
+		liquiditytypes.ModuleName,
 		cyberbanktypes.ModuleName,
 		bandwidthtypes.ModuleName,
 		graphtypes.ModuleName,
@@ -266,7 +266,7 @@ func orderInitBlockers() []string {
 		ibcexported.ModuleName,
 		evidencetypes.ModuleName,
 		consensusparamtypes.ModuleName,
-		// liquiditytypes.ModuleName,
+		liquiditytypes.ModuleName,
 		feegrant.ModuleName,
 		authz.ModuleName,
 		authtypes.ModuleName,

app/upgrades/v4/constants.go

@@ -4,6 +4,7 @@ import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
+
 	resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types"
 
 	"github.com/cybercongress/go-cyber/v4/app/upgrades"

app/upgrades/v4/upgrades.go

@@ -2,6 +2,7 @@ package v3
 
 import (
 	"fmt"
+	liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types"
 	"time"
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
@@ -83,8 +84,9 @@ func CreateV4UpgradeHandler(
 				keyTable = ranktypes.ParamKeyTable() //nolint:staticcheck
 			case resourcestypes.ModuleName:
 				keyTable = resourcestypes.ParamKeyTable() //nolint:staticcheck
+			case liquiditytypes.ModuleName:
+				keyTable = liquiditytypes.ParamKeyTable()
 			}
-
 			if !subspace.HasKeyTable() {
 				subspace.WithKeyTable(keyTable)
 			}