adding pool Depreciate poposal

app/app.go

@@ -178,6 +178,8 @@ import (
 	cwasm "github.com/comdex-official/comdex/app/wasm"
 
 	mv11 "github.com/comdex-official/comdex/app/upgrades/mainnet/v11"
+
+	mv12 "github.com/comdex-official/comdex/app/upgrades/mainnet/v12"
 	tv11_4 "github.com/comdex-official/comdex/app/upgrades/testnet/v11_4"
 )
 
@@ -215,6 +217,8 @@ func GetGovProposalHandlers() []govclient.ProposalHandler {
 		lendclient.AddMultipleLendPairsHandler,
 		lendclient.AddPoolPairsHandler,
 		lendclient.AddAssetRatesPoolPairsHandler,
+		lendclient.AddDepreciatePoolsHandler,
+		lendclient.AddEModePairsHandler,
 		paramsclient.ProposalHandler,
 		distrclient.ProposalHandler,
 		upgradeclient.ProposalHandler,
@@ -1361,6 +1365,11 @@ func (a *App) registerUpgradeHandlers() {
 			mv11.UpgradeName,
 			mv11.CreateUpgradeHandlerV11(a.mm, a.configurator, a.LiquidityKeeper, a.AssetKeeper, a.BankKeeper, a.AccountKeeper, a.Rewardskeeper, a.ICAHostKeeper),
 		)
+	case upgradeInfo.Name == mv12.UpgradeName:
+		a.UpgradeKeeper.SetUpgradeHandler(
+			mv12.UpgradeName,
+			mv12.CreateUpgradeHandlerV12(a.mm, a.configurator),
+		)
 	}
 
 	var storeUpgrades *storetypes.StoreUpgrades
@@ -1383,6 +1392,10 @@ func upgradeHandlers(upgradeInfo storetypes.UpgradeInfo, a *App, storeUpgrades *
 		storeUpgrades = &storetypes.StoreUpgrades{
 			Added: []string{ibchookstypes.StoreKey, packetforwardtypes.StoreKey},
 		}
+	case upgradeInfo.Name == mv12.UpgradeName && !a.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height):
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{},
+		}
 	}
 	return storeUpgrades
 }

app/upgrades/mainnet/v12/constants.go

@@ -0,0 +1,15 @@
+package v12
+
+const (
+	UpgradeName   = "v12.0.0"
+	UpgradeHeight = ""
+	UpgradeInfo   = `'{
+		"binaries": {
+			"darwin/arm64":"",
+			"darwin/x86_64":"",
+			"linux/arm64":"",
+			"linux/x86_64":"",
+			"windows/x86_64":""
+		}
+	}'`
+)

app/upgrades/mainnet/v12/upgrades.go

@@ -0,0 +1,26 @@
+package v12
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+)
+
+// An error occurred during the creation of the CMST/STJUNO pair, as it was mistakenly created in the Harbor app (ID-2) instead of the cSwap app (ID-1).
+// As a result, the transaction fee was charged to the creator of the pair, who is entitled to a refund.
+// The provided code is designed to initiate the refund process.
+// The transaction hash for the pair creation is EF408AD53B8BB0469C2A593E4792CB45552BD6495753CC2C810A1E4D82F3982F.
+// MintScan - https://www.mintscan.io/comdex/txs/EF408AD53B8BB0469C2A593E4792CB45552BD6495753CC2C810A1E4D82F3982F
+
+func CreateUpgradeHandlerV12(
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		vm, err := mm.RunMigrations(ctx, configurator, fromVM)
+		if err != nil {
+			return nil, err
+		}
+		return vm, err
+	}
+}

proto/comdex/lend/v1beta1/gov.proto

@@ -59,4 +59,16 @@ message AddAssetRatesPoolPairsProposal {
   string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
   string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
   AssetRatesPoolPairs AssetRatesPoolPairs = 3 [(gogoproto.nullable) = false];
+}
+
+message AddPoolDepreciateProposal {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  PoolDepreciate PoolDepreciate = 3 [(gogoproto.nullable) = false];
+}
+
+message AddEModePairsProposal {
+  string title = 1 [(gogoproto.moretags) = "yaml:\"title\""];
+  string description = 2 [(gogoproto.moretags) = "yaml:\"description\""];
+  EModePairsForProposal EModePairsForProposal = 3 [(gogoproto.nullable) = false];
 }

proto/comdex/lend/v1beta1/lend.proto

@@ -218,6 +218,10 @@ message Extended_Pair {
 
   uint64 min_usd_value_left = 6 [
     (gogoproto.moretags) = "yaml:\"min_usd_value_left\""];
+
+  bool is_e_mode_enabled = 7 [
+    (gogoproto.moretags) = "yaml:\"is_e_mode_enabled\""
+  ];
 }
 
 message AssetToPairMapping{
@@ -366,7 +370,24 @@ message AssetRatesParams{//AssetRatesStats
     (gogoproto.customname) = "CAssetID",
     (gogoproto.moretags) = "yaml:\"c_asset_id\""
   ];
-
+  bool is_isolated = 16 [
+    (gogoproto.moretags) = "yaml:\"is_isolated\""
+  ];
+  string e_ltv = 17 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"e_ltv\""
+  ];
+  string e_liquidation_threshold = 18 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"e_liquidation_threshold\""
+  ];
+  string e_liquidation_penalty = 19 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"e_liquidation_penalty\""
+  ];
 }
 
 message ReserveBuybackAssetData{// BalanceStats
@@ -738,5 +759,57 @@ message AssetRatesPoolPairs {
     (gogoproto.moretags) = "yaml:\"asset_data\""
   ];
   uint64 min_usd_value_left = 19 [
-    (gogoproto.moretags) = "yaml:\"min_usd_value_left\""];
+    (gogoproto.moretags) = "yaml:\"min_usd_value_left\""
+  ];
+  bool is_isolated = 20 [
+    (gogoproto.moretags) = "yaml:\"is_isolated\""
+  ];
+}
+
+message PoolDepreciate{
+  repeated IndividualPoolDepreciate individual_pool_depreciate = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.customname) = "IndividualPoolDepreciate",
+    (gogoproto.moretags) = "yaml:\"individual_pool_depreciate\""
+  ];
+}
+
+message IndividualPoolDepreciate{
+  uint64 pool_id = 1 [
+    (gogoproto.customname) = "PoolID",
+    (gogoproto.moretags) = "yaml:\"pool_id\""
+  ];
+  bool is_pool_depreciated = 2 [
+    (gogoproto.moretags) = "yaml:\"is_pool_depreciated\""
+  ];
+}
+
+message EModePairsForProposal {
+  repeated EModePairs e_mode_pairs = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.customname) = "EModePairs",
+    (gogoproto.moretags) = "yaml:\"e_mode_pairs\""
+  ];
+}
+
+message EModePairs {
+  uint64 pair_id = 1 [
+    (gogoproto.customname) = "PairID",
+    (gogoproto.moretags) = "yaml:\"pair_id\""
+  ];
+  string e_ltv = 2 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"e_ltv\""
+  ];
+  string e_liquidation_threshold = 3 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"e_liquidation_threshold\""
+  ];
+  string e_liquidation_penalty = 4 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false,
+    (gogoproto.moretags) = "yaml:\"e_liquidation_penalty\""
+  ];
 }

proto/comdex/lend/v1beta1/tx.proto

@@ -39,6 +39,8 @@ service Msg {
 
   rpc FundReserveAccounts(MsgFundReserveAccounts) returns (MsgFundReserveAccountsResponse);
 
+  rpc RepayWithdraw(MsgRepayWithdraw) returns (MsgRepayWithdrawResponse);
+
 }
 
 message MsgLend {
@@ -126,6 +128,11 @@ message MsgFundReserveAccounts {
   cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false];
 }
 
+message MsgRepayWithdraw {
+  string                   borrower = 1;
+  uint64                   borrow_id = 2;
+}
+
 message MsgLendResponse {}
 
 message MsgWithdrawResponse {}
@@ -151,3 +158,5 @@ message MsgFundModuleAccountsResponse {}
 message MsgCalculateInterestAndRewardsResponse {}
 
 message MsgFundReserveAccountsResponse {}
+
+message MsgRepayWithdrawResponse {}

x/lend/abci.go

@@ -0,0 +1,22 @@
+package lend
+
+import (
+	utils "github.com/comdex-official/comdex/types"
+	"github.com/comdex-official/comdex/x/lend/keeper"
+	"github.com/comdex-official/comdex/x/lend/types"
+	"github.com/cosmos/cosmos-sdk/telemetry"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	abci "github.com/tendermint/tendermint/abci/types"
+)
+
+func BeginBlocker(ctx sdk.Context, _ abci.RequestBeginBlock, k keeper.Keeper) {
+	defer telemetry.ModuleMeasureSince(types.ModuleName, ctx.BlockTime(), telemetry.MetricKeyBeginBlocker)
+
+	_ = utils.ApplyFuncIfNoError(ctx, func(ctx sdk.Context) error {
+		err := k.DeletePoolAndTransferFunds(ctx)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+}

x/lend/client/cli/flags.go

@@ -16,6 +16,8 @@ const (
 	FlagSetAuctionParamsFile       = "add-auction-params-file"
 	FlagAddLendPoolPairsFile       = "add-lend-pool-pairs-file"
 	FlagAddAssetRatesPoolPairsFile = "add-asset-rates-pool-pairs-file"
+	FlagDepreciatePoolsFile        = "depreciate-pools-file"
+	FlagAddEModePairsFile          = "e-mode-pairs-file"
 )
 
 func ParseUint64SliceFromString(s string, separator string) ([]uint64, error) {
@@ -98,6 +100,34 @@ func FlagSetAuctionParams() *flag.FlagSet {
 	return fs
 }
 
+func FlagSetDepreciatePoolsMapping() *flag.FlagSet {
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+
+	fs.String(FlagDepreciatePoolsFile, "", "depreciates existing pool, json file path")
+	return fs
+}
+
+func FlagAddEModePairs() *flag.FlagSet {
+	fs := flag.NewFlagSet("", flag.ContinueOnError)
+
+	fs.String(FlagAddEModePairsFile, "", "enable e-mode for a pair, json file path")
+	return fs
+}
+
+func ParseDecSliceFromStringForDec(s string, separator string) ([]sdk.Dec, error) {
+	var newParsedDec []sdk.Dec
+	for _, s := range strings.Split(s, separator) {
+		s = strings.TrimSpace(s)
+
+		parsed, err := sdk.NewDecFromStr(s)
+		if err != nil {
+			return []sdk.Dec{}, err
+		}
+		newParsedDec = append(newParsedDec, parsed)
+	}
+	return newParsedDec, nil
+}
+
 type addNewLendPairsInputs struct {
 	AssetIn         string `json:"asset_in"`
 	AssetOut        string `json:"asset_out"`
@@ -189,7 +219,25 @@ type addAssetRatesPoolPairsInputs struct {
 	SupplyCap            string `json:"supply_cap"`
 	CPoolName            string `json:"c_pool_name"`
 	MinUSDValueLeft      string `json:"min_usd_value_left"`
+	IsIsolated           string `json:"is_isolated"`
 	Title                string
 	Description          string
 	Deposit              string
 }
+
+type addDepreciatePoolsInputs struct {
+	PoolID      string `json:"pool_id"`
+	Title       string
+	Description string
+	Deposit     string
+}
+
+type addEModePairsInputs struct {
+	PairID                string `json:"pair_id"`
+	ELTV                  string `json:"e_ltv"`
+	ELiquidationThreshold string `json:"e_liquidation_threshold"`
+	ELiquidationPenalty   string `json:"e_liquidation_penalty"`
+	Title                 string
+	Description           string
+	Deposit               string
+}