mirror of
https://github.com/c9s/bbgo.git
synced 2024-11-10 09:11:55 +00:00
xfunding: improve funding fee guard
This commit is contained in:
parent
d58461d1cf
commit
dbd54575e6
|
@ -17,8 +17,13 @@ type ProfitStats struct {
|
||||||
FundingFeeCurrency string `json:"fundingFeeCurrency"`
|
FundingFeeCurrency string `json:"fundingFeeCurrency"`
|
||||||
TotalFundingFee fixedpoint.Value `json:"totalFundingFee"`
|
TotalFundingFee fixedpoint.Value `json:"totalFundingFee"`
|
||||||
FundingFeeRecords []FundingFee `json:"fundingFeeRecords"`
|
FundingFeeRecords []FundingFee `json:"fundingFeeRecords"`
|
||||||
LastFundingFeeTxn int64 `json:"lastFundingFeeTxn"`
|
|
||||||
LastFundingFeeTime time.Time `json:"lastFundingFeeTime"`
|
// Fees map[string]
|
||||||
|
Last *FundingFee `json:"last"`
|
||||||
|
|
||||||
|
LastFundingFeeTime time.Time `json:"lastFundingFeeTime"`
|
||||||
|
|
||||||
|
txns map[int64]struct{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProfitStats) SlackAttachment() slack.Attachment {
|
func (s *ProfitStats) SlackAttachment() slack.Attachment {
|
||||||
|
@ -31,24 +36,29 @@ func (s *ProfitStats) SlackAttachment() slack.Attachment {
|
||||||
// Pretext: "",
|
// Pretext: "",
|
||||||
// Text: text,
|
// Text: text,
|
||||||
Fields: fields,
|
Fields: fields,
|
||||||
Footer: fmt.Sprintf("Last Funding Fee Transation ID: %d Last Funding Fee Time %s", s.LastFundingFeeTxn, s.LastFundingFeeTime.Format(time.RFC822)),
|
Footer: fmt.Sprintf("Last Funding Fee Transation ID: %d Last Funding Fee Time %s", s.Last.Txn, s.Last.Time.Format(time.RFC822)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ProfitStats) AddFundingFee(fee FundingFee) error {
|
func (s *ProfitStats) AddFundingFee(fee FundingFee) error {
|
||||||
|
if s.txns == nil {
|
||||||
|
s.txns = make(map[int64]struct{})
|
||||||
|
}
|
||||||
|
|
||||||
if s.FundingFeeCurrency == "" {
|
if s.FundingFeeCurrency == "" {
|
||||||
s.FundingFeeCurrency = fee.Asset
|
s.FundingFeeCurrency = fee.Asset
|
||||||
} else if s.FundingFeeCurrency != fee.Asset {
|
} else if s.FundingFeeCurrency != fee.Asset {
|
||||||
return fmt.Errorf("unexpected error, funding fee currency is not matched, given: %s, wanted: %s", fee.Asset, s.FundingFeeCurrency)
|
return fmt.Errorf("unexpected error, funding fee currency is not matched, given: %s, wanted: %s", fee.Asset, s.FundingFeeCurrency)
|
||||||
}
|
}
|
||||||
|
|
||||||
if s.LastFundingFeeTxn == fee.Txn {
|
if _, ok := s.txns[fee.Txn]; ok {
|
||||||
return errDuplicatedFundingFeeTxnId
|
return errDuplicatedFundingFeeTxnId
|
||||||
}
|
}
|
||||||
|
|
||||||
s.FundingFeeRecords = append(s.FundingFeeRecords, fee)
|
s.FundingFeeRecords = append(s.FundingFeeRecords, fee)
|
||||||
s.TotalFundingFee = s.TotalFundingFee.Add(fee.Amount)
|
s.TotalFundingFee = s.TotalFundingFee.Add(fee.Amount)
|
||||||
s.LastFundingFeeTxn = fee.Txn
|
s.Last = &fee
|
||||||
s.LastFundingFeeTime = fee.Time
|
|
||||||
|
s.txns[fee.Txn] = struct{}{}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -298,7 +298,6 @@ func (s *Strategy) CrossRun(
|
||||||
FundingFeeCurrency: s.futuresMarket.QuoteCurrency,
|
FundingFeeCurrency: s.futuresMarket.QuoteCurrency,
|
||||||
TotalFundingFee: fixedpoint.Zero,
|
TotalFundingFee: fixedpoint.Zero,
|
||||||
FundingFeeRecords: nil,
|
FundingFeeRecords: nil,
|
||||||
LastFundingFeeTime: time.Time{},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -379,10 +378,7 @@ func (s *Strategy) CrossRun(
|
||||||
bbgo.Notify("State: %s", s.State.PositionState.String())
|
bbgo.Notify("State: %s", s.State.PositionState.String())
|
||||||
|
|
||||||
// sync funding fee txns
|
// sync funding fee txns
|
||||||
s.syncFundingFeeRecords(ctx, s.ProfitStats.LastFundingFeeTime)
|
s.syncFundingFeeRecords(ctx, time.Now().Add(-5*24*time.Hour))
|
||||||
|
|
||||||
// TEST CODE:
|
|
||||||
// s.syncFundingFeeRecords(ctx, time.Now().Add(-3*24*time.Hour))
|
|
||||||
|
|
||||||
switch s.State.PositionState {
|
switch s.State.PositionState {
|
||||||
case PositionClosed:
|
case PositionClosed:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user