Merge pull request #1257 from c9s/c9s/max-grid2-fee-discounted

FEATURE: [grid2] fee discounted filtering
c9s · Jul 31, 2023 · 82a43dc · 82a43dc
2 parents 570ccab + 4560b47
commit 82a43dc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/pkg/strategy/grid2/strategy.go b/pkg/strategy/grid2/strategy.go
@@ -484,7 +484,7 @@ func (s *Strategy) processFilledOrder(o types.Order) {
 		// use the profit to buy more inventory in the grid
 		if s.Compound || s.EarnBase {
 			// if it's not using the platform fee currency, reduce the quote quantity for the buy order
-			if feeCurrency == s.Market.QuoteCurrency {
+			if feeCurrency == s.Market.QuoteCurrency && fee.Sign() > 0 {
 				orderExecutedQuoteAmount = orderExecutedQuoteAmount.Sub(fee)
 			}
 
@@ -517,7 +517,7 @@ func (s *Strategy) processFilledOrder(o types.Order) {
 			}
 		}
 
-		if feeCurrency == s.Market.BaseCurrency {
+		if feeCurrency == s.Market.BaseCurrency && fee.Sign() > 0 {
 			newQuantity = newQuantity.Sub(fee)
 		}
 

diff --git a/pkg/strategy/grid2/trade.go b/pkg/strategy/grid2/trade.go
@@ -9,6 +9,10 @@ import (
 func collectTradeFee(trades []types.Trade) map[string]fixedpoint.Value {
 	fees := make(map[string]fixedpoint.Value)
 	for _, t := range trades {
+		if t.FeeDiscounted {
+			continue
+		}
+
 		if fee, ok := fees[t.FeeCurrency]; ok {
 			fees[t.FeeCurrency] = fee.Add(t.Fee)
 		} else {

diff --git a/pkg/types/time.go b/pkg/types/time.go
@@ -256,6 +256,10 @@ func ParseLooseFormatTime(s string) (LooseFormatTime, error) {
 		t = time.Now().AddDate(0, -1, 0)
 		return LooseFormatTime(t), nil
 
+	case "last 30 days":
+		t = time.Now().AddDate(0, 0, -30)
+		return LooseFormatTime(t), nil
+
 	case "last year":
 		t = time.Now().AddDate(-1, 0, 0)
 		return LooseFormatTime(t), nil
@@ -357,4 +361,3 @@ func BeginningOfTheDay(t time.Time) time.Time {
 func Over24Hours(since time.Time) bool {
 	return time.Since(since) >= 24*time.Hour
 }
-