[Perpetual]: New Liquidation System

proto/elys/perpetual/tx.proto

@@ -21,6 +21,7 @@ service Msg {
   rpc AddCollateral       (MsgAddCollateral      ) returns (MsgAddCollateralResponse      );
   rpc BrokerAddCollateral (MsgBrokerAddCollateral) returns (MsgAddCollateralResponse      );
   rpc UpdateStopLoss      (MsgUpdateStopLoss     ) returns (MsgUpdateStopLossResponse     );
+  rpc ClosePositions      (MsgClosePositions     ) returns (MsgClosePositionsResponse);
 }
 message MsgOpen {
   string                   creator           = 1;
@@ -111,10 +112,18 @@ message MsgBrokerAddCollateral {
   string owner   = 4;
 }
 
+message MsgClosePositions {
+  string creator = 1;
+  repeated PositionRequest liquidate = 2;
+  repeated PositionRequest stop_loss = 3;
+}
+
+message MsgClosePositionsResponse {}
+
 message MsgUpdateStopLoss {
   string creator = 1;
   uint64 id = 2;
   string price = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
 
-message MsgUpdateStopLossResponse {}
+message MsgUpdateStopLossResponse {}

proto/elys/perpetual/types.proto

@@ -12,7 +12,7 @@ enum Position {
   SHORT = 2;
 }
 
-message MTP {
+message LegacyMTP {
   string address = 1;
   string collateral_asset = 2;
   string trading_asset = 3;
@@ -99,13 +99,9 @@ message MTP {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
-  string stop_loss_price = 28 [
-    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
-    (gogoproto.nullable) = false
-  ];
 }
 
-message LegacyMTP {
+message MTP {
   string address = 1;
   string collateral_asset = 2;
   string trading_asset = 3;
@@ -192,8 +188,63 @@ message LegacyMTP {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable) = false
   ];
+  string stop_loss_price = 28 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false
+  ];
+  uint64 last_interest_calc_time = 29;
+  uint64 last_interest_calc_block = 30;
+  uint64 last_funding_calc_time = 31;
+  uint64 last_funding_calc_block = 32;
+}
+
+message InterestBlock {
+    string interest_rate = 1 [
+        (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+        (gogoproto.nullable) = false
+    ];
+    int64 block_height = 2;
+}
+
+message FundingRateBlock {
+    string funding_rate = 1 [
+        (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+        (gogoproto.nullable) = false
+    ];
+    int64 block_height = 2;
+    string funding_amount_short = 3 [
+      (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+      (gogoproto.nullable) = false
+    ];
+    string funding_amount_long = 4 [
+      (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+      (gogoproto.nullable) = false
+    ];
+    string funding_rate_long = 5 [
+        (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+        (gogoproto.nullable) = false
+    ];
+    string funding_rate_short = 6 [
+        (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+        (gogoproto.nullable) = false
+    ];
+}
+
+message ToPay {
+  string asset_balance = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
+    (gogoproto.nullable) = false
+  ];
+  string asset_denom =  2;
+  string address = 3;
+  uint64 id = 4;
 }
 
 message WhiteList {
   repeated string validator_list = 1;
 }
+
+message PositionRequest {
+  string address = 1;
+  uint64 id = 2;
+}

x/leveragelp/keeper/query_get_position_test.go

@@ -103,14 +103,14 @@ func (suite KeeperTestSuite) TestQueryGetPosition() {
 
 	expected := types.PositionAndInterest{
 		Position: &types.QueryPosition{
-			Position: position,
-			UpdatedLeverage: updated_leverage,
+			Position:         position,
+			UpdatedLeverage:  updated_leverage,
 			PositionUsdValue: sdk.NewDec(5000).Quo(sdk.NewDec(1000000)),
 		},
-		InterestRateHour: sdk.MustNewDecFromStr("0.000017123287671233"),
+		InterestRateHour:    sdk.MustNewDecFromStr("0.000017123287671233"),
 		InterestRateHourUsd: sdk.ZeroDec(),
 	}
-	pos_for_address_res, _ := k.QueryPositionsForAddress(suite.ctx, &types.PositionsForAddressRequest{Address: addr.String(), Pagination: nil} )
+	pos_for_address_res, _ := k.QueryPositionsForAddress(suite.ctx, &types.PositionsForAddressRequest{Address: addr.String(), Pagination: nil})
 
 	suite.Require().Equal(expected.Position, pos_for_address_res.Positions[0].Position)
 	suite.Require().True(expected.InterestRateHour.Equal(pos_for_address_res.Positions[0].InterestRateHour))

x/leveragelp/keeper/query_position.go

@@ -21,7 +21,7 @@ func (k Keeper) Position(goCtx context.Context, req *types.PositionRequest) (*ty
 	if err != nil {
 		return nil, err
 	}
-	updatedLeveragePosition, err := k.GetLeverageLpUpdatedLeverage(ctx, []*types.Position{&position}) 
+	updatedLeveragePosition, err := k.GetLeverageLpUpdatedLeverage(ctx, []*types.Position{&position})
 
 	if err != nil {
 		return nil, err

x/leveragelp/types/hooks.go

@@ -20,7 +20,6 @@ var _ LeverageLpHooks = MultiLeverageLpHooks{}
 // combine multiple leverageLp hooks, all hook functions are run in array sequence.
 type MultiLeverageLpHooks []LeverageLpHooks
 
-
 func NewMultiLeverageLpHooks(hooks ...LeverageLpHooks) MultiLeverageLpHooks {
 	return hooks
 }
@@ -35,7 +34,6 @@ func (h MultiLeverageLpHooks) AfterLeverageLpPositionOpen(ctx sdk.Context, sende
 	return nil
 }
 
-
 func (h MultiLeverageLpHooks) AfterLeverageLpPositionClose(ctx sdk.Context, sender sdk.AccAddress) error {
 	for i := range h {
 		err := h[i].AfterLeverageLpPositionClose(ctx, sender)
@@ -46,7 +44,6 @@ func (h MultiLeverageLpHooks) AfterLeverageLpPositionClose(ctx sdk.Context, send
 	return nil
 }
 
-
 func (h MultiLeverageLpHooks) AfterLeverageLpPositionOpenConsolidate(ctx sdk.Context, sender sdk.AccAddress) error {
 	for i := range h {
 		err := h[i].AfterLeverageLpPositionOpenConsolidate(ctx, sender)

x/perpetual/client/cli/tx.go

@@ -30,6 +30,7 @@
 	cmd.AddCommand(CmdWhitelist())
 	cmd.AddCommand(CmdDewhitelist())
 	cmd.AddCommand(CmdAddCollateral())
+	cmd.AddCommand(CmdClosePositions())
 	cmd.AddCommand(CmdUpdateStopLoss())
 	// this line is used by starport scaffolding # 1
 

x/perpetual/client/cli/tx_close_positions.go

@@ -0,0 +1,78 @@
+package cli
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"strconv"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/elys-network/elys/x/perpetual/types"
+	"github.com/spf13/cobra"
+)
+
+var _ = strconv.Itoa(0)
+
+func CmdClosePositions() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "close-positions [liquidate] [stoploss]",
+		Short: "Broadcast message close-positions",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			liquidate, err := readPositionRequestJSON(args[0])
+			if err != nil {
+				return err
+			}
+			// Convert to slice of pointers
+			var liqudiatePtrs []*types.PositionRequest
+			for i := range liquidate {
+				liqudiatePtrs = append(liqudiatePtrs, &liquidate[i])
+			}
+
+			stopLoss, err := readPositionRequestJSON(args[1])
+			if err != nil {
+				return err
+			}
+			// Convert to slice of pointers
+			var stoplossPtrs []*types.PositionRequest
+			for i := range stopLoss {
+				stoplossPtrs = append(stoplossPtrs, &stopLoss[i])
+			}
+
+			msg := types.NewMsgClosePositions(
+				clientCtx.GetFromAddress().String(),
+				liqudiatePtrs,
+				stoplossPtrs,
+			)
+			if err = msg.ValidateBasic(); err != nil {
+				return err
+			}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func readPositionRequestJSON(filename string) ([]types.PositionRequest, error) {
+	var positions []types.PositionRequest
+	bz, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return []types.PositionRequest{}, err
+	}
+	err = json.Unmarshal(bz, &positions)
+	if err != nil {
+		return []types.PositionRequest{}, err
+	}
+
+	return positions, nil
+}

x/perpetual/keeper/add_collateral.go

@@ -93,7 +93,7 @@
 		return nil, err
 	}
 
-	h, err := k.UpdateMTPHealth(ctx, mtp, ammPool, baseCurrency) // set mtp in func or return h?
+	h, err := k.GetMTPHealth(ctx, mtp, ammPool, baseCurrency) // set mtp in func or return h?
 	if err != nil {
 		return nil, err
 	}
@@ -149,7 +149,7 @@
 	}
 
 	// Update the MTP health.
-	lr, err := k.OpenLongChecker.UpdateMTPHealth(ctx, mtp, ammPool, baseCurrency)
+	lr, err := k.OpenLongChecker.GetMTPHealth(ctx, mtp, ammPool, baseCurrency)
 	if err != nil {
 		return nil, err
 	}

x/perpetual/keeper/begin_blocker.go

@@ -1,40 +1,14 @@
 package keeper
 
 import (
-	"fmt"
-
-	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	assetprofiletypes "github.com/elys-network/elys/x/assetprofile/types"
-	ptypes "github.com/elys-network/elys/x/parameter/types"
+	"github.com/elys-network/elys/x/perpetual/types"
 )
 
 func (k Keeper) BeginBlocker(ctx sdk.Context) {
-	// check if epoch has passed then execute
-	epochLength := k.GetEpochLength(ctx)
-	epochPosition := k.GetEpochPosition(ctx, epochLength)
-
-	// if epoch has not passed
-	if epochPosition != 0 {
-		return
-	}
-
-	// if epoch has passed
-	entry, found := k.assetProfileKeeper.GetEntry(ctx, ptypes.BaseCurrency)
-	if !found {
-		ctx.Logger().Error(errorsmod.Wrapf(assetprofiletypes.ErrAssetProfileNotFound, "asset %s not found", ptypes.BaseCurrency).Error())
-	}
-	baseCurrency := entry.Denom
-	baseCurrencyDecimal := entry.Decimals
-
 	currentHeight := ctx.BlockHeight()
 	pools := k.GetAllPools(ctx)
 	for _, pool := range pools {
-		ammPool, err := k.GetAmmPool(ctx, pool.AmmPoolId, "")
-		if err != nil {
-			ctx.Logger().Error(errorsmod.Wrap(err, fmt.Sprintf("error getting amm pool: %d", pool.AmmPoolId)).Error())
-			continue
-		}
 		if k.IsPoolEnabled(ctx, pool.AmmPoolId) {
 			rate, err := k.BorrowInterestRateComputation(ctx, pool)
 			if err != nil {
@@ -43,6 +17,12 @@
 			}
 			pool.BorrowInterestRate = rate
 			pool.LastHeightBorrowInterestRateComputed = currentHeight
+
+			k.SetBorrowRate(ctx, uint64(ctx.BlockHeight()), pool.AmmPoolId, types.InterestBlock{
+				InterestRate: rate,
+				BlockHeight:  ctx.BlockHeight(),
+			})
+
 			err = k.UpdatePoolHealth(ctx, &pool)
 			if err != nil {
 				ctx.Logger().Error(err.Error())
@@ -52,19 +32,40 @@
 				ctx.Logger().Error(err.Error())
 			}
 
-			// TODO GetMTPsForPool might become a very slow call as it iterates through all the MTPs in the KV Store
-			mtps, _, _ := k.GetMTPsForPool(ctx, pool.AmmPoolId, nil)
-			for _, mtp := range mtps {
-				err := BeginBlockerProcessMTP(ctx, k, mtp, pool, ammPool, baseCurrency, baseCurrencyDecimal)
-				if err != nil {
-					ctx.Logger().Error(err.Error())
-					continue
-				}
+			// account custody from long position
+			totalCustodyLong := sdk.ZeroInt()
+			for _, asset := range pool.PoolAssetsLong {
+				totalCustodyLong = totalCustodyLong.Add(asset.Custody)
 			}
-			err = k.HandleFundingFeeDistribution(ctx, mtps, &pool, ammPool, baseCurrency)
-			if err != nil {
-				ctx.Logger().Error(err.Error())
+
+			// account custody from short position
+			totalCustodyShort := sdk.ZeroInt()
+			for _, asset := range pool.PoolAssetsShort {
+				totalCustodyShort = totalCustodyShort.Add(asset.Custody)
+			}
+
+			fundingAmountLong := types.CalcTakeAmount(totalCustodyLong, pool.FundingRate)
+			fundingAmountShort := sdk.ZeroInt()
+
+			fundingRateLong := pool.FundingRate
+			fundingRateShort := sdk.ZeroDec()
+
+			// if funding rate is negative, collect from short position
+			if pool.FundingRate.IsNegative() {
+				fundingAmountShort = types.CalcTakeAmount(totalCustodyShort, pool.FundingRate)
+				fundingAmountLong = sdk.ZeroInt()
+
+				fundingRateLong = sdk.ZeroDec()
+				fundingRateShort = pool.FundingRate
 			}
+			k.SetFundingRate(ctx, uint64(ctx.BlockHeight()), pool.AmmPoolId, types.FundingRateBlock{
+				FundingRate:        pool.FundingRate,
+				BlockHeight:        ctx.BlockHeight(),
+				FundingAmountShort: fundingAmountShort,
+				FundingAmountLong:  fundingAmountLong,
+				FundingRateLong:    fundingRateLong,
+				FundingRateShort:   fundingRateShort,
+			})
 		}
 		k.SetPool(ctx, pool)
 	}