lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-09-20 00:01:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

grid2: consider quote fee in the buy order

Browse Source
This commit is contained in:
c9s 2023-03-03 15:50:31 +08:00
parent bfcb60d9d7
commit 5b18f19b9c
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,10 +446,6 @@ func (s *Strategy) processFilledOrder(o types.Order) {
profit = s.calculateProfit(o, newPrice, newQuantity) profit = s.calculateProfit(o, newPrice, newQuantity)
case types.SideTypeBuy: case types.SideTypeBuy:
if feeCurrency == s.Market.BaseCurrency {
newQuantity = newQuantity.Sub(feeQuantityReduction)
}
newSide = types.SideTypeSell newSide = types.SideTypeSell
if !s.ProfitSpread.IsZero() { if !s.ProfitSpread.IsZero() {
newPrice = newPrice.Add(s.ProfitSpread) newPrice = newPrice.Add(s.ProfitSpread)
@ -459,9 +455,19 @@ func (s *Strategy) processFilledOrder(o types.Order) {
} }
} }
if s.EarnBase { if feeCurrency == s.Market.QuoteCurrency {
newQuantity = fixedpoint.Max(orderExecutedQuoteAmount.Div(newPrice).Sub(feeQuantityReduction), s.Market.MinQuantity) orderExecutedQuoteAmount = orderExecutedQuoteAmount.Sub(feeQuantityReduction)
} }
if s.EarnBase {
newQuantity = orderExecutedQuoteAmount.Div(newPrice)
} else {
if feeCurrency == s.Market.BaseCurrency {
newQuantity = newQuantity.Sub(feeQuantityReduction)
}
}
newQuantity = fixedpoint.Max(newQuantity, s.Market.MinQuantity)
} }
orderForm := types.SubmitOrder{ orderForm := types.SubmitOrder{