Merge branch 'main' into main

x/estaking/keeper/hooks.go

@@ -3,6 +3,7 @@ package keeper
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	commitmenttypes "github.com/elys-network/elys/x/commitment/types"
+	"github.com/elys-network/elys/x/estaking/types"
 	ptypes "github.com/elys-network/elys/x/parameter/types"
 )
 
@@ -15,6 +16,10 @@ func (k Keeper) CommitmentChanged(ctx sdk.Context, creator sdk.AccAddress, amoun
 		if err != nil {
 			return err
 		}
+		_, err = k.WithdrawAllRewards(ctx, &types.MsgWithdrawAllRewards{DelegatorAddress: creator.String()})
+		if err != nil {
+			return err
+		}
 
 		del, _ := k.Delegation(ctx, creator, edenValAddr)
 		if del == nil {

x/leveragelp/keeper/msg_server_close_positions.go

@@ -31,7 +31,11 @@ func (k msgServer) ClosePositions(goCtx context.Context, msg *types.MsgClosePosi
 			continue
 		}
 
-		_, _, _, err = k.CheckAndLiquidateUnhealthyPosition(ctx, &position, pool, ammPool)
+		cachedCtx, write := ctx.CacheContext()
+		_, _, _, err = k.CheckAndLiquidateUnhealthyPosition(cachedCtx, &position, pool, ammPool)
+		if err == nil {
+			write()
+		}
 		if err != nil {
 			// Add log about error or not liquidated
 			liqLog = append(liqLog, fmt.Sprintf("Position: Address:%s Id:%d cannot be liquidated due to err: %s", position.Address, position.Id, err.Error()))
@@ -67,7 +71,11 @@ func (k msgServer) ClosePositions(goCtx context.Context, msg *types.MsgClosePosi
 		if poolErr != nil {
 			continue
 		}
-		_, _, err = k.CheckAndCloseAtStopLoss(ctx, &position, pool, ammPool)
+		cachedCtx, write := ctx.CacheContext()
+		_, _, err = k.CheckAndCloseAtStopLoss(cachedCtx, &position, pool, ammPool)
+		if err == nil {
+			write()
+		}
 		if err != nil {
 			// Add log about error or not closed
 			closeLog = append(closeLog, fmt.Sprintf("Position: Address:%s Id:%d cannot be liquidated due to err: %s", position.Address, position.Id, err.Error()))

x/perpetual/keeper/msg_server_close_positions.go

@@ -36,7 +36,11 @@ func (k msgServer) ClosePositions(goCtx context.Context, msg *types.MsgClosePosi
 			continue
 		}
 
-		err = k.CheckAndLiquidateUnhealthyPosition(ctx, &position, pool, ammPool, baseCurrency.Denom)
+		cachedCtx, write := ctx.CacheContext()
+		err = k.CheckAndLiquidateUnhealthyPosition(cachedCtx, &position, pool, ammPool, baseCurrency.Denom)
+		if err == nil {
+			write()
+		}
 		if err != nil {
 			// Add log about error or not liquidated
 			liqLog = append(liqLog, fmt.Sprintf("Position: Address:%s Id:%d cannot be liquidated due to err: %s", position.Address, position.Id, err.Error()))
@@ -57,7 +61,11 @@ func (k msgServer) ClosePositions(goCtx context.Context, msg *types.MsgClosePosi
 			continue
 		}
 
-		err = k.CheckAndCloseAtStopLoss(ctx, &position, pool, baseCurrency.Denom)
+		cachedCtx, write := ctx.CacheContext()
+		err = k.CheckAndCloseAtStopLoss(cachedCtx, &position, pool, baseCurrency.Denom)
+		if err == nil {
+			write()
+		}
 		if err != nil {
 			// Add log about error or not closed
 			closeLog = append(closeLog, fmt.Sprintf("Position: Address:%s Id:%d cannot be liquidated due to err: %s", position.Address, position.Id, err.Error()))
@@ -78,7 +86,11 @@ func (k msgServer) ClosePositions(goCtx context.Context, msg *types.MsgClosePosi
 			continue
 		}
 
-		err = k.CheckAndCloseAtTakeProfit(ctx, &position, pool, baseCurrency.Denom)
+		cachedCtx, write := ctx.CacheContext()
+		err = k.CheckAndCloseAtTakeProfit(cachedCtx, &position, pool, baseCurrency.Denom)
+		if err == nil {
+			write()
+		}
 		if err != nil {
 			// Add log about error or not closed
 			takeProfitLog = append(takeProfitLog, fmt.Sprintf("Position: Address:%s Id:%d cannot be liquidated due to err: %s", position.Address, position.Id, err.Error()))

x/tradeshield/keeper/msg_server_execute_orders.go

@@ -27,16 +27,32 @@ func (k msgServer) ExecuteOrders(goCtx context.Context, msg *types.MsgExecuteOrd
 		switch spotOrder.OrderType {
 		case types.SpotOrderType_STOPLOSS:
 			// execute the stop loss order
-			_, err = k.ExecuteStopLossOrder(ctx, spotOrder)
+			cachedCtx, write := ctx.CacheContext()
+			_, err = k.ExecuteStopLossOrder(cachedCtx, spotOrder)
+			if err == nil {
+				write()
+			}
 		case types.SpotOrderType_LIMITSELL:
 			// execute the limit sell order
-			_, err = k.ExecuteLimitSellOrder(ctx, spotOrder)
+			cachedCtx, write := ctx.CacheContext()
+			_, err = k.ExecuteLimitSellOrder(cachedCtx, spotOrder)
+			if err == nil {
+				write()
+			}
 		case types.SpotOrderType_LIMITBUY:
 			// execute the limit buy order
-			_, err = k.ExecuteLimitBuyOrder(ctx, spotOrder)
+			cachedCtx, write := ctx.CacheContext()
+			_, err = k.ExecuteLimitBuyOrder(cachedCtx, spotOrder)
+			if err == nil {
+				write()
+			}
 		case types.SpotOrderType_MARKETBUY:
 			// execute the market buy order
-			_, err = k.ExecuteMarketBuyOrder(ctx, spotOrder)
+			cachedCtx, write := ctx.CacheContext()
+			_, err = k.ExecuteMarketBuyOrder(cachedCtx, spotOrder)
+			if err == nil {
+				write()
+			}
 		}
 
 		// log the error if any
@@ -61,7 +77,11 @@ func (k msgServer) ExecuteOrders(goCtx context.Context, msg *types.MsgExecuteOrd
 		switch perpetualOrder.PerpetualOrderType {
 		case types.PerpetualOrderType_LIMITOPEN:
 			// execute the limit open order
-			err = k.ExecuteLimitOpenOrder(ctx, perpetualOrder)
+			cachedCtx, write := ctx.CacheContext()
+			err = k.ExecuteLimitOpenOrder(cachedCtx, perpetualOrder)
+			if err == nil {
+				write()
+			}
 			// Disable for v1
 			// case types.PerpetualOrderType_LIMITCLOSE:
 			// 	// execute the limit close order