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

Merge pull request #589 from c9s/fix-net-asset

Browse Source 
fix: use net asset to calculate inUSD
This commit is contained in:
Yo-An Lin 2022-05-04 19:35:57 +08:00 committed by GitHub
commit 826bf47156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/types/asset.go
View File

@ -14,13 +14,13 @@ type Asset struct {
Currency string `json:"currency" db:"currency"`
Total fixedpoint.Value `json:"total" db:"total"`
NetAsset fixedpoint.Value `json:"netAsset" db:"net_asset"`
NetAsset fixedpoint.Value `json:"netAsset" db:"net_asset"`
// InUSD is net asset in USD
InUSD fixedpoint.Value `json:"inUSD" db:"net_asset_in_usd"`
// InBTC is net asset in BTC
InBTC fixedpoint.Value `json:"inBTC" db:"net_asset_in_btc"`
InBTC fixedpoint.Value `json:"inBTC" db:"net_asset_in_btc"`
Time time.Time `json:"time" db:"time"`
Locked fixedpoint.Value `json:"lock" db:"lock" `
@ -76,7 +76,7 @@ func (m AssetMap) Slice() (assets []Asset) {
func (m AssetMap) SlackAttachment() slack.Attachment {
var fields []slack.AttachmentField
var totalBTC, totalUSD fixedpoint.Value
var netAssetInBTC, netAssetInUSD fixedpoint.Value
var assets = m.Slice()
@ -86,26 +86,38 @@ func (m AssetMap) SlackAttachment() slack.Attachment {
})
for _, a := range assets {
totalUSD = totalUSD.Add(a.InUSD)
totalBTC = totalBTC.Add(a.InBTC)
netAssetInUSD = netAssetInUSD.Add(a.InUSD)
netAssetInBTC = netAssetInBTC.Add(a.InBTC)
}
for _, a := range assets {
if !a.InUSD.IsZero() {
text := fmt.Sprintf("%s (≈ %s) (≈ %s) (%s)",
a.NetAsset.String(),
USD.FormatMoney(a.InUSD),
BTC.FormatMoney(a.InBTC),
a.InUSD.Div(netAssetInUSD).FormatPercentage(2),
)
if !a.Borrowed.IsZero() {
text += fmt.Sprintf(" Borrowed: %s", a.Borrowed.String())
}
fields = append(fields, slack.AttachmentField{
Title: a.Currency,
Value: fmt.Sprintf("%s (≈ %s) (≈ %s) (%s)",
a.Total.String(),
USD.FormatMoney(a.InUSD),
BTC.FormatMoney(a.InBTC),
a.InUSD.Div(totalUSD).FormatPercentage(2),
),
Value: text,
Short: false,
})
} else {
text := fmt.Sprintf("%s", a.NetAsset.String())
if !a.Borrowed.IsZero() {
text += fmt.Sprintf(" Borrowed: %s", a.Borrowed.String())
}
fields = append(fields, slack.AttachmentField{
Title: a.Currency,
Value: fmt.Sprintf("%s", a.Total.String()),
Value: text,
Short: false,
})
}
@ -113,8 +125,8 @@ func (m AssetMap) SlackAttachment() slack.Attachment {
return slack.Attachment{
Title: fmt.Sprintf("Net Asset Value %s (≈ %s)",
USD.FormatMoney(totalUSD),
BTC.FormatMoney(totalBTC),
USD.FormatMoney(netAssetInUSD),
BTC.FormatMoney(netAssetInBTC),
),
Fields: fields,
}

8
pkg/types/balance.go
View File

@ -129,13 +129,13 @@ func (m BalanceMap) Assets(prices map[string]fixedpoint.Value, priceTime time.Ti
if market, usdPrice, ok := findUSDMarketPrice(currency, prices); ok {
// this includes USDT, USD, USDC and so on
if strings.HasPrefix(market, "USD") { // for prices like USDT/TWD
if !asset.Total.IsZero() {
asset.InUSD = asset.Total.Div(usdPrice)
if !asset.NetAsset.IsZero() {
asset.InUSD = asset.NetAsset.Div(usdPrice)
}
asset.PriceInUSD = fixedpoint.One.Div(usdPrice)
} else { // for prices like BTC/USDT
if !asset.Total.IsZero() {
asset.InUSD = asset.Total.Mul(usdPrice)
if !asset.NetAsset.IsZero() {
asset.InUSD = asset.NetAsset.Mul(usdPrice)
}
asset.PriceInUSD = usdPrice
}