Merge pull request #262 from comdex-official/feature/lend

adding lend module
comdex-official · Jun 20, 2022 · 85113c3 · 85113c3
2 parents fccb184 + fca74ae
commit 85113c3
Show file tree

Hide file tree

Showing 44 changed files with 20,324 additions and 1,527 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/app.go b/app/app.go
@@ -112,9 +112,10 @@ import (
 	collectorkeeper "github.com/comdex-official/comdex/x/collector/keeper"
 	collectortypes "github.com/comdex-official/comdex/x/collector/types"
 
-	//"github.com/comdex-official/comdex/x/lend"
-	//lendkeeper "github.com/comdex-official/comdex/x/lend/keeper"
-	//lendtypes "github.com/comdex-official/comdex/x/lend/types"
+	"github.com/comdex-official/comdex/x/lend"
+	lendclient "github.com/comdex-official/comdex/x/lend/client"
+	lendkeeper "github.com/comdex-official/comdex/x/lend/keeper"
+	lendtypes "github.com/comdex-official/comdex/x/lend/types"
 	"github.com/comdex-official/comdex/x/locker"
 	lockerkeeper "github.com/comdex-official/comdex/x/locker/keeper"
 	lockertypes "github.com/comdex-official/comdex/x/locker/types"
@@ -188,6 +189,11 @@ func GetGovProposalHandlers() []govclient.ProposalHandler {
 		bandoraclemoduleclient.AddFetchPriceHandler,
 		collectorclient.AddLookupTableParamsHandlers,
 		collectorclient.AddAuctionControlParamsHandler,
+		lendclient.AddLendPairsHandler,
+		lendclient.UpdateLendPairsHandler,
+		lendclient.AddPoolHandler,
+		lendclient.AddAssetToPairHandler,
+		lendclient.AddAssetRatesStatsHandler,
 		paramsclient.ProposalHandler,
 		distrclient.ProposalHandler,
 		upgradeclient.ProposalHandler,
@@ -236,7 +242,7 @@ var (
 		vesting.AppModuleBasic{},
 		vault.AppModuleBasic{},
 		asset.AppModuleBasic{},
-		//lend.AppModuleBasic{},
+		lend.AppModuleBasic{},
 
 		market.AppModuleBasic{},
 		locker.AppModuleBasic{},
@@ -317,11 +323,11 @@ type App struct {
 	MarketKeeper      marketkeeper.Keeper
 	LiquidationKeeper liquidationkeeper.Keeper
 	LockerKeeper      lockerkeeper.Keeper
-	//lendKeeper        lendkeeper.Keeper
-	ScopedWasmKeeper capabilitykeeper.ScopedKeeper
-	AuctionKeeper    auctionkeeper.Keeper
-	TokenmintKeeper  tokenmintkeeper.Keeper
-	liquidityKeeper  liquiditykeeper.Keeper
+	LendKeeper        lendkeeper.Keeper
+	ScopedWasmKeeper  capabilitykeeper.ScopedKeeper
+	AuctionKeeper     auctionkeeper.Keeper
+	TokenmintKeeper   tokenmintkeeper.Keeper
+	liquidityKeeper   liquiditykeeper.Keeper
 	//lockingKeeper     lockingkeeper.Keeper
 	Rewardskeeper rewardskeeper.Keeper
 
@@ -402,7 +408,7 @@ func New(
 	app.ParamsKeeper.Subspace(vaulttypes.ModuleName)
 	app.ParamsKeeper.Subspace(assettypes.ModuleName)
 	app.ParamsKeeper.Subspace(collectortypes.ModuleName)
-	//app.ParamsKeeper.Subspace(lendtypes.ModuleName)
+	app.ParamsKeeper.Subspace(lendtypes.ModuleName)
 	app.ParamsKeeper.Subspace(markettypes.ModuleName)
 	app.ParamsKeeper.Subspace(liquidationtypes.ModuleName)
 	app.ParamsKeeper.Subspace(lockertypes.ModuleName)
@@ -543,15 +549,16 @@ func New(
 		&app.MarketKeeper,
 	)
 
-	/*app.lendKeeper = *lendkeeper.NewKeeper(
+	app.LendKeeper = *lendkeeper.NewKeeper(
 		app.cdc,
 		app.keys[lendtypes.StoreKey],
 		app.keys[lendtypes.StoreKey],
 		app.GetSubspace(lendtypes.ModuleName),
 		app.BankKeeper,
 		app.AccountKeeper,
 		&app.AssetKeeper,
-	)*/
+		&app.MarketKeeper,
+	)
 
 	app.VaultKeeper = vaultkeeper.NewKeeper(
 		app.cdc,
@@ -727,6 +734,7 @@ func New(
 		AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)).
 		AddRoute(assettypes.RouterKey, asset.NewUpdateAssetProposalHandler(app.AssetKeeper)).
 		AddRoute(collectortypes.RouterKey, collector.NewLookupTableParamsHandlers(app.CollectorKeeper)).
+		AddRoute(lendtypes.RouterKey, lend.NewLendHandler(app.LendKeeper)).
 		AddRoute(bandoraclemoduletypes.RouterKey, bandoraclemodule.NewFetchPriceHandler(app.BandoracleKeeper)).
 		AddRoute(ibchost.RouterKey, ibcclient.NewClientProposalHandler(app.IbcKeeper.ClientKeeper)).
 		AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IbcKeeper.ClientKeeper)).
@@ -804,7 +812,7 @@ func New(
 		liquidation.NewAppModule(app.cdc, app.LiquidationKeeper, app.AccountKeeper, app.BankKeeper),
 		locker.NewAppModule(app.cdc, app.LockerKeeper, app.AccountKeeper, app.BankKeeper),
 		collector.NewAppModule(app.cdc, app.CollectorKeeper, app.AccountKeeper, app.BankKeeper),
-		//lend.NewAppModule(app.cdc, app.lendKeeper, app.AccountKeeper, app.BankKeeper),
+		lend.NewAppModule(app.cdc, app.LendKeeper, app.AccountKeeper, app.BankKeeper),
 		wasm.NewAppModule(app.cdc, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper),
 		auction.NewAppModule(app.cdc, app.AuctionKeeper, app.AccountKeeper, app.BankKeeper),
 		tokenmint.NewAppModule(app.cdc, app.TokenmintKeeper, app.AccountKeeper, app.BankKeeper),
@@ -860,7 +868,7 @@ func New(
 		ibctransfertypes.ModuleName,
 		assettypes.ModuleName,
 		collectortypes.ModuleName,
-		//lendtypes.ModuleName,
+		lendtypes.ModuleName,
 		vaulttypes.ModuleName,
 		tokenminttypes.ModuleName,
 		bandoraclemoduletypes.ModuleName,
@@ -1060,16 +1068,16 @@ func (a *App) ModuleAccountsPermissions() map[string][]string {
 		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
 		collectortypes.ModuleName:      {authtypes.Burner, authtypes.Staking},
 		vaulttypes.ModuleName:          {authtypes.Minter, authtypes.Burner},
-		//lendtypes.ModuleName:           {authtypes.Minter, authtypes.Burner},
-		tokenminttypes.ModuleName: {authtypes.Minter, authtypes.Burner},
-		//lendtypes.ModuleAcc1:           {authtypes.Minter, authtypes.Burner},
-		//lendtypes.ModuleAcc2:           {authtypes.Minter, authtypes.Burner},
-		//lendtypes.ModuleAcc3:           {authtypes.Minter, authtypes.Burner},
-		liquidationtypes.ModuleName: {authtypes.Minter, authtypes.Burner},
-		auctiontypes.ModuleName:     {authtypes.Minter, authtypes.Burner},
-		lockertypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
-		wasm.ModuleName:             {authtypes.Burner},
-		liquiditytypes.ModuleName:   {authtypes.Minter, authtypes.Burner},
+		lendtypes.ModuleName:           {authtypes.Minter, authtypes.Burner},
+		tokenminttypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
+		lendtypes.ModuleAcc1:           {authtypes.Minter, authtypes.Burner},
+		lendtypes.ModuleAcc2:           {authtypes.Minter, authtypes.Burner},
+		lendtypes.ModuleAcc3:           {authtypes.Minter, authtypes.Burner},
+		liquidationtypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
+		auctiontypes.ModuleName:        {authtypes.Minter, authtypes.Burner},
+		lockertypes.ModuleName:         {authtypes.Minter, authtypes.Burner},
+		wasm.ModuleName:                {authtypes.Burner},
+		liquiditytypes.ModuleName:      {authtypes.Minter, authtypes.Burner},
 		//lockingtypes.ModuleName:        nil,
 		rewardstypes.ModuleName: {authtypes.Minter, authtypes.Burner},
 		icatypes.ModuleName:     nil,
@@ -1112,7 +1120,7 @@ func (a *App) registerUpgradeHandlers() {
 				auctiontypes.ModuleName,
 				bandoraclemoduletypes.ModuleName,
 				collectortypes.ModuleName,
-				//lendtypes.ModuleName,
+				lendtypes.ModuleName,
 				liquidationtypes.ModuleName,
 				liquiditytypes.ModuleName,
 				lockertypes.ModuleName,

diff --git a/proto/comdex/.DS_Store b/proto/comdex/.DS_Store
diff --git a/proto/comdex/lend/v1beta1/gov.proto b/proto/comdex/lend/v1beta1/gov.proto
@@ -0,0 +1,38 @@
+syntax = "proto3";
+package comdex.lend.v1beta1;
+
+import "gogoproto/gogo.proto";
+import "comdex/lend/v1beta1/lend.proto";
+
+
+option go_package = "github.com/comdex-official/comdex/x/lend/types";
+
+message LendPairsProposal {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  repeated Extended_Pair pairs = 3 [(gogoproto.nullable) = false];
+}
+
+message UpdatePairProposal {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  Extended_Pair pair = 3 [(gogoproto.nullable) = false];
+}
+
+message AddPoolsProposal {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  Pool Pool = 3 [(gogoproto.nullable) = false];
+}
+
+message AddAssetToPairProposal {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  AssetToPairMapping AssetToPairMapping = 3 [(gogoproto.nullable) = false];
+}
+
+message AddAssetRatesStats {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  repeated AssetRatesStats AssetRatesStats = 3 [(gogoproto.nullable) = false];
+}