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

Merge pull request #1479 from c9s/narumi/xgap/fix

Browse Source
This commit is contained in:
c9s 2024-01-04 20:03:07 +08:00 committed by GitHub
commit f2d5731acf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/strategy/xgap/strategy.go
View File

@ -18,8 +18,6 @@ import (
const ID = "xgap" const ID = "xgap"
const stateKey = "state-v1"
var log = logrus.WithField("strategy", ID) var log = logrus.WithField("strategy", ID)
var StepPercentageGap = fixedpoint.NewFromFloat(0.05) var StepPercentageGap = fixedpoint.NewFromFloat(0.05)
@ -77,6 +75,8 @@ type Strategy struct {
sourceBook, tradingBook *types.StreamOrderBook sourceBook, tradingBook *types.StreamOrderBook
groupID uint32 groupID uint32
activeOrderBook *bbgo.ActiveOrderBook
stopC chan struct{} stopC chan struct{}
} }
@ -213,6 +213,9 @@ func (s *Strategy) CrossRun(ctx context.Context, _ bbgo.OrderExecutionRouter, se
s.groupID = util.FNV32(instanceID) % math.MaxInt32 s.groupID = util.FNV32(instanceID) % math.MaxInt32
log.Infof("using group id %d from fnv32(%s)", s.groupID, instanceID) log.Infof("using group id %d from fnv32(%s)", s.groupID, instanceID)
s.activeOrderBook = bbgo.NewActiveOrderBook(s.Symbol)
s.activeOrderBook.BindStream(s.tradingSession.UserDataStream)
go func() { go func() {
ticker := time.NewTicker( ticker := time.NewTicker(
util.MillisecondsJitter(s.UpdateInterval.Duration(), 1000), util.MillisecondsJitter(s.UpdateInterval.Duration(), 1000),
@ -355,9 +358,11 @@ func (s *Strategy) CrossRun(ctx context.Context, _ bbgo.OrderExecutionRouter, se
log.WithError(err).Error("order submit error") log.WithError(err).Error("order submit error")
} }
s.activeOrderBook.Add(createdOrders...)
time.Sleep(time.Second) time.Sleep(time.Second)
if err := tradingSession.Exchange.CancelOrders(ctx, createdOrders...); err != nil { if err := s.activeOrderBook.GracefulCancel(ctx, s.tradingSession.Exchange); err != nil {
log.WithError(err).Error("cancel order error") log.WithError(err).Error("cancel order error")
} }
} }