Skip to content

Commit cf0906a

Browse files
authored
Merge pull request #507 from enarjord/v7.3.13_markup
- Replace bot parameters - close_grid_min_markup and close_grid_markup_range - with - close_grid_markup_start and close_grid_markup_end - see docs/configuration.md for more details - Fixes for binance fetch pnl - update some requirements
2 parents b688892 + 901a4fe commit cf0906a

27 files changed

+661
-561
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:warning: **Used at one's own risk** :warning:
66

7-
v7.3.12
7+
v7.3.13
88

99

1010
## Overview

configs/approved_coins_top20mcap.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
["BTC", "ETH", "XRP", "BNB", "SOL", "DOGE", "ADA", "TRX", "SUI", "LINK", "AVAX", "HYPE", "XLM", "SHIB", "HBAR", "BCH", "TON", "LTC", "XMR", "DOT"]

configs/examples/btc_long.json

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
{"backtest": {"base_dir": "backtests",
2-
"combine_ohlcvs": false,
2+
"combine_ohlcvs": true,
33
"compress_cache": true,
44
"end_date": "now",
55
"exchanges": ["binance", "bybit"],
66
"gap_tolerance_ohlcvs_minutes": 120,
77
"start_date": "2020-04-01",
88
"starting_balance": 100000,
99
"use_btc_collateral": true},
10-
"bot": {"long": {"close_grid_markup_range": 0.0006756,
11-
"close_grid_min_markup": 0.001573,
12-
"close_grid_qty_pct": 0.2298,
13-
"close_trailing_grid_ratio": -0.381,
14-
"close_trailing_qty_pct": 0.5509,
15-
"close_trailing_retracement_pct": 0.01716,
16-
"close_trailing_threshold_pct": 0.001962,
17-
"ema_span_0": 220.4,
18-
"ema_span_1": 1107,
10+
"bot": {"long": {"close_grid_markup_end": 0.01754,
11+
"close_grid_markup_start": 0.01959,
12+
"close_grid_qty_pct": 0.4406,
13+
"close_trailing_grid_ratio": 0.9476,
14+
"close_trailing_qty_pct": 0.5662,
15+
"close_trailing_retracement_pct": 0.0003578,
16+
"close_trailing_threshold_pct": 0.002069,
17+
"ema_span_0": 206.3,
18+
"ema_span_1": 718.5,
1919
"enforce_exposure_limit": true,
20-
"entry_grid_double_down_factor": 2.805,
21-
"entry_grid_spacing_pct": 0.03194,
22-
"entry_grid_spacing_weight": 0.4534,
23-
"entry_initial_ema_dist": -0.009122,
24-
"entry_initial_qty_pct": 0.009071,
25-
"entry_trailing_double_down_factor": 2.876,
26-
"entry_trailing_grid_ratio": -0.0711,
27-
"entry_trailing_retracement_pct": 0.03419,
28-
"entry_trailing_threshold_pct": -0.005534,
29-
"filter_noisiness_rolling_window": 10.0,
30-
"filter_volume_drop_pct": 0.5,
31-
"filter_volume_rolling_window": 360.0,
20+
"entry_grid_double_down_factor": 3.678,
21+
"entry_grid_spacing_pct": 0.01505,
22+
"entry_grid_spacing_weight": 4.019,
23+
"entry_initial_ema_dist": 0.00297,
24+
"entry_initial_qty_pct": 0.004931,
25+
"entry_trailing_double_down_factor": 0.4647,
26+
"entry_trailing_grid_ratio": -0.04499,
27+
"entry_trailing_retracement_pct": 0.001776,
28+
"entry_trailing_threshold_pct": 0.02659,
29+
"filter_noisiness_rolling_window": 133.5,
30+
"filter_volume_drop_pct": 0.7034,
31+
"filter_volume_rolling_window": 1628,
3232
"n_positions": 1,
33-
"total_wallet_exposure_limit": 6.194,
34-
"unstuck_close_pct": 0.01358,
35-
"unstuck_ema_dist": -0.05594,
36-
"unstuck_loss_allowance_pct": 0.04186,
37-
"unstuck_threshold": 0.6487},
38-
"short": {"close_grid_markup_range": 0,
39-
"close_grid_min_markup": 0.001,
33+
"total_wallet_exposure_limit": 8.735,
34+
"unstuck_close_pct": 0.002663,
35+
"unstuck_ema_dist": -0.06826,
36+
"unstuck_loss_allowance_pct": 0.00209,
37+
"unstuck_threshold": 0.5601},
38+
"short": {"close_grid_markup_end": 0.001,
39+
"close_grid_markup_start": 0.001,
4040
"close_grid_qty_pct": 0.05,
41-
"close_trailing_grid_ratio": 0,
41+
"close_trailing_grid_ratio": -1,
4242
"close_trailing_qty_pct": 0.05,
4343
"close_trailing_retracement_pct": 0.0001,
44-
"close_trailing_threshold_pct": 0,
44+
"close_trailing_threshold_pct": -0.01,
4545
"ema_span_0": 200,
4646
"ema_span_1": 200,
4747
"enforce_exposure_limit": true,
4848
"entry_grid_double_down_factor": 0.01,
4949
"entry_grid_spacing_pct": 0.001,
5050
"entry_grid_spacing_weight": 0,
51-
"entry_initial_ema_dist": 0,
51+
"entry_initial_ema_dist": -0.1,
5252
"entry_initial_qty_pct": 0.004,
5353
"entry_trailing_double_down_factor": 0.01,
54-
"entry_trailing_grid_ratio": 0,
54+
"entry_trailing_grid_ratio": -1,
5555
"entry_trailing_retracement_pct": 0.0001,
56-
"entry_trailing_threshold_pct": 0,
56+
"entry_trailing_threshold_pct": -0.01,
5757
"filter_noisiness_rolling_window": 10,
5858
"filter_volume_drop_pct": 0.5,
5959
"filter_volume_rolling_window": 360,
6060
"n_positions": 0,
6161
"total_wallet_exposure_limit": 0.01,
6262
"unstuck_close_pct": 0.001,
63-
"unstuck_ema_dist": 0,
63+
"unstuck_ema_dist": -0.1,
6464
"unstuck_loss_allowance_pct": 0.001,
6565
"unstuck_threshold": 0.4}},
6666
"live": {"approved_coins": {"long": ["BTC"], "short": ["BTC"]},
@@ -77,55 +77,55 @@
7777
"max_n_cancellations_per_batch": 5,
7878
"max_n_creations_per_batch": 3,
7979
"max_n_restarts_per_day": 10,
80-
"minimum_coin_age_days": 450,
80+
"minimum_coin_age_days": 365,
8181
"ohlcvs_1m_rolling_window_days": 4,
8282
"ohlcvs_1m_update_after_minutes": 10,
8383
"pnls_max_lookback_days": 30,
8484
"price_distance_threshold": 0.002,
8585
"time_in_force": "good_till_cancelled",
8686
"user": "bybit_01"},
87-
"optimize": {"bounds": {"long_close_grid_markup_range": [0, 0.03],
88-
"long_close_grid_min_markup": [0.001, 0.03],
87+
"optimize": {"bounds": {"long_close_grid_markup_end": [0.001, 0.03],
88+
"long_close_grid_markup_start": [0.001, 0.03],
8989
"long_close_grid_qty_pct": [0.05, 1],
9090
"long_close_trailing_grid_ratio": [-1, 1],
9191
"long_close_trailing_qty_pct": [0.05, 1],
9292
"long_close_trailing_retracement_pct": [0.0001, 0.1],
9393
"long_close_trailing_threshold_pct": [-0.01, 0.1],
9494
"long_ema_span_0": [200, 1440],
9595
"long_ema_span_1": [200, 1440],
96-
"long_entry_grid_double_down_factor": [0.01, 3],
96+
"long_entry_grid_double_down_factor": [0.01, 4],
9797
"long_entry_grid_spacing_pct": [0.001, 0.06],
9898
"long_entry_grid_spacing_weight": [0, 10],
9999
"long_entry_initial_ema_dist": [-0.1, 0.003],
100100
"long_entry_initial_qty_pct": [0.004, 0.02],
101-
"long_entry_trailing_double_down_factor": [0.01, 3],
101+
"long_entry_trailing_double_down_factor": [0.01, 4],
102102
"long_entry_trailing_grid_ratio": [-1, 1],
103103
"long_entry_trailing_retracement_pct": [0.0001, 0.1],
104104
"long_entry_trailing_threshold_pct": [-0.01, 0.1],
105105
"long_filter_noisiness_rolling_window": [10, 360],
106106
"long_filter_volume_drop_pct": [0.5, 1],
107107
"long_filter_volume_rolling_window": [360, 2880],
108-
"long_n_positions": [7, 30],
109-
"long_total_wallet_exposure_limit": [0.01, 10],
108+
"long_n_positions": [1, 1],
109+
"long_total_wallet_exposure_limit": [0.5, 20],
110110
"long_unstuck_close_pct": [0.001, 0.1],
111111
"long_unstuck_ema_dist": [-0.1, 0.01],
112112
"long_unstuck_loss_allowance_pct": [0.001, 0.05],
113113
"long_unstuck_threshold": [0.4, 0.95],
114-
"short_close_grid_markup_range": [0, 0.03],
115-
"short_close_grid_min_markup": [0.001, 0.03],
114+
"short_close_grid_markup_end": [0.001, 0.03],
115+
"short_close_grid_markup_start": [0.001, 0.03],
116116
"short_close_grid_qty_pct": [0.05, 1],
117117
"short_close_trailing_grid_ratio": [-1, 1],
118118
"short_close_trailing_qty_pct": [0.05, 1],
119119
"short_close_trailing_retracement_pct": [0.0001, 0.1],
120120
"short_close_trailing_threshold_pct": [-0.01, 0.1],
121121
"short_ema_span_0": [200, 1440],
122122
"short_ema_span_1": [200, 1440],
123-
"short_entry_grid_double_down_factor": [0.01, 3],
123+
"short_entry_grid_double_down_factor": [0.01, 4],
124124
"short_entry_grid_spacing_pct": [0.001, 0.06],
125125
"short_entry_grid_spacing_weight": [0, 10],
126126
"short_entry_initial_ema_dist": [-0.1, 0.003],
127127
"short_entry_initial_qty_pct": [0.004, 0.02],
128-
"short_entry_trailing_double_down_factor": [0.01, 3],
128+
"short_entry_trailing_double_down_factor": [0.01, 4],
129129
"short_entry_trailing_grid_ratio": [-1, 1],
130130
"short_entry_trailing_retracement_pct": [0.0001, 0.1],
131131
"short_entry_trailing_threshold_pct": [-0.01, 0.1],
@@ -139,15 +139,18 @@
139139
"short_unstuck_loss_allowance_pct": [0.001, 0.05],
140140
"short_unstuck_threshold": [0.4, 0.95]},
141141
"compress_results_file": true,
142-
"crossover_probability": 0.7,
142+
"crossover_probability": 0.64,
143143
"enable_overrides": [],
144144
"iters": 300000,
145145
"limits": {"btc_drawdown_worst": 0.333,
146146
"loss_profit_ratio": 0.9,
147-
"position_unchanged_hours_max": 900.0},
148-
"mutation_probability": 0.2,
147+
"position_unchanged_hours_max": 900},
148+
"mutation_probability": 0.34,
149149
"n_cpus": 5,
150150
"population_size": 500,
151151
"round_to_n_significant_digits": 4,
152-
"scoring": ["btc_adg_w", "btc_mdg_w", "btc_omega_ratio"],
153-
"write_all_results": true}}
152+
"scoring": ["btc_adg_w",
153+
"btc_mdg_w",
154+
"btc_sterling_ratio",
155+
"loss_profit_ratio"],
156+
"write_all_results": false}}

0 commit comments

Comments
 (0)