Merge pull request #269 from scorpioborn/refactor/remove-orderbook-ev…

…ents Fix / OrderBook status and events
sge-network · Oct 13, 2023 · 86d8334 · 86d8334
2 parents 635bb89 + d677490
commit 86d8334
Show file tree

Hide file tree

Showing 20 changed files with 16 additions and 500 deletions.
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
@@ -1,6 +1,6 @@
 <!-- docs/_sidebar.md -->
 
-* [About Sge Network](README.md)
+* [About Sge Network](../README.md)
 * [Modules](specs/README.md)
   * [Bet](specs/Bet/01_Overview.md)
   * [OVM](specs/OVM/01_Overview.md)

diff --git a/docs/specs/Bet/_sidebar.md b/docs/specs/Bet/_sidebar.md
@@ -1,6 +1,7 @@
 <!-- docs/_sidebar.md -->
 
-* [About SGE Network](../../README.md)
+* [Home](/)
+* [About SGE Network](../../../README.md)
 * [Modules](../README.md)
   * [Bet](../Bet/01_Overview.md)
     * [Overview](../Bet/01_Overview.md)

diff --git a/docs/specs/House/_sidebar.md b/docs/specs/House/_sidebar.md
@@ -1,7 +1,7 @@
 <!-- docs/_sidebar.md -->
 
 * [Home](/)
-* [About SGE Network](../README.md)
+* [About SGE Network](../../../README.md)
 * [Modules](../README.md)
   * [Bet](../Bet/01_Overview.md)
   * [OVM](../OVM/01_Overview.md)

diff --git a/docs/specs/Market/_sidebar.md b/docs/specs/Market/_sidebar.md
@@ -1,7 +1,7 @@
 <!-- docs/_sidebar.md -->
 
 * [Home](/)
-* [About SGE Network](../README.md)
+* [About SGE Network](../../../README.md)
 * [Modules](../README.md)
   * [Bet](../Bet/01_Overview.md)
   * [OVM](../OVM/01_Overview.md)

diff --git a/docs/specs/Mint/_sidebar.md b/docs/specs/Mint/_sidebar.md
@@ -1,6 +1,7 @@
 <!-- docs/_sidebar.md -->
 
-* [About SGE Network](../../README.md)
+* [Home](/)
+* [About SGE Network](../../../README.md)
 * [Modules](../README.md)
   * [Bet](../Bet/01_Overview.md)
   * [OVM](../OVM/01_Overview.md)

diff --git a/docs/specs/OVM/_sidebar.md b/docs/specs/OVM/_sidebar.md
@@ -1,6 +1,7 @@
 <!-- docs/_sidebar.md -->
 
-* [About SGE Network](../../README.md)
+* [Home](/)
+* [About SGE Network](../../../README.md)
 * [Modules](../README.md)
   * [Bet](../Bet/01_Overview.md)
   * [OVM](../OVM/01_Overview.md)

diff --git a/docs/specs/OrderBook/_sidebar.md b/docs/specs/OrderBook/_sidebar.md
@@ -1,7 +1,7 @@
 <!-- docs/_sidebar.md -->
 
 * [Home](/)
-* [About SGE Network](../README.md)
+* [About SGE Network](../../../README.md)
 * [Modules](../README.md)
   * [Bet](../Bet/01_Overview.md)
   * [OVM](../OVM/01_Overview.md)

diff --git a/docs/specs/_sidebar.md b/docs/specs/_sidebar.md
@@ -1,6 +1,6 @@
 <!-- docs/_sidebar.md -->
 
-* [About SGE Network](../README.md)
+* [About Sge Network](../../README.md)
 * [Modules](README.md)
   * [Bet](Bet/01_Overview.md)
   * [OVM](OVM/01_Overview.md)

diff --git a/proto/sge/orderbook/orderbookevent.proto b/proto/sge/orderbook/orderbookevent.proto
diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -3,7 +3,7 @@
 set -eo pipefail
 
 # get protoc executions
-go get github.com/cosmos/[email protected].10 2>/dev/null
+go get github.com/cosmos/[email protected].11 2>/dev/null
 
 # get cosmos sdk from github
 go get github.com/cosmos/[email protected] 2>/dev/null

diff --git a/x/bet/types/expected_keepers.go b/x/bet/types/expected_keepers.go
@@ -73,5 +73,4 @@ type OrderbookKeeper interface {
 	) error
 	SetOrderBookAsUnsettledResolved(ctx sdk.Context, orderBookUID string) error
 	WithdrawBetFee(ctx sdk.Context, marketCreator sdk.AccAddress, betFee sdkmath.Int) error
-	PublishOrderBookEvent(ctx sdk.Context, orderBookUID string)
 }
diff --git a/x/house/keeper/deposit.go b/x/house/keeper/deposit.go
@@ -79,7 +79,5 @@ func (k Keeper) Deposit(ctx sdk.Context, creator, depositor string,
 
 	k.SetDeposit(ctx, deposit)
 
-	k.orderbookKeeper.PublishOrderBookEvent(ctx, marketUID)
-
 	return participationIndex, err
 }
diff --git a/x/house/keeper/withdrawal.go b/x/house/keeper/withdrawal.go
@@ -95,7 +95,5 @@ func (k Keeper) Withdraw(
 	deposit.TotalWithdrawalAmount = deposit.TotalWithdrawalAmount.Add(withdrawableAmount)
 	k.SetDeposit(ctx, deposit)
 
-	k.orderbookKeeper.PublishOrderBookEvent(ctx, marketUID)
-
 	return withdrawalID, nil
 }
diff --git a/x/house/types/expected_keepers.go b/x/house/types/expected_keepers.go
@@ -20,7 +20,6 @@ type OrderbookKeeper interface {
 	WithdrawOrderBookParticipation(ctx sdk.Context, marketUID string,
 		participationIndex uint64, amount sdkmath.Int,
 	) error
-	PublishOrderBookEvent(ctx sdk.Context, orderBookUID string)
 }
 
 // OVMKeeper defines the expected interface needed to verify ticket and unmarshal it

diff --git a/x/orderbook/keeper/bet_wager.go b/x/orderbook/keeper/bet_wager.go
@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"fmt"
-
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -71,31 +69,8 @@ func (k Keeper) ProcessWager(
 	if err := k.fund(types.OrderBookLiquidityFunder{}, ctx, bettorAddress, fInfo.fulfilledBetAmount); err != nil {
 		return nil, err
 	}
-	k.PublishOrderBookEvent(ctx, bookUID)
-	return fInfo.fulfillments, nil
-}
-
-func (k Keeper) PublishOrderBookEvent(ctx sdk.Context, orderBookUID string) {
-	event := types.NewOrderBookEvent()
-	boes, err := k.GetOddsExposuresByOrderBook(ctx, orderBookUID)
-	if err != nil {
-		k.Logger(ctx).Error(fmt.Sprintf("Error in publishing order book event error: %s", err))
-		return
-	}
 
-	for _, boe := range boes {
-		event.AddOrderBookOddsExposure(boe)
-		pes, err := k.GetExposureByOrderBookAndOdds(ctx, orderBookUID, boe.OddsUID)
-		if err != nil {
-			k.Logger(ctx).Error(fmt.Sprintf("Error in publishing order book event error: %s", err))
-			return
-		}
-		for _, pe := range pes {
-			event.AddParticipationExposure(pe)
-		}
-	}
-
-	event.Emit(ctx)
+	return fInfo.fulfillments, nil
 }
 
 // fulfillBetByParticipationQueue fulfills the bet wagering payout using the participations

diff --git a/x/orderbook/keeper/exposure_odds.go b/x/orderbook/keeper/exposure_odds.go
@@ -82,14 +82,12 @@ func (k Keeper) initParticipationExposures(
 ) error {
 	// Update book odds exposures and add participant exposures
 	boes, err := k.GetOddsExposuresByOrderBook(ctx, orderBookUID)
-	bookEvent := types.NewOrderBookEvent()
 	if err != nil {
 		return err
 	}
 	for _, boe := range boes {
 		boe.FulfillmentQueue = append(boe.FulfillmentQueue, participationIndex)
 		k.SetOrderBookOddsExposure(ctx, boe)
-		bookEvent.AddOrderBookOddsExposure(boe)
 
 		pe := types.NewParticipationExposure(
 			orderBookUID,
@@ -101,9 +99,7 @@ func (k Keeper) initParticipationExposures(
 			false,
 		)
 		k.SetParticipationExposure(ctx, pe)
-		bookEvent.AddParticipationExposure(pe)
 	}
-	bookEvent.Emit(ctx)
 
 	return nil
 }

diff --git a/x/orderbook/keeper/orderbook_settle.go b/x/orderbook/keeper/orderbook_settle.go
@@ -47,6 +47,9 @@ func (k Keeper) BatchOrderBookSettlements(ctx sdk.Context) error {
 	// we need to remove its uid from the list of unsettled resolved orderbooks.
 	if allSettled {
 		k.RemoveUnsettledResolvedOrderBook(ctx, orderBookUID)
+
+		book.Status = types.OrderBookStatus_ORDER_BOOK_STATUS_STATUS_SETTLED
+		k.SetOrderBook(ctx, book)
 	}
 
 	return nil

diff --git a/x/orderbook/types/events.go b/x/orderbook/types/events.go
diff --git a/x/orderbook/types/order_book_event.go b/x/orderbook/types/order_book_event.go