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
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
import net from 'node:net';
|
|
3
3
|
import { SOCKET_PATH } from './bot_supervisor.js';
|
|
4
|
+
import { getErrorCode } from '../utils/errors.js';
|
|
4
5
|
function sendControlCommand(cmd) {
|
|
5
6
|
return new Promise((resolve, reject) => {
|
|
6
7
|
const socket = net.createConnection(SOCKET_PATH);
|
|
@@ -17,7 +18,7 @@ function sendControlCommand(cmd) {
|
|
|
17
18
|
if (err)
|
|
18
19
|
reject(err);
|
|
19
20
|
else
|
|
20
|
-
resolve(result);
|
|
21
|
+
resolve(result ?? {});
|
|
21
22
|
};
|
|
22
23
|
const timeout = setTimeout(() => {
|
|
23
24
|
done(new Error('Connection timed out. Is the supervisor running?'));
|
|
@@ -46,7 +47,8 @@ function sendControlCommand(cmd) {
|
|
|
46
47
|
});
|
|
47
48
|
socket.on('error', (err) => {
|
|
48
49
|
clearTimeout(timeout);
|
|
49
|
-
|
|
50
|
+
const code = getErrorCode(err);
|
|
51
|
+
if (code === 'ENOENT' || code === 'ECONNREFUSED') {
|
|
50
52
|
done(new Error('No supervisor socket found. Start bots with: dexbot start --isolated'));
|
|
51
53
|
}
|
|
52
54
|
else {
|
|
@@ -9,11 +9,17 @@ declare const DEFAULT_WHITELIST_FLAGS: WhitelistFlags;
|
|
|
9
9
|
/** AMA enabled only — legacy `whitelist: [botKey]` array entries, and the
|
|
10
10
|
* generator's base shape for a fresh AMA-bot entry (CLI flags override). */
|
|
11
11
|
declare const AMA_ONLY_WHITELIST_FLAGS: WhitelistFlags;
|
|
12
|
-
/** Legacy per-entry `true` shorthand: every flag on. */
|
|
13
|
-
declare const ALL_ENABLED_WHITELIST_FLAGS: WhitelistFlags;
|
|
14
12
|
declare function resetMarketAdapterWhitelistCache(): void;
|
|
15
13
|
declare function getWhitelistFlags(botKey: string): WhitelistFlags;
|
|
16
14
|
declare function isBotWhitelisted(botKey: string): boolean;
|
|
15
|
+
/**
|
|
16
|
+
* Whether an explicit whitelist entry exists for this key (distinguishes a
|
|
17
|
+
* stored all-off entry from an absent one, which getWhitelistFlags collapses
|
|
18
|
+
* to the same all-false shape).
|
|
19
|
+
* @param {string} botKey
|
|
20
|
+
* @returns {boolean}
|
|
21
|
+
*/
|
|
22
|
+
declare function hasWhitelistEntry(botKey: string): boolean;
|
|
17
23
|
declare function isBotDynamicWeightWhitelisted(botKey: string): boolean;
|
|
18
24
|
declare function isBotAsymmetricBoundsWhitelisted(botKey: string): boolean;
|
|
19
25
|
/**
|
|
@@ -48,5 +54,5 @@ declare function renameWhitelistEntry(oldKey: string, newKey: string): boolean;
|
|
|
48
54
|
* never existed); false when a malformed file blocked the write.
|
|
49
55
|
*/
|
|
50
56
|
declare function removeWhitelistEntry(botKey: string): boolean;
|
|
51
|
-
export { whitelistFile, resetMarketAdapterWhitelistCache, getWhitelistFlags, isBotWhitelisted, isBotDynamicWeightWhitelisted, isBotAsymmetricBoundsWhitelisted, setWhitelistFlags, renameWhitelistEntry, removeWhitelistEntry, DEFAULT_WHITELIST_FLAGS, AMA_ONLY_WHITELIST_FLAGS
|
|
57
|
+
export { whitelistFile, resetMarketAdapterWhitelistCache, getWhitelistFlags, hasWhitelistEntry, isBotWhitelisted, isBotDynamicWeightWhitelisted, isBotAsymmetricBoundsWhitelisted, setWhitelistFlags, renameWhitelistEntry, removeWhitelistEntry, DEFAULT_WHITELIST_FLAGS, AMA_ONLY_WHITELIST_FLAGS };
|
|
52
58
|
//# sourceMappingURL=market_adapter_whitelist.d.ts.map
|
|
@@ -47,9 +47,10 @@ function normalizeEntry(entry) {
|
|
|
47
47
|
if (!entry || typeof entry !== 'object') {
|
|
48
48
|
return { ...DEFAULT_WHITELIST_FLAGS };
|
|
49
49
|
}
|
|
50
|
+
const e = entry;
|
|
50
51
|
const flags = { ...DEFAULT_WHITELIST_FLAGS };
|
|
51
52
|
for (const key of Object.keys(DEFAULT_WHITELIST_FLAGS)) {
|
|
52
|
-
flags[key] =
|
|
53
|
+
flags[key] = e[key] === true;
|
|
53
54
|
}
|
|
54
55
|
return flags;
|
|
55
56
|
}
|
|
@@ -93,6 +94,17 @@ function getWhitelistFlags(botKey) {
|
|
|
93
94
|
function isBotWhitelisted(botKey) {
|
|
94
95
|
return getWhitelistFlags(botKey).ama === true;
|
|
95
96
|
}
|
|
97
|
+
/**
|
|
98
|
+
* Whether an explicit whitelist entry exists for this key (distinguishes a
|
|
99
|
+
* stored all-off entry from an absent one, which getWhitelistFlags collapses
|
|
100
|
+
* to the same all-false shape).
|
|
101
|
+
* @param {string} botKey
|
|
102
|
+
* @returns {boolean}
|
|
103
|
+
*/
|
|
104
|
+
function hasWhitelistEntry(botKey) {
|
|
105
|
+
const whitelist = loadMarketAdapterWhitelist();
|
|
106
|
+
return whitelist !== false && !!botKey && whitelist.has(String(botKey));
|
|
107
|
+
}
|
|
96
108
|
function isBotDynamicWeightWhitelisted(botKey) {
|
|
97
109
|
return getWhitelistFlags(botKey).dynamicWeight === true;
|
|
98
110
|
}
|
|
@@ -138,7 +150,7 @@ function readWhitelistDocument() {
|
|
|
138
150
|
/**
|
|
139
151
|
* Writes the whitelist document back (sorted keys, same shape the market
|
|
140
152
|
* adapter reads) and invalidates the in-process read cache.
|
|
141
|
-
* @param {
|
|
153
|
+
* @param {unknown} doc - Top-level document to preserve (extra keys survive).
|
|
142
154
|
* @param {Record<string, any>} entries - botKey-keyed whitelist entries.
|
|
143
155
|
*/
|
|
144
156
|
function writeWhitelistDocument(doc, entries) {
|
|
@@ -224,5 +236,5 @@ function removeWhitelistEntry(botKey) {
|
|
|
224
236
|
writeWhitelistDocument(loaded.doc, loaded.entries);
|
|
225
237
|
return true;
|
|
226
238
|
}
|
|
227
|
-
export { whitelistFile, resetMarketAdapterWhitelistCache, getWhitelistFlags, isBotWhitelisted, isBotDynamicWeightWhitelisted, isBotAsymmetricBoundsWhitelisted, setWhitelistFlags, renameWhitelistEntry, removeWhitelistEntry, DEFAULT_WHITELIST_FLAGS, AMA_ONLY_WHITELIST_FLAGS
|
|
239
|
+
export { whitelistFile, resetMarketAdapterWhitelistCache, getWhitelistFlags, hasWhitelistEntry, isBotWhitelisted, isBotDynamicWeightWhitelisted, isBotAsymmetricBoundsWhitelisted, setWhitelistFlags, renameWhitelistEntry, removeWhitelistEntry, DEFAULT_WHITELIST_FLAGS, AMA_ONLY_WHITELIST_FLAGS };
|
|
228
240
|
//# sourceMappingURL=market_adapter_whitelist.js.map
|
|
@@ -39,6 +39,8 @@
|
|
|
39
39
|
*
|
|
40
40
|
* ===============================================================================
|
|
41
41
|
*/
|
|
42
|
+
import Logger from './order/logger.js';
|
|
43
|
+
import { createFailureLedger } from './node_failure_ledger.js';
|
|
42
44
|
interface NodeManagerConfig {
|
|
43
45
|
list?: string[];
|
|
44
46
|
blacklistStateFile?: string;
|
|
@@ -56,7 +58,35 @@ interface NodeManagerConfig {
|
|
|
56
58
|
preferredNode?: string | null;
|
|
57
59
|
};
|
|
58
60
|
healthCacheFile?: string;
|
|
59
|
-
[key: string]:
|
|
61
|
+
[key: string]: unknown;
|
|
62
|
+
}
|
|
63
|
+
type WebSocketLike = WebSocket;
|
|
64
|
+
interface NodeStat {
|
|
65
|
+
url: string;
|
|
66
|
+
status: string;
|
|
67
|
+
latencyMs: number | null;
|
|
68
|
+
failureCount: number;
|
|
69
|
+
lastCheckTime: string | null;
|
|
70
|
+
lastErrorMessage: string | null;
|
|
71
|
+
chainId: string | null;
|
|
72
|
+
blacklistedAt: number | null;
|
|
73
|
+
healthCheckSuccessStreak: number;
|
|
74
|
+
lastFailureSource: string | null;
|
|
75
|
+
}
|
|
76
|
+
interface ResolvedNodeManagerConfig {
|
|
77
|
+
list: string[];
|
|
78
|
+
healthCheck: {
|
|
79
|
+
intervalMs: number;
|
|
80
|
+
timeoutMs: number;
|
|
81
|
+
maxPingMs: number;
|
|
82
|
+
blacklistThreshold: number;
|
|
83
|
+
liveFailureSuccessStreak: number;
|
|
84
|
+
enabled: boolean;
|
|
85
|
+
};
|
|
86
|
+
selection: {
|
|
87
|
+
strategy: string;
|
|
88
|
+
preferredNode: string | null;
|
|
89
|
+
};
|
|
60
90
|
}
|
|
61
91
|
/**
|
|
62
92
|
* NodeManager - Manages health checking and selection of BitShares nodes
|
|
@@ -74,19 +104,19 @@ interface NodeManagerConfig {
|
|
|
74
104
|
* @param {string} [config.selection.preferredNode] - Optional preferred node (if healthy)
|
|
75
105
|
*/
|
|
76
106
|
declare class NodeManager {
|
|
77
|
-
logger:
|
|
107
|
+
logger: Logger;
|
|
78
108
|
blacklistStateFile: string;
|
|
79
109
|
healthCacheFile: string;
|
|
80
|
-
config:
|
|
81
|
-
nodeStats: Map<
|
|
82
|
-
_lastBlacklistWarnMs: Map<
|
|
110
|
+
config: ResolvedNodeManagerConfig;
|
|
111
|
+
nodeStats: Map<string, NodeStat>;
|
|
112
|
+
_lastBlacklistWarnMs: Map<string, number>;
|
|
83
113
|
monitoringActive: boolean;
|
|
84
|
-
checkIntervalId:
|
|
85
|
-
checkAllNodesPromise:
|
|
114
|
+
checkIntervalId: ReturnType<typeof setInterval> | null;
|
|
115
|
+
checkAllNodesPromise: Promise<void> | null;
|
|
86
116
|
expectedChainId: string;
|
|
87
117
|
BLACKLIST_COOLDOWN_MS: number;
|
|
88
118
|
FAILURE_REPORT_COOLDOWN_MS: number;
|
|
89
|
-
failureLedger:
|
|
119
|
+
failureLedger: ReturnType<typeof createFailureLedger>;
|
|
90
120
|
constructor(config?: NodeManagerConfig);
|
|
91
121
|
/**
|
|
92
122
|
* Initialize tracking for all configured nodes
|
|
@@ -165,7 +195,7 @@ declare class NodeManager {
|
|
|
165
195
|
* @param {number} timeoutMs - Connection timeout
|
|
166
196
|
* @returns {Promise<WebSocket>} Connected WebSocket instance
|
|
167
197
|
*/
|
|
168
|
-
connectWithTimeout(nodeUrl: string, timeoutMs: number): Promise<
|
|
198
|
+
connectWithTimeout(nodeUrl: string, timeoutMs: number): Promise<WebSocketLike>;
|
|
169
199
|
/**
|
|
170
200
|
* Query the BitShares chain ID using the Graphene WebSocket RPC protocol.
|
|
171
201
|
* @private
|
|
@@ -173,7 +203,7 @@ declare class NodeManager {
|
|
|
173
203
|
* @param {number} timeoutMs - RPC timeout
|
|
174
204
|
* @returns {Promise<string>} Chain ID
|
|
175
205
|
*/
|
|
176
|
-
getChainId(ws:
|
|
206
|
+
getChainId(ws: WebSocketLike, timeoutMs: number): Promise<string>;
|
|
177
207
|
/**
|
|
178
208
|
* Make a JSON-RPC call to a WebSocket
|
|
179
209
|
* @private
|
|
@@ -183,7 +213,7 @@ declare class NodeManager {
|
|
|
183
213
|
* @param {number} timeoutMs - RPC timeout
|
|
184
214
|
* @returns {Promise<any>} RPC result
|
|
185
215
|
*/
|
|
186
|
-
rpcCall(ws:
|
|
216
|
+
rpcCall(ws: WebSocketLike, method: string, params: unknown[], timeoutMs: number): Promise<unknown>;
|
|
187
217
|
/**
|
|
188
218
|
* Get list of healthy nodes sorted by latency (best first)
|
|
189
219
|
* @returns {string[]} Array of node URLs
|
|
@@ -52,7 +52,7 @@ const { readJSON } = storage;
|
|
|
52
52
|
import { createFailureLedger } from './node_failure_ledger.js';
|
|
53
53
|
const _WebSocket = globalThis.WebSocket;
|
|
54
54
|
import { resolveHealthCacheFile, writeHealthCache, } from './node_health_cache.js';
|
|
55
|
-
import { getErrorMessage } from './utils/errors.js';
|
|
55
|
+
import { getErrorMessage, getErrorCode } from './utils/errors.js';
|
|
56
56
|
import { nowIso } from './order/utils/system.js';
|
|
57
57
|
/**
|
|
58
58
|
* NodeManager - Manages health checking and selection of BitShares nodes
|
|
@@ -195,7 +195,7 @@ class NodeManager {
|
|
|
195
195
|
}
|
|
196
196
|
catch (err) {
|
|
197
197
|
// A never-created blacklist file (normal first run) is not an error.
|
|
198
|
-
if (err
|
|
198
|
+
if (getErrorCode(err) !== 'ENOENT') {
|
|
199
199
|
this.logger.warn(`Failed to load blacklist state: ${getErrorMessage(err)}`);
|
|
200
200
|
}
|
|
201
201
|
}
|
|
@@ -463,8 +463,9 @@ class NodeManager {
|
|
|
463
463
|
const timeout = setTimeout(() => {
|
|
464
464
|
if (ws) {
|
|
465
465
|
try {
|
|
466
|
-
|
|
467
|
-
|
|
466
|
+
const closable = ws;
|
|
467
|
+
if (typeof closable.terminate === 'function') {
|
|
468
|
+
closable.terminate();
|
|
468
469
|
}
|
|
469
470
|
else {
|
|
470
471
|
ws.close();
|
|
@@ -70,6 +70,22 @@
|
|
|
70
70
|
*
|
|
71
71
|
* ===============================================================================
|
|
72
72
|
*/
|
|
73
|
+
import type { OrderManagerLike, ManagedOrder, ChainOrder, FundDriftCheck } from '../types.js';
|
|
74
|
+
interface FillPaysReceives {
|
|
75
|
+
asset_id?: string;
|
|
76
|
+
amount: number | string;
|
|
77
|
+
}
|
|
78
|
+
interface FillOperation {
|
|
79
|
+
pays?: FillPaysReceives;
|
|
80
|
+
receives?: FillPaysReceives;
|
|
81
|
+
is_maker?: boolean;
|
|
82
|
+
order_id?: string;
|
|
83
|
+
[key: string]: unknown;
|
|
84
|
+
}
|
|
85
|
+
interface FillAccountingOptions {
|
|
86
|
+
persistenceMode?: string;
|
|
87
|
+
[key: string]: unknown;
|
|
88
|
+
}
|
|
73
89
|
/**
|
|
74
90
|
* Accountant engine - Specialized handler for fund tracking and calculations
|
|
75
91
|
* @class Accountant
|
|
@@ -84,42 +100,52 @@ declare class Accountant {
|
|
|
84
100
|
* @param {Object} manager.funds - Fund tracking structure
|
|
85
101
|
* @param {Logger} manager.logger - Logger instance
|
|
86
102
|
*/
|
|
87
|
-
manager:
|
|
103
|
+
manager: OrderManagerLike;
|
|
88
104
|
_isVerifyingInvariants: boolean;
|
|
89
105
|
_pendingInvariantSnapshot: {
|
|
90
106
|
chainFreeBuy: number;
|
|
91
107
|
chainFreeSell: number;
|
|
92
108
|
chainBuy: number;
|
|
93
109
|
chainSell: number;
|
|
110
|
+
actualBuy?: number | null;
|
|
111
|
+
actualSell?: number | null;
|
|
94
112
|
} | null;
|
|
95
113
|
_logThrottleState: Map<string, {
|
|
96
114
|
lastAt: number;
|
|
97
115
|
suppressed: number;
|
|
98
116
|
}>;
|
|
99
|
-
constructor(manager:
|
|
100
|
-
_logThrottled(key:
|
|
117
|
+
constructor(manager: OrderManagerLike);
|
|
118
|
+
_logThrottled(key: string, message: string, level?: string, intervalMs?: number): boolean;
|
|
101
119
|
/**
|
|
102
120
|
* Apply a list of balance adjustments.
|
|
103
121
|
* @param {Array<{orderType: string, delta: number, operation: string}>} balanceAdjustments
|
|
104
122
|
* @returns {void}
|
|
105
123
|
*/
|
|
106
|
-
_applyBalanceAdjustments(balanceAdjustments:
|
|
124
|
+
_applyBalanceAdjustments(balanceAdjustments: Array<{
|
|
125
|
+
orderType: string | null | undefined;
|
|
126
|
+
delta: number;
|
|
127
|
+
operation: string;
|
|
128
|
+
}>): Promise<void>;
|
|
107
129
|
_getBtsOrderType(): string | null;
|
|
108
|
-
_normalizeBtsFeeState(order:
|
|
130
|
+
_normalizeBtsFeeState(order: Partial<ManagedOrder> | null | undefined): {
|
|
109
131
|
deferredFee: number;
|
|
110
132
|
};
|
|
111
133
|
_getBtsFeeSchedule(): {
|
|
112
134
|
createFee: number;
|
|
113
135
|
updateFee: number;
|
|
114
136
|
cancelFee: number;
|
|
115
|
-
makerFeeDiscountPercent:
|
|
137
|
+
makerFeeDiscountPercent: number;
|
|
116
138
|
};
|
|
117
|
-
_calculateUpdateDeferredCharge(oldDeferredFee:
|
|
118
|
-
|
|
139
|
+
_calculateUpdateDeferredCharge(oldDeferredFee: number, feeSchedule: {
|
|
140
|
+
cancelFee?: number;
|
|
141
|
+
createFee?: number;
|
|
142
|
+
updateFee?: number;
|
|
143
|
+
} | null): number;
|
|
144
|
+
_resolveBtsFeeLifecycle(oldOrder: Partial<ManagedOrder> | null, newOrder: Partial<ManagedOrder> | null, context: string, explicitFee: number): {
|
|
119
145
|
balanceDelta: number;
|
|
120
146
|
nextDeferred: number;
|
|
121
147
|
};
|
|
122
|
-
_buildBtsDeferredRefundAdjustment(orderId:
|
|
148
|
+
_buildBtsDeferredRefundAdjustment(orderId: string | null | undefined, isMaker: boolean): {
|
|
123
149
|
orderType: string;
|
|
124
150
|
delta: number;
|
|
125
151
|
operation: string;
|
|
@@ -177,7 +203,7 @@ declare class Accountant {
|
|
|
177
203
|
* @returns {void}
|
|
178
204
|
* @private
|
|
179
205
|
*/
|
|
180
|
-
_verifyFundInvariants(mgr:
|
|
206
|
+
_verifyFundInvariants(mgr: OrderManagerLike, chainFreeBuy: number, chainFreeSell: number, chainBuy: number, chainSell: number, actualBuy: number | null | undefined, actualSell: number | null | undefined): Promise<void>;
|
|
181
207
|
/**
|
|
182
208
|
* Perform centralized state recovery (fetch + sync + validate).
|
|
183
209
|
* Shared by both immediate recovery and stabilization gate.
|
|
@@ -185,7 +211,10 @@ declare class Accountant {
|
|
|
185
211
|
* @param {Object} mgr - Manager instance
|
|
186
212
|
* @returns {Promise<Object>} - Validation result from validateGridStateForPersistence()
|
|
187
213
|
*/
|
|
188
|
-
_performStateRecovery(mgr:
|
|
214
|
+
_performStateRecovery(mgr: OrderManagerLike): Promise<{
|
|
215
|
+
[key: string]: unknown;
|
|
216
|
+
isValid: boolean;
|
|
217
|
+
}>;
|
|
189
218
|
/**
|
|
190
219
|
* Rebuild the tracked fund commitment from a fresh chain read (recovery
|
|
191
220
|
* recalibration).
|
|
@@ -214,7 +243,7 @@ declare class Accountant {
|
|
|
214
243
|
* @param {Array} openOrders - Fresh raw chain open orders (same read the sync used)
|
|
215
244
|
* @returns {Promise<{attempted: number, resized: number, virtualized: number, rejected: number}>}
|
|
216
245
|
*/
|
|
217
|
-
_recalibrateTrackedFundsFromChain(mgr:
|
|
246
|
+
_recalibrateTrackedFundsFromChain(mgr: OrderManagerLike, openOrders: ChainOrder[]): Promise<{
|
|
218
247
|
attempted: number;
|
|
219
248
|
resized: number;
|
|
220
249
|
virtualized: number;
|
|
@@ -244,7 +273,7 @@ declare class Accountant {
|
|
|
244
273
|
* @param {Object} driftValidation - Result of checkFundDriftAfterFills()
|
|
245
274
|
* @returns {Promise<{side: string, seededFree: number, committed: number, chainTotal: number}|null>}
|
|
246
275
|
*/
|
|
247
|
-
_tryTrustChainFreeHeal(mgr:
|
|
276
|
+
_tryTrustChainFreeHeal(mgr: OrderManagerLike, driftValidation: FundDriftCheck): Promise<{
|
|
248
277
|
side: string;
|
|
249
278
|
seededFree: number;
|
|
250
279
|
committed: number;
|
|
@@ -258,7 +287,7 @@ declare class Accountant {
|
|
|
258
287
|
* @param {string} violationType - Description of the violation for logging
|
|
259
288
|
* @returns {Promise<boolean>} - True if recovery succeeded, false otherwise
|
|
260
289
|
*/
|
|
261
|
-
_attemptFundRecovery(mgr:
|
|
290
|
+
_attemptFundRecovery(mgr: OrderManagerLike, violationType: string): Promise<boolean>;
|
|
262
291
|
/**
|
|
263
292
|
* Reset the recovery attempt flag.
|
|
264
293
|
* Called at the start of each fill processing cycle to allow fresh recovery attempts.
|
|
@@ -273,7 +302,7 @@ declare class Accountant {
|
|
|
273
302
|
* @param {string} [operation='move'] - Label for logging
|
|
274
303
|
* @returns {Promise<{ok: boolean, reason?: string}>} {ok: true} on success, {ok: false, reason} on failure
|
|
275
304
|
*/
|
|
276
|
-
tryDeductFromChainFree(orderType:
|
|
305
|
+
tryDeductFromChainFree(orderType: string | null | undefined, size: number, operation?: string): Promise<{
|
|
277
306
|
ok: boolean;
|
|
278
307
|
reason: string;
|
|
279
308
|
} | {
|
|
@@ -288,25 +317,25 @@ declare class Accountant {
|
|
|
288
317
|
* @param {string} [operation='release'] - Label for logging
|
|
289
318
|
* @returns {Promise<boolean>} true if addition succeeded
|
|
290
319
|
*/
|
|
291
|
-
addToChainFree(orderType:
|
|
320
|
+
addToChainFree(orderType: string | null | undefined, size: number, operation?: string): Promise<boolean>;
|
|
292
321
|
/**
|
|
293
322
|
* PRIVATE: Must be called while holding _fundLock.
|
|
294
323
|
* Body of adjustTotalBalance; takes the lock externally for clean
|
|
295
324
|
* nesting in callers that already hold the lock.
|
|
296
325
|
*/
|
|
297
|
-
_adjustTotalBalanceLocked(orderType:
|
|
326
|
+
_adjustTotalBalanceLocked(orderType: string | null | undefined, delta: number, operation: string): void;
|
|
298
327
|
/**
|
|
299
328
|
* PUBLIC API: Acquires _fundLock.
|
|
300
329
|
* Adjust both total and free balances (for fills, fees, deposits).
|
|
301
330
|
* @returns {Promise<void>}
|
|
302
331
|
*/
|
|
303
|
-
adjustTotalBalance(orderType:
|
|
332
|
+
adjustTotalBalance(orderType: string | null | undefined, delta: number, operation: string): Promise<void>;
|
|
304
333
|
/**
|
|
305
334
|
* Normalize side hint to standard ORDER_TYPES constant.
|
|
306
335
|
* @param {string|null} sideHint - Side hint ('buy', 'sell', ORDER_TYPES.BUY, ORDER_TYPES.SELL, or null)
|
|
307
336
|
* @returns {string|null} Normalized side or null if unrecognised
|
|
308
337
|
*/
|
|
309
|
-
_normalizeSideHint(sideHint:
|
|
338
|
+
_normalizeSideHint(sideHint: string | null | undefined): "sell" | "buy" | null;
|
|
310
339
|
/**
|
|
311
340
|
* Resolve the effective order side from multiple sources of truth.
|
|
312
341
|
* @param {Object|null} order - Order object carrying optional side hints
|
|
@@ -314,7 +343,7 @@ declare class Accountant {
|
|
|
314
343
|
* @param {string|null} [explicitSideHint] - Explicit side override
|
|
315
344
|
* @returns {string|null} Resolved side (ORDER_TYPES.BUY, ORDER_TYPES.SELL) or null
|
|
316
345
|
*/
|
|
317
|
-
_resolveOrderSide(order:
|
|
346
|
+
_resolveOrderSide(order: Partial<ManagedOrder> | null | undefined, fallbackOrder?: Partial<ManagedOrder> | null, explicitSideHint?: string | null): "sell" | "buy" | null;
|
|
318
347
|
/**
|
|
319
348
|
* Update optimistic balance during transitions.
|
|
320
349
|
* @param {Object} oldOrder - Previous order state
|
|
@@ -323,7 +352,7 @@ declare class Accountant {
|
|
|
323
352
|
* @param {number} fee - Blockchain fee to deduct
|
|
324
353
|
* @param {boolean} skipAssetAccounting - If true, skip capital commitment changes (asset amounts) but still process fees
|
|
325
354
|
*/
|
|
326
|
-
updateOptimisticFreeBalance(oldOrder:
|
|
355
|
+
updateOptimisticFreeBalance(oldOrder: Partial<ManagedOrder> | null | undefined, newOrder: Partial<ManagedOrder>, context: string, fee?: number, skipAssetAccounting?: boolean): Promise<void>;
|
|
327
356
|
/**
|
|
328
357
|
* Deduct BTS fees using adjustTotalBalance.
|
|
329
358
|
*
|
|
@@ -334,7 +363,7 @@ declare class Accountant {
|
|
|
334
363
|
* @param {string|null} [requestedSide=null] - ORDER_TYPES.BUY or ORDER_TYPES.SELL to target a specific side
|
|
335
364
|
* @returns {void}
|
|
336
365
|
*/
|
|
337
|
-
deductBtsFees(requestedSide?:
|
|
366
|
+
deductBtsFees(requestedSide?: string | null): Promise<void>;
|
|
338
367
|
/**
|
|
339
368
|
* Centralized fee deduction helper - prevents duplicate logic across codebase.
|
|
340
369
|
* Returns net proceeds after market fees, or raw amount if asset is not recognized.
|
|
@@ -344,7 +373,7 @@ declare class Accountant {
|
|
|
344
373
|
* @returns {number} Net proceeds after fees, or rawAmount if symbol not found
|
|
345
374
|
* @private
|
|
346
375
|
*/
|
|
347
|
-
_deductFeesFromProceeds(assetSymbol:
|
|
376
|
+
_deductFeesFromProceeds(assetSymbol: string | null | undefined, rawAmount: number, isMaker: boolean): number;
|
|
348
377
|
/**
|
|
349
378
|
* Process the fund impact of an order fill.
|
|
350
379
|
* Atomically updates accountTotals to keep internal state in sync with blockchain.
|
|
@@ -354,7 +383,7 @@ declare class Accountant {
|
|
|
354
383
|
* @param {Object} [options={}] - Persistence mode options
|
|
355
384
|
* @returns {Promise<boolean>} true if fill was successfully processed
|
|
356
385
|
*/
|
|
357
|
-
processFillAccounting(fillOp:
|
|
386
|
+
processFillAccounting(fillOp: FillOperation, fillKey?: string | null, options?: FillAccountingOptions): Promise<boolean>;
|
|
358
387
|
}
|
|
359
388
|
export default Accountant;
|
|
360
389
|
//# sourceMappingURL=accounting.d.ts.map
|
|
@@ -159,7 +159,7 @@ class Accountant {
|
|
|
159
159
|
catch (err) {
|
|
160
160
|
if (!warnedBtsFeeScheduleFallback.has('BTS')) {
|
|
161
161
|
warnedBtsFeeScheduleFallback.add('BTS');
|
|
162
|
-
this.manager?.logger?.log?.(`[FEE] Failed to load BTS fee schedule: ${err
|
|
162
|
+
this.manager?.logger?.log?.(`[FEE] Failed to load BTS fee schedule: ${getErrorMessage(err)}; using fallback defaults`, 'warn');
|
|
163
163
|
}
|
|
164
164
|
return {
|
|
165
165
|
createFee: 0,
|
|
@@ -400,7 +400,7 @@ class Accountant {
|
|
|
400
400
|
// (the list is replaced wholesale each sync); a fill between syncs
|
|
401
401
|
// over-counts until the next refresh, at most one transient recovery.
|
|
402
402
|
try {
|
|
403
|
-
const unmatched = mgr
|
|
403
|
+
const unmatched = mgr._lastUnmatchedChainOrders;
|
|
404
404
|
if (Array.isArray(unmatched)) {
|
|
405
405
|
for (const u of unmatched) {
|
|
406
406
|
const uSize = Number(u?.size);
|
|
@@ -518,7 +518,7 @@ class Accountant {
|
|
|
518
518
|
}
|
|
519
519
|
const precisionSlackBuy = getPrecisionSlack(buyPrecision);
|
|
520
520
|
const precisionSlackSell = getPrecisionSlack(sellPrecision);
|
|
521
|
-
const PERCENT_TOLERANCE = (mgr.config?.gridLimits?.FUND_INVARIANT_PERCENT_TOLERANCE ?? GRID_LIMITS.FUND_INVARIANT_PERCENT_TOLERANCE) / 100;
|
|
521
|
+
const PERCENT_TOLERANCE = toFiniteNumber(mgr.config?.gridLimits?.FUND_INVARIANT_PERCENT_TOLERANCE ?? GRID_LIMITS.FUND_INVARIANT_PERCENT_TOLERANCE) / 100;
|
|
522
522
|
// FIX 5: Widen tolerance when orphan fills were recently credited.
|
|
523
523
|
// Orphan fill accounting adjusts mgr.accountTotals optimistically, but
|
|
524
524
|
// chainFree (sellFree/buyFree) from the last fetchAccountTotals call
|
|
@@ -609,8 +609,8 @@ class Accountant {
|
|
|
609
609
|
const sellBad = actualSell !== null && actualSell !== undefined && diffSell > allowedSellTolerance;
|
|
610
610
|
const buyBad = actualBuy !== null && actualBuy !== undefined && diffBuy > allowedBuyTolerance;
|
|
611
611
|
const side = (buyBad && !sellBad) ? 'buy' : (!buyBad && sellBad) ? 'sell' : 'both';
|
|
612
|
-
const direction = (side === 'buy') ? (actualBuy > expectedBuy ? 'tracked-low' : 'tracked-high')
|
|
613
|
-
: (side === 'sell') ? (actualSell > expectedSell ? 'tracked-low' : 'tracked-high')
|
|
612
|
+
const direction = (side === 'buy') ? ((actualBuy ?? 0) > expectedBuy ? 'tracked-low' : 'tracked-high')
|
|
613
|
+
: (side === 'sell') ? ((actualSell ?? 0) > expectedSell ? 'tracked-low' : 'tracked-high')
|
|
614
614
|
: null;
|
|
615
615
|
const prev = mgr._fundDriftLedger;
|
|
616
616
|
if (prev && side !== 'both' && direction && prev.side === side && prev.direction === direction) {
|
|
@@ -1056,10 +1056,10 @@ class Accountant {
|
|
|
1056
1056
|
if (!mgr._recoveryState || typeof mgr._recoveryState !== 'object') {
|
|
1057
1057
|
mgr._recoveryState = { attemptCount: 0, lastAttemptAt: 0, inFlight: false, lastFailureAt: 0, structuralResyncRequested: false };
|
|
1058
1058
|
}
|
|
1059
|
-
const pt = mgr.config?.pipelineTiming
|
|
1059
|
+
const pt = (mgr.config?.pipelineTiming ?? PIPELINE_TIMING);
|
|
1060
1060
|
const state = mgr._recoveryState;
|
|
1061
1061
|
const now = Date.now();
|
|
1062
|
-
const retryIntervalMs = Math.max(0,
|
|
1062
|
+
const retryIntervalMs = Math.max(0, toFiniteNumber(pt.RECOVERY_RETRY_INTERVAL_MS));
|
|
1063
1063
|
const maxAttemptsRaw = Number(pt.MAX_RECOVERY_ATTEMPTS);
|
|
1064
1064
|
const hasAttemptLimit = Number.isFinite(maxAttemptsRaw) && maxAttemptsRaw > 0;
|
|
1065
1065
|
if (state.inFlight) {
|
|
@@ -1069,7 +1069,7 @@ class Accountant {
|
|
|
1069
1069
|
// Decay: if enough time has passed since the last failure, treat this
|
|
1070
1070
|
// as a fresh violation cycle to prevent stale counts from a previous
|
|
1071
1071
|
// cycle permanently exhausting the attempt budget.
|
|
1072
|
-
const decayMs = retryIntervalMs > 0 ? retryIntervalMs * 3 : (pt.RECOVERY_DECAY_FALLBACK_MS ?? PIPELINE_TIMING.RECOVERY_DECAY_FALLBACK_MS);
|
|
1072
|
+
const decayMs = retryIntervalMs > 0 ? retryIntervalMs * 3 : toFiniteNumber(pt.RECOVERY_DECAY_FALLBACK_MS ?? PIPELINE_TIMING.RECOVERY_DECAY_FALLBACK_MS);
|
|
1073
1073
|
if (state.attemptCount > 0 && state.lastFailureAt > 0 && (now - state.lastFailureAt) > decayMs) {
|
|
1074
1074
|
// Log at 'info' level so operators can monitor for repeated decay patterns
|
|
1075
1075
|
// which may indicate a persistent issue that self-corrects just long enough
|
|
@@ -1134,6 +1134,7 @@ class Accountant {
|
|
|
1134
1134
|
}
|
|
1135
1135
|
state.lastFailureAt = Date.now();
|
|
1136
1136
|
if (validation.structuralGridResyncRequired && typeof mgr.requestStructuralGridResync === 'function') {
|
|
1137
|
+
const requestStructuralGridResync = mgr.requestStructuralGridResync;
|
|
1137
1138
|
const unmatchedCount = Array.isArray(validation.unmatchedChainOrders)
|
|
1138
1139
|
? validation.unmatchedChainOrders.length
|
|
1139
1140
|
: 0;
|
|
@@ -1142,7 +1143,7 @@ class Accountant {
|
|
|
1142
1143
|
mgr.logger?.log?.(`[RECOVERY] Structural drift detected (${unmatchedCount} unmatched chain order(s)); scheduling full grid resync.`, 'warn');
|
|
1143
1144
|
Promise.resolve()
|
|
1144
1145
|
.then(async () => {
|
|
1145
|
-
const scheduleResult = await
|
|
1146
|
+
const scheduleResult = await requestStructuralGridResync('fund invariant structural drift', {
|
|
1146
1147
|
unmatchedChainOrders: validation.unmatchedChainOrders || [],
|
|
1147
1148
|
source: 'fund-invariant-recovery'
|
|
1148
1149
|
});
|
|
@@ -1160,8 +1161,8 @@ class Accountant {
|
|
|
1160
1161
|
this._logThrottled('structural-resync-already-requested', '[RECOVERY] Structural grid resync already scheduled; suppressing duplicate request.', 'warn');
|
|
1161
1162
|
}
|
|
1162
1163
|
}
|
|
1163
|
-
const level = validation.reason.includes('missing account context') ? 'warn' : 'error';
|
|
1164
|
-
mgr.logger?.log?.(`[RECOVERY] State recovery failed: ${validation.reason}`, level);
|
|
1164
|
+
const level = String(validation.reason).includes('missing account context') ? 'warn' : 'error';
|
|
1165
|
+
mgr.logger?.log?.(`[RECOVERY] State recovery failed: ${String(validation.reason)}`, level);
|
|
1165
1166
|
return false;
|
|
1166
1167
|
}
|
|
1167
1168
|
catch (err) {
|
|
@@ -1232,7 +1233,7 @@ class Accountant {
|
|
|
1232
1233
|
const oldValue = mgr.accountTotals[key];
|
|
1233
1234
|
mgr.accountTotals[key] = Math.max(0, current - size);
|
|
1234
1235
|
if (mgr.logger && mgr.logger.level === 'debug') {
|
|
1235
|
-
mgr.logger.log(`[ACCOUNTING] ${key} -${Format.formatAmount8(size)} (${operation}) -> ${Format.formatAmount8(mgr.accountTotals[key])} (was ${Format.formatAmount8(oldValue)})`, 'debug');
|
|
1236
|
+
mgr.logger.log(`[ACCOUNTING] ${key} -${Format.formatAmount8(size)} (${operation}) -> ${Format.formatAmount8(toFiniteNumber(mgr.accountTotals[key]))} (was ${Format.formatAmount8(toFiniteNumber(oldValue))})`, 'debug');
|
|
1236
1237
|
}
|
|
1237
1238
|
return { ok: true };
|
|
1238
1239
|
}
|
|
@@ -1253,7 +1254,7 @@ class Accountant {
|
|
|
1253
1254
|
const oldFree = toFiniteNumber(mgr.accountTotals[key]);
|
|
1254
1255
|
mgr.accountTotals[key] = oldFree + size;
|
|
1255
1256
|
if (mgr.logger && mgr.logger.level === 'debug') {
|
|
1256
|
-
mgr.logger.log(`[ACCOUNTING] ${key} +${Format.formatAmount8(size)} (${operation}) -> ${Format.formatAmount8(mgr.accountTotals[key])} (was ${Format.formatAmount8(oldFree)})`, 'debug');
|
|
1257
|
+
mgr.logger.log(`[ACCOUNTING] ${key} +${Format.formatAmount8(size)} (${operation}) -> ${Format.formatAmount8(toFiniteNumber(mgr.accountTotals[key]))} (was ${Format.formatAmount8(oldFree)})`, 'debug');
|
|
1257
1258
|
}
|
|
1258
1259
|
return true;
|
|
1259
1260
|
}
|
|
@@ -1279,7 +1280,7 @@ class Accountant {
|
|
|
1279
1280
|
mgr.accountTotals[totalKey] = Math.max(0, oldTotal + delta);
|
|
1280
1281
|
}
|
|
1281
1282
|
if (mgr.logger && mgr.logger.level === 'debug') {
|
|
1282
|
-
mgr.logger.log(`[ACCOUNTING] ${totalKey} ${delta >= 0 ? '+' : ''}${Format.formatAmount8(delta)} (${operation}) -> Total: ${Format.formatAmount8(mgr.accountTotals[totalKey])}, Free: ${Format.formatAmount8(mgr.accountTotals[freeKey])}`, 'debug');
|
|
1283
|
+
mgr.logger.log(`[ACCOUNTING] ${totalKey} ${delta >= 0 ? '+' : ''}${Format.formatAmount8(delta)} (${operation}) -> Total: ${Format.formatAmount8(toFiniteNumber(mgr.accountTotals[totalKey]))}, Free: ${Format.formatAmount8(toFiniteNumber(mgr.accountTotals[freeKey]))}`, 'debug');
|
|
1283
1284
|
}
|
|
1284
1285
|
}
|
|
1285
1286
|
/**
|
|
@@ -1654,7 +1655,7 @@ class Accountant {
|
|
|
1654
1655
|
balanceAdjustments.push(btsRefundAdjustment);
|
|
1655
1656
|
}
|
|
1656
1657
|
let processedAt = null;
|
|
1657
|
-
const tracker =
|
|
1658
|
+
const tracker = this.manager.processedFillTracker;
|
|
1658
1659
|
if (fillKey) {
|
|
1659
1660
|
processedAt = Date.now();
|
|
1660
1661
|
const lastProcessed = tracker.get(fillKey);
|
|
@@ -189,11 +189,14 @@ declare class AsyncLock {
|
|
|
189
189
|
* Centralizing the check-and-acquire keeps every future call site correct by
|
|
190
190
|
* construction (no accidental lock bypass when the lock is present).
|
|
191
191
|
*
|
|
192
|
-
* @param {
|
|
192
|
+
* @param {unknown} lock - AsyncLock (or lock-like { acquire, isReentrant }) to guard with
|
|
193
193
|
* @param {() => Promise<T>} fn - Work to run exclusively; when the lock is held
|
|
194
194
|
* by the caller it runs directly (re-entrant)
|
|
195
195
|
* @returns {Promise<T>}
|
|
196
196
|
*/
|
|
197
|
-
export declare function acquireIfNotHeld<T>(lock:
|
|
197
|
+
export declare function acquireIfNotHeld<T>(lock: {
|
|
198
|
+
acquire<T>(fn: () => Promise<T>): Promise<T>;
|
|
199
|
+
isReentrant(): boolean;
|
|
200
|
+
} | null | undefined, fn: () => Promise<T>): Promise<T>;
|
|
198
201
|
export default AsyncLock;
|
|
199
202
|
//# sourceMappingURL=async_lock.d.ts.map
|
|
@@ -402,7 +402,7 @@ class AsyncLock {
|
|
|
402
402
|
* Centralizing the check-and-acquire keeps every future call site correct by
|
|
403
403
|
* construction (no accidental lock bypass when the lock is present).
|
|
404
404
|
*
|
|
405
|
-
* @param {
|
|
405
|
+
* @param {unknown} lock - AsyncLock (or lock-like { acquire, isReentrant }) to guard with
|
|
406
406
|
* @param {() => Promise<T>} fn - Work to run exclusively; when the lock is held
|
|
407
407
|
* by the caller it runs directly (re-entrant)
|
|
408
408
|
* @returns {Promise<T>}
|
|
@@ -75,6 +75,7 @@
|
|
|
75
75
|
*
|
|
76
76
|
* ===============================================================================
|
|
77
77
|
*/
|
|
78
|
+
import type { GridConfig } from '../types.js';
|
|
78
79
|
/**
|
|
79
80
|
* Parse a legacy fill line from PM2 log file
|
|
80
81
|
* Expected format: [2026-01-15T15:29:06.185Z] [DEBUG] [FILL] sell fill: size=0.0316, price=1791.30065898866, proceeds=56.60510082 BTS
|
|
@@ -83,7 +84,7 @@
|
|
|
83
84
|
* @returns {Object|null} Parsed fill object or null on no match
|
|
84
85
|
*/
|
|
85
86
|
interface FillCore {
|
|
86
|
-
side:
|
|
87
|
+
side: string;
|
|
87
88
|
amount: number;
|
|
88
89
|
price: number;
|
|
89
90
|
proceeds: number;
|
|
@@ -97,7 +98,7 @@ interface FillEntry extends FillCore {
|
|
|
97
98
|
interface FeeEntry {
|
|
98
99
|
count: number;
|
|
99
100
|
fee_per_fill: number;
|
|
100
|
-
fee_asset:
|
|
101
|
+
fee_asset: string;
|
|
101
102
|
total_fee: number;
|
|
102
103
|
timestamp: number;
|
|
103
104
|
}
|
|
@@ -153,7 +154,7 @@ declare function deriveTradeFromFillBlock(block: FillBlock, ctx: ExportAssetCont
|
|
|
153
154
|
* @param {ExportAssetContext|null} [assetContext] - Offline asset metadata for block derivation
|
|
154
155
|
* @returns {Promise<Array>} Array of trade objects
|
|
155
156
|
*/
|
|
156
|
-
declare function parseLogFile(logFilePath:
|
|
157
|
+
declare function parseLogFile(logFilePath: string | null | undefined, assetContext?: ExportAssetContext | null): Promise<FillEntry[]>;
|
|
157
158
|
/**
|
|
158
159
|
* Export bot trades from PM2 log file to CSV
|
|
159
160
|
* @param {string} botKey - Bot identifier (e.g., 'aaa-bbb-0')
|
|
@@ -161,19 +162,19 @@ declare function parseLogFile(logFilePath: any, assetContext?: ExportAssetContex
|
|
|
161
162
|
* @param {string} outputDir - Output directory for exports (default: './exports')
|
|
162
163
|
* @returns {Promise<Object>} Export result status
|
|
163
164
|
*/
|
|
164
|
-
declare function exportBotTrades(botKey:
|
|
165
|
+
declare function exportBotTrades(botKey: string, botConfig: GridConfig, outputDir?: string): Promise<{
|
|
165
166
|
success: boolean;
|
|
166
167
|
trades_exported: number;
|
|
167
168
|
csv_path: string;
|
|
168
169
|
settings_path: string;
|
|
169
|
-
output_dir:
|
|
170
|
+
output_dir: string;
|
|
170
171
|
timestamp: string;
|
|
171
172
|
error?: undefined;
|
|
172
173
|
bot_key?: undefined;
|
|
173
174
|
} | {
|
|
174
175
|
success: boolean;
|
|
175
176
|
error: string;
|
|
176
|
-
bot_key:
|
|
177
|
+
bot_key: string;
|
|
177
178
|
trades_exported?: undefined;
|
|
178
179
|
csv_path?: undefined;
|
|
179
180
|
settings_path?: undefined;
|