Merge pull request #263 from P-U-D-G-E/reorder_mino

Fix for reorder in case of no liquidity left when reorder is possible
sge-network · Oct 6, 2023 · eac83d6 · eac83d6
2 parents 1b4b5bb + bc5a1b7
commit eac83d6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/x/orderbook/keeper/bet_wager.go b/x/orderbook/keeper/bet_wager.go
@@ -152,20 +152,22 @@ func (k Keeper) fulfillBetByParticipationQueue(
 
 		if setFulfilled {
 			fInfo.setItemFulfilledAndRemove()
-			eUpdate, err := fInfo.checkFullfillmentForOtherOdds(requeThreshold)
-			if err != nil {
-				return err
-			}
-			for _, exposure := range eUpdate {
-				k.SetParticipationExposure(ctx, exposure)
+			if fInfo.inProcessItem.participation.IsEligibleForNextRoundPreLiquidityReduction() {
+				eUpdate, err := fInfo.checkFullfillmentForOtherOdds(requeThreshold)
+				if err != nil {
+					return err
+				}
+				for _, exposure := range eUpdate {
+					k.SetParticipationExposure(ctx, exposure)
+				}
 			}
 		}
 
 		k.SetParticipationExposure(ctx, fInfo.inProcessItem.participationExposure)
 		k.SetOrderBookParticipation(ctx, fInfo.inProcessItem.participation)
 
 		// if there are no more exposures to be filled
-		if fInfo.inProcessItem.allExposureFulfilled() {
+		if fInfo.inProcessItem.allExposureFulfilled() && fInfo.inProcessItem.participation.IsEligibleForNextRoundPreLiquidityReduction() {
 			err := k.refreshQueueAndState(ctx, fInfo, book)
 			if err != nil {
 				return err
@@ -465,6 +467,9 @@ func (fInfo *fulfillmentInfo) checkFullfillmentForOtherOdds(requeThreshold sdkma
 
 	// check if other exposures are fulfilled according to new max loss multipliers
 	for _, oddUID := range fInfo.oddUIDS {
+		if oddUID == fInfo.oddsUID {
+			continue
+		}
 		exposure, ok := fInfo.inProcessItem.allExposures[oddUID]
 		if !ok {
 			err = sdkerrors.Wrapf(types.ErrParticipationExposuresNotFound, "%s %d", oddUID, fInfo.inProcessItem.participation.Index)

diff --git a/x/orderbook/keeper/bet_wager_test.go b/x/orderbook/keeper/bet_wager_test.go
@@ -165,7 +165,7 @@ func (ts *testBetSuite) placeBetsAndTest() ([]bettypes.Bet, sdk.Dec, sdk.Dec) {
 	betOdds := make(map[string]*bettypes.BetOddsCompact)
 	var oddUIDS []string
 	for _, odd := range ts.market.Odds {
-		betOdds[odd.UID] = &bettypes.BetOddsCompact{UID: odd.UID, MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}
+		betOdds[odd.UID] = &bettypes.BetOddsCompact{UID: odd.UID, MaxLossMultiplier: sdk.MustNewDecFromStr("0.3")}
 		oddUIDS = append(oddUIDS, odd.UID)
 	}
 

diff --git a/x/orderbook/types/participation.go b/x/orderbook/types/participation.go
@@ -142,6 +142,13 @@ func (p *OrderBookParticipation) IsEligibleForNextRound() bool {
 	return p.CurrentRoundLiquidity.GT(sdk.ZeroInt())
 }
 
+// IsEligibleForNextRound determines if the participation has enough
+// liquidity to be used in the next round or not
+func (p *OrderBookParticipation) IsEligibleForNextRoundPreLiquidityReduction() bool {
+	maxLoss := sdk.MaxInt(sdk.ZeroInt(), p.CurrentRoundMaxLoss)
+	return p.CurrentRoundLiquidity.Sub(maxLoss).GT(sdk.ZeroInt())
+}
+
 // TrimCurrentRoundLiquidity subtracts the max loss from the current round liquidity.
 func (p *OrderBookParticipation) TrimCurrentRoundLiquidity() {
 	maxLoss := sdk.MaxInt(sdk.ZeroInt(), p.CurrentRoundMaxLoss)