dexbot 1.6.11 → 1.6.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +35 -4
- package/README.md +2 -1
- package/analysis/README.md +2 -0
- package/analysis/tradingview/README.md +1 -1
- package/analysis/trend_detection/DYNAMIC_WEIGHT_RESEARCH.md +3 -3
- package/claw/docs/DEXBOT2_TUNING_CHEAT_SHEET.md +4 -3
- package/claw/modules/chain_broadcast.ts +7 -1
- package/claw/modules/claw_launcher.ts +1 -1
- package/claw/modules/launcher_mode_detector.ts +9 -2
- package/claw/package.json +1 -1
- package/claw/runtimes/openclaw-plugin/openclaw.plugin.json +1 -1
- package/claw/runtimes/openclaw-plugin/package.json +1 -1
- package/dist/analysis/account_resolver.d.ts +1 -1
- package/dist/analysis/account_resolver.js +2 -1
- package/dist/analysis/ama_fitting/analyze_ama_price_changes.js +3 -4
- package/dist/analysis/ama_fitting/analyze_lambda_vs_slow.js +2 -7
- package/dist/analysis/ama_fitting/calibrate_convergence_er.js +0 -1
- package/dist/analysis/ama_fitting/fetch_lp_candles.js +4 -4
- package/dist/analysis/ama_fitting/generate_unified_comparison_chart.d.ts +20 -4
- package/dist/analysis/ama_fitting/generate_unified_comparison_chart.js +9 -6
- package/dist/analysis/ama_fitting/optimizer_high_resolution.js +16 -12
- package/dist/analysis/analyze_args.d.ts +31 -0
- package/dist/analysis/analyze_args.js +41 -0
- package/dist/analysis/analyze_dynamic_weight.js +7 -17
- package/dist/analysis/analyze_kalman.js +7 -17
- package/dist/analysis/analyze_regime.js +7 -17
- package/dist/analysis/analyze_regime_windows.js +8 -18
- package/dist/analysis/analyze_risk_profile.js +8 -18
- package/dist/analysis/analyze_trade_heatmap.js +7 -17
- package/dist/analysis/analyze_volatility.js +7 -17
- package/dist/analysis/bot_fitting/backtest_ama_sweep.d.ts +220 -12
- package/dist/analysis/bot_fitting/backtest_ama_sweep.js +6 -5
- package/dist/analysis/bot_fitting/backtest_bot_fitting.d.ts +34 -4
- package/dist/analysis/bot_fitting/backtest_bot_fitting.js +11 -63
- package/dist/analysis/bot_fitting/shared_utils.d.ts +7 -7
- package/dist/analysis/bot_fitting/shared_utils.js +2 -2
- package/dist/analysis/bot_key_utils.d.ts +18 -10
- package/dist/analysis/bot_key_utils.js +7 -4
- package/dist/analysis/bot_usage/discover_bot_accounts.js +44 -47
- package/dist/analysis/bot_usage/kibana_bot_queries.d.ts +1 -21
- package/dist/analysis/chain_pool.d.ts +3 -1
- package/dist/analysis/chart_ui.d.ts +5 -2
- package/dist/analysis/chart_ui.js +6 -3
- package/dist/analysis/chart_utils.d.ts +5 -5
- package/dist/analysis/chart_utils.js +9 -0
- package/dist/analysis/fills_cache.d.ts +1 -1
- package/dist/analysis/fills_source.d.ts +2 -2
- package/dist/analysis/fills_source.js +14 -12
- package/dist/analysis/grid_correction_check.d.ts +1 -1
- package/dist/analysis/grid_correction_check.js +12 -11
- package/dist/analysis/math_utils.d.ts +7 -6
- package/dist/analysis/math_utils.js +5 -8
- package/dist/analysis/pnl_report.js +29 -29
- package/dist/analysis/price_sources.d.ts +8 -8
- package/dist/analysis/price_sources.js +5 -4
- package/dist/analysis/resolve_bot_accounts.js +2 -2
- package/dist/analysis/resolve_source.d.ts +1 -1
- package/dist/analysis/trade_profitability.d.ts +23 -2
- package/dist/analysis/trade_profitability.js +50 -50
- package/dist/analysis/tradingview/analyze_tradingview.d.ts +17 -6
- package/dist/analysis/tradingview/analyze_tradingview.js +6 -5
- package/dist/analysis/tradingview/grid_reset_config.d.ts +41 -32
- package/dist/analysis/tradingview/grid_reset_config.js +23 -11
- package/dist/analysis/tradingview/grid_reset_sim.d.ts +75 -9
- package/dist/analysis/tradingview/grid_reset_sim.js +4 -3
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.d.ts +69 -4
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.js +18 -19
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.d.ts +1 -1
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.js +5 -5
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.d.ts +63 -1
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.js +5 -4
- package/dist/analysis/trend_detection/huber_scale_variants.d.ts +9 -3
- package/dist/analysis/trend_detection/huber_scale_variants.js +4 -4
- package/dist/analysis/trend_detection/kalman_chart_generator.d.ts +30 -1
- package/dist/analysis/trend_detection/kalman_chart_generator.js +3 -3
- package/dist/analysis/trend_detection/regime_chart_generator.d.ts +31 -1
- package/dist/analysis/trend_detection/regime_chart_generator.js +2 -2
- package/dist/analysis/trend_detection/volatility_chart_generator.d.ts +33 -1
- package/dist/credential-daemon.js +34 -20
- package/dist/dexbot.js +11 -11
- package/dist/market_adapter/candle_utils.d.ts +22 -18
- package/dist/market_adapter/candle_utils.js +24 -20
- package/dist/market_adapter/core/asymmetric_bounds.d.ts +13 -4
- package/dist/market_adapter/core/config_normalizers.d.ts +3 -3
- package/dist/market_adapter/core/kibana_candles.d.ts +53 -18
- package/dist/market_adapter/core/kibana_candles.js +9 -7
- package/dist/market_adapter/core/kibana_client.d.ts +9 -1
- package/dist/market_adapter/core/kibana_client.js +8 -7
- package/dist/market_adapter/core/kibana_market_candles.d.ts +3 -2
- package/dist/market_adapter/core/market_adapter_service.d.ts +284 -117
- package/dist/market_adapter/core/market_adapter_service.js +137 -113
- package/dist/market_adapter/core/strategies/ama.d.ts +10 -2
- package/dist/market_adapter/core/strategies/ama.js +2 -4
- package/dist/market_adapter/core/strategies/ama_slope_model.d.ts +14 -1
- package/dist/market_adapter/core/strategies/ama_slope_model.js +12 -34
- package/dist/market_adapter/core/strategies/atr/calculator.d.ts +7 -2
- package/dist/market_adapter/core/strategies/atr/calculator.js +2 -34
- package/dist/market_adapter/core/strategies/collateral_manager.d.ts +7 -1
- package/dist/market_adapter/core/strategies/collateral_manager.js +0 -22
- package/dist/market_adapter/core/strategies/dynamic_weight_series.d.ts +34 -6
- package/dist/market_adapter/core/strategies/dynamic_weight_series.js +7 -7
- package/dist/market_adapter/core/strategies/regime_gate.d.ts +24 -15
- package/dist/market_adapter/core/strategies/regime_gate.js +4 -31
- package/dist/market_adapter/core/strategies/regime_interp.d.ts +7 -1
- package/dist/market_adapter/core/strategies/regime_interp.js +14 -22
- package/dist/market_adapter/core/strategies/volatility_shift.d.ts +11 -1
- package/dist/market_adapter/core/strategies/volatility_shift.js +0 -13
- package/dist/market_adapter/inputs/cex_candle_parsing.d.ts +29 -0
- package/dist/market_adapter/inputs/cex_candle_parsing.js +52 -0
- package/dist/market_adapter/inputs/fetch_book_data.d.ts +20 -4
- package/dist/market_adapter/inputs/fetch_book_data.js +3 -1
- package/dist/market_adapter/inputs/fetch_cex_synthetic_data.js +96 -224
- package/dist/market_adapter/inputs/fetch_lp_data.d.ts +42 -7
- package/dist/market_adapter/inputs/fetch_lp_data.js +22 -15
- package/dist/market_adapter/inputs/kibana_feed_source.d.ts +74 -15
- package/dist/market_adapter/inputs/kibana_feed_source.js +29 -22
- package/dist/market_adapter/inputs/kibana_source.d.ts +25 -3
- package/dist/market_adapter/inputs/kibana_source.js +2 -2
- package/dist/market_adapter/inputs/window_cache.d.ts +99 -94
- package/dist/market_adapter/inputs/window_cache.js +8 -8
- package/dist/market_adapter/interval_utils.d.ts +4 -4
- package/dist/market_adapter/log_format.d.ts +6 -6
- package/dist/market_adapter/log_format.js +28 -21
- package/dist/market_adapter/lp_chart_core.d.ts +22 -1
- package/dist/market_adapter/lp_chart_core.js +26 -192
- package/dist/market_adapter/lp_chart_runner.d.ts +7 -7
- package/dist/market_adapter/lp_chart_strategy_loader.d.ts +41 -6
- package/dist/market_adapter/lp_chart_strategy_loader.js +8 -7
- package/dist/market_adapter/market_adapter.d.ts +94 -32
- package/dist/market_adapter/market_adapter.js +67 -48
- package/dist/market_adapter/utils/adapter_client.d.ts +3 -3
- package/dist/market_adapter/utils/adapter_client.js +2 -2
- package/dist/market_adapter/utils/atomic_write.d.ts +8 -1
- package/dist/market_adapter/utils/chain.d.ts +50 -41
- package/dist/market_adapter/utils/chain.js +40 -46
- package/dist/market_adapter/utils/data_discovery.d.ts +4 -1
- package/dist/market_adapter/utils/dynamic_grid_snapshot.d.ts +12 -3
- package/dist/market_adapter/utils/file_json_cache.d.ts +2 -2
- package/dist/market_adapter/utils/file_lock.d.ts +28 -14
- package/dist/market_adapter/utils/file_lock.js +36 -32
- package/dist/market_adapter/utils/native_history.d.ts +9 -2
- package/dist/market_adapter/utils/native_history.js +35 -28
- package/dist/modules/account_bots.d.ts +577 -21
- package/dist/modules/account_bots.js +182 -158
- package/dist/modules/account_orders.d.ts +66 -30
- package/dist/modules/account_orders.js +22 -20
- package/dist/modules/authority_resolver.d.ts +12 -2
- package/dist/modules/authority_resolver.js +15 -8
- package/dist/modules/bitshares-native/chain_client.d.ts +38 -3
- package/dist/modules/bitshares-native/chain_client.js +45 -46
- package/dist/modules/bitshares-native/crypto/ecc.browser.js +11 -171
- package/dist/modules/bitshares-native/crypto/ecc.js +13 -176
- package/dist/modules/bitshares-native/crypto/ecc_core.d.ts +33 -0
- package/dist/modules/bitshares-native/crypto/ecc_core.js +213 -0
- package/dist/modules/bitshares-native/crypto/ecc_selector.d.ts +2 -1
- package/dist/modules/bitshares-native/crypto/ecc_selector.js +1 -13
- package/dist/modules/bitshares-native/index.d.ts +1 -1
- package/dist/modules/bitshares-native/lru_cache.d.ts +7 -7
- package/dist/modules/bitshares-native/resolvers.d.ts +18 -6
- package/dist/modules/bitshares-native/serial/lazy_buffer.d.ts +4 -0
- package/dist/modules/bitshares-native/serial/lazy_buffer.js +21 -0
- package/dist/modules/bitshares-native/serial/operations.d.ts +1 -1
- package/dist/modules/bitshares-native/serial/serializer.d.ts +16 -12
- package/dist/modules/bitshares-native/serial/serializer.js +7 -13
- package/dist/modules/bitshares-native/serial/types.d.ts +25 -16
- package/dist/modules/bitshares-native/serial/types.js +55 -62
- package/dist/modules/bitshares-native/signing_client.d.ts +32 -2
- package/dist/modules/bitshares-native/signing_client.js +19 -14
- package/dist/modules/bitshares-native/subscriptions.d.ts +81 -1
- package/dist/modules/bitshares-native/subscriptions.js +12 -12
- package/dist/modules/bitshares-native/transport.d.ts +5 -4
- package/dist/modules/bitshares-native/transport.js +5 -4
- package/dist/modules/bitshares-native/tx/builder.d.ts +40 -5
- package/dist/modules/bitshares-native/tx/builder.js +4 -3
- package/dist/modules/bitshares-native/tx/tx_cache.d.ts +4 -4
- package/dist/modules/bitshares_client.d.ts +45 -13
- package/dist/modules/bitshares_client.js +28 -19
- package/dist/modules/bot_defaults.d.ts +6 -15
- package/dist/modules/bot_defaults.js +1 -5
- package/dist/modules/bot_settings.d.ts +44 -10
- package/dist/modules/bot_settings.js +11 -8
- package/dist/modules/bots_file_lock.d.ts +6 -6
- package/dist/modules/bots_file_lock.js +16 -12
- package/dist/modules/broadcast_failure.d.ts +2 -2
- package/dist/modules/broadcast_failure.js +5 -4
- package/dist/modules/chain_keys.d.ts +42 -40
- package/dist/modules/chain_keys.js +53 -45
- package/dist/modules/chain_orders.d.ts +93 -59
- package/dist/modules/chain_orders.js +31 -23
- package/dist/modules/constants.d.ts +527 -31
- package/dist/modules/constants.js +15 -47
- package/dist/modules/cr_planner.d.ts +40 -2
- package/dist/modules/credential_policy.d.ts +68 -8
- package/dist/modules/credential_policy.js +37 -31
- package/dist/modules/credential_session_cache.d.ts +2 -2
- package/dist/modules/credit_pricing.d.ts +42 -6
- package/dist/modules/credit_pricing.js +44 -30
- package/dist/modules/credit_runtime.d.ts +276 -118
- package/dist/modules/credit_runtime.js +462 -165
- package/dist/modules/crypto/browser_provider.js +6 -4
- package/dist/modules/crypto/node_provider.js +1 -1
- package/dist/modules/crypto/pure_scrypt.js +35 -4
- package/dist/modules/crypto/pure_secp256k1.js +72 -26
- package/dist/modules/crypto/sync.d.ts +9 -9
- package/dist/modules/crypto/sync.js +16 -9
- package/dist/modules/dexbot_class.d.ts +195 -139
- package/dist/modules/dexbot_class.js +78 -28
- package/dist/modules/dexbot_cow_runtime.d.ts +167 -87
- package/dist/modules/dexbot_cow_runtime.js +248 -206
- package/dist/modules/dexbot_credential_client.d.ts +19 -11
- package/dist/modules/dexbot_fill_runtime.d.ts +63 -48
- package/dist/modules/dexbot_fill_runtime.js +48 -41
- package/dist/modules/dexbot_maintenance_runtime.d.ts +109 -70
- package/dist/modules/dexbot_maintenance_runtime.js +108 -83
- package/dist/modules/dexbot_startup_runtime.d.ts +11 -10
- package/dist/modules/dexbot_startup_runtime.js +43 -43
- package/dist/modules/dexbot_state_recovery.d.ts +13 -12
- package/dist/modules/dexbot_state_recovery.js +18 -13
- package/dist/modules/fund_registry.d.ts +4 -2
- package/dist/modules/fund_registry.js +10 -10
- package/dist/modules/general_settings.d.ts +30 -4
- package/dist/modules/graceful_shutdown.d.ts +3 -3
- package/dist/modules/graceful_shutdown.js +2 -2
- package/dist/modules/grid_price_source.d.ts +1 -1
- package/dist/modules/key_store.d.ts +14 -8
- package/dist/modules/key_store.js +7 -6
- package/dist/modules/launcher/adapter_requirement.d.ts +11 -5
- package/dist/modules/launcher/adapter_requirement.js +5 -5
- package/dist/modules/launcher/bot_supervisor.d.ts +106 -24
- package/dist/modules/launcher/bot_supervisor.js +12 -11
- package/dist/modules/launcher/credential_bootstrap.d.ts +1 -1
- package/dist/modules/launcher/credential_bootstrap.js +1 -1
- package/dist/modules/launcher/credential_daemon.d.ts +4 -4
- package/dist/modules/launcher/credential_daemon.js +2 -2
- package/dist/modules/launcher/credential_secret.d.ts +1 -1
- package/dist/modules/launcher/foreign_cred_daemon.d.ts +2 -2
- package/dist/modules/launcher/market_adapter_runtime.d.ts +61 -6
- package/dist/modules/launcher/market_adapter_watchdog.d.ts +10 -2
- package/dist/modules/launcher/market_adapter_watchdog.js +4 -0
- package/dist/modules/launcher/monolithic_runtime.d.ts +18 -16
- package/dist/modules/launcher/status_reporting.d.ts +22 -14
- package/dist/modules/launcher/supervisor_control.d.ts +8 -1
- package/dist/modules/launcher/supervisor_control.js +4 -2
- package/dist/modules/market_adapter_whitelist.d.ts +9 -3
- package/dist/modules/market_adapter_whitelist.js +15 -3
- package/dist/modules/node_manager.d.ts +41 -11
- package/dist/modules/node_manager.js +5 -4
- package/dist/modules/order/accounting.d.ts +53 -24
- package/dist/modules/order/accounting.js +16 -15
- package/dist/modules/order/async_lock.d.ts +5 -2
- package/dist/modules/order/async_lock.js +1 -1
- package/dist/modules/order/export.d.ts +7 -6
- package/dist/modules/order/export.js +1 -7
- package/dist/modules/order/format.d.ts +4 -4
- package/dist/modules/order/genesis_policy.d.ts +21 -18
- package/dist/modules/order/genesis_policy.js +12 -8
- package/dist/modules/order/grid.d.ts +142 -36
- package/dist/modules/order/grid.js +148 -123
- package/dist/modules/order/grid_reconcile.d.ts +21 -20
- package/dist/modules/order/grid_reconcile.js +13 -12
- package/dist/modules/order/grid_reconcile_internal.d.ts +85 -72
- package/dist/modules/order/grid_reconcile_internal.js +28 -19
- package/dist/modules/order/index.d.ts +263 -1
- package/dist/modules/order/logger.d.ts +45 -11
- package/dist/modules/order/logger.js +38 -40
- package/dist/modules/order/logger_state.d.ts +4 -4
- package/dist/modules/order/manager.d.ts +225 -180
- package/dist/modules/order/manager.js +80 -83
- package/dist/modules/order/processed_fill_store.d.ts +18 -3
- package/dist/modules/order/processed_fill_store.js +16 -27
- package/dist/modules/order/strategy.d.ts +21 -13
- package/dist/modules/order/strategy.js +5 -6
- package/dist/modules/order/sync_engine.d.ts +91 -33
- package/dist/modules/order/sync_engine.js +84 -53
- package/dist/modules/order/utils/math.d.ts +157 -102
- package/dist/modules/order/utils/math.js +77 -38
- package/dist/modules/order/utils/order.d.ts +310 -110
- package/dist/modules/order/utils/order.js +122 -99
- package/dist/modules/order/utils/slot.d.ts +1 -1
- package/dist/modules/order/utils/system.d.ts +176 -26
- package/dist/modules/order/utils/system.js +86 -69
- package/dist/modules/order/utils/validate.d.ts +89 -41
- package/dist/modules/order/utils/validate.js +24 -22
- package/dist/modules/order/utils/withPoolRef.d.ts +4 -3
- package/dist/modules/order/utils/withPoolRef.js +18 -12
- package/dist/modules/order/working_grid.d.ts +14 -13
- package/dist/modules/paths.d.ts +1 -4
- package/dist/modules/paths.js +1 -27
- package/dist/modules/process_discovery.d.ts +1 -1
- package/dist/modules/process_discovery.js +2 -1
- package/dist/modules/runtime.d.ts +7 -3
- package/dist/modules/runtime.js +4 -3
- package/dist/modules/runtime_settings.d.ts +15 -10
- package/dist/modules/runtime_settings.js +30 -24
- package/dist/modules/settings_merge.d.ts +29 -3
- package/dist/modules/settings_merge.js +56 -78
- package/dist/modules/socket_json_client.d.ts +7 -4
- package/dist/modules/storage/browser_adapter.d.ts +38 -53
- package/dist/modules/storage/browser_adapter.js +7 -30
- package/dist/modules/storage/index.d.ts +1 -1
- package/dist/modules/storage/node_adapter.d.ts +45 -27
- package/dist/modules/storage/node_adapter.js +9 -9
- package/dist/modules/storage/types.d.ts +5 -4
- package/dist/modules/types.d.ts +1071 -2
- package/dist/modules/types.js +4 -1
- package/dist/modules/utils/asset_symbols.d.ts +2 -1
- package/dist/modules/utils/asset_symbols.js +2 -1
- package/dist/modules/utils/errors.d.ts +9 -0
- package/dist/modules/utils/errors.js +23 -1
- package/dist/modules/utils/time_range.d.ts +1 -12
- package/dist/modules/utils/time_range.js +1 -1
- package/dist/modules/validate_profiles.js +53 -43
- package/dist/modules/version_notice.d.ts +14 -3
- package/dist/modules/version_notice.js +6 -4
- package/dist/pm2.d.ts +29 -27
- package/dist/pm2.js +5 -5
- package/dist/scripts/analyze-credit.d.ts +2 -1
- package/dist/scripts/analyze-credit.js +23 -24
- package/dist/scripts/analyze-orders.d.ts +77 -9
- package/dist/scripts/analyze-orders.js +65 -40
- package/dist/scripts/chart_command.d.ts +27 -18
- package/dist/scripts/chart_command.js +13 -11
- package/dist/scripts/check_any.d.ts +18 -0
- package/dist/scripts/check_any.js +126 -0
- package/dist/scripts/diagnose-pool-history.js +12 -7
- package/dist/scripts/print_grid.js +0 -1
- package/dist/scripts/run-tests.js +39 -7
- package/dist/scripts/runner.js +1 -1
- package/dist/scripts/test-credit-renewal.js +30 -21
- package/dist/scripts/update.d.ts +10 -5
- package/dist/scripts/update.js +168 -103
- package/dist/scripts/update_dist_freshness.js +1 -0
- package/dist/scripts/update_layout.d.ts +61 -0
- package/dist/scripts/update_layout.js +180 -0
- package/dist/scripts/validate_bots.js +2 -1
- package/dist/scripts/verify-browser-bundle.js +8 -0
- package/dist/unlock.d.ts +28 -3
- package/dist/unlock.js +63 -35
- package/docs/BITSHARES_ONBOARDING.md +2 -0
- package/docs/COPY_ON_WRITE_MASTER_PLAN.md +1 -1
- package/docs/COW_INVARIANTS.md +13 -6
- package/docs/DEXBOT_COMPARISON.md +8 -8
- package/docs/EVOLUTION.md +10 -9
- package/docs/FUND_MOVEMENT_AND_ACCOUNTING.md +5 -5
- package/docs/GRID_RECALCULATION.md +4 -2
- package/docs/GRID_RECONCILE.md +14 -3
- package/docs/LIFECYCLE.md +11 -11
- package/docs/MPA_CREDIT_USAGE.md +22 -3
- package/docs/README.md +14 -3
- package/docs/architecture.md +12 -9
- package/docs/developer_guide.md +6 -6
- package/market_adapter/README.md +6 -1
- package/modules/README.md +4 -1
- package/package.json +4 -1
|
@@ -6,18 +6,18 @@ const MAX_DETAIL_ROWS = 2000;
|
|
|
6
6
|
/**
|
|
7
7
|
* Numbers go through the shared `formatFundsValue` (4 significant figures,
|
|
8
8
|
* K/M compaction, significant trailing zeros kept) so the report matches
|
|
9
|
-
* `dexbot order` instead of printing 8-decimal tails.
|
|
10
|
-
*
|
|
9
|
+
* `dexbot order` instead of printing 8-decimal tails. Per-value precision is
|
|
10
|
+
* fixed by the shared formatter, so callers pass no decimals.
|
|
11
11
|
*/
|
|
12
|
-
function num(n
|
|
12
|
+
function num(n) {
|
|
13
13
|
return Number.isFinite(n) ? formatFundsValue(n) : 'NaN';
|
|
14
14
|
}
|
|
15
|
-
function signed(n
|
|
15
|
+
function signed(n) {
|
|
16
16
|
if (!Number.isFinite(n))
|
|
17
17
|
return 'NaN';
|
|
18
18
|
if (n === 0)
|
|
19
|
-
return num(0
|
|
20
|
-
return (n >= 0 ? '+' : '') + num(n
|
|
19
|
+
return num(0);
|
|
20
|
+
return (n >= 0 ? '+' : '') + num(n);
|
|
21
21
|
}
|
|
22
22
|
function pct(n, decimals = 2) {
|
|
23
23
|
if (!Number.isFinite(n))
|
|
@@ -63,17 +63,17 @@ function renderMetrics(metrics, quoteSymbol) {
|
|
|
63
63
|
metricRow('Profit factor', ratio(metrics.profitFactor)),
|
|
64
64
|
metricRow('Avg win / avg loss', ratio(metrics.avgWinLossRatio)),
|
|
65
65
|
metricRow('Fee drag', metrics.feeDragPct > 0 ? metrics.feeDragPct.toFixed(2) + '% of gross profit' : '—'),
|
|
66
|
-
metricRow('Expectancy (net)', `${num(metrics.netExpectancyBts
|
|
67
|
-
metricRow('Expectancy (gross)', `${num(metrics.expectancyBts
|
|
66
|
+
metricRow('Expectancy (net)', `${num(metrics.netExpectancyBts)} ${q} / trade`),
|
|
67
|
+
metricRow('Expectancy (gross)', `${num(metrics.expectancyBts)} ${q} (${pct(metrics.expectancyPct)})`),
|
|
68
68
|
metricRow('Expectancy (R)', metrics.expectancyR === Infinity ? '∞' : metrics.expectancyR.toFixed(3) + 'R'),
|
|
69
69
|
].join('');
|
|
70
70
|
const risk = [
|
|
71
71
|
metricRow('Sharpe (annualised)', `${ratio(metrics.sharpeAnn)}${Number.isFinite(metrics.sharpeAnnSE) ? ` ± ${metrics.sharpeAnnSE.toFixed(2)}` : ''}`, `${metrics.periodLabel} bins, n=${metrics.periodCount}`),
|
|
72
72
|
metricRow('Sortino (annualised)', ratio(metrics.sortinoAnn) + (metrics.sortinoAnn === Infinity ? ' (no losing periods)' : '')),
|
|
73
|
-
metricRow('Projected net PnL', `${num(metrics.projectedNetPnlAnn
|
|
73
|
+
metricRow('Projected net PnL', `${num(metrics.projectedNetPnlAnn)} ${q}/yr`, `${num(metrics.projectedNetPnlPerDay)}/day`),
|
|
74
74
|
metrics.mddHadStablePeak
|
|
75
|
-
? metricRow('Max drawdown', `${num(metrics.mddAbsBts
|
|
76
|
-
: metricRow('Min equity', `${num(metrics.prePeakMinEquity
|
|
75
|
+
? metricRow('Max drawdown', `${num(metrics.mddAbsBts)} ${q} (${pct(metrics.mddPct)})`)
|
|
76
|
+
: metricRow('Min equity', `${num(metrics.prePeakMinEquity)} ${q}`),
|
|
77
77
|
metricRow('Max recovery time', metrics.maxRecoveryDays > 0 ? metrics.maxRecoveryDays.toFixed(1) + ' days' + (metrics.isOngoingRecovery ? ' (ongoing)' : '') : '—'),
|
|
78
78
|
metrics.currentDrawdownDays > 0
|
|
79
79
|
? metricRow('Current drawdown', metrics.currentDrawdownDays.toFixed(1) + ' days (active)')
|
|
@@ -95,7 +95,7 @@ function renderMetrics(metrics, quoteSymbol) {
|
|
|
95
95
|
metricRow('Partial fills / order', `${metrics.fillsPerOrderMean.toFixed(2)} mean, ${metrics.fillsPerOrderMedian.toFixed(1)} med, ${metrics.fillsPerOrderMax} max`),
|
|
96
96
|
metricRow('One-shot orders', `${(metrics.oneShotOrderRatio * 100).toFixed(0)}%`),
|
|
97
97
|
metricRow('Fills / day', metrics.fillsPerDay.toFixed(2)),
|
|
98
|
-
metricRow('Avg volume / day', `${num(metrics.avgVolumePerDay
|
|
98
|
+
metricRow('Avg volume / day', `${num(metrics.avgVolumePerDay)} ${q}`),
|
|
99
99
|
].join('');
|
|
100
100
|
return `
|
|
101
101
|
<div class="metrics-grid">
|
|
@@ -117,14 +117,14 @@ function renderPairsTable(pair, quoteSymbol) {
|
|
|
117
117
|
<td class="num">${i + 1}</td>
|
|
118
118
|
<td>${escapeHtml((r.entryTime || '').slice(0, 19).replace('T', ' '))}</td>
|
|
119
119
|
<td>${escapeHtml((r.exitTime || '').slice(0, 19).replace('T', ' '))}</td>
|
|
120
|
-
<td class="num">${num(r.amount
|
|
121
|
-
<td class="num">${num(r.buyPrice
|
|
122
|
-
<td class="num">${num(r.sellPrice
|
|
123
|
-
<td class="num ${pnlClass(r.pnl)}">${signed(r.pnl
|
|
120
|
+
<td class="num">${num(r.amount)}</td>
|
|
121
|
+
<td class="num">${num(r.buyPrice)}</td>
|
|
122
|
+
<td class="num">${num(r.sellPrice)}</td>
|
|
123
|
+
<td class="num ${pnlClass(r.pnl)}">${signed(r.pnl)}</td>
|
|
124
124
|
<td class="num ${pnlClass(r.pnlPct)}">${pct(r.pnlPct)}</td>
|
|
125
|
-
<td class="num">${num(r.marketFeeEntry + r.marketFeeExit
|
|
126
|
-
<td class="num">${num(r.feeBts
|
|
127
|
-
<td class="num ${pnlClass(net)}">${signed(net
|
|
125
|
+
<td class="num">${num(r.marketFeeEntry + r.marketFeeExit)}</td>
|
|
126
|
+
<td class="num">${num(r.feeBts)}</td>
|
|
127
|
+
<td class="num ${pnlClass(net)}">${signed(net)}</td>
|
|
128
128
|
<td class="num ${pnlClass(r.pnlNetPct)}">${pct(r.pnlNetPct)}</td>
|
|
129
129
|
<td class="center">${legs}</td>
|
|
130
130
|
</tr>`;
|
|
@@ -165,25 +165,25 @@ function renderPairSection(entry) {
|
|
|
165
165
|
const hasMarketFee = pair.totalMarketFees > 0.0001;
|
|
166
166
|
const hasChainFee = pair.totalBlockchainFees > 0.0001;
|
|
167
167
|
const feeCard = hasMarketFee && hasChainFee
|
|
168
|
-
? statCard('Fees', `${num(-pair.totalMarketFees
|
|
168
|
+
? statCard('Fees', `${num(-pair.totalMarketFees)} ${q}`, `op ${num(-pair.totalBlockchainFees)} BTS`, 'neg')
|
|
169
169
|
: hasChainFee
|
|
170
|
-
? statCard('Blockchain fees', `${num(-pair.totalBlockchainFees
|
|
170
|
+
? statCard('Blockchain fees', `${num(-pair.totalBlockchainFees)} BTS`, '', 'neg')
|
|
171
171
|
: hasMarketFee
|
|
172
|
-
? statCard('Market fees', `${num(-pair.totalMarketFees
|
|
172
|
+
? statCard('Market fees', `${num(-pair.totalMarketFees)} ${q}`, '', 'neg')
|
|
173
173
|
: '';
|
|
174
174
|
// Two 2x2 blocks: PnL/volume/fees, then position/activity. A 2-column grid
|
|
175
175
|
// keeps each card readable instead of squeezing six across one row.
|
|
176
176
|
const pnlCards = [
|
|
177
|
-
statCard('Gross PnL', `${signed(pair.totalRealizedPnl
|
|
178
|
-
statCard('Net PnL', `${signed(pair.totalRealizedPnlNet
|
|
179
|
-
statCard('Volume', `${num(pair.totalBuyQuote + pair.totalSellQuote
|
|
177
|
+
statCard('Gross PnL', `${signed(pair.totalRealizedPnl)} ${q}`, '', pnlClass(pair.totalRealizedPnl)),
|
|
178
|
+
statCard('Net PnL', `${signed(pair.totalRealizedPnlNet)} ${q}`, 'after market + op fees', pnlClass(pair.totalRealizedPnlNet)),
|
|
179
|
+
statCard('Volume', `${num(pair.totalBuyQuote + pair.totalSellQuote)} ${q}`, `${num(pair.totalBuyQuote)} bought · ${num(pair.totalSellQuote)} sold`),
|
|
180
180
|
feeCard,
|
|
181
181
|
].filter(Boolean).join('');
|
|
182
182
|
const positionCards = [
|
|
183
183
|
statCard('Realized lots', String(pair.realizedPnls.length), `from ${pair.buys.length} buys · ${pair.sells.length} sells`),
|
|
184
|
-
statCard('Net inventory \u0394', `${num(pair.netPosition
|
|
185
|
-
statCard('Avg buy / sell', `${num(avgBuy
|
|
186
|
-
pair.unmatchedSellBase > 0.0001 ? statCard('Unmatched sold', `${num(pair.unmatchedSellBase
|
|
184
|
+
statCard('Net inventory \u0394', `${num(pair.netPosition)} ${base}`, 'bought \u2212 sold in window'),
|
|
185
|
+
statCard('Avg buy / sell', `${num(avgBuy)} / ${num(avgSell)}`, `in ${q} per ${base}`),
|
|
186
|
+
pair.unmatchedSellBase > 0.0001 ? statCard('Unmatched sold', `${num(pair.unmatchedSellBase)} ${base}`, 'inventory predates window', 'muted') : '',
|
|
187
187
|
].filter(Boolean).join('');
|
|
188
188
|
return `
|
|
189
189
|
<article class="pair">
|
|
@@ -214,7 +214,7 @@ function renderTotals(pairs) {
|
|
|
214
214
|
const fees = group.reduce((s, e) => s + e.pair.totalMarketFees, 0);
|
|
215
215
|
const lots = group.reduce((s, e) => s + e.pair.realizedPnls.length, 0);
|
|
216
216
|
const quote = escapeHtml(assetSymbol(quoteAsset));
|
|
217
|
-
return statCard(`Total (${quote}) · ${group.length} pair${group.length === 1 ? '' : 's'}`, `${signed(net
|
|
217
|
+
return statCard(`Total (${quote}) · ${group.length} pair${group.length === 1 ? '' : 's'}`, `${signed(net)} ${quote}`, `gross ${signed(gross)} · mkt fees ${num(fees)} · ${lots} lots`, pnlClass(net));
|
|
218
218
|
}).join('');
|
|
219
219
|
return `<section class="totals"><div class="cards">${cards}</div></section>`;
|
|
220
220
|
}
|
|
@@ -14,10 +14,10 @@ declare class JsonFileSource {
|
|
|
14
14
|
filePath: string;
|
|
15
15
|
name: string;
|
|
16
16
|
constructor(config: JsonFileConfig);
|
|
17
|
-
fetchCandles(): Promise<
|
|
18
|
-
extractMarketPrice(candle:
|
|
19
|
-
marketPrice:
|
|
20
|
-
timestamp:
|
|
17
|
+
fetchCandles(): Promise<Record<string, unknown>[]>;
|
|
18
|
+
extractMarketPrice(candle: unknown): {
|
|
19
|
+
marketPrice: number;
|
|
20
|
+
timestamp: number;
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
23
|
interface MarketAdapterConfig {
|
|
@@ -30,10 +30,10 @@ declare class MarketAdapterSource {
|
|
|
30
30
|
botKey: string;
|
|
31
31
|
name: string;
|
|
32
32
|
constructor(config: MarketAdapterConfig);
|
|
33
|
-
fetchCandles(): Promise<
|
|
34
|
-
extractMarketPrice(candle:
|
|
35
|
-
marketPrice:
|
|
36
|
-
timestamp:
|
|
33
|
+
fetchCandles(): Promise<Record<string, unknown>[]>;
|
|
34
|
+
extractMarketPrice(candle: unknown): {
|
|
35
|
+
marketPrice: number;
|
|
36
|
+
timestamp: number;
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
declare function createSource(type: string, config: JsonFileConfig | MarketAdapterConfig): JsonFileSource | MarketAdapterSource;
|
|
@@ -23,10 +23,10 @@ class JsonFileSource {
|
|
|
23
23
|
if (!Array.isArray(candles) || candles.length === 0) {
|
|
24
24
|
throw new Error('Expected JSON array or object with .candles or .data property');
|
|
25
25
|
}
|
|
26
|
-
const intervalSeconds = meta?.intervalSeconds || 3600;
|
|
27
|
-
const lookbackHours = meta?.lookbackHours;
|
|
26
|
+
const intervalSeconds = Number(meta?.intervalSeconds) || 3600;
|
|
27
|
+
const lookbackHours = Number(meta?.lookbackHours) || 0;
|
|
28
28
|
if (lookbackHours && candles.length > 0) {
|
|
29
|
-
const nowMs = new Date(meta
|
|
29
|
+
const nowMs = new Date(Number(meta?.fetchedAt) || Date.now()).getTime();
|
|
30
30
|
const startTs = nowMs - (lookbackHours * 3600 * 1000);
|
|
31
31
|
return fillCandleGaps(candles, intervalSeconds, startTs, nowMs);
|
|
32
32
|
}
|
|
@@ -83,7 +83,8 @@ class MarketAdapterSource {
|
|
|
83
83
|
}
|
|
84
84
|
}
|
|
85
85
|
extractMarketPrice(candle) {
|
|
86
|
-
|
|
86
|
+
const c = candle;
|
|
87
|
+
return { marketPrice: c.close, timestamp: c.timestamp };
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
function createSource(type, config) {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
import { loadBotSettings, computeBotKey, persistBotAccountId } from './bot_key_utils.js';
|
|
24
24
|
import { setGlobalConsoleLevel, getGlobalConsoleLevel } from '../modules/order/logger.js';
|
|
25
25
|
import { sleep } from '../modules/order/utils/system.js';
|
|
26
|
-
import { getErrorMessage } from '../modules/utils/errors.js';
|
|
26
|
+
import { getErrorMessage, getErrorCode } from '../modules/utils/errors.js';
|
|
27
27
|
const DEFAULT_TIMEOUT_MS = 20000;
|
|
28
28
|
function printHelp() {
|
|
29
29
|
console.log(`\
|
|
@@ -95,7 +95,7 @@ async function resolveWithTimeout(chainOrders, ref, timeoutMs) {
|
|
|
95
95
|
return { id: null, reason: 'not-found' };
|
|
96
96
|
}
|
|
97
97
|
catch (err) {
|
|
98
|
-
return { id: null, reason: err && err
|
|
98
|
+
return { id: null, reason: err && getErrorCode(err) === 'ACCOUNT_LOOKUP_TIMEOUT' ? 'timeout' : 'error' };
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
async function main() {
|
|
@@ -50,7 +50,28 @@ interface PairAnalysis {
|
|
|
50
50
|
totalRealizedPnlNet: number;
|
|
51
51
|
netPosition: number;
|
|
52
52
|
}
|
|
53
|
-
|
|
53
|
+
interface TradeProfitabilityOptions {
|
|
54
|
+
accountId: string;
|
|
55
|
+
hours: number | null;
|
|
56
|
+
months: number | null;
|
|
57
|
+
start: string | null;
|
|
58
|
+
end: string | null;
|
|
59
|
+
asset: string | null;
|
|
60
|
+
pair: string | {
|
|
61
|
+
base: string;
|
|
62
|
+
quote: string;
|
|
63
|
+
} | null;
|
|
64
|
+
refreshAccount: boolean;
|
|
65
|
+
csv: string | null;
|
|
66
|
+
json: string | null;
|
|
67
|
+
matchMode: string;
|
|
68
|
+
showPnlDetail: boolean;
|
|
69
|
+
verbose: boolean;
|
|
70
|
+
feePerOrder: number | null;
|
|
71
|
+
html: boolean;
|
|
72
|
+
report: string | null;
|
|
73
|
+
}
|
|
74
|
+
declare function parseArgs(argv?: string[]): TradeProfitabilityOptions;
|
|
54
75
|
declare function classifyFills(fills: FillRecord[], filterAsset: string | null, pairFilter?: {
|
|
55
76
|
base: string;
|
|
56
77
|
quote: string;
|
|
@@ -117,7 +138,7 @@ interface TradingMetrics {
|
|
|
117
138
|
}
|
|
118
139
|
declare function computeMetrics(pair: PairAnalysis, window?: WindowRange): TradingMetrics;
|
|
119
140
|
/** Auto-named report file: bot/account + pair filter + requested range. */
|
|
120
|
-
declare function reportFileName(opts:
|
|
141
|
+
declare function reportFileName(opts: TradeProfitabilityOptions, accountRef: string, botName: string | null): string;
|
|
121
142
|
declare function run(argv?: string[]): Promise<void>;
|
|
122
143
|
export { analyzePair, classifyFills, computeMetrics, parseArgs, run, reportFileName, TradeFill, FillRecord, RealizedPnl, PairAnalysis, TradingMetrics, WindowRange };
|
|
123
144
|
//# sourceMappingURL=trade_profitability.d.ts.map
|
|
@@ -475,7 +475,7 @@ function analyzePair(trades, matchMode = 'sequential') {
|
|
|
475
475
|
};
|
|
476
476
|
}
|
|
477
477
|
// ─── Output Helpers ──────────────────────────────────────────────────────────
|
|
478
|
-
function fmt(n
|
|
478
|
+
function fmt(n) {
|
|
479
479
|
// Shared 4-significant-figure formatter (see modules/order/format.ts) so
|
|
480
480
|
// terminal output matches the HTML report and `dexbot order`.
|
|
481
481
|
return Number.isFinite(n) ? formatFundsValue(n) : 'NaN';
|
|
@@ -488,7 +488,18 @@ function fmtPct(n) {
|
|
|
488
488
|
function fmtAsset(id) {
|
|
489
489
|
return assetSymbol(id);
|
|
490
490
|
}
|
|
491
|
-
|
|
491
|
+
/** Group pairs by quote asset for the grand-total sections. */
|
|
492
|
+
function groupPairsByQuote(pairs) {
|
|
493
|
+
const quoteGroups = new Map();
|
|
494
|
+
for (const p of pairs) {
|
|
495
|
+
const q = p.quoteAsset;
|
|
496
|
+
if (!quoteGroups.has(q))
|
|
497
|
+
quoteGroups.set(q, []);
|
|
498
|
+
quoteGroups.get(q).push(p);
|
|
499
|
+
}
|
|
500
|
+
return quoteGroups;
|
|
501
|
+
}
|
|
502
|
+
function printSummary(pairs) {
|
|
492
503
|
console.log('');
|
|
493
504
|
for (const pair of pairs) {
|
|
494
505
|
const pairLabel = `${fmtAsset(pair.baseAsset)}/${fmtAsset(pair.quoteAsset)}`;
|
|
@@ -497,36 +508,30 @@ function printSummary(pairs, _accountId, _start, _end, _matchMode = 'sequential'
|
|
|
497
508
|
const avgBuy = pair.totalBuyBase > 0 ? pair.totalBuyQuote / pair.totalBuyBase : 0;
|
|
498
509
|
const avgSell = pair.totalSellBase > 0 ? pair.totalSellQuote / pair.totalSellBase : 0;
|
|
499
510
|
console.log(` ── ${pairLabel}`);
|
|
500
|
-
console.log(` Buys: ${fmt(totalBought
|
|
501
|
-
console.log(` Sells: ${fmt(totalSold
|
|
502
|
-
console.log(` Net inventory \u0394: ${fmt(pair.netPosition
|
|
511
|
+
console.log(` Buys: ${fmt(totalBought)} @ ${fmt(avgBuy)} = ${fmt(pair.totalBuyQuote)} ${fmtAsset(pair.quoteAsset)}`);
|
|
512
|
+
console.log(` Sells: ${fmt(totalSold)} @ ${fmt(avgSell)} = ${fmt(pair.totalSellQuote)} ${fmtAsset(pair.quoteAsset)}`);
|
|
513
|
+
console.log(` Net inventory \u0394: ${fmt(pair.netPosition)} ${fmtAsset(pair.baseAsset)} (bought \u2212 sold in window)`);
|
|
503
514
|
console.log(` Trades: ${pair.realizedPnls.length} realized lots, ${pair.buys.length} buys, ${pair.sells.length} sells`);
|
|
504
515
|
if (pair.unmatchedSellBase > 0.0001) {
|
|
505
|
-
console.log(` Unmatched: ${fmt(pair.unmatchedSellBase
|
|
516
|
+
console.log(` Unmatched: ${fmt(pair.unmatchedSellBase)} ${fmtAsset(pair.baseAsset)} (sold without prior buy in window — expected if inventory predates window)`);
|
|
506
517
|
}
|
|
507
|
-
console.log(` Gross PnL: ${fmtAsset(pair.quoteAsset)} ${fmt(pair.totalRealizedPnl
|
|
518
|
+
console.log(` Gross PnL: ${fmtAsset(pair.quoteAsset)} ${fmt(pair.totalRealizedPnl)}`);
|
|
508
519
|
const mktFee = pair.totalMarketFees;
|
|
509
520
|
const blkFee = pair.totalBlockchainFees;
|
|
510
521
|
if (mktFee > 0.0001) {
|
|
511
|
-
console.log(` Market fees: ${fmtAsset(pair.quoteAsset)} ${fmt(-mktFee
|
|
522
|
+
console.log(` Market fees: ${fmtAsset(pair.quoteAsset)} ${fmt(-mktFee)}`);
|
|
512
523
|
}
|
|
513
524
|
if (blkFee > 0.0001) {
|
|
514
|
-
console.log(` Blockchain: BTS ${fmt(-blkFee
|
|
525
|
+
console.log(` Blockchain: BTS ${fmt(-blkFee)}`);
|
|
515
526
|
}
|
|
516
|
-
console.log(` Net PnL: ${fmtAsset(pair.quoteAsset)} ${fmt(pair.totalRealizedPnlNet
|
|
527
|
+
console.log(` Net PnL: ${fmtAsset(pair.quoteAsset)} ${fmt(pair.totalRealizedPnlNet)}`);
|
|
517
528
|
if (pair.quoteAsset !== BTS_ID) {
|
|
518
529
|
console.log(` ⚠ Non-BTS quote — PnL is in ${fmtAsset(pair.quoteAsset)}, not BTS`);
|
|
519
530
|
}
|
|
520
531
|
console.log('');
|
|
521
532
|
}
|
|
522
533
|
// Grand totals grouped by quote asset
|
|
523
|
-
const quoteGroups =
|
|
524
|
-
for (const p of pairs) {
|
|
525
|
-
const q = p.quoteAsset;
|
|
526
|
-
if (!quoteGroups.has(q))
|
|
527
|
-
quoteGroups.set(q, []);
|
|
528
|
-
quoteGroups.get(q).push(p);
|
|
529
|
-
}
|
|
534
|
+
const quoteGroups = groupPairsByQuote(pairs);
|
|
530
535
|
if (pairs.length > 1 && quoteGroups.size > 0) {
|
|
531
536
|
for (const [quoteAsset, group] of quoteGroups) {
|
|
532
537
|
const groupPnl = group.reduce((s, p) => s + p.totalRealizedPnl, 0);
|
|
@@ -536,15 +541,15 @@ function printSummary(pairs, _accountId, _start, _end, _matchMode = 'sequential'
|
|
|
536
541
|
const groupVol = group.reduce((s, p) => s + p.totalBuyQuote + p.totalSellQuote, 0);
|
|
537
542
|
const qSymbol = fmtAsset(quoteAsset);
|
|
538
543
|
console.log(` ── TOTAL (${qSymbol}) — ${group.length} pair(s)`);
|
|
539
|
-
console.log(` Gross PnL: ${fmtAsset(quoteAsset)} ${fmt(groupPnl
|
|
544
|
+
console.log(` Gross PnL: ${fmtAsset(quoteAsset)} ${fmt(groupPnl)}`);
|
|
540
545
|
if (groupMktFees > 0.0001) {
|
|
541
|
-
console.log(` Market fees: ${fmtAsset(quoteAsset)} ${fmt(-groupMktFees
|
|
546
|
+
console.log(` Market fees: ${fmtAsset(quoteAsset)} ${fmt(-groupMktFees)}`);
|
|
542
547
|
}
|
|
543
548
|
if (groupBlkFees > 0.0001) {
|
|
544
|
-
console.log(` Blockchain: BTS ${fmt(-groupBlkFees
|
|
549
|
+
console.log(` Blockchain: BTS ${fmt(-groupBlkFees)}`);
|
|
545
550
|
}
|
|
546
|
-
console.log(` Net PnL: ${fmtAsset(quoteAsset)} ${fmt(groupNet
|
|
547
|
-
console.log(` Volume: ${fmt(groupVol
|
|
551
|
+
console.log(` Net PnL: ${fmtAsset(quoteAsset)} ${fmt(groupNet)}`);
|
|
552
|
+
console.log(` Volume: ${fmt(groupVol)} ${qSymbol}`);
|
|
548
553
|
console.log('');
|
|
549
554
|
}
|
|
550
555
|
}
|
|
@@ -572,15 +577,15 @@ function printPnlDetail(pairs) {
|
|
|
572
577
|
for (let i = 0; i < pair.realizedPnls.length; i++) {
|
|
573
578
|
const r = pair.realizedPnls[i];
|
|
574
579
|
const idx = String(i + 1).padStart(2);
|
|
575
|
-
const bp = fmt(r.buyPrice
|
|
576
|
-
const ep = fmt(r.effPrice
|
|
577
|
-
const sp = fmt(r.sellPrice
|
|
578
|
-
const amt = fmt(r.amount
|
|
579
|
-
const pnlStr = fmt(r.pnl
|
|
580
|
+
const bp = fmt(r.buyPrice).padStart(11);
|
|
581
|
+
const ep = fmt(r.effPrice).padStart(11);
|
|
582
|
+
const sp = fmt(r.sellPrice).padStart(11);
|
|
583
|
+
const amt = fmt(r.amount).padStart(9);
|
|
584
|
+
const pnlStr = fmt(r.pnl).padStart(9);
|
|
580
585
|
const pctStr = fmtPct(r.pnlPct).padStart(8);
|
|
581
|
-
const mktFeeStr = fmt(r.marketFeeEntry + r.marketFeeExit
|
|
582
|
-
const feeStr = fmt(r.feeBts
|
|
583
|
-
const netStr = fmt(r.pnlNet
|
|
586
|
+
const mktFeeStr = fmt(r.marketFeeEntry + r.marketFeeExit).padStart(8);
|
|
587
|
+
const feeStr = fmt(r.feeBts).padStart(8);
|
|
588
|
+
const netStr = fmt(r.pnlNet).padStart(10);
|
|
584
589
|
const netPctStr = fmtPct(r.pnlNetPct).padStart(8);
|
|
585
590
|
const mk = (r.entryIsMaker ? 'M' : 'T') + '/' + (r.exitIsMaker ? 'M' : 'T') + ' ';
|
|
586
591
|
const et = (r.entryTime || '').slice(0, 22).padEnd(22);
|
|
@@ -962,15 +967,15 @@ function printMetrics(pairs, window) {
|
|
|
962
967
|
// Edge
|
|
963
968
|
console.log(` Win Rate: ${(m.winRate * 100).toFixed(1)}%`);
|
|
964
969
|
console.log(` Profit Factor: ${m.profitFactor === Infinity ? '∞' : m.profitFactor.toFixed(2)}`);
|
|
965
|
-
const mktFeeStr = pair.totalMarketFees > 0.0001 ? ` (market ${fmt(pair.totalMarketFees
|
|
966
|
-
const blkFeeStr = pair.totalBlockchainFees > 0.0001 ? ` (op ${fmt(pair.totalBlockchainFees
|
|
970
|
+
const mktFeeStr = pair.totalMarketFees > 0.0001 ? ` (market ${fmt(pair.totalMarketFees)})` : '';
|
|
971
|
+
const blkFeeStr = pair.totalBlockchainFees > 0.0001 ? ` (op ${fmt(pair.totalBlockchainFees)} BTS)` : '';
|
|
967
972
|
console.log(` Fee Drag: ${m.feeDragPct > 0 ? m.feeDragPct.toFixed(2) + '% of gross profit' + mktFeeStr + blkFeeStr : '—'}`);
|
|
968
973
|
console.log(` Avg Win / Avg Loss: ${m.avgWinLossRatio === Infinity ? '∞' : m.avgWinLossRatio.toFixed(2)}`);
|
|
969
974
|
const qSymbol = fmtAsset(pair.quoteAsset);
|
|
970
|
-
console.log(` Expectancy (gross): ${fmt(m.expectancyBts
|
|
975
|
+
console.log(` Expectancy (gross): ${fmt(m.expectancyBts)} ${qSymbol} (${fmtPct(m.expectancyPct)}) per trade`);
|
|
971
976
|
const rDisplay = m.expectancyR === Infinity ? '∞' : m.expectancyR.toFixed(3) + 'R';
|
|
972
977
|
console.log(` Expectancy (R): ${rDisplay}`);
|
|
973
|
-
console.log(` Expectancy (net): ${fmt(m.netExpectancyBts
|
|
978
|
+
console.log(` Expectancy (net): ${fmt(m.netExpectancyBts)} ${qSymbol} per trade`);
|
|
974
979
|
console.log('');
|
|
975
980
|
// Edge quality
|
|
976
981
|
console.log(` Median R: ${m.medianR.toFixed(2)}`);
|
|
@@ -995,14 +1000,14 @@ function printMetrics(pairs, window) {
|
|
|
995
1000
|
const spanStr = m.scoredSpanDays < m.periodSpanDays - 1e-9
|
|
996
1001
|
? `${m.scoredSpanDays.toFixed(1)}d scored of ${m.periodSpanDays.toFixed(1)}d window`
|
|
997
1002
|
: `${m.periodSpanDays.toFixed(1)}d`;
|
|
998
|
-
console.log(` Projected net PnL: ${fmt(m.projectedNetPnlAnn
|
|
1003
|
+
console.log(` Projected net PnL: ${fmt(m.projectedNetPnlAnn)} ${qSymbol}/yr (${fmt(m.projectedNetPnlPerDay)}/day over ${spanStr})`);
|
|
999
1004
|
console.log('');
|
|
1000
1005
|
// Tail risk
|
|
1001
1006
|
if (m.mddHadStablePeak) {
|
|
1002
|
-
console.log(` Max Drawdown: ${fmt(m.mddAbsBts
|
|
1007
|
+
console.log(` Max Drawdown: ${fmt(m.mddAbsBts)} ${qSymbol} (${fmtPct(m.mddPct)} of peak cumulative profit)`);
|
|
1003
1008
|
}
|
|
1004
1009
|
else {
|
|
1005
|
-
console.log(` Min Equity: ${fmt(m.prePeakMinEquity
|
|
1010
|
+
console.log(` Min Equity: ${fmt(m.prePeakMinEquity)} ${fmtAsset(pair.quoteAsset)}`);
|
|
1006
1011
|
}
|
|
1007
1012
|
const recLabel = m.maxRecoveryDays > 0 ? m.maxRecoveryDays.toFixed(1) + ' days' + (m.isOngoingRecovery ? ' (ongoing)' : '') : '—';
|
|
1008
1013
|
console.log(` Max Recovery Time: ${recLabel}`);
|
|
@@ -1021,17 +1026,11 @@ function printMetrics(pairs, window) {
|
|
|
1021
1026
|
console.log(` Partial fills/order: ${m.fillsPerOrderMean.toFixed(2)} mean, ${m.fillsPerOrderMedian.toFixed(1)} med, ${m.fillsPerOrderMax} max`);
|
|
1022
1027
|
console.log(` One-shot orders: ${(m.oneShotOrderRatio * 100).toFixed(0)}%`);
|
|
1023
1028
|
console.log(` Fills/day: ${m.fillsPerDay.toFixed(2)}`);
|
|
1024
|
-
console.log(` Avg vol/day: ${fmt(m.avgVolumePerDay
|
|
1029
|
+
console.log(` Avg vol/day: ${fmt(m.avgVolumePerDay)} ${fmtAsset(pair.quoteAsset)}`);
|
|
1025
1030
|
console.log('');
|
|
1026
1031
|
}
|
|
1027
1032
|
// Grand totals grouped by quote asset
|
|
1028
|
-
const quoteGroups =
|
|
1029
|
-
for (const p of pairs) {
|
|
1030
|
-
const q = p.quoteAsset;
|
|
1031
|
-
if (!quoteGroups.has(q))
|
|
1032
|
-
quoteGroups.set(q, []);
|
|
1033
|
-
quoteGroups.get(q).push(p);
|
|
1034
|
-
}
|
|
1033
|
+
const quoteGroups = groupPairsByQuote(pairs);
|
|
1035
1034
|
if (pairs.length > 1 && quoteGroups.size > 0) {
|
|
1036
1035
|
for (const [quoteAsset, group] of quoteGroups) {
|
|
1037
1036
|
const totalLots = group.reduce((s, p) => s + p.realizedPnls.length, 0);
|
|
@@ -1043,11 +1042,11 @@ function printMetrics(pairs, window) {
|
|
|
1043
1042
|
console.log(` Lots: ${totalLots}`);
|
|
1044
1043
|
const feeParts = [];
|
|
1045
1044
|
if (totalMktFees > 0.0001)
|
|
1046
|
-
feeParts.push(`market ${fmt(totalMktFees
|
|
1045
|
+
feeParts.push(`market ${fmt(totalMktFees)} ${qSymbol}`);
|
|
1047
1046
|
if (totalBlkFees > 0.0001)
|
|
1048
|
-
feeParts.push(`op ${fmt(totalBlkFees
|
|
1047
|
+
feeParts.push(`op ${fmt(totalBlkFees)} BTS`);
|
|
1049
1048
|
const feeSuffix = feeParts.length > 0 ? ` (${feeParts.join(', ')})` : '';
|
|
1050
|
-
console.log(` Net PnL: ${fmtAsset(quoteAsset)} ${fmt(totalNet
|
|
1049
|
+
console.log(` Net PnL: ${fmtAsset(quoteAsset)} ${fmt(totalNet)}${feeSuffix}`);
|
|
1051
1050
|
console.log('');
|
|
1052
1051
|
}
|
|
1053
1052
|
}
|
|
@@ -1133,7 +1132,8 @@ function normalizeTimeBound(raw, isEnd) {
|
|
|
1133
1132
|
/** Auto-named report file: bot/account + pair filter + requested range. */
|
|
1134
1133
|
function reportFileName(opts, accountRef, botName) {
|
|
1135
1134
|
const slugBase = botName ? sanitizeKey(botName) : sanitizeKey(accountRef);
|
|
1136
|
-
const
|
|
1135
|
+
const pair = opts.pair;
|
|
1136
|
+
const pairSlug = pair ? `_${sanitizeKey(pair.base)}-${sanitizeKey(pair.quote)}` : '';
|
|
1137
1137
|
let rangeSlug;
|
|
1138
1138
|
if (opts.months != null)
|
|
1139
1139
|
rangeSlug = `_${String(opts.months).replace('.', 'p')}m`;
|
|
@@ -1253,7 +1253,7 @@ async function run(argv = process.argv.slice(2)) {
|
|
|
1253
1253
|
}
|
|
1254
1254
|
else {
|
|
1255
1255
|
// Output: summaries → grand total → per-match detail
|
|
1256
|
-
printSummary(analyses
|
|
1256
|
+
printSummary(analyses);
|
|
1257
1257
|
if (opts.showPnlDetail) {
|
|
1258
1258
|
printPnlDetail(analyses);
|
|
1259
1259
|
}
|
|
@@ -3,8 +3,8 @@ declare function parseArgs(): {
|
|
|
3
3
|
source: {
|
|
4
4
|
type: string;
|
|
5
5
|
config: {
|
|
6
|
-
filePath
|
|
7
|
-
botKey?:
|
|
6
|
+
filePath?: string;
|
|
7
|
+
botKey?: string;
|
|
8
8
|
};
|
|
9
9
|
};
|
|
10
10
|
chartFile: string;
|
|
@@ -30,11 +30,22 @@ declare function parseArgs(): {
|
|
|
30
30
|
quiet: boolean;
|
|
31
31
|
listBots: boolean;
|
|
32
32
|
};
|
|
33
|
-
declare function loadJsonMeta(filePath:
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
declare function loadJsonMeta(filePath: string | null | undefined): import("../math_utils.js").CandleFile | {
|
|
34
|
+
meta: null;
|
|
35
|
+
candles: null;
|
|
36
36
|
};
|
|
37
|
-
declare function inferTitle(meta:
|
|
37
|
+
declare function inferTitle(meta: {
|
|
38
|
+
pool?: unknown;
|
|
39
|
+
intervalSeconds?: unknown;
|
|
40
|
+
assetA?: {
|
|
41
|
+
symbol?: unknown;
|
|
42
|
+
id?: unknown;
|
|
43
|
+
};
|
|
44
|
+
assetB?: {
|
|
45
|
+
symbol?: unknown;
|
|
46
|
+
id?: unknown;
|
|
47
|
+
};
|
|
48
|
+
} | null | undefined, fallback: string): string;
|
|
38
49
|
declare function main(): Promise<void>;
|
|
39
50
|
export { main, parseArgs, loadJsonMeta, inferTitle };
|
|
40
51
|
//# sourceMappingURL=analyze_tradingview.d.ts.map
|
|
@@ -201,7 +201,7 @@ function inferTitle(meta, fallback) {
|
|
|
201
201
|
const b = meta?.assetB?.symbol || meta?.assetB?.id || null;
|
|
202
202
|
const pair = a && b ? `${a}/${b}` : fallback;
|
|
203
203
|
const label = pool || pair;
|
|
204
|
-
const interval = Number(meta?.intervalSeconds) > 0 ? toIntervalLabel(meta
|
|
204
|
+
const interval = Number(meta?.intervalSeconds) > 0 ? toIntervalLabel(Number(meta?.intervalSeconds)) : '1h';
|
|
205
205
|
return `${label} · ${interval} · TradingView`;
|
|
206
206
|
}
|
|
207
207
|
async function main() {
|
|
@@ -237,15 +237,16 @@ async function main() {
|
|
|
237
237
|
// Bot grid bounds for the range highlight: mirrors the runtime grid
|
|
238
238
|
// (center = AMA, min "Nx" = center/N, max "Nx" = center*N) with the
|
|
239
239
|
// live asymmetric tilt. Null when no bot key (width% fallback in-page).
|
|
240
|
+
const asym = botMeta?.asymmetricBounds;
|
|
240
241
|
const grid = botMeta?.minPrice != null && botMeta?.maxPrice != null ? {
|
|
241
242
|
minPrice: botMeta.minPrice,
|
|
242
243
|
maxPrice: botMeta.maxPrice,
|
|
243
244
|
incrementPercent: Number(botMeta.incrementPercent) > 0 ? Number(botMeta.incrementPercent) : null,
|
|
244
|
-
maxAsymmetryFactor: Number.isFinite(Number(
|
|
245
|
-
? Number(
|
|
245
|
+
maxAsymmetryFactor: Number.isFinite(Number(asym?.maxAsymmetryFactor))
|
|
246
|
+
? Number(asym?.maxAsymmetryFactor)
|
|
246
247
|
: null,
|
|
247
|
-
minScaleSlots: Number.isFinite(Number(
|
|
248
|
-
? Number(
|
|
248
|
+
minScaleSlots: Number.isFinite(Number(asym?.minScaleSlots))
|
|
249
|
+
? Number(asym?.minScaleSlots)
|
|
249
250
|
: null,
|
|
250
251
|
} : null;
|
|
251
252
|
// Order overlay (canonical profiles/orders/<botKey>.json; silent when absent)
|
|
@@ -5,23 +5,32 @@
|
|
|
5
5
|
* @param {Object|null} input.ama Resolved AMA config (er/fast/slow) the chart runs with.
|
|
6
6
|
* @param {Object} [input.overrides] CLI overrides {priceDeltaThresholdPercent, slopeDeltaThresholdPercent, enabled}.
|
|
7
7
|
*/
|
|
8
|
-
declare function resolveGridResetSimConfig({ botKey, bot, ama, overrides }?:
|
|
8
|
+
declare function resolveGridResetSimConfig({ botKey, bot, ama, overrides }?: {
|
|
9
|
+
botKey?: string | null;
|
|
10
|
+
bot?: Record<string, unknown> | null;
|
|
11
|
+
ama?: {
|
|
12
|
+
erPeriod?: number;
|
|
13
|
+
fastPeriod?: number;
|
|
14
|
+
slowPeriod?: number;
|
|
15
|
+
} | null;
|
|
16
|
+
overrides?: Record<string, unknown>;
|
|
17
|
+
}): {
|
|
9
18
|
enabled: boolean;
|
|
10
|
-
botKey:
|
|
11
|
-
priceDeltaThresholdPercent:
|
|
12
|
-
priceSource:
|
|
13
|
-
slopeDeltaThresholdPercent:
|
|
14
|
-
slopeSource:
|
|
19
|
+
botKey: string | null;
|
|
20
|
+
priceDeltaThresholdPercent: number;
|
|
21
|
+
priceSource: string;
|
|
22
|
+
slopeDeltaThresholdPercent: number;
|
|
23
|
+
slopeSource: string;
|
|
15
24
|
slopeEnabled: boolean;
|
|
16
25
|
dynamicWeightEnabled: boolean;
|
|
17
|
-
lookbackBars:
|
|
26
|
+
lookbackBars: number;
|
|
18
27
|
slopePersistBars: number;
|
|
19
|
-
maxSlopePct:
|
|
28
|
+
maxSlopePct: number;
|
|
20
29
|
neutralZonePct: number;
|
|
21
|
-
maxSlopeOffset:
|
|
30
|
+
maxSlopeOffset: number;
|
|
22
31
|
clipPercentile: number;
|
|
23
|
-
maxAsymmetryFactor:
|
|
24
|
-
minScaleSlots:
|
|
32
|
+
maxAsymmetryFactor: number;
|
|
33
|
+
minScaleSlots: number;
|
|
25
34
|
incrementPercent: number | null;
|
|
26
35
|
erPeriod: number;
|
|
27
36
|
warmupBars: number;
|
|
@@ -34,30 +43,30 @@ declare function resolveGridResetSimConfig({ botKey, bot, ama, overrides }?: any
|
|
|
34
43
|
* Flatten the resolved config for the chart payload, dropping anything the page
|
|
35
44
|
* must not see (e.g. Infinity from a disabled threshold).
|
|
36
45
|
*/
|
|
37
|
-
declare function toGridSimPayload(cfg:
|
|
46
|
+
declare function toGridSimPayload(cfg: Record<string, unknown> | null): {
|
|
38
47
|
enabled: boolean;
|
|
39
|
-
botKey:
|
|
40
|
-
priceDeltaThresholdPercent:
|
|
41
|
-
priceSource:
|
|
42
|
-
slopeDeltaThresholdPercent:
|
|
43
|
-
slopeSource:
|
|
48
|
+
botKey: {} | null;
|
|
49
|
+
priceDeltaThresholdPercent: unknown;
|
|
50
|
+
priceSource: {};
|
|
51
|
+
slopeDeltaThresholdPercent: unknown;
|
|
52
|
+
slopeSource: {};
|
|
44
53
|
slopeEnabled: boolean;
|
|
45
54
|
dynamicWeightEnabled: boolean;
|
|
46
|
-
lookbackBars:
|
|
47
|
-
slopePersistBars:
|
|
48
|
-
maxSlopePct:
|
|
49
|
-
neutralZonePct:
|
|
50
|
-
maxSlopeOffset:
|
|
51
|
-
clipPercentile:
|
|
52
|
-
maxAsymmetryFactor:
|
|
53
|
-
minScaleSlots:
|
|
54
|
-
incrementPercent:
|
|
55
|
-
erPeriod:
|
|
56
|
-
warmupBars:
|
|
57
|
-
warmupBarsOverride:
|
|
58
|
-
clampMin:
|
|
59
|
-
clampMax:
|
|
60
|
-
notes: any;
|
|
55
|
+
lookbackBars: unknown;
|
|
56
|
+
slopePersistBars: unknown;
|
|
57
|
+
maxSlopePct: unknown;
|
|
58
|
+
neutralZonePct: unknown;
|
|
59
|
+
maxSlopeOffset: unknown;
|
|
60
|
+
clipPercentile: unknown;
|
|
61
|
+
maxAsymmetryFactor: unknown;
|
|
62
|
+
minScaleSlots: unknown;
|
|
63
|
+
incrementPercent: unknown;
|
|
64
|
+
erPeriod: unknown;
|
|
65
|
+
warmupBars: unknown;
|
|
66
|
+
warmupBarsOverride: unknown;
|
|
67
|
+
clampMin: unknown;
|
|
68
|
+
clampMax: unknown;
|
|
69
|
+
notes: any[];
|
|
61
70
|
} | null;
|
|
62
71
|
export { resolveGridResetSimConfig, toGridSimPayload };
|
|
63
72
|
//# sourceMappingURL=grid_reset_config.d.ts.map
|