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

grid2: check if we have o.AveragePrice, use it for newQuantity

Browse Source
This commit is contained in:
c9s 2023-02-24 18:45:18 +08:00
parent 7eb953093c
commit 04da988639
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,13 @@ func (s *Strategy) processFilledOrder(o types.Order) {
newSide := types.SideTypeSell newSide := types.SideTypeSell
newPrice := o.Price newPrice := o.Price
newQuantity := o.Quantity newQuantity := o.Quantity
orderQuoteQuantity := o.Quantity.Mul(o.Price) executedPrice := o.Price
if o.AveragePrice.Sign() > 0 {
executedPrice = o.AveragePrice
}
// will be used for calculating quantity
orderExecutedQuoteAmount := o.Quantity.Mul(executedPrice)
// collect trades // collect trades
baseSellQuantityReduction := fixedpoint.Zero baseSellQuantityReduction := fixedpoint.Zero
@ -382,7 +388,7 @@ func (s *Strategy) processFilledOrder(o types.Order) {
// use the profit to buy more inventory in the grid // use the profit to buy more inventory in the grid
if s.Compound || s.EarnBase { if s.Compound || s.EarnBase {
newQuantity = fixedpoint.Max(orderQuoteQuantity.Div(newPrice), s.Market.MinQuantity) newQuantity = fixedpoint.Max(orderExecutedQuoteAmount.Div(newPrice), s.Market.MinQuantity)
} else if s.QuantityOrAmount.Quantity.Sign() > 0 { } else if s.QuantityOrAmount.Quantity.Sign() > 0 {
newQuantity = s.QuantityOrAmount.Quantity newQuantity = s.QuantityOrAmount.Quantity
} }
@ -415,7 +421,7 @@ func (s *Strategy) processFilledOrder(o types.Order) {
} }
if s.EarnBase { if s.EarnBase {
newQuantity = fixedpoint.Max(orderQuoteQuantity.Div(newPrice).Sub(baseSellQuantityReduction), s.Market.MinQuantity) newQuantity = fixedpoint.Max(orderExecutedQuoteAmount.Div(newPrice).Sub(baseSellQuantityReduction), s.Market.MinQuantity)
} }
} }