xfunding: call syncFundingFeeRecords to sync funding fee records

This commit is contained in:
c9s 2023-03-26 15:04:12 +08:00
parent cadd3f0795
commit 88514e8bd9
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54

View File

@ -321,6 +321,9 @@ func (s *Strategy) CrossRun(ctx context.Context, orderExecutionRouter bbgo.Order
s.syncFundingFeeRecords(ctx, s.ProfitStats.LastFundingFeeTime) s.syncFundingFeeRecords(ctx, s.ProfitStats.LastFundingFeeTime)
} }
// TEST CODE:
// s.syncFundingFeeRecords(ctx, time.Now().Add(-3*24*time.Hour))
s.spotOrderExecutor = s.allocateOrderExecutor(ctx, s.spotSession, instanceID, s.SpotPosition) s.spotOrderExecutor = s.allocateOrderExecutor(ctx, s.spotSession, instanceID, s.SpotPosition)
s.spotOrderExecutor.TradeCollector().OnTrade(func(trade types.Trade, profit fixedpoint.Value, netProfit fixedpoint.Value) { s.spotOrderExecutor.TradeCollector().OnTrade(func(trade types.Trade, profit fixedpoint.Value, netProfit fixedpoint.Value) {
// we act differently on the spot account // we act differently on the spot account
@ -463,6 +466,11 @@ func (s *Strategy) CrossRun(ctx context.Context, orderExecutionRouter bbgo.Order
func (s *Strategy) syncFundingFeeRecords(ctx context.Context, since time.Time) { func (s *Strategy) syncFundingFeeRecords(ctx context.Context, since time.Time) {
now := time.Now() now := time.Now()
log.Infof("syncing funding fee records from the income history query: %s <=> %s", since, now)
defer log.Infof("sync funding fee records done")
q := batch.BinanceFuturesIncomeBatchQuery{ q := batch.BinanceFuturesIncomeBatchQuery{
BinanceFuturesIncomeHistoryService: s.binanceFutures, BinanceFuturesIncomeHistoryService: s.binanceFutures,
} }
@ -473,10 +481,30 @@ func (s *Strategy) syncFundingFeeRecords(ctx context.Context, since time.Time) {
case <-ctx.Done(): case <-ctx.Done():
return return
case income := <-dataC: case income, ok := <-dataC:
log.Infof("income: %+v", income) if !ok {
return
}
log.Infof("income: %+v", income)
switch income.IncomeType {
case binanceapi.FuturesIncomeFundingFee:
err := s.ProfitStats.AddFundingFee(FundingFee{
Asset: income.Asset,
Amount: income.Income,
Txn: income.TranId,
Time: income.Time.Time(),
})
if err != nil {
log.WithError(err).Errorf("can not add funding fee record to ProfitStats")
}
}
case err, ok := <-errC:
if !ok {
return
}
case err := <-errC:
log.WithError(err).Errorf("unable to query futures income history") log.WithError(err).Errorf("unable to query futures income history")
return return