dexbot 1.6.10 → 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 +50 -3
- package/README.md +3 -1
- package/analysis/README.md +51 -11
- package/analysis/bot_fitting/README.md +12 -0
- package/analysis/tradingview/README.md +3 -3
- package/analysis/trend_detection/DYNAMIC_WEIGHT_RESEARCH.md +11 -37
- package/analysis/trend_detection/README.md +31 -0
- 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 +15 -2
- 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 -20
- 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 +55 -10
- package/dist/analysis/bot_fitting/backtest_bot_fitting.d.ts +34 -4
- package/dist/analysis/bot_fitting/backtest_bot_fitting.js +72 -66
- package/dist/analysis/bot_fitting/backtest_lookback_drawdown.d.ts +21 -0
- package/dist/analysis/bot_fitting/backtest_lookback_drawdown.js +315 -0
- 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 +10 -17
- 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 +64 -0
- package/dist/analysis/fills_cache.js +254 -0
- package/dist/analysis/fills_source.d.ts +2 -2
- package/dist/analysis/fills_source.js +19 -14
- 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.d.ts +39 -0
- package/dist/analysis/pnl_report.js +325 -0
- 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 -2
- package/dist/analysis/trade_profitability.d.ts +32 -2
- package/dist/analysis/trade_profitability.js +232 -106
- package/dist/analysis/tradingview/analyze_tradingview.d.ts +17 -6
- package/dist/analysis/tradingview/analyze_tradingview.js +9 -10
- package/dist/analysis/tradingview/grid_reset_config.d.ts +42 -31
- package/dist/analysis/tradingview/grid_reset_config.js +35 -6
- package/dist/analysis/tradingview/grid_reset_sim.d.ts +75 -8
- package/dist/analysis/tradingview/grid_reset_sim.js +42 -5
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.d.ts +69 -4
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.js +20 -20
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.d.ts +102 -0
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.js +725 -0
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.d.ts +63 -1
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.js +27 -112
- package/dist/analysis/trend_detection/huber_scale_variants.d.ts +40 -0
- package/dist/analysis/trend_detection/huber_scale_variants.js +176 -0
- 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 +17 -14
- 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 +297 -115
- package/dist/market_adapter/core/market_adapter_service.js +184 -101
- package/dist/market_adapter/core/strategies/ama.d.ts +10 -2
- package/dist/market_adapter/core/strategies/ama.js +7 -32
- 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 +36 -8
- package/dist/market_adapter/core/strategies/dynamic_weight_series.js +9 -9
- 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 +97 -226
- 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 -22
- 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 -33
- package/dist/market_adapter/market_adapter.js +69 -75
- 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 +530 -32
- package/dist/modules/constants.js +52 -60
- 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 +117 -80
- 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 +40 -14
- 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 +39 -19
- package/dist/modules/order/format.js +62 -16
- 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 +226 -180
- package/dist/modules/order/manager.js +101 -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 +99 -54
- 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 +326 -106
- package/dist/modules/order/utils/order.js +200 -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 +3 -4
- package/dist/modules/paths.js +3 -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 +4 -0
- package/dist/modules/utils/time_range.js +18 -0
- 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 +66 -84
- package/dist/scripts/chart_command.d.ts +27 -18
- package/dist/scripts/chart_command.js +16 -15
- 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/pnl.d.ts +3 -0
- package/dist/scripts/pnl.js +40 -0
- 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 +72 -10
- 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 +12 -10
- package/docs/FUND_MOVEMENT_AND_ACCOUNTING.md +5 -5
- package/docs/GRID_RECALCULATION.md +15 -16
- 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 +15 -4
- package/docs/WORKFLOW.md +1 -0
- package/docs/architecture.md +12 -9
- package/docs/developer_guide.md +6 -6
- package/market_adapter/README.md +9 -26
- package/modules/README.md +4 -1
- package/package.json +4 -1
- package/scripts/README.md +14 -0
|
@@ -20,7 +20,7 @@ import { acquireFileLockSync, releaseFileLockSync } from './utils/file_lock.js';
|
|
|
20
20
|
import { updateDynamicGridSnapshotSync } from './utils/dynamic_grid_snapshot.js';
|
|
21
21
|
import { PATHS, getRecalculateTriggerFile } from '../modules/paths.js';
|
|
22
22
|
import Logger from '../modules/order/logger.js';
|
|
23
|
-
import {
|
|
23
|
+
import { roundTo } from '../modules/order/utils/math.js';
|
|
24
24
|
import { usesAmaGridPrice } from '../modules/dexbot_maintenance_runtime.js';
|
|
25
25
|
import { normalizeAtrPeriod, normalizeMaxVolatilityOffset, normalizeVolatilityThreshold, } from './core/config_normalizers.js';
|
|
26
26
|
import { resetMarketAdapterWhitelistCache, isBotWhitelisted, isBotDynamicWeightWhitelisted, isBotAsymmetricBoundsWhitelisted, } from '../modules/market_adapter_whitelist.js';
|
|
@@ -102,7 +102,7 @@ function loadMarketAdapterSettings() {
|
|
|
102
102
|
}
|
|
103
103
|
catch (_) {
|
|
104
104
|
console.warn(`[WARN] Failed to parse ${MARKET_ADAPTER_SETTINGS_FILE}: ${getErrorMessage(_)}. Using defaults.`);
|
|
105
|
-
_marketAdapterSettingsCache =
|
|
105
|
+
_marketAdapterSettingsCache = null;
|
|
106
106
|
return null;
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -114,7 +114,8 @@ function findPairForBot(bot, pairs) {
|
|
|
114
114
|
const botA = normalizeAssetSymbol(bot.assetA);
|
|
115
115
|
const botB = normalizeAssetSymbol(bot.assetB);
|
|
116
116
|
let fallbackMatch = null;
|
|
117
|
-
for (const
|
|
117
|
+
for (const rawPair of pairs) {
|
|
118
|
+
const p = rawPair;
|
|
118
119
|
const parts = String(p.key || '').split('|');
|
|
119
120
|
const pAId = parts[0];
|
|
120
121
|
const pBId = parts[1];
|
|
@@ -255,14 +256,17 @@ function resolveBotCfg(bot, globalCfg) {
|
|
|
255
256
|
? { ...globalCfg.kalman }
|
|
256
257
|
: globalCfg.kalman,
|
|
257
258
|
};
|
|
258
|
-
applyMarketAdapterOverrides(merged, settings.globals || {});
|
|
259
|
+
applyMarketAdapterOverrides(merged, (settings.globals || {}));
|
|
259
260
|
// Pair-level overrides
|
|
260
|
-
const pair = findPairForBot(bot, settings.pairs);
|
|
261
|
-
if (pair
|
|
261
|
+
const pair = findPairForBot(bot, Array.isArray(settings.pairs) ? settings.pairs : []);
|
|
262
|
+
if (pair && pair.marketAdapterSettings) {
|
|
262
263
|
applyMarketAdapterOverrides(merged, pair.marketAdapterSettings);
|
|
263
264
|
}
|
|
264
265
|
// Bot-level overrides
|
|
265
|
-
const
|
|
266
|
+
const pairObj = pair;
|
|
267
|
+
const botOverride = pairObj?.botOverrides
|
|
268
|
+
? pairObj.botOverrides[String(bot.name)]
|
|
269
|
+
: undefined;
|
|
266
270
|
if (botOverride) {
|
|
267
271
|
applyMarketAdapterOverrides(merged, botOverride, { includeDefaultAmaKey: true });
|
|
268
272
|
}
|
|
@@ -273,9 +277,10 @@ const BUILTIN_AMAS = MARKET_ADAPTER.AMAS;
|
|
|
273
277
|
const DEFAULT_AMA = MARKET_ADAPTER.AMAS.AMA3;
|
|
274
278
|
const AMA_KEYWORDS = new Set(['ama', 'ama1', 'ama2', 'ama3', 'ama4']);
|
|
275
279
|
function normalizeAmaPreset(raw) {
|
|
276
|
-
const
|
|
277
|
-
const
|
|
278
|
-
const
|
|
280
|
+
const r = raw;
|
|
281
|
+
const erPeriod = Number(r?.erPeriod);
|
|
282
|
+
const fastPeriod = Number(r?.fastPeriod);
|
|
283
|
+
const slowPeriod = Number(r?.slowPeriod);
|
|
279
284
|
if (!Number.isFinite(erPeriod) || !Number.isFinite(fastPeriod) || !Number.isFinite(slowPeriod))
|
|
280
285
|
return null;
|
|
281
286
|
return { erPeriod, fastPeriod, slowPeriod };
|
|
@@ -298,8 +303,10 @@ function findAmaProfileForBot(bot, ctx) {
|
|
|
298
303
|
return null;
|
|
299
304
|
const botAssetA = normalizeAssetSymbol(bot?.assetA);
|
|
300
305
|
const botAssetB = normalizeAssetSymbol(bot?.assetB);
|
|
301
|
-
const
|
|
302
|
-
const
|
|
306
|
+
const ctxAssetA = ctx?.assetA;
|
|
307
|
+
const ctxAssetB = ctx?.assetB;
|
|
308
|
+
const ctxAssetAId = normalizeAssetSymbol(ctxAssetA?.id);
|
|
309
|
+
const ctxAssetBId = normalizeAssetSymbol(ctxAssetB?.id);
|
|
303
310
|
if (!botAssetA && !ctxAssetAId)
|
|
304
311
|
return null;
|
|
305
312
|
if (!botAssetB && !ctxAssetBId)
|
|
@@ -334,24 +341,8 @@ function findAmaProfileForBot(bot, ctx) {
|
|
|
334
341
|
})[0] || null;
|
|
335
342
|
}
|
|
336
343
|
function getAmaPresetForKey(key, profile) {
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
function normalizeErSmoothPeriod(raw, fallback = 0) {
|
|
340
|
-
const value = Number(raw);
|
|
341
|
-
if (value === 0)
|
|
342
|
-
return 0;
|
|
343
|
-
if (Number.isFinite(value) && value >= 1)
|
|
344
|
-
return value;
|
|
345
|
-
const fallbackValue = Number(fallback);
|
|
346
|
-
return Number.isFinite(fallbackValue) && fallbackValue >= 1 ? fallbackValue : 0;
|
|
347
|
-
}
|
|
348
|
-
function resolveErSmoothPeriodForBot(bot) {
|
|
349
|
-
const raw = (bot && typeof bot.ama === 'object' && bot.ama !== null) ? bot.ama : {};
|
|
350
|
-
const globalErSmoothPeriod = normalizeErSmoothPeriod(MARKET_ADAPTER.AMA_ER_SMOOTH_FAST_PERIOD, 0);
|
|
351
|
-
if (Object.prototype.hasOwnProperty.call(raw, 'erSmoothPeriod')) {
|
|
352
|
-
return normalizeErSmoothPeriod(raw.erSmoothPeriod, globalErSmoothPeriod);
|
|
353
|
-
}
|
|
354
|
-
return globalErSmoothPeriod;
|
|
344
|
+
const amas = profile?.amas;
|
|
345
|
+
return normalizeAmaPreset(amas?.[key]) || normalizeAmaPreset(BUILTIN_AMAS[key]) || null;
|
|
355
346
|
}
|
|
356
347
|
function getAmaFromProfilesForBot(bot, ctx, cfg) {
|
|
357
348
|
const selected = resolveAmaPresetForBot(bot, ctx, cfg);
|
|
@@ -363,7 +354,6 @@ function getAmaFromProfilesForBot(bot, ctx, cfg) {
|
|
|
363
354
|
erPeriod: selected.erPeriod,
|
|
364
355
|
fastPeriod: selected.fastPeriod,
|
|
365
356
|
slowPeriod: selected.slowPeriod,
|
|
366
|
-
erSmoothPeriod: selected.erSmoothPeriod,
|
|
367
357
|
};
|
|
368
358
|
}
|
|
369
359
|
/**
|
|
@@ -375,7 +365,6 @@ function getAmaFromProfilesForBot(bot, ctx, cfg) {
|
|
|
375
365
|
*/
|
|
376
366
|
function resolveAmaPresetForBot(bot, ctx, cfg) {
|
|
377
367
|
const profile = findAmaProfileForBot(bot, ctx);
|
|
378
|
-
const erSmoothPeriod = resolveErSmoothPeriodForBot(bot);
|
|
379
368
|
if (!profile)
|
|
380
369
|
return null;
|
|
381
370
|
const rawGridPrice = String(bot?.gridPrice || '').trim().toLowerCase();
|
|
@@ -399,7 +388,6 @@ function resolveAmaPresetForBot(bot, ctx, cfg) {
|
|
|
399
388
|
erPeriod: selected.preset.erPeriod,
|
|
400
389
|
fastPeriod: selected.preset.fastPeriod,
|
|
401
390
|
slowPeriod: selected.preset.slowPeriod,
|
|
402
|
-
erSmoothPeriod,
|
|
403
391
|
};
|
|
404
392
|
}
|
|
405
393
|
function pairAmaKey(key, preset) {
|
|
@@ -618,7 +606,7 @@ function withRetries(fn, attempts, baseDelayMs, label) {
|
|
|
618
606
|
await sleep(waitMs);
|
|
619
607
|
}
|
|
620
608
|
}
|
|
621
|
-
const msg = label ? `${label}: ${lastErr
|
|
609
|
+
const msg = label ? `${label}: ${getErrorMessage(lastErr) || 'unknown error'}` : (getErrorMessage(lastErr) || 'unknown error');
|
|
622
610
|
throw new Error(msg);
|
|
623
611
|
})();
|
|
624
612
|
}
|
|
@@ -837,8 +825,10 @@ function calculateBotThreshold(cfg) {
|
|
|
837
825
|
return Number.isFinite(value) && value > 0 ? value : null;
|
|
838
826
|
}
|
|
839
827
|
function computeCandleStaleness(lastCandleTs, maxStaleHours) {
|
|
840
|
-
const
|
|
841
|
-
const
|
|
828
|
+
const lastTs = Number(lastCandleTs);
|
|
829
|
+
const maxHours = Number(maxStaleHours);
|
|
830
|
+
const staleAgeMs = Number.isFinite(lastCandleTs) ? (Date.now() - lastTs) : Number.POSITIVE_INFINITY;
|
|
831
|
+
const staleData = staleAgeMs > (maxHours * 3600 * 1000);
|
|
842
832
|
const staleAgeHours = Number.isFinite(staleAgeMs) ? (staleAgeMs / 3600000) : null;
|
|
843
833
|
return { staleData, staleAgeHours };
|
|
844
834
|
}
|
|
@@ -866,8 +856,9 @@ function computeCandleStaleness(lastCandleTs, maxStaleHours) {
|
|
|
866
856
|
* work on `usesAmaGridPrice(bot)`.
|
|
867
857
|
*/
|
|
868
858
|
function resolveAmaForBot(bot, ctx = null, cfg = null) {
|
|
869
|
-
const raw = (bot && typeof bot.ama === 'object' && bot.ama !== null)
|
|
870
|
-
|
|
859
|
+
const raw = (bot && typeof bot.ama === 'object' && bot.ama !== null)
|
|
860
|
+
? bot.ama
|
|
861
|
+
: {};
|
|
871
862
|
const fromProfiles = getAmaFromProfilesForBot(bot, ctx, cfg);
|
|
872
863
|
if (fromProfiles)
|
|
873
864
|
return fromProfiles;
|
|
@@ -875,7 +866,6 @@ function resolveAmaForBot(bot, ctx = null, cfg = null) {
|
|
|
875
866
|
erPeriod: Number(raw.erPeriod),
|
|
876
867
|
fastPeriod: Number(raw.fastPeriod),
|
|
877
868
|
slowPeriod: Number(raw.slowPeriod),
|
|
878
|
-
erSmoothPeriod,
|
|
879
869
|
enabled: true,
|
|
880
870
|
name: 'custom',
|
|
881
871
|
};
|
|
@@ -938,20 +928,19 @@ function pruneCandles(candles, keepCount) {
|
|
|
938
928
|
* persisted state for backwards compatibility with existing snapshots.
|
|
939
929
|
*/
|
|
940
930
|
function buildAmaRecord(botAma, amaPrice) {
|
|
941
|
-
const
|
|
942
|
-
const
|
|
943
|
-
const
|
|
944
|
-
const
|
|
931
|
+
const a = botAma;
|
|
932
|
+
const erPeriod = Number(a?.erPeriod);
|
|
933
|
+
const fastPeriod = Number(a?.fastPeriod);
|
|
934
|
+
const slowPeriod = Number(a?.slowPeriod);
|
|
945
935
|
if (!Number.isFinite(erPeriod) || !Number.isFinite(fastPeriod) || !Number.isFinite(slowPeriod)) {
|
|
946
936
|
return [];
|
|
947
937
|
}
|
|
948
938
|
const value = Number(amaPrice);
|
|
949
939
|
return [{
|
|
950
|
-
name: String(
|
|
940
|
+
name: String(a?.name || 'active'),
|
|
951
941
|
erPeriod,
|
|
952
942
|
fastPeriod,
|
|
953
943
|
slowPeriod,
|
|
954
|
-
erSmoothPeriod: Number.isFinite(erSmoothPeriod) ? erSmoothPeriod : 0,
|
|
955
944
|
value: Number.isFinite(value) ? value : null,
|
|
956
945
|
ok: Number.isFinite(value),
|
|
957
946
|
}];
|
|
@@ -1008,17 +997,18 @@ async function fetchNativeTradesSince(poolId, sinceMs, pageLimit, maxPages) {
|
|
|
1008
997
|
};
|
|
1009
998
|
}
|
|
1010
999
|
function nativeHistoryRowToTrade(row) {
|
|
1011
|
-
const
|
|
1000
|
+
const r = row;
|
|
1001
|
+
const tsMs = parseChainTimeToMs(r?.time || r?.op?.block_time);
|
|
1012
1002
|
if (!Number.isFinite(tsMs))
|
|
1013
1003
|
return null;
|
|
1014
|
-
const opPayload = Array.isArray(
|
|
1015
|
-
const resultPayload = Array.isArray(
|
|
1004
|
+
const opPayload = (Array.isArray(r?.op?.op) ? r.op.op[1] : null);
|
|
1005
|
+
const resultPayload = (Array.isArray(r?.op?.result) ? r.op.result[1] : null);
|
|
1016
1006
|
const received = Array.isArray(resultPayload?.received)
|
|
1017
1007
|
? resultPayload.received[0]
|
|
1018
1008
|
: (resultPayload?.received || null);
|
|
1019
1009
|
if (!opPayload?.amount_to_sell || !received)
|
|
1020
1010
|
return null;
|
|
1021
|
-
const sequence = Number(
|
|
1011
|
+
const sequence = Number(r?.sequence);
|
|
1022
1012
|
return {
|
|
1023
1013
|
tsMs,
|
|
1024
1014
|
sequence: Number.isFinite(sequence) ? sequence : null,
|
|
@@ -1084,6 +1074,8 @@ async function fetchNativeTradesUntilOverlap(poolId, overlapSequences, minOverla
|
|
|
1084
1074
|
};
|
|
1085
1075
|
}
|
|
1086
1076
|
async function fetchNativeMarketHistorySince(assetA, assetB, sinceMs, untilMs, intervalSeconds, options = {}) {
|
|
1077
|
+
const a = assetA;
|
|
1078
|
+
const b = assetB;
|
|
1087
1079
|
const { BitShares } = getBitsharesClient();
|
|
1088
1080
|
if (!BitShares) {
|
|
1089
1081
|
throw new Error('BitShares client unavailable');
|
|
@@ -1092,22 +1084,22 @@ async function fetchNativeMarketHistorySince(assetA, assetB, sinceMs, untilMs, i
|
|
|
1092
1084
|
const stopDate = new Date(Number.isFinite(untilMs) ? untilMs : Date.now());
|
|
1093
1085
|
let history = null;
|
|
1094
1086
|
if (typeof BitShares.history?.getMarketHistory === 'function') {
|
|
1095
|
-
history = await BitShares.history.getMarketHistory(
|
|
1087
|
+
history = await BitShares.history.getMarketHistory(b.id, a.id, intervalSeconds, startDate.toISOString().slice(0, -5), stopDate.toISOString().slice(0, -5));
|
|
1096
1088
|
}
|
|
1097
1089
|
else if (typeof BitShares.tradeHistory === 'function') {
|
|
1098
|
-
history = await BitShares.tradeHistory(
|
|
1090
|
+
history = await BitShares.tradeHistory(b.symbol || b.id, a.symbol || a.id, startDate, stopDate, intervalSeconds);
|
|
1099
1091
|
}
|
|
1100
1092
|
else {
|
|
1101
1093
|
throw new Error('native market history source unavailable');
|
|
1102
1094
|
}
|
|
1103
|
-
let candles = normalizeNativeMarketHistoryCandles(history,
|
|
1095
|
+
let candles = normalizeNativeMarketHistoryCandles(history, a, b);
|
|
1104
1096
|
if (candles.length > 0 && typeof options.fillCandleGaps === 'function') {
|
|
1105
1097
|
candles = options.fillCandleGaps(candles, intervalSeconds);
|
|
1106
1098
|
}
|
|
1107
1099
|
return candles;
|
|
1108
1100
|
}
|
|
1109
1101
|
function writeGridResetTrigger(bot, payload) {
|
|
1110
|
-
const triggerPath = getRecalculateTriggerFile(bot.botKey);
|
|
1102
|
+
const triggerPath = getRecalculateTriggerFile(String(bot.botKey));
|
|
1111
1103
|
const content = {
|
|
1112
1104
|
createdAt: new Date().toISOString(),
|
|
1113
1105
|
source: MARKET_ADAPTER_SOURCE,
|
|
@@ -1155,6 +1147,7 @@ function writeBotDynamicGrid(botKey, gridCenterPrice, options = {}) {
|
|
|
1155
1147
|
return target;
|
|
1156
1148
|
};
|
|
1157
1149
|
const result = updateDynamicGridSnapshotSync(filePath, (previousSnapshot) => {
|
|
1150
|
+
const previous = previousSnapshot;
|
|
1158
1151
|
const amaCenterPrice = Number(options.amaCenterPrice);
|
|
1159
1152
|
const resolvedGridCenterPrice = Number.isFinite(Number(gridCenterPrice))
|
|
1160
1153
|
? roundTo(Number(gridCenterPrice), 1e8)
|
|
@@ -1182,7 +1175,7 @@ function writeBotDynamicGrid(botKey, gridCenterPrice, options = {}) {
|
|
|
1182
1175
|
if (Number.isFinite(Number(options.amaSlopeThresholdPercent))) {
|
|
1183
1176
|
payload.amaSlopeThresholdPercent = Number(options.amaSlopeThresholdPercent);
|
|
1184
1177
|
}
|
|
1185
|
-
preserveGridResetMetadata(payload,
|
|
1178
|
+
preserveGridResetMetadata(payload, previous);
|
|
1186
1179
|
if (options.dynamicWeights && typeof options.dynamicWeights === 'object') {
|
|
1187
1180
|
payload.dynamicWeights = options.dynamicWeights;
|
|
1188
1181
|
}
|
|
@@ -1273,9 +1266,10 @@ function mergeGridResetMetadataFromDynamicGrid(state) {
|
|
|
1273
1266
|
return state;
|
|
1274
1267
|
}
|
|
1275
1268
|
const bots = state.bots;
|
|
1276
|
-
for (const [botKey,
|
|
1277
|
-
if (!
|
|
1269
|
+
for (const [botKey, rawBotState] of Object.entries(bots)) {
|
|
1270
|
+
if (!rawBotState || typeof rawBotState !== 'object')
|
|
1278
1271
|
continue;
|
|
1272
|
+
const botState = rawBotState;
|
|
1279
1273
|
const snapshotPath = path.join(ORDERS_DIR, `${botKey}.dynamicgrid.json`);
|
|
1280
1274
|
let snapshot;
|
|
1281
1275
|
try {
|
|
@@ -1334,7 +1328,7 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1334
1328
|
// instead of the full signal block (which would print n/a for
|
|
1335
1329
|
// every field and bury the hourly cycle in noise).
|
|
1336
1330
|
if (r.source === 'off-hour-skip') {
|
|
1337
|
-
log(cfg, `skip (no new closed candle, last processed ${Number.isFinite(r.lastClosedCandleTs) ? new Date(r.lastClosedCandleTs).toISOString() : 'n/a'})`);
|
|
1331
|
+
log(cfg, `skip (no new closed candle, last processed ${Number.isFinite(r.lastClosedCandleTs) ? new Date(Number(r.lastClosedCandleTs)).toISOString() : 'n/a'})`);
|
|
1338
1332
|
results.push({
|
|
1339
1333
|
botName: bot.name,
|
|
1340
1334
|
botKey: bot.botKey,
|
|
@@ -1342,18 +1336,18 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1342
1336
|
});
|
|
1343
1337
|
continue;
|
|
1344
1338
|
}
|
|
1345
|
-
const amaText = Number.isFinite(r.amaPrice) ? r.amaPrice.toFixed(8) : 'n/a';
|
|
1346
|
-
const prevCenterText = Number.isFinite(r.previousCenterPrice) ? r.previousCenterPrice.toFixed(8) : 'n/a';
|
|
1347
|
-
const deltaText = Number.isFinite(r.deltaPercent) ? `${r.deltaPercent.toFixed(3)}%` : 'n/a';
|
|
1348
|
-
const thresholdText = Number.isFinite(r.thresholdPercent) ? `${r.thresholdPercent.toFixed(3)}%` : 'n/a';
|
|
1339
|
+
const amaText = Number.isFinite(r.amaPrice) ? Number(r.amaPrice).toFixed(8) : 'n/a';
|
|
1340
|
+
const prevCenterText = Number.isFinite(r.previousCenterPrice) ? Number(r.previousCenterPrice).toFixed(8) : 'n/a';
|
|
1341
|
+
const deltaText = Number.isFinite(r.deltaPercent) ? `${Number(r.deltaPercent).toFixed(3)}%` : 'n/a';
|
|
1342
|
+
const thresholdText = Number.isFinite(r.thresholdPercent) ? `${Number(r.thresholdPercent).toFixed(3)}%` : 'n/a';
|
|
1349
1343
|
const offText = r.weights?.meta?.finalOffset != null ? ` off=${r.weights.meta.finalOffset.toFixed(3)}` : '';
|
|
1350
1344
|
const amaOffText = r.amaSlope?.amaSlopeGated != null ? ` (amaOff=${r.amaSlope.amaSlopeGated.toFixed(3)})` : '';
|
|
1351
1345
|
const regimeText = r.amaSlope?.regimeMultiplier != null ? ` regime=${r.amaSlope.regimeMultiplier.toFixed(2)}` : '';
|
|
1352
1346
|
const staleText = r.staleData ? ` STALE` : '';
|
|
1353
|
-
const patchText = Number
|
|
1354
|
-
const backfillText = Number
|
|
1355
|
-
const gapText = Number
|
|
1356
|
-
const trigText = r.triggered ? ` TRIGGERED -> ${r.triggerPath ? path.relative(ROOT, r.triggerPath) : '[suppressed, dry-run]'}` : '';
|
|
1347
|
+
const patchText = Number(r.kibanaGapRepairCount) > 0 ? ` KIBANA_PATCH(${r.kibanaGapRepairCount})` : '';
|
|
1348
|
+
const backfillText = Number(r.kibanaBackfillCount) > 0 ? ` BACKFILL(${r.kibanaBackfillCount})` : '';
|
|
1349
|
+
const gapText = Number(r.unresolvedGapCount) > 0 ? ` GAPS(${r.unresolvedGapCount})` : '';
|
|
1350
|
+
const trigText = r.triggered ? ` TRIGGERED -> ${r.triggerPath ? path.relative(ROOT, String(r.triggerPath)) : '[suppressed, dry-run]'}` : '';
|
|
1357
1351
|
const pendingText = r.pendingClosedCandle ? ' WAITING_FOR_CLOSED_CANDLE' : '';
|
|
1358
1352
|
const weightText = buildWeightSummary(r.weights);
|
|
1359
1353
|
const trendText = r.amaSlope?.trend ? ` trend=${r.amaSlope.trend}` : '';
|
|
@@ -1361,9 +1355,9 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1361
1355
|
? ` WARMUP_INSUFFICIENT(used=${r.analysisCandleCount}${Number.isFinite(r.analysisKeepCount) ? `/${r.analysisKeepCount}` : ''})`
|
|
1362
1356
|
: '';
|
|
1363
1357
|
const isOneHourResult = Number(r.intervalSeconds) === RUNTIME_DEFAULTS.intervalSeconds;
|
|
1364
|
-
const closedTsText = isOneHourResult && Number.isFinite(r.lastClosedCandleTs) ? ` closed=${new Date(r.lastClosedCandleTs).toISOString()}` : '';
|
|
1365
|
-
const rawTsText = isOneHourResult && Number.isFinite(r.rawLastCandleTs) ? ` rawLast=${new Date(r.rawLastCandleTs).toISOString()}` : '';
|
|
1366
|
-
const closeText = isOneHourResult && Number.isFinite(r.lastClosedCandleClose) ? ` close=${r.lastClosedCandleClose.toFixed(8)}` : '';
|
|
1358
|
+
const closedTsText = isOneHourResult && Number.isFinite(r.lastClosedCandleTs) ? ` closed=${new Date(Number(r.lastClosedCandleTs)).toISOString()}` : '';
|
|
1359
|
+
const rawTsText = isOneHourResult && Number.isFinite(r.rawLastCandleTs) ? ` rawLast=${new Date(Number(r.rawLastCandleTs)).toISOString()}` : '';
|
|
1360
|
+
const closeText = isOneHourResult && Number.isFinite(r.lastClosedCandleClose) ? ` close=${Number(r.lastClosedCandleClose).toFixed(8)}` : '';
|
|
1367
1361
|
const rawCountText = Number.isFinite(r.candleCount)
|
|
1368
1362
|
? ` raw=${r.candleCount}${Number.isFinite(r.rawKeepCount) ? `/${r.rawKeepCount}` : ''}`
|
|
1369
1363
|
: '';
|
|
@@ -1402,8 +1396,7 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1402
1396
|
if (Array.isArray(r.amaComparison) && r.amaComparison.length > 0) {
|
|
1403
1397
|
const parts = r.amaComparison.map((a) => {
|
|
1404
1398
|
const val = Number.isFinite(a.value) ? a.value.toFixed(8) : 'n/a';
|
|
1405
|
-
|
|
1406
|
-
return `${a.name}[${a.erPeriod}/${a.fastPeriod}/${a.slowPeriod}${erSmoothText}]=${val}`;
|
|
1399
|
+
return `${a.name}[${a.erPeriod}/${a.fastPeriod}/${a.slowPeriod}]=${val}`;
|
|
1407
1400
|
});
|
|
1408
1401
|
log(cfg, ` AMA active: ${parts.join(' | ')}`);
|
|
1409
1402
|
}
|
|
@@ -1444,11 +1437,11 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1444
1437
|
triggeredBots: results.filter((r) => r.ok && r.triggered).length,
|
|
1445
1438
|
staleBots: results.filter((r) => r.ok && r.staleData).length,
|
|
1446
1439
|
kibanaPatchedBots: results.filter((r) => r.ok && Number(r.kibanaGapRepairCount) > 0).length,
|
|
1447
|
-
kibanaPatchedCandles: results.reduce((sum, r) => sum + (r.ok && Number.isFinite(r.kibanaGapRepairCount) ? r.kibanaGapRepairCount : 0), 0),
|
|
1440
|
+
kibanaPatchedCandles: results.reduce((sum, r) => sum + (r.ok && Number.isFinite(r.kibanaGapRepairCount) ? Number(r.kibanaGapRepairCount) : 0), 0),
|
|
1448
1441
|
kibanaBackfilledBots: results.filter((r) => r.ok && Number(r.kibanaBackfillCount) > 0).length,
|
|
1449
|
-
kibanaBackfilledCandles: results.reduce((sum, r) => sum + (r.ok && Number.isFinite(r.kibanaBackfillCount) ? r.kibanaBackfillCount : 0), 0),
|
|
1442
|
+
kibanaBackfilledCandles: results.reduce((sum, r) => sum + (r.ok && Number.isFinite(r.kibanaBackfillCount) ? Number(r.kibanaBackfillCount) : 0), 0),
|
|
1450
1443
|
unresolvedGapBots: results.filter((r) => r.ok && Number(r.unresolvedGapCount) > 0).length,
|
|
1451
|
-
unresolvedGapCandles: results.reduce((sum, r) => sum + (r.ok && Number.isFinite(r.unresolvedGapCount) ? r.unresolvedGapCount : 0), 0),
|
|
1444
|
+
unresolvedGapCandles: results.reduce((sum, r) => sum + (r.ok && Number.isFinite(r.unresolvedGapCount) ? Number(r.unresolvedGapCount) : 0), 0),
|
|
1452
1445
|
};
|
|
1453
1446
|
state.meta.metrics = metrics;
|
|
1454
1447
|
mergeGridResetMetadataFromDynamicGrid(state);
|
|
@@ -1541,7 +1534,8 @@ async function main() {
|
|
|
1541
1534
|
try {
|
|
1542
1535
|
activeAmaBotKeys = loadActiveBots()
|
|
1543
1536
|
.filter((bot) => usesAmaGridPrice(bot))
|
|
1544
|
-
.map((bot) => bot.botKey)
|
|
1537
|
+
.map((bot) => bot.botKey)
|
|
1538
|
+
.filter((k) => typeof k === 'string');
|
|
1545
1539
|
}
|
|
1546
1540
|
catch (_) {
|
|
1547
1541
|
activeAmaBotKeys = null;
|
|
@@ -1580,7 +1574,7 @@ async function main() {
|
|
|
1580
1574
|
}
|
|
1581
1575
|
}
|
|
1582
1576
|
if (lastErr) {
|
|
1583
|
-
logger.error(`Fatal: BitShares connection failed after ${maxRetries} attempts: ${lastErr
|
|
1577
|
+
logger.error(`Fatal: BitShares connection failed after ${maxRetries} attempts: ${getErrorMessage(lastErr)}`);
|
|
1584
1578
|
return 1;
|
|
1585
1579
|
}
|
|
1586
1580
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
declare function connectClient(servers:
|
|
1
|
+
declare function connectClient(servers: unknown): Promise<void>;
|
|
2
2
|
declare function disconnectClient(): void;
|
|
3
|
-
declare function isConnected():
|
|
4
|
-
declare function getNodeUrl():
|
|
3
|
+
declare function isConnected(): boolean;
|
|
4
|
+
declare function getNodeUrl(): string | null;
|
|
5
5
|
declare const BitShares: {
|
|
6
6
|
db: {};
|
|
7
7
|
history: {};
|
|
@@ -54,12 +54,12 @@ function _call(api, method, args) {
|
|
|
54
54
|
const BitShares = {
|
|
55
55
|
db: new Proxy({}, {
|
|
56
56
|
get(_target, method) {
|
|
57
|
-
return (...args) => _call('db', method, args);
|
|
57
|
+
return (...args) => _call('db', String(method), args);
|
|
58
58
|
},
|
|
59
59
|
}),
|
|
60
60
|
history: new Proxy({}, {
|
|
61
61
|
get(_target, method) {
|
|
62
|
-
return (...args) => _call('history', method, args);
|
|
62
|
+
return (...args) => _call('history', String(method), args);
|
|
63
63
|
},
|
|
64
64
|
}),
|
|
65
65
|
};
|
|
@@ -1,6 +1,13 @@
|
|
|
1
|
+
import type { UnknownRecord } from '../../modules/types.js';
|
|
2
|
+
interface AtomicWriteOptions {
|
|
3
|
+
mode?: number;
|
|
4
|
+
fsync?: boolean;
|
|
5
|
+
tmpPrefix?: string;
|
|
6
|
+
flag?: 'w' | 'wx';
|
|
7
|
+
}
|
|
1
8
|
/**
|
|
2
9
|
* Write JSON atomically via the unified StorageAdapter.
|
|
3
10
|
*/
|
|
4
|
-
declare function writeJsonAtomic(targetPath:
|
|
11
|
+
declare function writeJsonAtomic(targetPath: string, data: UnknownRecord, options?: AtomicWriteOptions): void;
|
|
5
12
|
export { writeJsonAtomic };
|
|
6
13
|
//# sourceMappingURL=atomic_write.d.ts.map
|
|
@@ -1,46 +1,55 @@
|
|
|
1
1
|
import { normalizeAssetSymbol } from '../../modules/utils/asset_symbols.js';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
declare function normalizeMarketSource(raw: any): "pool" | "book" | null;
|
|
15
|
-
declare function hasNumericStartPrice(raw: any): boolean;
|
|
16
|
-
declare function resolveMarketSourceForBot(bot: any): "pool" | "book" | null;
|
|
17
|
-
declare function normalizePoolId(id: any): string | null;
|
|
18
|
-
declare function resolveBotContext(bot: any): Promise<{
|
|
19
|
-
assetA: {
|
|
20
|
-
id: any;
|
|
21
|
-
precision: any;
|
|
22
|
-
symbol: any;
|
|
23
|
-
};
|
|
24
|
-
assetB: {
|
|
25
|
-
id: any;
|
|
26
|
-
precision: any;
|
|
27
|
-
symbol: any;
|
|
28
|
-
};
|
|
29
|
-
poolId: null;
|
|
30
|
-
marketSource: null;
|
|
31
|
-
} | {
|
|
32
|
-
assetA: {
|
|
33
|
-
id: any;
|
|
34
|
-
precision: any;
|
|
35
|
-
symbol: any;
|
|
36
|
-
};
|
|
37
|
-
assetB: {
|
|
38
|
-
id: any;
|
|
39
|
-
precision: any;
|
|
40
|
-
symbol: any;
|
|
2
|
+
import type { UnknownRecord } from '../../modules/types.js';
|
|
3
|
+
/** A dynamic JSON-RPC proxy: any method returns a promise of an unknown result. */
|
|
4
|
+
interface RpcProxy {
|
|
5
|
+
[method: string]: (...args: unknown[]) => Promise<unknown>;
|
|
6
|
+
}
|
|
7
|
+
/** The read-only BitShares client shape this module consumes. */
|
|
8
|
+
interface RpcClient {
|
|
9
|
+
BitShares: {
|
|
10
|
+
db: RpcProxy;
|
|
11
|
+
history: RpcProxy;
|
|
12
|
+
tradeHistory?: (...args: unknown[]) => Promise<unknown>;
|
|
13
|
+
[method: string]: unknown;
|
|
41
14
|
};
|
|
15
|
+
}
|
|
16
|
+
/** The adapter_client module shape (superset of {@link RpcClient}). */
|
|
17
|
+
interface BitsharesClient extends RpcClient {
|
|
18
|
+
connectClient: (servers?: string[]) => Promise<unknown>;
|
|
19
|
+
disconnectClient: () => unknown;
|
|
20
|
+
[key: string]: unknown;
|
|
21
|
+
}
|
|
22
|
+
/** Resolved asset identity used by the pool/context helpers. */
|
|
23
|
+
export interface ResolvedAsset {
|
|
24
|
+
id: string;
|
|
25
|
+
precision: number;
|
|
26
|
+
symbol: string;
|
|
27
|
+
}
|
|
28
|
+
interface PoolObject extends UnknownRecord {
|
|
29
|
+
id?: string;
|
|
30
|
+
}
|
|
31
|
+
interface FindPoolOptions {
|
|
32
|
+
bitsharesClient?: RpcClient;
|
|
33
|
+
sortBy?: 'totalBalance' | 'assetABalance';
|
|
34
|
+
}
|
|
35
|
+
declare function getBitsharesClient(): BitsharesClient;
|
|
36
|
+
declare function setBitsharesClientForTests(client: BitsharesClient | null): void;
|
|
37
|
+
declare function resolveAsset(symbol: unknown, bitsharesClient?: RpcClient | null): Promise<ResolvedAsset>;
|
|
38
|
+
declare function findPoolByAssets(assetAId: string, assetBId: string, options?: FindPoolOptions): Promise<PoolObject>;
|
|
39
|
+
declare function isExactPair(a: unknown, b: unknown, targetA: unknown, targetB: unknown): boolean;
|
|
40
|
+
declare function isSamePair(a: unknown, b: unknown, targetA: unknown, targetB: unknown): boolean;
|
|
41
|
+
declare function isExactPairIds(aId: unknown, bId: unknown, targetAId: unknown, targetBId: unknown): boolean;
|
|
42
|
+
declare function isSamePairIds(aId: unknown, bId: unknown, targetAId: unknown, targetBId: unknown): boolean;
|
|
43
|
+
declare function normalizeMarketSource(raw: unknown): 'pool' | 'book' | null;
|
|
44
|
+
declare function hasNumericStartPrice(raw: unknown): boolean;
|
|
45
|
+
declare function resolveMarketSourceForBot(bot: unknown): 'pool' | 'book' | null;
|
|
46
|
+
declare function normalizePoolId(id: unknown): string | null;
|
|
47
|
+
export interface ResolvedBotContext {
|
|
48
|
+
assetA: ResolvedAsset;
|
|
49
|
+
assetB: ResolvedAsset;
|
|
42
50
|
poolId: string | null;
|
|
43
|
-
marketSource:
|
|
44
|
-
}
|
|
51
|
+
marketSource: 'pool' | 'book' | null;
|
|
52
|
+
}
|
|
53
|
+
declare function resolveBotContext(bot: UnknownRecord): Promise<ResolvedBotContext>;
|
|
45
54
|
export { resolveAsset, findPoolByAssets, normalizeAssetSymbol, normalizeMarketSource, normalizePoolId, hasNumericStartPrice, resolveMarketSourceForBot, resolveBotContext, isExactPair, isSamePair, isExactPairIds, isSamePairIds, getBitsharesClient, setBitsharesClientForTests };
|
|
46
55
|
//# sourceMappingURL=chain.d.ts.map
|