lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-26 16:55:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX: [grid2] fix active orderbook at recovering

Browse Source
This commit is contained in:
gx578007 2023-03-05 14:29:31 +08:00
parent 45da0bd4c7
commit ec0d438f9d
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/strategy/grid2/strategy.go
View File

@ -1341,8 +1341,11 @@ func (s *Strategy) recoverGridWithOpenOrders(ctx context.Context, historyService
missingPrices := scanMissingPinPrices(orderBook, grid.Pins) missingPrices := scanMissingPinPrices(orderBook, grid.Pins)
if numMissing := len(missingPrices); numMissing <= 1 { if numMissing := len(missingPrices); numMissing <= 1 {
s.logger.Infof("GRID RECOVER: no missing grid prices, stop re-playing order history") s.logger.Infof("GRID RECOVER: no missing grid prices, stop re-playing order history")
s.addOrdersToActiveOrderBook(gridOrders)
s.setGrid(grid) s.setGrid(grid)
s.EmitGridReady() s.EmitGridReady()
s.updateGridNumOfOrdersMetrics()
s.updateOpenOrderPricesMetrics(s.orderExecutor.ActiveMakerOrders().Orders())
return nil return nil
} else { } else {
s.logger.Infof("GRID RECOVER: found missing prices: %v", missingPrices) s.logger.Infof("GRID RECOVER: found missing prices: %v", missingPrices)
@ -1384,8 +1387,11 @@ func (s *Strategy) recoverGridWithOpenOrders(ctx context.Context, historyService
// if all orders on the order book are active orders, we don't need to recover. // if all orders on the order book are active orders, we don't need to recover.
if isCompleteGridOrderBook(orderBook, s.GridNum) { if isCompleteGridOrderBook(orderBook, s.GridNum) {
s.logger.Infof("GRID RECOVER: all orders are active orders, do not need recover") s.logger.Infof("GRID RECOVER: all orders are active orders, do not need recover")
s.addOrdersToActiveOrderBook(gridOrders)
s.setGrid(grid) s.setGrid(grid)
s.EmitGridReady() s.EmitGridReady()
s.updateGridNumOfOrdersMetrics()
s.updateOpenOrderPricesMetrics(s.orderExecutor.ActiveMakerOrders().Orders())
return nil return nil
} }
@ -1407,11 +1413,7 @@ func (s *Strategy) recoverGridWithOpenOrders(ctx context.Context, historyService
// before we re-play the orders, // before we re-play the orders,
// we need to add these open orders to the active order book // we need to add these open orders to the active order book
activeOrderBook := s.orderExecutor.ActiveMakerOrders() s.addOrdersToActiveOrderBook(gridOrders)
for _, gridOrder := range gridOrders {
// put the order back to the active order book so that we can receive order update
activeOrderBook.Add(gridOrder)
}
s.setGrid(grid) s.setGrid(grid)
s.EmitGridReady() s.EmitGridReady()
@ -1435,6 +1437,14 @@ func (s *Strategy) recoverGridWithOpenOrders(ctx context.Context, historyService
return nil return nil
} }
func (s *Strategy) addOrdersToActiveOrderBook(gridOrders []types.Order) {
activeOrderBook := s.orderExecutor.ActiveMakerOrders()
for _, gridOrder := range gridOrders {
// put the order back to the active order book so that we can receive order update
activeOrderBook.Add(gridOrder)
}
}
func (s *Strategy) setGrid(grid *Grid) { func (s *Strategy) setGrid(grid *Grid) {
s.mu.Lock() s.mu.Lock()
s.grid = grid s.grid = grid
@ -1857,4 +1867,4 @@ func roundUpMarketQuantity(market types.Market, v fixedpoint.Value, c string) (f
} }
return v.Round(prec, fixedpoint.Up), prec return v.Round(prec, fixedpoint.Up), prec
} }