Avkr003/leverage improvements

proto/elys/leveragelp/tx.proto

@@ -17,8 +17,8 @@ service Msg {
   rpc Close          (MsgClose) returns (MsgCloseResponse);
   rpc ClaimRewards   (MsgClaimRewards) returns (MsgClaimRewardsResponse);
   rpc UpdateParams   (MsgUpdateParams) returns (MsgUpdateParamsResponse);
-  rpc AddPools       (MsgAddPool) returns (MsgAddPoolResponse);
-  rpc UpdatePools    (MsgUpdatePools) returns (MsgUpdatePoolsResponse);
+  rpc AddPool       (MsgAddPool) returns (MsgAddPoolResponse);
+  rpc UpdatePool    (MsgUpdatePool) returns (MsgUpdatePoolResponse);
   rpc RemovePool    (MsgRemovePool) returns (MsgRemovePoolResponse);
   rpc Whitelist      (MsgWhitelist) returns (MsgWhitelistResponse);
   rpc Dewhitelist    (MsgDewhitelist) returns (MsgDewhitelistResponse);
@@ -66,16 +66,16 @@ message MsgUpdateParamsResponse {}
 
 message UpdatePool {
   uint64 pool_id = 1;
-  bool   Enabled = 2;
-  bool   Closed = 3;
+  bool   enabled = 2;
+  bool   closed = 3;
 }
 
-message MsgUpdatePools {
+message MsgUpdatePool {
   string     authority = 1;
   UpdatePool UpdatePool = 2;
 }
 
-message MsgUpdatePoolsResponse {}
+message MsgUpdatePoolResponse {}
 
 message MsgWhitelist {
   string authority = 1;
@@ -93,7 +93,7 @@ message MsgDewhitelistResponse {}
 
 message MsgUpdateStopLoss {
   string creator = 1;
-  int32  position = 2;
+  uint64 position = 2;
   string price = 3 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
 }
 
@@ -131,7 +131,7 @@ message MsgRemovePoolResponse {}
 message MsgClosePositions {
   string creator = 1;
   repeated PositionRequest liquidate = 2;
-  repeated PositionRequest stoploss = 3;
+  repeated PositionRequest stop_loss = 3;
 }
 
 message MsgClosePositionsResponse {}

proto/elys/leveragelp/types.proto

@@ -9,7 +9,7 @@ import "cosmos/base/v1beta1/coin.proto";
 
 message PositionRequest {
   string address = 1;
-  uint64 id      = 2;
+  uint64 id = 2;
 }
 
 message Position {
@@ -70,11 +70,6 @@ message LegacyPosition {
   ];
 }
 
-message AddressId {
-  string address = 1;
-  uint64 id = 2;
-}
-
 message PositionAndInterest {
   Position position = 1;
   string interest_rate_hour = 2 [

x/amm/client/wasm/query_earn_mining_pool_all.go

@@ -83,7 +83,7 @@ func (oq *Querier) generateEarnPool(ctx sdk.Context, ammPool *types.Pool, filter
 
 	leverageLpPool, found := oq.leveragelpKeeper.GetPool(ctx, ammPool.PoolId)
 	if found {
-		isLeverageLpEnabled = oq.leveragelpKeeper.IsPoolEnabled(ctx, ammPool.PoolId)
+		isLeverageLpEnabled = leverageLpPool.Enabled
 		leverageLpPercent = leverageLpPool.LeveragedLpAmount.ToLegacyDec().Quo(ammPool.TotalShares.Amount.ToLegacyDec()).Mul(sdk.NewDec(100))
 	}
 

x/leveragelp/client/cli/tx_add_pool.go

@@ -54,7 +54,7 @@ func CmdAddPools() *cobra.Command {
 			}
 
 			govAddress := sdk.AccAddress(address.Module("gov"))
-			msg := types.NewMsgAddPools(
+			msg := types.NewMsgAddPool(
 				govAddress.String(),
 				pool,
 			)

x/leveragelp/client/cli/tx_close_positions.go

@@ -46,11 +46,11 @@ func CmdClosePositions() *cobra.Command {
 			}
 
 			msg := types.NewMsgClosePositions(
-				clientCtx.GetFromAddress().String(),
+				clientCtx.GetFromAddress(),
 				liqudiatePtrs,
 				stoplossPtrs,
 			)
-			if err := msg.ValidateBasic(); err != nil {
+			if err = msg.ValidateBasic(); err != nil {
 				return err
 			}
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)

x/leveragelp/client/cli/tx_update_pools.go

@@ -54,7 +54,7 @@ func CmdUpdatePools() *cobra.Command {
 			}
 
 			govAddress := sdk.AccAddress(address.Module("gov"))
-			msg := types.NewMsgUpdatePools(
+			msg := types.NewMsgUpdatePool(
 				govAddress.String(),
 				pool,
 			)

x/leveragelp/client/cli/tx_update_stop_loss.go

@@ -20,7 +20,7 @@ func CmdUpdateStopLoss() *cobra.Command {
 		Short: "Broadcast message update-stop-loss",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			argPosition, err := cast.ToInt32E(args[0])
+			argPosition, err := cast.ToUint64E(args[0])
 			if err != nil {
 				return err
 			}
@@ -39,7 +39,7 @@ func CmdUpdateStopLoss() *cobra.Command {
 				argPosition,
 				argPrice,
 			)
-			if err := msg.ValidateBasic(); err != nil {
+			if err = msg.ValidateBasic(); err != nil {
 				return err
 			}
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)

x/leveragelp/keeper/add_collateral.go

@@ -22,7 +22,7 @@ func (k Keeper) ProcessAddCollateral(ctx sdk.Context, address string, id uint64,
 	}
 
 	// Check if the pool is enabled.
-	if !k.IsPoolEnabled(ctx, position.AmmPoolId) {
+	if !pool.Enabled {
 		return errorsmod.Wrap(types.ErrPositionDisabled, fmt.Sprintf("poolId: %d", position.AmmPoolId))
 	}
 

x/leveragelp/keeper/begin_blocker.go

@@ -40,23 +40,27 @@
 		for _, position := range positions {
 			pool, found := k.GetPool(ctx, position.AmmPoolId)
 			if !found {
+				ctx.Logger().Error(fmt.Sprintf("pool not found for id: %d", position.AmmPoolId))
 				continue
 			}
-			ammPool, err := k.GetAmmPool(ctx, pool.AmmPoolId)
-			if err != nil {
-				ctx.Logger().Error(errors.Wrap(err, fmt.Sprintf("error getting amm pool: %d", pool.AmmPoolId)).Error())
+			ammPool, poolErr := k.GetAmmPool(ctx, pool.AmmPoolId)
+			if poolErr != nil {
+				ctx.Logger().Error(fmt.Sprintf("error getting for amm pool %d: %s", position.AmmPoolId, poolErr.Error()))
 				continue
 			}
-			isHealthy, _, _, _ := k.LiquidatePositionIfUnhealthy(ctx, position, pool, ammPool)
-			if !isHealthy {
+
+			isHealthy, closeAttempted, _, err := k.CheckAndLiquidateUnhealthyPosition(ctx, position, pool, ammPool)
+			if err == nil {
 				continue
 			}
-			k.ClosePositionIfUnderStopLossPrice(ctx, position, pool, ammPool)
+			if isHealthy && !closeAttempted {
+				_, _, _ = k.CheckAndCloseAtStopLoss(ctx, position, pool, ammPool)
+			}
 		}
 	}
 }
 
-func (k Keeper) LiquidatePositionIfUnhealthy(ctx sdk.Context, position *types.Position, pool types.Pool, ammPool ammtypes.Pool) (isHealthy, earlyReturn bool, health math.LegacyDec, err error) {
+func (k Keeper) CheckAndLiquidateUnhealthyPosition(ctx sdk.Context, position *types.Position, pool types.Pool, ammPool ammtypes.Pool) (isHealthy, closeAttempted bool, health math.LegacyDec, err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			if msg, ok := r.(string); ok {
@@ -67,7 +71,7 @@
 	h, err := k.GetPositionHealth(ctx, *position)
 	if err != nil {
 		ctx.Logger().Error(errors.Wrap(err, fmt.Sprintf("error updating position health: %s", position.String())).Error())
-		return false, true, sdk.ZeroDec(), err
+		return false, false, sdk.ZeroDec(), err
 	}
 	position.PositionHealth = h
 	k.SetPosition(ctx, position)
@@ -78,7 +82,7 @@
 	debt := k.stableKeeper.UpdateInterestAndGetDebt(ctx, position.GetPositionAddress())
 	liab := debt.GetTotalLiablities()
 	if isHealthy || liab.IsZero() {
-		return true, false, h, err
+		return true, false, h, fmt.Errorf("position is healthy to close")
 	}
 
 	repayAmount, err := k.ForceCloseLong(ctx, *position, pool, position.LeveragedLpAmount)
@@ -95,10 +99,10 @@
 		sdk.NewAttribute("liabilities", position.Liabilities.String()),
 		sdk.NewAttribute("health", position.PositionHealth.String()),
 	))
-	return isHealthy, false, h, nil
+	return isHealthy, true, h, nil
 }
 
-func (k Keeper) ClosePositionIfUnderStopLossPrice(ctx sdk.Context, position *types.Position, pool types.Pool, ammPool ammtypes.Pool) (underStopLossPrice, earlyReturn bool, err error) {
+func (k Keeper) CheckAndCloseAtStopLoss(ctx sdk.Context, position *types.Position, pool types.Pool, ammPool ammtypes.Pool) (underStopLossPrice, closeAttempted bool, err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			if msg, ok := r.(string); ok {
@@ -109,19 +113,19 @@
 	h, err := k.GetPositionHealth(ctx, *position)
 	if err != nil {
 		ctx.Logger().Error(errors.Wrap(err, fmt.Sprintf("error updating position health: %s", position.String())).Error())
-		return false, true, err
+		return false, false, err
 	}
 	position.PositionHealth = h
 	k.SetPosition(ctx, position)
 
 	lpTokenPrice, err := ammPool.LpTokenPrice(ctx, k.oracleKeeper)
 	if err != nil {
-		return false, true, err
+		return false, false, err
 	}
 
 	underStopLossPrice = !position.StopLossPrice.IsNil() && lpTokenPrice.LTE(position.StopLossPrice)
 	if !underStopLossPrice {
-		return underStopLossPrice, false, err
+		return underStopLossPrice, false, fmt.Errorf("position stop loss price is not <= lp token price")
 	}
 
 	repayAmount, err := k.ForceCloseLong(ctx, *position, pool, position.LeveragedLpAmount)
@@ -138,5 +142,5 @@
 		sdk.NewAttribute("liabilities", position.Liabilities.String()),
 		sdk.NewAttribute("health", position.PositionHealth.String()),
 	))
-	return underStopLossPrice, false, err
+	return underStopLossPrice, true, nil
 }