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

tri: update quantity truncation method

Browse Source
This commit is contained in:
c9s 2024-01-26 17:16:06 +08:00
parent 67b500fce5
commit 4b70f864ff
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
2 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pkg/strategy/tri/market.go
View File

@ -2,6 +2,8 @@ package tri
import ( import (
"fmt" "fmt"
"math"
"strconv"
"github.com/c9s/bbgo/pkg/fixedpoint" "github.com/c9s/bbgo/pkg/fixedpoint"
"github.com/c9s/bbgo/pkg/sigchan" "github.com/c9s/bbgo/pkg/sigchan"
@ -18,12 +20,39 @@ type ArbMarket struct {
bestBid, bestAsk types.PriceVolume bestBid, bestAsk types.PriceVolume
buyRate, sellRate float64 buyRate, sellRate float64
sigC sigchan.Chan sigC sigchan.Chan
truncateBaseQuantity, truncateQuoteQuantity QuantityTruncator
} }
func (m *ArbMarket) String() string { func (m *ArbMarket) String() string {
return m.Symbol return m.Symbol
} }
type QuantityTruncator func(value fixedpoint.Value) fixedpoint.Value
func createBaseQuantityTruncator(m types.Market) QuantityTruncator {
var stepSizeFloat = m.StepSize.Float64()
var truncPrec = int(math.Round(math.Log10(stepSizeFloat) * -1.0))
return createRoundedTruncator(truncPrec)
}
func createPricePrecisionBasedQuoteQuantityTruncator(m types.Market) QuantityTruncator {
// note that MAX uses the price precision for its quote asset precision
return createRoundedTruncator(m.PricePrecision)
}
func createRoundedTruncator(truncPrec int) QuantityTruncator {
var truncPow10 = math.Pow10(truncPrec)
var roundPrec = truncPrec + 1
var roundPow10 = math.Pow10(roundPrec)
return func(value fixedpoint.Value) fixedpoint.Value {
v := value.Float64()
v = math.Trunc(math.Round(v*roundPow10)/10.0) / truncPow10
s := strconv.FormatFloat(v, 'f', truncPrec, 64)
return fixedpoint.MustNewFromString(s)
}
}
func (m *ArbMarket) getInitialBalance(balances types.BalanceMap, dir int) (fixedpoint.Value, string) { func (m *ArbMarket) getInitialBalance(balances types.BalanceMap, dir int) (fixedpoint.Value, string) {
if dir == 1 { // sell 1 BTC -> 19000 USDT if dir == 1 { // sell 1 BTC -> 19000 USDT
b, ok := balances[m.BaseCurrency] b, ok := balances[m.BaseCurrency]
@ -31,14 +60,14 @@ func (m *ArbMarket) getInitialBalance(balances types.BalanceMap, dir int) (fixed
return fixedpoint.Zero, m.BaseCurrency return fixedpoint.Zero, m.BaseCurrency
} }
return m.market.TruncateQuantity(b.Available), m.BaseCurrency return m.truncateBaseQuantity(b.Available), m.BaseCurrency
} else if dir == -1 { } else if dir == -1 {
b, ok := balances[m.QuoteCurrency] b, ok := balances[m.QuoteCurrency]
if !ok { if !ok {
return fixedpoint.Zero, m.QuoteCurrency return fixedpoint.Zero, m.QuoteCurrency
} }
return m.market.TruncateQuantity(b.Available), m.QuoteCurrency return m.truncateQuoteQuantity(b.Available), m.QuoteCurrency
} }
return fixedpoint.Zero, "" return fixedpoint.Zero, ""
@ -75,24 +104,22 @@ func (m *ArbMarket) updateRate() {
func (m *ArbMarket) newOrder(dir int, transitingQuantity float64) (types.SubmitOrder, float64) { func (m *ArbMarket) newOrder(dir int, transitingQuantity float64) (types.SubmitOrder, float64) {
if dir == 1 { // sell ETH -> BTC, sell USDT -> TWD if dir == 1 { // sell ETH -> BTC, sell USDT -> TWD
q, r := fitQuantityByBase(m.market.TruncateQuantity(m.bestBid.Volume).Float64(), transitingQuantity) q, r := fitQuantityByBase(m.truncateBaseQuantity(m.bestBid.Volume).Float64(), transitingQuantity)
fq := fixedpoint.NewFromFloat(q)
return types.SubmitOrder{ return types.SubmitOrder{
Symbol: m.Symbol, Symbol: m.Symbol,
Side: types.SideTypeSell, Side: types.SideTypeSell,
Type: types.OrderTypeLimit, Type: types.OrderTypeLimit,
Quantity: fq, Quantity: fixedpoint.NewFromFloat(q),
Price: m.bestBid.Price, Price: m.bestBid.Price,
Market: m.market, Market: m.market,
}, r }, r
} else if dir == -1 { // use 1 BTC to buy X ETH } else if dir == -1 { // use 1 BTC to buy X ETH
q, r := fitQuantityByQuote(m.bestAsk.Price.Float64(), m.market.TruncateQuantity(m.bestAsk.Volume).Float64(), transitingQuantity) q, r := fitQuantityByQuote(m.bestAsk.Price.Float64(), m.truncateBaseQuantity(m.bestAsk.Volume).Float64(), transitingQuantity)
fq := fixedpoint.NewFromFloat(q)
return types.SubmitOrder{ return types.SubmitOrder{
Symbol: m.Symbol, Symbol: m.Symbol,
Side: types.SideTypeBuy, Side: types.SideTypeBuy,
Type: types.OrderTypeLimit, Type: types.OrderTypeLimit,
Quantity: fq, Quantity: fixedpoint.NewFromFloat(q),
Price: m.bestAsk.Price, Price: m.bestAsk.Price,
Market: m.market, Market: m.market,
}, r }, r

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

@ -773,11 +773,13 @@ func (s *Strategy) buildArbMarkets(session *bbgo.ExchangeSession, symbols []stri
} }
m := &ArbMarket{ m := &ArbMarket{
Symbol: symbol, Symbol: symbol,
market: market, market: market,
BaseCurrency: market.BaseCurrency, BaseCurrency: market.BaseCurrency,
QuoteCurrency: market.QuoteCurrency, QuoteCurrency: market.QuoteCurrency,
sigC: sigC, sigC: sigC,
truncateBaseQuantity: createBaseQuantityTruncator(market),
truncateQuoteQuantity: createPricePrecisionBasedQuoteQuantityTruncator(market),
} }
if separateStream { if separateStream {