Feature/lend refactor

app/app.go

@@ -631,6 +631,7 @@ func New(
 		&app.MarketKeeper,
 		&app.AuctionKeeper,
 		&app.EsmKeeper,
+		&app.LendKeeper,
 	)
 
 	app.AuctionKeeper = *auctionkeeper.NewKeeper(

proto/comdex/lend/v1beta1/lend.proto

@@ -52,7 +52,8 @@ message LendAsset {
     (gogoproto.moretags) = "yaml:\"reward_accumulated\"",
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"
   ];
-
+  uint64 app_id = 10
+  [(gogoproto.customname) = "AppId", (gogoproto.moretags) = "yaml:\"app_id\""];
 }
 
 message BorrowAsset {
@@ -408,4 +409,23 @@ message ModuleBalanceStats{
     (gogoproto.moretags) = "yaml:\"balance\"",
     (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.Coin"
   ];
+}
+
+message BalanceStats{
+  uint64 asset_id = 1 [
+    (gogoproto.customname) = "AssetId",
+    (gogoproto.moretags) = "yaml:\"asset_id\""
+  ];
+  string amount = 2 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"amount\"",
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int"
+  ];
+}
+
+message DepositStats{
+  repeated BalanceStats balance_stats = 1[
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"balance_stats\""
+  ];
 }

proto/comdex/lend/v1beta1/query.proto

@@ -233,6 +233,47 @@ message QueryModuleBalanceResponse {
     (gogoproto.nullable) = false,
     (gogoproto.moretags) = "yaml:\"module_balance\""];
 }
+
+message QueryDepositStatsRequest {}
+
+message QueryDepositStatsResponse {
+  DepositStats DepositStats = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"deposit_stats\""];
+}
+
+message QueryUserDepositStatsRequest {}
+
+message QueryUserDepositStatsResponse {
+  DepositStats UserDepositStats = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"user_deposit_stats\""];
+}
+
+message QueryReserveDepositStatsRequest {}
+
+message QueryReserveDepositStatsResponse {
+  DepositStats ReserveDepositStats = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"reserve_deposit_stats\""];
+}
+
+message QueryBuyBackDepositStatsRequest {}
+
+message QueryBuyBackDepositStatsResponse {
+  DepositStats BuyBackDepositStats = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"buy_back_deposit_stats\""];
+}
+
+message QueryBorrowStatsRequest {}
+
+message QueryBorrowStatsResponse {
+  DepositStats BorrowStats = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"borrow_stats\""];
+}
+
 service Query {
   rpc QueryLends(QueryLendsRequest) returns (QueryLendsResponse) {
     option (google.api.http).get = "/comdex/lend/v1beta1/lends";
@@ -303,5 +344,25 @@ service Query {
   rpc QueryModuleBalance(QueryModuleBalanceRequest) returns (QueryModuleBalanceResponse) {
     option (google.api.http).get = "/comdex/lend/v1beta1/module_balance/{pool_id}";
   };
+
+  rpc QueryDepositStats(QueryDepositStatsRequest) returns (QueryDepositStatsResponse) {
+    option (google.api.http).get = "/comdex/lend/v1beta1/deposit_stats";
+  }
+
+  rpc QueryUserDepositStats(QueryUserDepositStatsRequest) returns (QueryUserDepositStatsResponse) {
+    option (google.api.http).get = "/comdex/lend/v1beta1/user_deposit_stats";
+  }
+
+  rpc QueryReserveDepositStats(QueryReserveDepositStatsRequest) returns (QueryReserveDepositStatsResponse) {
+    option (google.api.http).get = "/comdex/lend/v1beta1/reserve_deposit_stats";
+  }
+
+  rpc QueryBuyBackDepositStats(QueryBuyBackDepositStatsRequest) returns (QueryBuyBackDepositStatsResponse) {
+    option (google.api.http).get = "/comdex/lend/v1beta1/buy_back_deposit_stats";
+  }
+
+  rpc QueryBorrowStats(QueryBorrowStatsRequest) returns (QueryBorrowStatsResponse) {
+    option (google.api.http).get = "/comdex/lend/v1beta1/borrow_stats";
+  }
 }
 

proto/comdex/lend/v1beta1/tx.proto

@@ -39,6 +39,7 @@ message MsgLend {
   uint64                   asset_id = 2;
   cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false];
   uint64                   pool_id = 4;
+  uint64                   app_id = 5;
 }
 
 message MsgWithdraw {
@@ -62,7 +63,7 @@ message MsgBorrow {
   string                   borrower = 1;
   uint64                   lend_id = 2;
   uint64                   pair_id = 3;
-  bool                     is_stable_borrow =4;
+  bool                     is_stable_borrow = 4;
   cosmos.base.v1beta1.Coin amount_in = 5 [(gogoproto.nullable) = false];
   cosmos.base.v1beta1.Coin amount_out = 6 [(gogoproto.nullable) = false];
 }
@@ -93,7 +94,7 @@ message MsgCloseBorrow {
 
 message MsgFundModuleAccounts {
   string                   moduleName = 1;
-  uint64                   assetId =2;
+  uint64                   assetId = 2;
   string                   lender = 3;
   cosmos.base.v1beta1.Coin amount = 4 [(gogoproto.nullable) = false];
 }

proto/comdex/liquidation/v1beta1/locked_vault.proto

@@ -3,6 +3,7 @@ package comdex.liquidation.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
+import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/comdex-official/comdex/x/liquidation/types";
 option (gogoproto.equal_all) = false;
@@ -95,6 +96,24 @@ message LockedVault {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
     (gogoproto.moretags) = "yaml:\"interest_accumulated\"",
     (gogoproto.nullable) = false];
+  oneof kind {
+    BorrowMetaData borrow_meta_data = 19;
+  }
+}
+
+message BorrowMetaData {
+  uint64 lending_id = 1;
+  bool is_stable_borrow = 2;
+  string stable_borrow_rate = 3 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"stable_borrow_rate\""
+  ];
+  cosmos.base.v1beta1.Coin bridged_asset_amount = 7 [
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"bridged_asset_amount\"",
+    (gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.Coin"
+  ];
 }
 
 message LockedVaultToAppMapping {

x/lend/client/cli/query.go

@@ -42,6 +42,11 @@ func GetQueryCmd() *cobra.Command {
 		queryAssetRatesStats(),
 		QueryAssetStats(),
 		QueryModuleBalance(),
+		queryDepositStats(),
+		queryUserDepositStats(),
+		queryReserveDepositStats(),
+		queryBuyBackDepositStats(),
+		queryBorrowStats(),
 	)
 
 	return cmd
@@ -691,3 +696,153 @@ func QueryModuleBalance() *cobra.Command {
 	flags.AddQueryFlagsToCmd(cmd)
 	return cmd
 }
+
+func queryDepositStats() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "deposit-stats",
+		Short: "Query deposit stats",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(ctx)
+
+			res, err := queryClient.QueryDepositStats(
+				context.Background(),
+				&types.QueryDepositStatsRequest{},
+			)
+			if err != nil {
+				return err
+			}
+
+			return ctx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, "deposit-stats")
+
+	return cmd
+}
+
+func queryUserDepositStats() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "user-deposit-stats",
+		Short: "Query user deposit stats",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(ctx)
+
+			res, err := queryClient.QueryUserDepositStats(
+				context.Background(),
+				&types.QueryUserDepositStatsRequest{},
+			)
+			if err != nil {
+				return err
+			}
+
+			return ctx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, "user-deposit-stats")
+
+	return cmd
+}
+
+func queryReserveDepositStats() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "reserve-deposit-stats",
+		Short: "Query reserve deposit stats",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(ctx)
+
+			res, err := queryClient.QueryReserveDepositStats(
+				context.Background(),
+				&types.QueryReserveDepositStatsRequest{},
+			)
+			if err != nil {
+				return err
+			}
+
+			return ctx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, "reserve-deposit-stats")
+
+	return cmd
+}
+
+func queryBuyBackDepositStats() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "buy-back-deposit-stats",
+		Short: "Query reserve deposit stats",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(ctx)
+
+			res, err := queryClient.QueryBuyBackDepositStats(
+				context.Background(),
+				&types.QueryBuyBackDepositStatsRequest{},
+			)
+			if err != nil {
+				return err
+			}
+
+			return ctx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, "buy-back-deposit-stats")
+
+	return cmd
+}
+
+func queryBorrowStats() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "borrow-stats",
+		Short: "Query borrow stats",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ctx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(ctx)
+
+			res, err := queryClient.QueryBorrowStats(
+				context.Background(),
+				&types.QueryBorrowStatsRequest{},
+			)
+			if err != nil {
+				return err
+			}
+
+			return ctx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, "borrow-stats")
+
+	return cmd
+}

x/lend/client/cli/tx.go

@@ -43,16 +43,16 @@ func GetTxCmd() *cobra.Command {
 
 func txLend() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "lend [Asset_Id] [Amount] [Pool_Id]",
+		Use:   "lend [Asset_Id] [Amount] [Pool_Id] [App_Id]",
 		Short: "lend a whitelisted asset",
-		Args:  cobra.ExactArgs(3),
+		Args:  cobra.ExactArgs(4),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			pair, err := strconv.ParseUint(args[0], 10, 64)
+			assetId, err := strconv.ParseUint(args[0], 10, 64)
 			if err != nil {
 				return err
 			}
@@ -67,7 +67,12 @@ func txLend() *cobra.Command {
 				return err
 			}
 
-			msg := types.NewMsgLend(ctx.GetFromAddress().String(), pair, asset, pool)
+			appId, err := strconv.ParseUint(args[3], 10, 64)
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgLend(ctx.GetFromAddress().String(), assetId, asset, pool, appId)
 
 			return tx.GenerateOrBroadcastTxCLI(ctx, cmd.Flags(), msg)
 		},