Commit Graph

1788 Commits

Author SHA1 Message Date
c9s
4d59edc3d1
xfunding: add funding fee slack attachment support 2023-03-29 21:39:36 +08:00
c9s
c437837210
xfunding: improve checkAndRestorePositionRisks 2023-03-29 21:36:29 +08:00
c9s
8257c4ffbe
xfunding: fix ClosePosition call for futures 2023-03-29 18:28:25 +08:00
c9s
38778ff756
bbgo: fix order executor ClosePosition for order executor 2023-03-29 17:46:54 +08:00
c9s
38ba567558
xfunding: fix and call FuturesChangeInitialLeverageRequest 2023-03-29 17:14:29 +08:00
c9s
18d8d63b02
binance: add and fix multi assets mode 2023-03-29 16:59:15 +08:00
Yo-An Lin
dc87c79edd
Merge pull request #1132 from c9s/c9s/strategy/funding
strategy: xfunding: add profit stats and collect funding fee info
2023-03-26 15:11:10 +08:00
c9s
88514e8bd9
xfunding: call syncFundingFeeRecords to sync funding fee records 2023-03-26 15:04:12 +08:00
c9s
4d1f691300
xfunding: add syncFundingFeeRecords method 2023-03-26 14:54:27 +08:00
c9s
a3f96871e2
xfunding: pull out newState constructor 2023-03-26 14:44:18 +08:00
c9s
36836c7c79
xfunding: add funding fee time 2023-03-26 14:42:13 +08:00
c9s
e5d2db0f72
xfunding: customize netural position profit 2023-03-26 02:32:21 +08:00
c9s
f4a35132e8
xfunding: add trades to s.NeutralPosition 2023-03-26 02:16:23 +08:00
c9s
ac33b5a878
xfunding: check duplicated funding fee txn 2023-03-26 02:13:22 +08:00
c9s
a6b47fda72
xfunding: check funding fee and record txn id 2023-03-26 02:12:00 +08:00
c9s
ff35fd06c4
xfunding: pull out interval option 2023-03-26 02:09:21 +08:00
c9s
425952d76c
xfunding: log collected funding fee 2023-03-26 01:55:33 +08:00
c9s
ba0dd68be0
xfunding: callcate funding fee 2023-03-26 01:54:39 +08:00
c9s
f127a530b7
xfunding: bind profit stats 2023-03-26 01:33:52 +08:00
c9s
78c73e4514
bbgo: check e.disableNotify for profit stats 2023-03-26 01:32:47 +08:00
c9s
e41df7e321
xfunding: add wip list 2023-03-26 01:21:20 +08:00
c9s
22d339cb41
xfunding: check binance type and return error 2023-03-26 01:16:54 +08:00
c9s
23746678b4
xfunding: initialize NeutralPosition 2023-03-26 01:07:50 +08:00
c9s
5c21445b15
xfunding: comment unused code 2023-03-26 01:03:07 +08:00
c9s
c176e2df5f
xfunding: move moving average config out 2023-03-26 01:02:31 +08:00
Yo-An Lin
e0a9cd3c6d
Merge pull request #1131 from c9s/c9s/strategy/funding
strategy: xfunding: improve sync goroutine, add mutex lock, fix binance websocket message parsing ...
2023-03-25 03:05:46 +08:00
c9s
0c6e9496b3
xfunding: use early return 2023-03-25 02:56:45 +08:00
c9s
300506f9f9
xfunding: fix critical section for usedQuoteInvestment 2023-03-25 02:53:55 +08:00
c9s
0f49f9fbe5
xfunding: add e.AccountUpdate.EventReasonType switch case 2023-03-25 02:48:27 +08:00
Yo-An Lin
cc74156a7d
Merge pull request #1127 from c9s/c9s/strategy/funding
feature: strategy: xfunding
2023-03-24 15:08:28 +08:00
c9s
feec194843
binance: improve transfer logs 2023-03-24 14:37:18 +08:00
c9s
ea7af708f9
add mutex lock 2023-03-24 14:28:36 +08:00
gx578007
cd1314e9e0
Merge pull request #1125 from c9s/bhwu/grid2/using-dnum
FEATURE: [grid2] using dnum
2023-03-24 13:53:35 +08:00
c9s
4669692b8d
xfunding: remove debug log and test code 2023-03-24 03:20:04 +08:00
c9s
1517076f6d
xfunding: implement syncSpotPosition 2023-03-24 03:20:04 +08:00
c9s
0f21c1fd8f
xfunding: fix Warnf format 2023-03-24 03:20:03 +08:00
c9s
84313dbdf9
xfunding: refactor state functions and fix transfer out 2023-03-24 02:52:13 +08:00
c9s
f3049de2ba
all: improve logging 2023-03-24 02:09:49 +08:00
c9s
209fb102fa
xfunding: add stringer support on PremiumIndex 2023-03-24 01:57:43 +08:00
c9s
62e6b232ed
xfunding: refactor and refine PositionState checking 2023-03-24 00:52:36 +08:00
c9s
c1fbbbe400
xfunding: move position state to state struct 2023-03-24 00:36:28 +08:00
c9s
108bb5deeb
xfunding: add guard condition for starting and stopping 2023-03-23 22:58:42 +08:00
c9s
e016892a70
xfunding: pull out startClosingPosition, startOpeningPosition method 2023-03-23 22:57:13 +08:00
c9s
3624dd0338
xfunding: implement close position transfer 2023-03-23 22:54:42 +08:00
c9s
aba80398d9
xfunding: add MinHoldingPeriod support 2023-03-23 22:36:35 +08:00
c9s
a933f90cc8
xfunding: log low funding fee 2023-03-23 18:19:30 +08:00
c9s
b5f69e7f45
xfunding: reset stats when direction changed 2023-03-23 18:18:30 +08:00
c9s
7ba7eb8be7
xfunding: implement reduceFuturesPosition 2023-03-23 18:09:16 +08:00
c9s
1b5126c9a1
xfunding: add mutex 2023-03-23 17:36:30 +08:00
narumi
32c617a283 replenish on start 2023-03-23 16:47:48 +08:00
c9s
44850e48e8
xfunding: add mutex protection 2023-03-23 14:48:24 +08:00
c9s
8b87a8706b
xfunding: add state for recording TotalBaseTransfer 2023-03-23 14:46:02 +08:00
c9s
b7edc38dc7
xfunding: record pending transfer 2023-03-23 13:14:59 +08:00
c9s
16608619ca
xfunding: fix sync guard 2023-03-23 13:07:59 +08:00
c9s
80c30d15a0
xfunding: correct method names 2023-03-23 13:02:22 +08:00
c9s
20cd73e6ad
xfunding: fix transfer and refactoring more methods 2023-03-23 12:58:10 +08:00
c9s
6ca85b175a
xfunding: adjust quote investment according to the fee rate 2023-03-23 00:56:28 +08:00
c9s
6668d683e1
xfunding: adjust quoteInvestment according to the quote balance 2023-03-23 00:40:20 +08:00
c9s
684f6c6e1d
xfunding: document spot trade handler 2023-03-23 00:23:51 +08:00
c9s
928f668fec
xfunding: pull out premium check to detectPremiumIndex 2023-03-22 22:17:37 +08:00
c9s
dc5e0cbcc2
xfunding: solve lint error 2023-03-22 22:15:24 +08:00
c9s
6265ad248e
xfunding: add premium checker 2023-03-22 22:15:01 +08:00
c9s
98b0ffa510
all: add more futures channel types 2023-03-22 22:01:59 +08:00
c9s
e607fc19ac
xfunding: check spotSession, futuresSession names 2023-03-22 21:42:44 +08:00
c9s
d6c430a4b4
xfunding: implement CrossSubscribe 2023-03-22 21:42:06 +08:00
c9s
b881aea228
add position action 2023-03-22 21:38:56 +08:00
c9s
e93d13e425
xfunding: implement CrossRun 2023-03-22 21:36:42 +08:00
c9s
12b9775eb3
rename funding to xfunding 2023-03-22 21:17:33 +08:00
c9s
ab52dd6349
funding: filter kline event with types.KLineWith 2023-03-22 21:11:58 +08:00
gx578007
0e2e8306b4 FEATURE: [grid2] using dnum 2023-03-20 18:00:41 +08:00
chiahung
bc23055536 FEATURE: emit grid error when failed to recover or open grid 2023-03-20 16:27:08 +08:00
narumi
7114016bc9 clamp skew 2023-03-18 23:31:03 +08:00
kbearXD
294c09b9e8
Merge pull request #1119 from c9s/feature/grids/recover-from-trades
FEATURE: make PinOrderMap's key from string to Pin
2023-03-17 10:45:09 +08:00
chiahung
8182840685 use fixedpoint.Value as key 2023-03-16 21:58:41 +08:00
c9s
0b922a929e
grid2: pull out backoff cancel all to cancelAllOrdersUntilSuccessful 2023-03-16 18:01:56 +08:00
chiahung
feabadeb59 FEATURE: make PinOrderMap's key from string to Pin 2023-03-16 17:34:02 +08:00
なるみ
57e3f46c5c
Merge pull request #1117 from c9s/narumi/fixedmaker/atr
strategy: fixedmaker: add option to use ATR to adjust spread ratio
2023-03-16 17:11:13 +08:00
narumi
939427c81f use ATR to adjust spread ratio 2023-03-16 17:03:45 +08:00
chiahung
a5675f72ad MINOR: use Debug config for debug log 2023-03-16 16:44:16 +08:00
なるみ
52b2ffebd1
Merge pull request #1113 from c9s/narumi/fixedmaker/skew
strategy: fixedmaker: add skew to adjust bid/ask price
2023-03-16 02:39:02 +08:00
narumi
cf9a2e55bf add skew to adjust bid/ask price 2023-03-16 02:04:26 +08:00
Yo-An Lin
4ac5a2a9e9
Merge pull request #1115 from c9s/bhwu/fix-correct-price-metrics
FIX: [grid2] fix correct price metrics
2023-03-15 22:10:17 +08:00
gx578007
74c465d943 FIX: [grid2] fix correct price metrics 2023-03-15 21:40:44 +08:00
chiahung
ffdc242f66 use debugOrders 2023-03-15 21:34:04 +08:00
chiahung
f987c85f17 move info log to debug log 2023-03-15 21:12:59 +08:00
chiahung
e686a26dda FEATURE: verify the grids before emit filled orders 2023-03-15 20:15:53 +08:00
narumi
0f9319a2f5 make CreatePositions and CreateProfitStats public 2023-03-15 16:01:13 +08:00
c9s
0882bc4960
bollmaker: log submit order error 2023-03-15 13:26:27 +08:00
なるみ
7d91fd01d8
Merge pull request #1109 from c9s/narumi/rebalance/fix-order-executor-not-found
fix: rebalance: fix positions and profit stats map
2023-03-15 12:25:19 +08:00
Andy Cheng
0a6c41cfe7
fix/bollmaker: fix s.MinProfitActivationRate condition 2023-03-15 11:06:26 +08:00
Andy Cheng
ca4890425c
fix/bollmaker: MinProfitActivationRate is disabled if it's not set 2023-03-15 10:57:18 +08:00
narumi
0458858de0 fix position and profitstats 2023-03-14 19:27:41 +08:00
kbearXD
ee4388406e
Merge pull request #1097 from c9s/feature/grids/recover-from-trades
FEATURE: get filled orders when bbgo down
2023-03-14 15:15:32 +08:00
chiahung
dce1e4c7d4 rename buildSyncOrderMap to SyncOrderMap 2023-03-14 14:35:15 +08:00
なるみ
cddf3570f2
Merge pull request #1104 from c9s/narumi/rebalance/balance
fix: rebalance: adjust max amount by balance
2023-03-14 14:06:31 +08:00
chiahung
9da8c39d2c avoid re-query same order 2023-03-14 13:46:46 +08:00
chiahung
4af8523144 new struct PinOrderMap 2023-03-14 10:47:25 +08:00
chiahung
7af4e3bf8a FEATURE: get filled orders when bbgo down 2023-03-14 10:47:23 +08:00
c9s
60d7d20ced
grid2: fix newline for the message format 2023-03-14 00:29:13 +08:00
なるみ
add9372eba use mid price to calculate weight 2023-03-13 15:30:33 +00:00
narumi
0690518dc7 add option to rebalance on start 2023-03-13 22:43:42 +08:00
narumi
640001ffa1 check minimal order quantity 2023-03-13 22:39:22 +08:00
narumi
c9f6995701 fix OrderExecutorMap's SumbitOrders 2023-03-13 22:39:04 +08:00
narumi
0b7f42c382 adjust max amount by balance 2023-03-13 22:39:01 +08:00
Yo-An Lin
4b3f00fe79
Merge pull request #1105 from c9s/strategy/grid2/client-order-id-max
grid2: use newClientOrderID only for max
2023-03-13 21:47:02 +08:00
Yo-An Lin
07ebd83a62
Merge pull request #1052 from andycheng123/improve/linregmaker-minprofit
Improve/linregmaker minprofit
2023-03-13 21:31:28 +08:00
c9s
35ceda8408
grid2: use newClientOrderID only for max 2023-03-13 21:27:13 +08:00
gx578007
4b540fce88
Merge pull request #1100 from c9s/bhwu/grid2/specify-client-order-id
FIX: [grid2] specify client order id explicitly
2023-03-13 18:51:27 +08:00
gx578007
83ba32bf2f mock SubmitOrders by DoAndReturn 2023-03-13 18:43:52 +08:00
Andy Cheng
360173ac2b
fix/linregmaker: fix syntax error 2023-03-13 16:35:19 +08:00
Andy Cheng
cb412dc13f
improve/bollmaker: add MinProfitActivationRate 2023-03-13 16:35:19 +08:00
Andy Cheng
5fc459d404
improve/linregmaker: rename MinProfitDisableOn to MinProfitActivationRate 2023-03-13 16:35:19 +08:00
Andy Cheng
6e854f8027
improve/linregmaker: add MinProfitSpread 2023-03-13 16:35:19 +08:00
Andy Cheng
3c14382c3c
improve/linregmaker: fix StandardIndicatorSet initialization problem 2023-03-13 16:35:19 +08:00
Andy Cheng
a607f230d6
improve/linregmaker: more log for can buy sell 2023-03-13 16:35:19 +08:00
Andy Cheng
0ea345a18c
improve/linregmaker: fix balance calculation in backtesting 2023-03-13 16:35:18 +08:00
narumi
4559a35f31 graceful cancel in rebalance strategy 2023-03-13 00:49:49 +08:00
c9s
b050ae4098
grid2: fix log format 2023-03-11 16:03:13 +08:00
narumi
74656e0e49 fix fixedmaker errors 2023-03-10 18:39:30 +08:00
gx578007
16b30960cc FIX: [grid2] specify client order id explicitly 2023-03-10 18:29:53 +08:00
Yo-An Lin
31e299baf2
Merge pull request #1101 from c9s/narumi/fixedmaker
strategy: add fixedmaker
2023-03-10 17:24:01 +08:00
c9s
3eae532e13
grid2: init filledOrderIDMap for tests 2023-03-10 17:11:51 +08:00
c9s
c6609927f2
grid2: fix Warn by using Warnf 2023-03-10 17:00:09 +08:00
narumi
a7cfd488ed add fixedmaker 2023-03-10 16:41:01 +08:00
gx578007
fd2032b825 FIX: [grid2] avoid handling one orderID twice 2023-03-10 16:16:11 +08:00
c9s
df6e58d654
grid2: replace all openOrders query to queryOpenOrdersUntilSuccessful 2023-03-10 13:11:42 +08:00
c9s
89abbeb2d1
grid2: add context to backoffs 2023-03-10 13:10:14 +08:00
c9s
f093c73457
grid2: add queryOpenOrdersUntilSuccessful func 2023-03-10 13:10:14 +08:00
c9s
64e0a169e9
grid2: add debug option 2023-03-10 13:10:14 +08:00
c9s
ccf567fdab
grid2: add ClearDuplicatedPriceOpenOrders option 2023-03-10 13:10:11 +08:00
chiahung
67001fcbb7 new config 'recoverGridByScanningTrades' 2023-03-09 17:53:13 +08:00
chiahung
4288c82e25 FEATURE: recover grids with open orders by querying trades process and its buildPinOrderMap method 2023-03-09 17:10:44 +08:00
なるみ
1ebdd37f3f
Merge pull request #1093 from c9s/narumi/rebalance/positions
strategy: rebalance: add positions and profit stats
2023-03-09 12:07:19 +08:00
gx578007
045c8de2a6 refactor metric function to be separated in terms of lock 2023-03-09 11:26:02 +08:00
gx578007
5988567d09 FEATURE: [grid2] add more metrics and fix metric-related issues 2023-03-08 23:54:21 +08:00
なるみ
40e2296492 add positions and profit stats 2023-03-08 14:12:42 +00:00
c9s
c860e45c34
grid2: simplify isCompleteGridOrderBook 2023-03-08 16:02:31 +08:00
c9s
a75bc2e590
grid2: add isCompleteGridOrderBook doc comment 2023-03-07 21:42:53 +08:00
c9s
72b6f73cb6
grid2: fix complete grid order book condition 2023-03-07 21:41:16 +08:00
c9s
db119a2218
grid2: update metrics before we re-play orders 2023-03-07 20:01:51 +08:00
c9s
756a3bb43f
grid2: add base round down for buy order 2023-03-07 18:37:45 +08:00
c9s
62eed9605d
grid2: round down quoteQuantity/baseQuantity after the fee reduction 2023-03-07 13:53:14 +08:00
gx578007
b04492a5a7
Merge pull request #1085 from c9s/bhwu/grid2/fix-group-id
FIX: [grid2] group id should be bound by MaxInt32
2023-03-07 12:01:17 +08:00
gx578007
f8054459c4 FIX: [grid2] group id should be bound by MaxInt32 2023-03-07 11:54:45 +08:00
なるみ
f064f5fbe1
Merge pull request #1080 from c9s/narumi/marketcap/order-type
strategy: marketcap: add orderType parameter
2023-03-06 21:46:25 +08:00
なるみ
00e022dbdc fixup! set order type default value in Defaults method 2023-03-06 13:37:03 +00:00
なるみ
cd500e6e73 set order type default value in Defaults method 2023-03-06 12:33:14 +00:00
gx578007
d4912ed3cd FIX: [grid2] avoid initializing metrics twice 2023-03-06 16:56:40 +08:00
c9s
1dd6f9ef3e
grid2: remove order group cancel 2023-03-06 10:38:45 +08:00
c9s
9f29fbd645
grid2: add order group id to the submitOrder forms 2023-03-05 23:21:28 +08:00
c9s
773b055711
grid2: fix length check 2023-03-05 23:20:17 +08:00
c9s
dfba758e88
grid2: add one more log 2023-03-05 17:55:04 +08:00
c9s
584fae1a53
grid2: fix recover order filtering 2023-03-05 17:41:05 +08:00
c9s
4927dd7f98
grid2: add more logs 2023-03-05 17:34:50 +08:00
c9s
5805f0c7f0
grid2: call cancelWrite before everything 2023-03-05 17:10:11 +08:00
c9s
0f307bba7d
grid2: pull out start process to a function 2023-03-05 17:07:01 +08:00
gx578007
ec0d438f9d FIX: [grid2] fix active orderbook at recovering 2023-03-05 14:29:31 +08:00
narumi
94b946a993 add orderType parameter 2023-03-03 23:14:30 +08:00
c9s
9d1da7c847
grid2: remove outdated comment 2023-03-03 19:21:23 +08:00
c9s
e2435f1fc0
grid2: pass submit orders in one call since we have solved the order store issue 2023-03-03 19:09:53 +08:00
c9s
1a109c118d
grid2: use write context for submitting orders 2023-03-03 19:09:53 +08:00
c9s
3f560b2230
grid2: backoff retry open orders api 2023-03-03 19:09:05 +08:00
c9s
fa395b0d0a
grid2: improve the onStart handler 2023-03-03 19:09:05 +08:00
c9s
0d41f0261a
grid2: rewrite cancel all check loop 2023-03-03 19:09:05 +08:00
c9s
bf4553d767
grid2: add OrderFillDelay option 2023-03-03 14:30:58 +08:00
c9s
ca741f91eb
grid2: add fee currency check for buy order 2023-03-03 14:30:58 +08:00
c9s
9a89237c24
grid2: fix base/quote fee reduction 2023-03-03 14:30:58 +08:00
c9s
bd86a89667
grid2: return fee currency 2023-03-03 13:13:27 +08:00
c9s
5cbc6f191f
grid2: aggregate order fee instead of only base fee 2023-03-03 13:13:27 +08:00
gx578007
8039068d51
Merge pull request #1075 from c9s/bhwu/add-persistence-to-env
FEATURE: add persistence service to environment
2023-03-02 23:00:20 +08:00
gx578007
bc7a071dbd FIX: add persistence service to environment 2023-03-02 22:42:02 +08:00
Yo-An Lin
d03c7d624f
Merge pull request #1074 from c9s/narumi/rebalance/order-type
strategy: rebalance: add order type parameter
2023-03-02 22:37:36 +08:00
c9s
e915825ac6
grid2: defer call grid closed 2023-03-02 18:16:09 +08:00
narumi
904491e750 add orderType parameter 2023-03-02 18:11:43 +08:00
c9s
c5e2acf0f5
grid2: call Initialize in clean up 2023-03-02 18:08:26 +08:00
c9s
86584b01b9
grid2: fix exchange session field 2023-03-02 18:05:48 +08:00
c9s
5212365d2f
grid2: remove s.ExchangeSession check 2023-03-02 17:40:44 +08:00
c9s
6947c8b104
grid2: improve clean up 2023-03-02 17:33:58 +08:00
c9s
3cb190c2c7
bbgo: apply logger into the order executor 2023-03-02 16:16:14 +08:00
c9s
385a97448d
grid2: add StopIfLessThanMinimalQuoteInvestment doc comment 2023-03-02 15:53:42 +08:00
c9s
11329dffe7
grid2: add StopIfLessThanMinimalQuoteInvestment option 2023-03-02 15:50:10 +08:00
c9s
729d32af70
grid2: add minimal quote investment check error log 2023-03-02 15:14:21 +08:00
c9s
4aa25db3ed
grid2: add one more calculateMinimalQuoteInvestment test case 2023-03-02 14:03:22 +08:00
c9s
1d8df08a74
fixedpoint: fix fixedpoint rounding 2023-03-01 22:21:24 +08:00
c9s
f553ee05a0
grid2: log base fee rounding precision 2023-03-01 21:49:15 +08:00
c9s
b2bbf2d6ca
grid2: add comment to the sync call 2023-03-01 21:09:48 +08:00
c9s
b13efdf30e
grid2: calculate grid profit only when the reverse order is placed 2023-03-01 20:05:35 +08:00
c9s
06eff47058
grid2: improve UseCancelAllOrdersApiWhenClose process 2023-03-01 16:35:09 +08:00
c9s
f82af6e6dd
grid2: use UseCancelAllOrdersApiWhenClose 2023-03-01 16:16:26 +08:00
c9s
98739cc8a1
grid2: avoid using loop iterator var 2023-03-01 15:29:46 +08:00
c9s
04da988639
grid2: check if we have o.AveragePrice, use it for newQuantity 2023-03-01 15:29:46 +08:00
c9s
7eb953093c
grid2: merge baseSellQuantityReduction section 2023-03-01 15:29:46 +08:00
c9s
6fc45e66dd
grid2: for non-compound or earn base mode we should always use the original buy quantity 2023-03-01 15:29:46 +08:00
gx578007
3acb0a0a64
Merge pull request #1066 from c9s/fix/grid2/fee-reduction 2023-02-24 12:56:09 +08:00
c9s
5b903cd4ed
grid2: always round up 2023-02-24 12:46:38 +08:00
c9s
37535e9f3e
grid2: fix fee reduction by rounding 2023-02-24 12:25:23 +08:00
c9s
59ff86e4bb
grid2: fix metrics for tests 2023-02-24 00:44:50 +08:00
c9s
d89d0cf0ff
bbgo: refactor SubmitOrders method for retry 2023-02-23 23:34:26 +08:00
c9s
2a47d390f0
grid2: update grid2 metrics 2023-02-23 22:49:03 +08:00
c9s
5e2add8765
grid2: add the missing metrics update 2023-02-23 22:39:47 +08:00