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

Merge pull request #934 from c9s/fix/pnl-position

Browse Source 
pnl: fix nil position point issue
This commit is contained in:
Yo-An Lin 2022-09-12 00:32:17 +08:00 committed by GitHub
commit 5db41f4be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/accounting/pnl/avg_cost.go
View File

@ -12,6 +12,7 @@ import (
type AverageCostCalculator struct { type AverageCostCalculator struct {
TradingFeeCurrency string TradingFeeCurrency string
Market types.Market Market types.Market
ExchangeFee *types.ExchangeFee
} }
func (c *AverageCostCalculator) Calculate(symbol string, trades []types.Trade, currentPrice fixedpoint.Value) *AverageCostPnLReport { func (c *AverageCostCalculator) Calculate(symbol string, trades []types.Trade, currentPrice fixedpoint.Value) *AverageCostPnLReport {
@ -22,12 +23,31 @@ func (c *AverageCostCalculator) Calculate(symbol string, trades []types.Trade, c
var grossProfit = fixedpoint.Zero var grossProfit = fixedpoint.Zero
var grossLoss = fixedpoint.Zero var grossLoss = fixedpoint.Zero
var position = types.NewPositionFromMarket(c.Market)
if c.ExchangeFee != nil {
position.SetFeeRate(*c.ExchangeFee)
} else {
makerFeeRate := 0.075 * 0.01
if c.Market.QuoteCurrency == "BUSD" {
makerFeeRate = 0
}
position.SetFeeRate(types.ExchangeFee{
// binance vip 0 uses 0.075%
MakerFeeRate: fixedpoint.NewFromFloat(makerFeeRate),
TakerFeeRate: fixedpoint.NewFromFloat(0.075 * 0.01),
})
}
if len(trades) == 0 { if len(trades) == 0 {
return &AverageCostPnLReport{ return &AverageCostPnLReport{
Symbol: symbol, Symbol: symbol,
Market: c.Market, Market: c.Market,
LastPrice: currentPrice, LastPrice: currentPrice,
NumTrades: 0, NumTrades: 0,
Position: position,
BuyVolume: bidVolume, BuyVolume: bidVolume,
SellVolume: askVolume, SellVolume: askVolume,
FeeInUSD: feeUSD, FeeInUSD: feeUSD,
@ -36,13 +56,6 @@ func (c *AverageCostCalculator) Calculate(symbol string, trades []types.Trade, c
var currencyFees = map[string]fixedpoint.Value{} var currencyFees = map[string]fixedpoint.Value{}
var position = types.NewPositionFromMarket(c.Market)
position.SetFeeRate(types.ExchangeFee{
// binance vip 0 uses 0.075%
MakerFeeRate: fixedpoint.NewFromFloat(0.075 * 0.01),
TakerFeeRate: fixedpoint.NewFromFloat(0.075 * 0.01),
})
// TODO: configure the exchange fee rate here later // TODO: configure the exchange fee rate here later
// position.SetExchangeFeeRate() // position.SetExchangeFeeRate()
var totalProfit fixedpoint.Value var totalProfit fixedpoint.Value