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
|
@@ -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,7 +341,8 @@ function findAmaProfileForBot(bot, ctx) {
|
|
|
334
341
|
})[0] || null;
|
|
335
342
|
}
|
|
336
343
|
function getAmaPresetForKey(key, profile) {
|
|
337
|
-
|
|
344
|
+
const amas = profile?.amas;
|
|
345
|
+
return normalizeAmaPreset(amas?.[key]) || normalizeAmaPreset(BUILTIN_AMAS[key]) || null;
|
|
338
346
|
}
|
|
339
347
|
function getAmaFromProfilesForBot(bot, ctx, cfg) {
|
|
340
348
|
const selected = resolveAmaPresetForBot(bot, ctx, cfg);
|
|
@@ -598,7 +606,7 @@ function withRetries(fn, attempts, baseDelayMs, label) {
|
|
|
598
606
|
await sleep(waitMs);
|
|
599
607
|
}
|
|
600
608
|
}
|
|
601
|
-
const msg = label ? `${label}: ${lastErr
|
|
609
|
+
const msg = label ? `${label}: ${getErrorMessage(lastErr) || 'unknown error'}` : (getErrorMessage(lastErr) || 'unknown error');
|
|
602
610
|
throw new Error(msg);
|
|
603
611
|
})();
|
|
604
612
|
}
|
|
@@ -817,8 +825,10 @@ function calculateBotThreshold(cfg) {
|
|
|
817
825
|
return Number.isFinite(value) && value > 0 ? value : null;
|
|
818
826
|
}
|
|
819
827
|
function computeCandleStaleness(lastCandleTs, maxStaleHours) {
|
|
820
|
-
const
|
|
821
|
-
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);
|
|
822
832
|
const staleAgeHours = Number.isFinite(staleAgeMs) ? (staleAgeMs / 3600000) : null;
|
|
823
833
|
return { staleData, staleAgeHours };
|
|
824
834
|
}
|
|
@@ -846,7 +856,9 @@ function computeCandleStaleness(lastCandleTs, maxStaleHours) {
|
|
|
846
856
|
* work on `usesAmaGridPrice(bot)`.
|
|
847
857
|
*/
|
|
848
858
|
function resolveAmaForBot(bot, ctx = null, cfg = null) {
|
|
849
|
-
const raw = (bot && typeof bot.ama === 'object' && bot.ama !== null)
|
|
859
|
+
const raw = (bot && typeof bot.ama === 'object' && bot.ama !== null)
|
|
860
|
+
? bot.ama
|
|
861
|
+
: {};
|
|
850
862
|
const fromProfiles = getAmaFromProfilesForBot(bot, ctx, cfg);
|
|
851
863
|
if (fromProfiles)
|
|
852
864
|
return fromProfiles;
|
|
@@ -916,15 +928,16 @@ function pruneCandles(candles, keepCount) {
|
|
|
916
928
|
* persisted state for backwards compatibility with existing snapshots.
|
|
917
929
|
*/
|
|
918
930
|
function buildAmaRecord(botAma, amaPrice) {
|
|
919
|
-
const
|
|
920
|
-
const
|
|
921
|
-
const
|
|
931
|
+
const a = botAma;
|
|
932
|
+
const erPeriod = Number(a?.erPeriod);
|
|
933
|
+
const fastPeriod = Number(a?.fastPeriod);
|
|
934
|
+
const slowPeriod = Number(a?.slowPeriod);
|
|
922
935
|
if (!Number.isFinite(erPeriod) || !Number.isFinite(fastPeriod) || !Number.isFinite(slowPeriod)) {
|
|
923
936
|
return [];
|
|
924
937
|
}
|
|
925
938
|
const value = Number(amaPrice);
|
|
926
939
|
return [{
|
|
927
|
-
name: String(
|
|
940
|
+
name: String(a?.name || 'active'),
|
|
928
941
|
erPeriod,
|
|
929
942
|
fastPeriod,
|
|
930
943
|
slowPeriod,
|
|
@@ -984,17 +997,18 @@ async function fetchNativeTradesSince(poolId, sinceMs, pageLimit, maxPages) {
|
|
|
984
997
|
};
|
|
985
998
|
}
|
|
986
999
|
function nativeHistoryRowToTrade(row) {
|
|
987
|
-
const
|
|
1000
|
+
const r = row;
|
|
1001
|
+
const tsMs = parseChainTimeToMs(r?.time || r?.op?.block_time);
|
|
988
1002
|
if (!Number.isFinite(tsMs))
|
|
989
1003
|
return null;
|
|
990
|
-
const opPayload = Array.isArray(
|
|
991
|
-
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);
|
|
992
1006
|
const received = Array.isArray(resultPayload?.received)
|
|
993
1007
|
? resultPayload.received[0]
|
|
994
1008
|
: (resultPayload?.received || null);
|
|
995
1009
|
if (!opPayload?.amount_to_sell || !received)
|
|
996
1010
|
return null;
|
|
997
|
-
const sequence = Number(
|
|
1011
|
+
const sequence = Number(r?.sequence);
|
|
998
1012
|
return {
|
|
999
1013
|
tsMs,
|
|
1000
1014
|
sequence: Number.isFinite(sequence) ? sequence : null,
|
|
@@ -1060,6 +1074,8 @@ async function fetchNativeTradesUntilOverlap(poolId, overlapSequences, minOverla
|
|
|
1060
1074
|
};
|
|
1061
1075
|
}
|
|
1062
1076
|
async function fetchNativeMarketHistorySince(assetA, assetB, sinceMs, untilMs, intervalSeconds, options = {}) {
|
|
1077
|
+
const a = assetA;
|
|
1078
|
+
const b = assetB;
|
|
1063
1079
|
const { BitShares } = getBitsharesClient();
|
|
1064
1080
|
if (!BitShares) {
|
|
1065
1081
|
throw new Error('BitShares client unavailable');
|
|
@@ -1068,22 +1084,22 @@ async function fetchNativeMarketHistorySince(assetA, assetB, sinceMs, untilMs, i
|
|
|
1068
1084
|
const stopDate = new Date(Number.isFinite(untilMs) ? untilMs : Date.now());
|
|
1069
1085
|
let history = null;
|
|
1070
1086
|
if (typeof BitShares.history?.getMarketHistory === 'function') {
|
|
1071
|
-
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));
|
|
1072
1088
|
}
|
|
1073
1089
|
else if (typeof BitShares.tradeHistory === 'function') {
|
|
1074
|
-
history = await BitShares.tradeHistory(
|
|
1090
|
+
history = await BitShares.tradeHistory(b.symbol || b.id, a.symbol || a.id, startDate, stopDate, intervalSeconds);
|
|
1075
1091
|
}
|
|
1076
1092
|
else {
|
|
1077
1093
|
throw new Error('native market history source unavailable');
|
|
1078
1094
|
}
|
|
1079
|
-
let candles = normalizeNativeMarketHistoryCandles(history,
|
|
1095
|
+
let candles = normalizeNativeMarketHistoryCandles(history, a, b);
|
|
1080
1096
|
if (candles.length > 0 && typeof options.fillCandleGaps === 'function') {
|
|
1081
1097
|
candles = options.fillCandleGaps(candles, intervalSeconds);
|
|
1082
1098
|
}
|
|
1083
1099
|
return candles;
|
|
1084
1100
|
}
|
|
1085
1101
|
function writeGridResetTrigger(bot, payload) {
|
|
1086
|
-
const triggerPath = getRecalculateTriggerFile(bot.botKey);
|
|
1102
|
+
const triggerPath = getRecalculateTriggerFile(String(bot.botKey));
|
|
1087
1103
|
const content = {
|
|
1088
1104
|
createdAt: new Date().toISOString(),
|
|
1089
1105
|
source: MARKET_ADAPTER_SOURCE,
|
|
@@ -1131,6 +1147,7 @@ function writeBotDynamicGrid(botKey, gridCenterPrice, options = {}) {
|
|
|
1131
1147
|
return target;
|
|
1132
1148
|
};
|
|
1133
1149
|
const result = updateDynamicGridSnapshotSync(filePath, (previousSnapshot) => {
|
|
1150
|
+
const previous = previousSnapshot;
|
|
1134
1151
|
const amaCenterPrice = Number(options.amaCenterPrice);
|
|
1135
1152
|
const resolvedGridCenterPrice = Number.isFinite(Number(gridCenterPrice))
|
|
1136
1153
|
? roundTo(Number(gridCenterPrice), 1e8)
|
|
@@ -1158,7 +1175,7 @@ function writeBotDynamicGrid(botKey, gridCenterPrice, options = {}) {
|
|
|
1158
1175
|
if (Number.isFinite(Number(options.amaSlopeThresholdPercent))) {
|
|
1159
1176
|
payload.amaSlopeThresholdPercent = Number(options.amaSlopeThresholdPercent);
|
|
1160
1177
|
}
|
|
1161
|
-
preserveGridResetMetadata(payload,
|
|
1178
|
+
preserveGridResetMetadata(payload, previous);
|
|
1162
1179
|
if (options.dynamicWeights && typeof options.dynamicWeights === 'object') {
|
|
1163
1180
|
payload.dynamicWeights = options.dynamicWeights;
|
|
1164
1181
|
}
|
|
@@ -1249,9 +1266,10 @@ function mergeGridResetMetadataFromDynamicGrid(state) {
|
|
|
1249
1266
|
return state;
|
|
1250
1267
|
}
|
|
1251
1268
|
const bots = state.bots;
|
|
1252
|
-
for (const [botKey,
|
|
1253
|
-
if (!
|
|
1269
|
+
for (const [botKey, rawBotState] of Object.entries(bots)) {
|
|
1270
|
+
if (!rawBotState || typeof rawBotState !== 'object')
|
|
1254
1271
|
continue;
|
|
1272
|
+
const botState = rawBotState;
|
|
1255
1273
|
const snapshotPath = path.join(ORDERS_DIR, `${botKey}.dynamicgrid.json`);
|
|
1256
1274
|
let snapshot;
|
|
1257
1275
|
try {
|
|
@@ -1310,7 +1328,7 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1310
1328
|
// instead of the full signal block (which would print n/a for
|
|
1311
1329
|
// every field and bury the hourly cycle in noise).
|
|
1312
1330
|
if (r.source === 'off-hour-skip') {
|
|
1313
|
-
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'})`);
|
|
1314
1332
|
results.push({
|
|
1315
1333
|
botName: bot.name,
|
|
1316
1334
|
botKey: bot.botKey,
|
|
@@ -1318,18 +1336,18 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1318
1336
|
});
|
|
1319
1337
|
continue;
|
|
1320
1338
|
}
|
|
1321
|
-
const amaText = Number.isFinite(r.amaPrice) ? r.amaPrice.toFixed(8) : 'n/a';
|
|
1322
|
-
const prevCenterText = Number.isFinite(r.previousCenterPrice) ? r.previousCenterPrice.toFixed(8) : 'n/a';
|
|
1323
|
-
const deltaText = Number.isFinite(r.deltaPercent) ? `${r.deltaPercent.toFixed(3)}%` : 'n/a';
|
|
1324
|
-
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';
|
|
1325
1343
|
const offText = r.weights?.meta?.finalOffset != null ? ` off=${r.weights.meta.finalOffset.toFixed(3)}` : '';
|
|
1326
1344
|
const amaOffText = r.amaSlope?.amaSlopeGated != null ? ` (amaOff=${r.amaSlope.amaSlopeGated.toFixed(3)})` : '';
|
|
1327
1345
|
const regimeText = r.amaSlope?.regimeMultiplier != null ? ` regime=${r.amaSlope.regimeMultiplier.toFixed(2)}` : '';
|
|
1328
1346
|
const staleText = r.staleData ? ` STALE` : '';
|
|
1329
|
-
const patchText = Number
|
|
1330
|
-
const backfillText = Number
|
|
1331
|
-
const gapText = Number
|
|
1332
|
-
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]'}` : '';
|
|
1333
1351
|
const pendingText = r.pendingClosedCandle ? ' WAITING_FOR_CLOSED_CANDLE' : '';
|
|
1334
1352
|
const weightText = buildWeightSummary(r.weights);
|
|
1335
1353
|
const trendText = r.amaSlope?.trend ? ` trend=${r.amaSlope.trend}` : '';
|
|
@@ -1337,9 +1355,9 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1337
1355
|
? ` WARMUP_INSUFFICIENT(used=${r.analysisCandleCount}${Number.isFinite(r.analysisKeepCount) ? `/${r.analysisKeepCount}` : ''})`
|
|
1338
1356
|
: '';
|
|
1339
1357
|
const isOneHourResult = Number(r.intervalSeconds) === RUNTIME_DEFAULTS.intervalSeconds;
|
|
1340
|
-
const closedTsText = isOneHourResult && Number.isFinite(r.lastClosedCandleTs) ? ` closed=${new Date(r.lastClosedCandleTs).toISOString()}` : '';
|
|
1341
|
-
const rawTsText = isOneHourResult && Number.isFinite(r.rawLastCandleTs) ? ` rawLast=${new Date(r.rawLastCandleTs).toISOString()}` : '';
|
|
1342
|
-
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)}` : '';
|
|
1343
1361
|
const rawCountText = Number.isFinite(r.candleCount)
|
|
1344
1362
|
? ` raw=${r.candleCount}${Number.isFinite(r.rawKeepCount) ? `/${r.rawKeepCount}` : ''}`
|
|
1345
1363
|
: '';
|
|
@@ -1419,11 +1437,11 @@ async function runOnce(cfg, state, contextCache) {
|
|
|
1419
1437
|
triggeredBots: results.filter((r) => r.ok && r.triggered).length,
|
|
1420
1438
|
staleBots: results.filter((r) => r.ok && r.staleData).length,
|
|
1421
1439
|
kibanaPatchedBots: results.filter((r) => r.ok && Number(r.kibanaGapRepairCount) > 0).length,
|
|
1422
|
-
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),
|
|
1423
1441
|
kibanaBackfilledBots: results.filter((r) => r.ok && Number(r.kibanaBackfillCount) > 0).length,
|
|
1424
|
-
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),
|
|
1425
1443
|
unresolvedGapBots: results.filter((r) => r.ok && Number(r.unresolvedGapCount) > 0).length,
|
|
1426
|
-
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),
|
|
1427
1445
|
};
|
|
1428
1446
|
state.meta.metrics = metrics;
|
|
1429
1447
|
mergeGridResetMetadataFromDynamicGrid(state);
|
|
@@ -1516,7 +1534,8 @@ async function main() {
|
|
|
1516
1534
|
try {
|
|
1517
1535
|
activeAmaBotKeys = loadActiveBots()
|
|
1518
1536
|
.filter((bot) => usesAmaGridPrice(bot))
|
|
1519
|
-
.map((bot) => bot.botKey)
|
|
1537
|
+
.map((bot) => bot.botKey)
|
|
1538
|
+
.filter((k) => typeof k === 'string');
|
|
1520
1539
|
}
|
|
1521
1540
|
catch (_) {
|
|
1522
1541
|
activeAmaBotKeys = null;
|
|
@@ -1555,7 +1574,7 @@ async function main() {
|
|
|
1555
1574
|
}
|
|
1556
1575
|
}
|
|
1557
1576
|
if (lastErr) {
|
|
1558
|
-
logger.error(`Fatal: BitShares connection failed after ${maxRetries} attempts: ${lastErr
|
|
1577
|
+
logger.error(`Fatal: BitShares connection failed after ${maxRetries} attempts: ${getErrorMessage(lastErr)}`);
|
|
1559
1578
|
return 1;
|
|
1560
1579
|
}
|
|
1561
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
|
|
@@ -3,6 +3,7 @@ import { createRequire } from 'node:module';
|
|
|
3
3
|
const require = createRequire(import.meta.url);
|
|
4
4
|
import { API_LIMITS } from '../../modules/constants.js';
|
|
5
5
|
import { normalizeAssetSymbol } from '../../modules/utils/asset_symbols.js';
|
|
6
|
+
import { isUnknownRecord } from '../../modules/types.js';
|
|
6
7
|
let _bitsharesClient = null;
|
|
7
8
|
function getBitsharesClient() {
|
|
8
9
|
// lazy require to avoid circular dependencies at module load time
|
|
@@ -16,7 +17,7 @@ function setBitsharesClientForTests(client) {
|
|
|
16
17
|
}
|
|
17
18
|
async function resolveAsset(symbol, bitsharesClient = null) {
|
|
18
19
|
if (!symbol || typeof symbol !== 'string') {
|
|
19
|
-
throw new Error(`Cannot resolve asset: invalid or missing symbol "${symbol}"`);
|
|
20
|
+
throw new Error(`Cannot resolve asset: invalid or missing symbol "${String(symbol)}"`);
|
|
20
21
|
}
|
|
21
22
|
// BitShares symbols are canonical UPPERCASE; nodes answer lowercase lookups
|
|
22
23
|
// silently, so normalize here and hand the canonical symbol downstream
|
|
@@ -24,12 +25,26 @@ async function resolveAsset(symbol, bitsharesClient = null) {
|
|
|
24
25
|
const canonical = normalizeAssetSymbol(symbol);
|
|
25
26
|
const client = bitsharesClient || getBitsharesClient();
|
|
26
27
|
const results = await client.BitShares.db.lookup_asset_symbols([canonical]);
|
|
27
|
-
const asset = results
|
|
28
|
-
if (!asset
|
|
28
|
+
const asset = Array.isArray(results) ? results[0] : undefined;
|
|
29
|
+
if (!isUnknownRecord(asset) || typeof asset.id !== 'string' || typeof asset.precision !== 'number') {
|
|
29
30
|
throw new Error(`Cannot resolve asset "${canonical}": lookup failed`);
|
|
30
31
|
}
|
|
31
32
|
return { id: asset.id, precision: asset.precision, symbol: String(asset.symbol || canonical) };
|
|
32
33
|
}
|
|
34
|
+
/** Balance of `idAStr` in a pool object (both `asset_a` and `asset_ids[]` shapes). */
|
|
35
|
+
function poolBalanceFor(idAStr, p) {
|
|
36
|
+
const assetIds = Array.isArray(p.asset_ids) ? p.asset_ids : null;
|
|
37
|
+
const value = String(p.asset_a ?? assetIds?.[0] ?? '') === idAStr
|
|
38
|
+
? Number(p.balance_a)
|
|
39
|
+
: String(p.asset_b ?? assetIds?.[1] ?? '') === idAStr
|
|
40
|
+
? Number(p.balance_b)
|
|
41
|
+
: Number.NEGATIVE_INFINITY;
|
|
42
|
+
return Number.isFinite(value) ? value : Number.NEGATIVE_INFINITY;
|
|
43
|
+
}
|
|
44
|
+
/** Total liquidity of a pool object. */
|
|
45
|
+
function poolTotalBalance(p) {
|
|
46
|
+
return Number(p.balance_a ?? 0) + Number(p.balance_b ?? 0);
|
|
47
|
+
}
|
|
33
48
|
async function findPoolByAssets(assetAId, assetBId, options = {}) {
|
|
34
49
|
const client = options.bitsharesClient || getBitsharesClient();
|
|
35
50
|
const { BitShares } = client;
|
|
@@ -38,26 +53,13 @@ async function findPoolByAssets(assetAId, assetBId, options = {}) {
|
|
|
38
53
|
try {
|
|
39
54
|
const pools = await BitShares.db.get_liquidity_pools_by_both_assets(assetAId, assetBId);
|
|
40
55
|
if (Array.isArray(pools) && pools.length > 0) {
|
|
41
|
-
const valid = pools.filter(p => p
|
|
56
|
+
const valid = pools.filter((p) => isUnknownRecord(p) && Boolean(p.id));
|
|
42
57
|
if (valid.length) {
|
|
43
58
|
const idAStr = String(assetAId);
|
|
44
59
|
if (sortBy === 'assetABalance') {
|
|
45
|
-
return valid.sort((a, b) =>
|
|
46
|
-
const bal = (p) => {
|
|
47
|
-
const value = String(p.asset_a ?? p.asset_ids?.[0] ?? '') === idAStr
|
|
48
|
-
? Number(p.balance_a)
|
|
49
|
-
: String(p.asset_b ?? p.asset_ids?.[1] ?? '') === idAStr
|
|
50
|
-
? Number(p.balance_b)
|
|
51
|
-
: Number.NEGATIVE_INFINITY;
|
|
52
|
-
return Number.isFinite(value) ? value : Number.NEGATIVE_INFINITY;
|
|
53
|
-
};
|
|
54
|
-
return bal(b) - bal(a);
|
|
55
|
-
})[0];
|
|
60
|
+
return valid.slice().sort((a, b) => poolBalanceFor(idAStr, b) - poolBalanceFor(idAStr, a))[0];
|
|
56
61
|
}
|
|
57
|
-
return valid.sort((x, y) =>
|
|
58
|
-
const bal = (p) => Number(p.balance_a ?? 0) + Number(p.balance_b ?? 0);
|
|
59
|
-
return bal(y) - bal(x);
|
|
60
|
-
})[0];
|
|
62
|
+
return valid.slice().sort((x, y) => poolTotalBalance(y) - poolTotalBalance(x))[0];
|
|
61
63
|
}
|
|
62
64
|
}
|
|
63
65
|
}
|
|
@@ -80,34 +82,24 @@ async function findPoolByAssets(assetAId, assetBId, options = {}) {
|
|
|
80
82
|
break;
|
|
81
83
|
const effective = startId === '1.19.0' ? pools : pools.slice(1);
|
|
82
84
|
const matches = effective.filter((p) => {
|
|
83
|
-
|
|
85
|
+
if (!isUnknownRecord(p))
|
|
86
|
+
return false;
|
|
87
|
+
const ids = (Array.isArray(p.asset_ids) ? p.asset_ids : [p.asset_a, p.asset_b]).map(String);
|
|
84
88
|
return ids.includes(a) && ids.includes(b);
|
|
85
89
|
});
|
|
86
90
|
if (matches.length > 0) {
|
|
87
91
|
if (sortBy === 'assetABalance') {
|
|
88
92
|
const idAStr = String(assetAId);
|
|
89
|
-
return matches.sort((
|
|
90
|
-
const bal = (p) => {
|
|
91
|
-
const assetA = String(p.asset_a ?? p.asset_ids?.[0] ?? '');
|
|
92
|
-
const assetB = String(p.asset_b ?? p.asset_ids?.[1] ?? '');
|
|
93
|
-
const value = assetA === idAStr
|
|
94
|
-
? Number(p.balance_a)
|
|
95
|
-
: assetB === idAStr
|
|
96
|
-
? Number(p.balance_b)
|
|
97
|
-
: Number.NEGATIVE_INFINITY;
|
|
98
|
-
return Number.isFinite(value) ? value : Number.NEGATIVE_INFINITY;
|
|
99
|
-
};
|
|
100
|
-
return bal(b) - bal(a);
|
|
101
|
-
})[0];
|
|
93
|
+
return matches.slice().sort((x, y) => poolBalanceFor(idAStr, y) - poolBalanceFor(idAStr, x))[0];
|
|
102
94
|
}
|
|
103
|
-
return matches.sort((x, y) =>
|
|
104
|
-
const bal = (p) => Number(p.balance_a ?? 0) + Number(p.balance_b ?? 0);
|
|
105
|
-
return bal(y) - bal(x);
|
|
106
|
-
})[0];
|
|
95
|
+
return matches.slice().sort((x, y) => poolTotalBalance(y) - poolTotalBalance(x))[0];
|
|
107
96
|
}
|
|
108
97
|
if (pools.length < page)
|
|
109
98
|
break;
|
|
110
|
-
|
|
99
|
+
const last = pools[pools.length - 1];
|
|
100
|
+
if (!isUnknownRecord(last) || typeof last.id !== 'string')
|
|
101
|
+
break;
|
|
102
|
+
startId = last.id;
|
|
111
103
|
}
|
|
112
104
|
}
|
|
113
105
|
throw new Error(`No liquidity pool found for ${assetAId}/${assetBId}`);
|
|
@@ -144,9 +136,11 @@ function hasNumericStartPrice(raw) {
|
|
|
144
136
|
return typeof raw === 'number' && Number.isFinite(raw) && raw > 0;
|
|
145
137
|
}
|
|
146
138
|
function resolveMarketSourceForBot(bot) {
|
|
147
|
-
if (
|
|
139
|
+
if (!isUnknownRecord(bot))
|
|
140
|
+
return 'pool';
|
|
141
|
+
if (hasNumericStartPrice(bot.startPrice))
|
|
148
142
|
return null;
|
|
149
|
-
return normalizeMarketSource(bot
|
|
143
|
+
return normalizeMarketSource(bot.startPrice) || 'pool';
|
|
150
144
|
}
|
|
151
145
|
function normalizePoolId(id) {
|
|
152
146
|
if (id == null)
|
|
@@ -156,16 +150,16 @@ function normalizePoolId(id) {
|
|
|
156
150
|
}
|
|
157
151
|
async function resolveBotContext(bot) {
|
|
158
152
|
if (!bot.assetAId && !bot.assetA) {
|
|
159
|
-
throw new Error(`Bot "${bot.botKey}" config is missing assetA symbol or ID`);
|
|
153
|
+
throw new Error(`Bot "${String(bot.botKey)}" config is missing assetA symbol or ID`);
|
|
160
154
|
}
|
|
161
155
|
if (!bot.assetBId && !bot.assetB) {
|
|
162
|
-
throw new Error(`Bot "${bot.botKey}" config is missing assetB symbol or ID`);
|
|
156
|
+
throw new Error(`Bot "${String(bot.botKey)}" config is missing assetB symbol or ID`);
|
|
163
157
|
}
|
|
164
|
-
const assetA = bot.assetAId && Number.isFinite(bot.assetAPrecision)
|
|
165
|
-
? { id: bot.assetAId, precision: bot.assetAPrecision, symbol: bot.assetA }
|
|
158
|
+
const assetA = typeof bot.assetAId === 'string' && typeof bot.assetAPrecision === 'number' && Number.isFinite(bot.assetAPrecision)
|
|
159
|
+
? { id: bot.assetAId, precision: bot.assetAPrecision, symbol: String(bot.assetA ?? '') }
|
|
166
160
|
: await resolveAsset(bot.assetA);
|
|
167
|
-
const assetB = bot.assetBId && Number.isFinite(bot.assetBPrecision)
|
|
168
|
-
? { id: bot.assetBId, precision: bot.assetBPrecision, symbol: bot.assetB }
|
|
161
|
+
const assetB = typeof bot.assetBId === 'string' && typeof bot.assetBPrecision === 'number' && Number.isFinite(bot.assetBPrecision)
|
|
162
|
+
? { id: bot.assetBId, precision: bot.assetBPrecision, symbol: String(bot.assetB ?? '') }
|
|
169
163
|
: await resolveAsset(bot.assetB);
|
|
170
164
|
if (hasNumericStartPrice(bot.startPrice)) {
|
|
171
165
|
return {
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
interface FindLatestLpDataOptions {
|
|
2
|
+
dataDir?: string;
|
|
3
|
+
}
|
|
4
|
+
declare function findLatestLpData(options?: FindLatestLpDataOptions): string | null;
|
|
2
5
|
export { findLatestLpData };
|
|
3
6
|
//# sourceMappingURL=data_discovery.d.ts.map
|
|
@@ -1,8 +1,17 @@
|
|
|
1
|
-
|
|
1
|
+
interface SnapshotMutationResult {
|
|
2
|
+
write?: boolean;
|
|
3
|
+
ok?: boolean;
|
|
4
|
+
snapshot?: unknown;
|
|
5
|
+
[key: string]: unknown;
|
|
6
|
+
}
|
|
7
|
+
interface UpdateSnapshotOptions {
|
|
8
|
+
lock?: unknown;
|
|
9
|
+
}
|
|
10
|
+
declare function updateDynamicGridSnapshotSync(filePath: string, mutator: (previous: unknown) => SnapshotMutationResult | null | undefined, options?: UpdateSnapshotOptions): {
|
|
2
11
|
ok: boolean;
|
|
3
12
|
written: boolean;
|
|
4
|
-
previous:
|
|
5
|
-
snapshot:
|
|
13
|
+
previous: unknown;
|
|
14
|
+
snapshot: unknown;
|
|
6
15
|
};
|
|
7
16
|
export { updateDynamicGridSnapshotSync };
|
|
8
17
|
//# sourceMappingURL=dynamic_grid_snapshot.d.ts.map
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* wrote earlier only while the file is provably unchanged. The entry is
|
|
4
4
|
* consumed on use, so at most one cycle benefits from any single write.
|
|
5
5
|
*/
|
|
6
|
-
declare function readCachedJson(filePath:
|
|
6
|
+
declare function readCachedJson<T>(filePath: string, loader: () => T): T;
|
|
7
7
|
/**
|
|
8
8
|
* Record that `filePath` now holds exactly `value` on disk, so the next read can
|
|
9
9
|
* skip the parse. Call this right after writing.
|
|
@@ -22,7 +22,7 @@ declare function readCachedJson(filePath: any, loader: () => any): any;
|
|
|
22
22
|
* cross-process writer is far better served by the mtime check failing on its
|
|
23
23
|
* own write than by a cache that guesses.
|
|
24
24
|
*/
|
|
25
|
-
declare function noteJsonWritten(filePath:
|
|
25
|
+
declare function noteJsonWritten(filePath: string, value: unknown): void;
|
|
26
26
|
/** Drop every cached entry (config reload, tests, explicit cache busting). */
|
|
27
27
|
declare function clearJsonCache(): void;
|
|
28
28
|
export { readCachedJson, noteJsonWritten, clearJsonCache };
|