dexbot 1.6.10 → 1.6.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +50 -3
- package/README.md +3 -1
- package/analysis/README.md +51 -11
- package/analysis/bot_fitting/README.md +12 -0
- package/analysis/tradingview/README.md +3 -3
- package/analysis/trend_detection/DYNAMIC_WEIGHT_RESEARCH.md +11 -37
- package/analysis/trend_detection/README.md +31 -0
- package/claw/docs/DEXBOT2_TUNING_CHEAT_SHEET.md +4 -3
- package/claw/modules/chain_broadcast.ts +7 -1
- package/claw/modules/claw_launcher.ts +1 -1
- package/claw/modules/launcher_mode_detector.ts +9 -2
- package/claw/package.json +1 -1
- package/claw/runtimes/openclaw-plugin/openclaw.plugin.json +1 -1
- package/claw/runtimes/openclaw-plugin/package.json +1 -1
- package/dist/analysis/account_resolver.d.ts +1 -1
- package/dist/analysis/account_resolver.js +15 -2
- package/dist/analysis/ama_fitting/analyze_ama_price_changes.js +3 -4
- package/dist/analysis/ama_fitting/analyze_lambda_vs_slow.js +2 -7
- package/dist/analysis/ama_fitting/calibrate_convergence_er.js +0 -1
- package/dist/analysis/ama_fitting/fetch_lp_candles.js +4 -4
- package/dist/analysis/ama_fitting/generate_unified_comparison_chart.d.ts +20 -4
- package/dist/analysis/ama_fitting/generate_unified_comparison_chart.js +9 -6
- package/dist/analysis/ama_fitting/optimizer_high_resolution.js +16 -12
- package/dist/analysis/analyze_args.d.ts +31 -0
- package/dist/analysis/analyze_args.js +41 -0
- package/dist/analysis/analyze_dynamic_weight.js +7 -20
- package/dist/analysis/analyze_kalman.js +7 -17
- package/dist/analysis/analyze_regime.js +7 -17
- package/dist/analysis/analyze_regime_windows.js +8 -18
- package/dist/analysis/analyze_risk_profile.js +8 -18
- package/dist/analysis/analyze_trade_heatmap.js +7 -17
- package/dist/analysis/analyze_volatility.js +7 -17
- package/dist/analysis/bot_fitting/backtest_ama_sweep.d.ts +220 -12
- package/dist/analysis/bot_fitting/backtest_ama_sweep.js +55 -10
- package/dist/analysis/bot_fitting/backtest_bot_fitting.d.ts +34 -4
- package/dist/analysis/bot_fitting/backtest_bot_fitting.js +72 -66
- package/dist/analysis/bot_fitting/backtest_lookback_drawdown.d.ts +21 -0
- package/dist/analysis/bot_fitting/backtest_lookback_drawdown.js +315 -0
- package/dist/analysis/bot_fitting/shared_utils.d.ts +7 -7
- package/dist/analysis/bot_fitting/shared_utils.js +2 -2
- package/dist/analysis/bot_key_utils.d.ts +18 -10
- package/dist/analysis/bot_key_utils.js +10 -17
- package/dist/analysis/bot_usage/discover_bot_accounts.js +44 -47
- package/dist/analysis/bot_usage/kibana_bot_queries.d.ts +1 -21
- package/dist/analysis/chain_pool.d.ts +3 -1
- package/dist/analysis/chart_ui.d.ts +5 -2
- package/dist/analysis/chart_ui.js +6 -3
- package/dist/analysis/chart_utils.d.ts +5 -5
- package/dist/analysis/chart_utils.js +9 -0
- package/dist/analysis/fills_cache.d.ts +64 -0
- package/dist/analysis/fills_cache.js +254 -0
- package/dist/analysis/fills_source.d.ts +2 -2
- package/dist/analysis/fills_source.js +19 -14
- package/dist/analysis/grid_correction_check.d.ts +1 -1
- package/dist/analysis/grid_correction_check.js +12 -11
- package/dist/analysis/math_utils.d.ts +7 -6
- package/dist/analysis/math_utils.js +5 -8
- package/dist/analysis/pnl_report.d.ts +39 -0
- package/dist/analysis/pnl_report.js +325 -0
- package/dist/analysis/price_sources.d.ts +8 -8
- package/dist/analysis/price_sources.js +5 -4
- package/dist/analysis/resolve_bot_accounts.js +2 -2
- package/dist/analysis/resolve_source.d.ts +1 -2
- package/dist/analysis/trade_profitability.d.ts +32 -2
- package/dist/analysis/trade_profitability.js +232 -106
- package/dist/analysis/tradingview/analyze_tradingview.d.ts +17 -6
- package/dist/analysis/tradingview/analyze_tradingview.js +9 -10
- package/dist/analysis/tradingview/grid_reset_config.d.ts +42 -31
- package/dist/analysis/tradingview/grid_reset_config.js +35 -6
- package/dist/analysis/tradingview/grid_reset_sim.d.ts +75 -8
- package/dist/analysis/tradingview/grid_reset_sim.js +42 -5
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.d.ts +69 -4
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.js +20 -20
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.d.ts +102 -0
- package/dist/analysis/trend_detection/backtest_ama_slope_huber.js +725 -0
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.d.ts +63 -1
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.js +27 -112
- package/dist/analysis/trend_detection/huber_scale_variants.d.ts +40 -0
- package/dist/analysis/trend_detection/huber_scale_variants.js +176 -0
- package/dist/analysis/trend_detection/kalman_chart_generator.d.ts +30 -1
- package/dist/analysis/trend_detection/kalman_chart_generator.js +3 -3
- package/dist/analysis/trend_detection/regime_chart_generator.d.ts +31 -1
- package/dist/analysis/trend_detection/regime_chart_generator.js +2 -2
- package/dist/analysis/trend_detection/volatility_chart_generator.d.ts +33 -1
- package/dist/credential-daemon.js +34 -20
- package/dist/dexbot.js +17 -14
- package/dist/market_adapter/candle_utils.d.ts +22 -18
- package/dist/market_adapter/candle_utils.js +24 -20
- package/dist/market_adapter/core/asymmetric_bounds.d.ts +13 -4
- package/dist/market_adapter/core/config_normalizers.d.ts +3 -3
- package/dist/market_adapter/core/kibana_candles.d.ts +53 -18
- package/dist/market_adapter/core/kibana_candles.js +9 -7
- package/dist/market_adapter/core/kibana_client.d.ts +9 -1
- package/dist/market_adapter/core/kibana_client.js +8 -7
- package/dist/market_adapter/core/kibana_market_candles.d.ts +3 -2
- package/dist/market_adapter/core/market_adapter_service.d.ts +297 -115
- package/dist/market_adapter/core/market_adapter_service.js +184 -101
- package/dist/market_adapter/core/strategies/ama.d.ts +10 -2
- package/dist/market_adapter/core/strategies/ama.js +7 -32
- package/dist/market_adapter/core/strategies/ama_slope_model.d.ts +14 -1
- package/dist/market_adapter/core/strategies/ama_slope_model.js +12 -34
- package/dist/market_adapter/core/strategies/atr/calculator.d.ts +7 -2
- package/dist/market_adapter/core/strategies/atr/calculator.js +2 -34
- package/dist/market_adapter/core/strategies/collateral_manager.d.ts +7 -1
- package/dist/market_adapter/core/strategies/collateral_manager.js +0 -22
- package/dist/market_adapter/core/strategies/dynamic_weight_series.d.ts +36 -8
- package/dist/market_adapter/core/strategies/dynamic_weight_series.js +9 -9
- package/dist/market_adapter/core/strategies/regime_gate.d.ts +24 -15
- package/dist/market_adapter/core/strategies/regime_gate.js +4 -31
- package/dist/market_adapter/core/strategies/regime_interp.d.ts +7 -1
- package/dist/market_adapter/core/strategies/regime_interp.js +14 -22
- package/dist/market_adapter/core/strategies/volatility_shift.d.ts +11 -1
- package/dist/market_adapter/core/strategies/volatility_shift.js +0 -13
- package/dist/market_adapter/inputs/cex_candle_parsing.d.ts +29 -0
- package/dist/market_adapter/inputs/cex_candle_parsing.js +52 -0
- package/dist/market_adapter/inputs/fetch_book_data.d.ts +20 -4
- package/dist/market_adapter/inputs/fetch_book_data.js +3 -1
- package/dist/market_adapter/inputs/fetch_cex_synthetic_data.js +97 -226
- package/dist/market_adapter/inputs/fetch_lp_data.d.ts +42 -7
- package/dist/market_adapter/inputs/fetch_lp_data.js +22 -15
- package/dist/market_adapter/inputs/kibana_feed_source.d.ts +74 -15
- package/dist/market_adapter/inputs/kibana_feed_source.js +29 -22
- package/dist/market_adapter/inputs/kibana_source.d.ts +25 -3
- package/dist/market_adapter/inputs/kibana_source.js +2 -2
- package/dist/market_adapter/inputs/window_cache.d.ts +99 -94
- package/dist/market_adapter/inputs/window_cache.js +8 -8
- package/dist/market_adapter/interval_utils.d.ts +4 -4
- package/dist/market_adapter/log_format.d.ts +6 -6
- package/dist/market_adapter/log_format.js +28 -22
- package/dist/market_adapter/lp_chart_core.d.ts +22 -1
- package/dist/market_adapter/lp_chart_core.js +26 -192
- package/dist/market_adapter/lp_chart_runner.d.ts +7 -7
- package/dist/market_adapter/lp_chart_strategy_loader.d.ts +41 -6
- package/dist/market_adapter/lp_chart_strategy_loader.js +8 -7
- package/dist/market_adapter/market_adapter.d.ts +94 -33
- package/dist/market_adapter/market_adapter.js +69 -75
- package/dist/market_adapter/utils/adapter_client.d.ts +3 -3
- package/dist/market_adapter/utils/adapter_client.js +2 -2
- package/dist/market_adapter/utils/atomic_write.d.ts +8 -1
- package/dist/market_adapter/utils/chain.d.ts +50 -41
- package/dist/market_adapter/utils/chain.js +40 -46
- package/dist/market_adapter/utils/data_discovery.d.ts +4 -1
- package/dist/market_adapter/utils/dynamic_grid_snapshot.d.ts +12 -3
- package/dist/market_adapter/utils/file_json_cache.d.ts +2 -2
- package/dist/market_adapter/utils/file_lock.d.ts +28 -14
- package/dist/market_adapter/utils/file_lock.js +36 -32
- package/dist/market_adapter/utils/native_history.d.ts +9 -2
- package/dist/market_adapter/utils/native_history.js +35 -28
- package/dist/modules/account_bots.d.ts +577 -21
- package/dist/modules/account_bots.js +182 -158
- package/dist/modules/account_orders.d.ts +66 -30
- package/dist/modules/account_orders.js +22 -20
- package/dist/modules/authority_resolver.d.ts +12 -2
- package/dist/modules/authority_resolver.js +15 -8
- package/dist/modules/bitshares-native/chain_client.d.ts +38 -3
- package/dist/modules/bitshares-native/chain_client.js +45 -46
- package/dist/modules/bitshares-native/crypto/ecc.browser.js +11 -171
- package/dist/modules/bitshares-native/crypto/ecc.js +13 -176
- package/dist/modules/bitshares-native/crypto/ecc_core.d.ts +33 -0
- package/dist/modules/bitshares-native/crypto/ecc_core.js +213 -0
- package/dist/modules/bitshares-native/crypto/ecc_selector.d.ts +2 -1
- package/dist/modules/bitshares-native/crypto/ecc_selector.js +1 -13
- package/dist/modules/bitshares-native/index.d.ts +1 -1
- package/dist/modules/bitshares-native/lru_cache.d.ts +7 -7
- package/dist/modules/bitshares-native/resolvers.d.ts +18 -6
- package/dist/modules/bitshares-native/serial/lazy_buffer.d.ts +4 -0
- package/dist/modules/bitshares-native/serial/lazy_buffer.js +21 -0
- package/dist/modules/bitshares-native/serial/operations.d.ts +1 -1
- package/dist/modules/bitshares-native/serial/serializer.d.ts +16 -12
- package/dist/modules/bitshares-native/serial/serializer.js +7 -13
- package/dist/modules/bitshares-native/serial/types.d.ts +25 -16
- package/dist/modules/bitshares-native/serial/types.js +55 -62
- package/dist/modules/bitshares-native/signing_client.d.ts +32 -2
- package/dist/modules/bitshares-native/signing_client.js +19 -14
- package/dist/modules/bitshares-native/subscriptions.d.ts +81 -1
- package/dist/modules/bitshares-native/subscriptions.js +12 -12
- package/dist/modules/bitshares-native/transport.d.ts +5 -4
- package/dist/modules/bitshares-native/transport.js +5 -4
- package/dist/modules/bitshares-native/tx/builder.d.ts +40 -5
- package/dist/modules/bitshares-native/tx/builder.js +4 -3
- package/dist/modules/bitshares-native/tx/tx_cache.d.ts +4 -4
- package/dist/modules/bitshares_client.d.ts +45 -13
- package/dist/modules/bitshares_client.js +28 -19
- package/dist/modules/bot_defaults.d.ts +6 -15
- package/dist/modules/bot_defaults.js +1 -5
- package/dist/modules/bot_settings.d.ts +44 -10
- package/dist/modules/bot_settings.js +11 -8
- package/dist/modules/bots_file_lock.d.ts +6 -6
- package/dist/modules/bots_file_lock.js +16 -12
- package/dist/modules/broadcast_failure.d.ts +2 -2
- package/dist/modules/broadcast_failure.js +5 -4
- package/dist/modules/chain_keys.d.ts +42 -40
- package/dist/modules/chain_keys.js +53 -45
- package/dist/modules/chain_orders.d.ts +93 -59
- package/dist/modules/chain_orders.js +31 -23
- package/dist/modules/constants.d.ts +530 -32
- package/dist/modules/constants.js +52 -60
- package/dist/modules/cr_planner.d.ts +40 -2
- package/dist/modules/credential_policy.d.ts +68 -8
- package/dist/modules/credential_policy.js +37 -31
- package/dist/modules/credential_session_cache.d.ts +2 -2
- package/dist/modules/credit_pricing.d.ts +42 -6
- package/dist/modules/credit_pricing.js +44 -30
- package/dist/modules/credit_runtime.d.ts +276 -118
- package/dist/modules/credit_runtime.js +462 -165
- package/dist/modules/crypto/browser_provider.js +6 -4
- package/dist/modules/crypto/node_provider.js +1 -1
- package/dist/modules/crypto/pure_scrypt.js +35 -4
- package/dist/modules/crypto/pure_secp256k1.js +72 -26
- package/dist/modules/crypto/sync.d.ts +9 -9
- package/dist/modules/crypto/sync.js +16 -9
- package/dist/modules/dexbot_class.d.ts +195 -139
- package/dist/modules/dexbot_class.js +78 -28
- package/dist/modules/dexbot_cow_runtime.d.ts +167 -87
- package/dist/modules/dexbot_cow_runtime.js +248 -206
- package/dist/modules/dexbot_credential_client.d.ts +19 -11
- package/dist/modules/dexbot_fill_runtime.d.ts +63 -48
- package/dist/modules/dexbot_fill_runtime.js +48 -41
- package/dist/modules/dexbot_maintenance_runtime.d.ts +109 -70
- package/dist/modules/dexbot_maintenance_runtime.js +117 -80
- package/dist/modules/dexbot_startup_runtime.d.ts +11 -10
- package/dist/modules/dexbot_startup_runtime.js +43 -43
- package/dist/modules/dexbot_state_recovery.d.ts +13 -12
- package/dist/modules/dexbot_state_recovery.js +18 -13
- package/dist/modules/fund_registry.d.ts +4 -2
- package/dist/modules/fund_registry.js +10 -10
- package/dist/modules/general_settings.d.ts +30 -4
- package/dist/modules/graceful_shutdown.d.ts +3 -3
- package/dist/modules/graceful_shutdown.js +2 -2
- package/dist/modules/grid_price_source.d.ts +1 -1
- package/dist/modules/key_store.d.ts +14 -8
- package/dist/modules/key_store.js +7 -6
- package/dist/modules/launcher/adapter_requirement.d.ts +11 -5
- package/dist/modules/launcher/adapter_requirement.js +5 -5
- package/dist/modules/launcher/bot_supervisor.d.ts +106 -24
- package/dist/modules/launcher/bot_supervisor.js +12 -11
- package/dist/modules/launcher/credential_bootstrap.d.ts +1 -1
- package/dist/modules/launcher/credential_bootstrap.js +1 -1
- package/dist/modules/launcher/credential_daemon.d.ts +4 -4
- package/dist/modules/launcher/credential_daemon.js +2 -2
- package/dist/modules/launcher/credential_secret.d.ts +1 -1
- package/dist/modules/launcher/foreign_cred_daemon.d.ts +2 -2
- package/dist/modules/launcher/market_adapter_runtime.d.ts +61 -6
- package/dist/modules/launcher/market_adapter_watchdog.d.ts +10 -2
- package/dist/modules/launcher/market_adapter_watchdog.js +4 -0
- package/dist/modules/launcher/monolithic_runtime.d.ts +18 -16
- package/dist/modules/launcher/status_reporting.d.ts +22 -14
- package/dist/modules/launcher/supervisor_control.d.ts +8 -1
- package/dist/modules/launcher/supervisor_control.js +4 -2
- package/dist/modules/market_adapter_whitelist.d.ts +9 -3
- package/dist/modules/market_adapter_whitelist.js +15 -3
- package/dist/modules/node_manager.d.ts +41 -11
- package/dist/modules/node_manager.js +5 -4
- package/dist/modules/order/accounting.d.ts +53 -24
- package/dist/modules/order/accounting.js +40 -14
- package/dist/modules/order/async_lock.d.ts +5 -2
- package/dist/modules/order/async_lock.js +1 -1
- package/dist/modules/order/export.d.ts +7 -6
- package/dist/modules/order/export.js +1 -7
- package/dist/modules/order/format.d.ts +39 -19
- package/dist/modules/order/format.js +62 -16
- package/dist/modules/order/genesis_policy.d.ts +21 -18
- package/dist/modules/order/genesis_policy.js +12 -8
- package/dist/modules/order/grid.d.ts +142 -36
- package/dist/modules/order/grid.js +148 -123
- package/dist/modules/order/grid_reconcile.d.ts +21 -20
- package/dist/modules/order/grid_reconcile.js +13 -12
- package/dist/modules/order/grid_reconcile_internal.d.ts +85 -72
- package/dist/modules/order/grid_reconcile_internal.js +28 -19
- package/dist/modules/order/index.d.ts +263 -1
- package/dist/modules/order/logger.d.ts +45 -11
- package/dist/modules/order/logger.js +38 -40
- package/dist/modules/order/logger_state.d.ts +4 -4
- package/dist/modules/order/manager.d.ts +226 -180
- package/dist/modules/order/manager.js +101 -83
- package/dist/modules/order/processed_fill_store.d.ts +18 -3
- package/dist/modules/order/processed_fill_store.js +16 -27
- package/dist/modules/order/strategy.d.ts +21 -13
- package/dist/modules/order/strategy.js +5 -6
- package/dist/modules/order/sync_engine.d.ts +91 -33
- package/dist/modules/order/sync_engine.js +99 -54
- package/dist/modules/order/utils/math.d.ts +157 -102
- package/dist/modules/order/utils/math.js +77 -38
- package/dist/modules/order/utils/order.d.ts +326 -106
- package/dist/modules/order/utils/order.js +200 -99
- package/dist/modules/order/utils/slot.d.ts +1 -1
- package/dist/modules/order/utils/system.d.ts +176 -26
- package/dist/modules/order/utils/system.js +86 -69
- package/dist/modules/order/utils/validate.d.ts +89 -41
- package/dist/modules/order/utils/validate.js +24 -22
- package/dist/modules/order/utils/withPoolRef.d.ts +4 -3
- package/dist/modules/order/utils/withPoolRef.js +18 -12
- package/dist/modules/order/working_grid.d.ts +14 -13
- package/dist/modules/paths.d.ts +3 -4
- package/dist/modules/paths.js +3 -27
- package/dist/modules/process_discovery.d.ts +1 -1
- package/dist/modules/process_discovery.js +2 -1
- package/dist/modules/runtime.d.ts +7 -3
- package/dist/modules/runtime.js +4 -3
- package/dist/modules/runtime_settings.d.ts +15 -10
- package/dist/modules/runtime_settings.js +30 -24
- package/dist/modules/settings_merge.d.ts +29 -3
- package/dist/modules/settings_merge.js +56 -78
- package/dist/modules/socket_json_client.d.ts +7 -4
- package/dist/modules/storage/browser_adapter.d.ts +38 -53
- package/dist/modules/storage/browser_adapter.js +7 -30
- package/dist/modules/storage/index.d.ts +1 -1
- package/dist/modules/storage/node_adapter.d.ts +45 -27
- package/dist/modules/storage/node_adapter.js +9 -9
- package/dist/modules/storage/types.d.ts +5 -4
- package/dist/modules/types.d.ts +1071 -2
- package/dist/modules/types.js +4 -1
- package/dist/modules/utils/asset_symbols.d.ts +2 -1
- package/dist/modules/utils/asset_symbols.js +2 -1
- package/dist/modules/utils/errors.d.ts +9 -0
- package/dist/modules/utils/errors.js +23 -1
- package/dist/modules/utils/time_range.d.ts +4 -0
- package/dist/modules/utils/time_range.js +18 -0
- package/dist/modules/validate_profiles.js +53 -43
- package/dist/modules/version_notice.d.ts +14 -3
- package/dist/modules/version_notice.js +6 -4
- package/dist/pm2.d.ts +29 -27
- package/dist/pm2.js +5 -5
- package/dist/scripts/analyze-credit.d.ts +2 -1
- package/dist/scripts/analyze-credit.js +23 -24
- package/dist/scripts/analyze-orders.d.ts +77 -9
- package/dist/scripts/analyze-orders.js +66 -84
- package/dist/scripts/chart_command.d.ts +27 -18
- package/dist/scripts/chart_command.js +16 -15
- package/dist/scripts/check_any.d.ts +18 -0
- package/dist/scripts/check_any.js +126 -0
- package/dist/scripts/diagnose-pool-history.js +12 -7
- package/dist/scripts/pnl.d.ts +3 -0
- package/dist/scripts/pnl.js +40 -0
- package/dist/scripts/print_grid.js +0 -1
- package/dist/scripts/run-tests.js +39 -7
- package/dist/scripts/runner.js +1 -1
- package/dist/scripts/test-credit-renewal.js +30 -21
- package/dist/scripts/update.d.ts +10 -5
- package/dist/scripts/update.js +168 -103
- package/dist/scripts/update_dist_freshness.js +1 -0
- package/dist/scripts/update_layout.d.ts +61 -0
- package/dist/scripts/update_layout.js +180 -0
- package/dist/scripts/validate_bots.js +2 -1
- package/dist/scripts/verify-browser-bundle.js +8 -0
- package/dist/unlock.d.ts +28 -3
- package/dist/unlock.js +72 -10
- package/docs/BITSHARES_ONBOARDING.md +2 -0
- package/docs/COPY_ON_WRITE_MASTER_PLAN.md +1 -1
- package/docs/COW_INVARIANTS.md +13 -6
- package/docs/DEXBOT_COMPARISON.md +8 -8
- package/docs/EVOLUTION.md +12 -10
- package/docs/FUND_MOVEMENT_AND_ACCOUNTING.md +5 -5
- package/docs/GRID_RECALCULATION.md +15 -16
- package/docs/GRID_RECONCILE.md +14 -3
- package/docs/LIFECYCLE.md +11 -11
- package/docs/MPA_CREDIT_USAGE.md +22 -3
- package/docs/README.md +15 -4
- package/docs/WORKFLOW.md +1 -0
- package/docs/architecture.md +12 -9
- package/docs/developer_guide.md +6 -6
- package/market_adapter/README.md +9 -26
- package/modules/README.md +4 -1
- package/package.json +4 -1
- package/scripts/README.md +14 -0
|
@@ -39,12 +39,12 @@ import { fetchFeedCandlesSequentially } from '../market_adapter/inputs/kibana_fe
|
|
|
39
39
|
import { muteChainLogs } from '../modules/utils/chain_logs.js';
|
|
40
40
|
import { isSameBotName, sanitizeKey } from '../modules/utils/sanitize_key.js';
|
|
41
41
|
import { slugPart } from '../market_adapter/interval_utils.js';
|
|
42
|
+
import { monthsToHours } from '../modules/utils/time_range.js';
|
|
42
43
|
const INTERVAL_SECONDS = 3600;
|
|
43
44
|
const DEFAULT_MONTHS = 3;
|
|
44
45
|
// Explicit --feed warns when the settlement feed is older than this
|
|
45
46
|
// (a stale feed draws a flat/misleading chart). Default: 7 days.
|
|
46
47
|
const FEED_STALE_WARN_AGE_MS = 7 * 24 * 3600 * 1000;
|
|
47
|
-
const HOURS_PER_MONTH = 730;
|
|
48
48
|
const CHUNK_MONTHS = 1;
|
|
49
49
|
const RENDERERS = {
|
|
50
50
|
tv: {
|
|
@@ -104,12 +104,12 @@ async function resolveMpaBacking(mpaSymbol, bitsharesClient) {
|
|
|
104
104
|
return null;
|
|
105
105
|
try {
|
|
106
106
|
const objs = await db.get_objects([mpa.bitasset_data_id]);
|
|
107
|
-
const bitasset = Array.isArray(objs) ? objs[0] : objs;
|
|
107
|
+
const bitasset = (Array.isArray(objs) ? objs[0] : objs);
|
|
108
108
|
const backingId = String(bitasset?.options?.short_backing_asset || '');
|
|
109
109
|
if (!backingId)
|
|
110
110
|
return null;
|
|
111
111
|
const metas = typeof db.get_assets === 'function' ? await db.get_assets([backingId]) : null;
|
|
112
|
-
const list = Array.isArray(metas) ? metas.flat(Infinity) : [];
|
|
112
|
+
const list = (Array.isArray(metas) ? metas.flat(Infinity) : []);
|
|
113
113
|
const backing = list.find((a) => String(a?.id) === backingId) || null;
|
|
114
114
|
if (!backing?.id || !Number.isFinite(Number(backing.precision)))
|
|
115
115
|
return null;
|
|
@@ -160,7 +160,7 @@ function feedAgeMs(ctx, nowMs = Date.now()) {
|
|
|
160
160
|
function feedName(feedCtx) {
|
|
161
161
|
if (feedCtx.kind === 'cross')
|
|
162
162
|
return `${feedCtx.legs[0].mpa.symbol}/${feedCtx.legs[1].mpa.symbol}`;
|
|
163
|
-
return feedCtx.legs[0].mpa.symbol;
|
|
163
|
+
return String(feedCtx.legs[0].mpa.symbol ?? '');
|
|
164
164
|
}
|
|
165
165
|
async function activateFeedIfCovered(symA, symB, assetA, assetB, source, bitsharesClient, label = 'tv') {
|
|
166
166
|
const ctx = await pickFeedContext(symA, symB, source, bitsharesClient);
|
|
@@ -252,12 +252,12 @@ function findBotByTarget(target) {
|
|
|
252
252
|
if (!entry)
|
|
253
253
|
continue;
|
|
254
254
|
if (isSameBotName(entry.name, target))
|
|
255
|
-
return { botKey: computeBotKey(entry, i), meta: entry };
|
|
255
|
+
return { botKey: computeBotKey(entry, i) ?? '', meta: entry };
|
|
256
256
|
}
|
|
257
257
|
const meta = loadBotMeta(target);
|
|
258
258
|
if (meta) {
|
|
259
259
|
const idx = entries.indexOf(meta);
|
|
260
|
-
return { botKey: computeBotKey(meta, idx >= 0 ? idx : 0), meta };
|
|
260
|
+
return { botKey: computeBotKey(meta, idx >= 0 ? idx : 0) ?? '', meta };
|
|
261
261
|
}
|
|
262
262
|
return null;
|
|
263
263
|
}
|
|
@@ -271,13 +271,13 @@ async function resolvePoolAssets(poolId, bitsharesClient) {
|
|
|
271
271
|
if (db && typeof db.get_objects === 'function') {
|
|
272
272
|
try {
|
|
273
273
|
const objs = await db.get_objects([fullId]);
|
|
274
|
-
const pool = Array.isArray(objs) ? objs[0] : null;
|
|
274
|
+
const pool = (Array.isArray(objs) ? objs[0] : null);
|
|
275
275
|
const idA = pool?.asset_a || pool?.asset_ids?.[0];
|
|
276
276
|
const idB = pool?.asset_b || pool?.asset_ids?.[1];
|
|
277
277
|
if (idA && idB) {
|
|
278
278
|
const assets = typeof db.get_assets === 'function' ? await db.get_assets([String(idA), String(idB)]) : null;
|
|
279
279
|
// Tolerate both [..] and [[..]] result shapes.
|
|
280
|
-
const list = Array.isArray(assets) ? assets.flat(Infinity) : [];
|
|
280
|
+
const list = (Array.isArray(assets) ? assets.flat(Infinity) : []);
|
|
281
281
|
const metaA = list.find((a) => String(a?.id) === String(idA));
|
|
282
282
|
const metaB = list.find((a) => String(a?.id) === String(idB));
|
|
283
283
|
if (metaA && metaB) {
|
|
@@ -299,6 +299,8 @@ async function resolvePoolAssets(poolId, bitsharesClient) {
|
|
|
299
299
|
throw new Error(`Pool ${fullId}: expected exactly 2 assets, discovered [${(ids || []).join(', ')}]. Pass AssetA/AssetB instead.`);
|
|
300
300
|
}
|
|
301
301
|
const [idA, idB] = ids.map(String);
|
|
302
|
+
if (!db || typeof db.get_assets !== 'function')
|
|
303
|
+
throw new Error(`Pool ${fullId}: chain asset lookup unavailable`);
|
|
302
304
|
const assets = await db.get_assets([idA, idB]);
|
|
303
305
|
const metaA = (assets || []).find((a) => String(a?.id) === idA);
|
|
304
306
|
const metaB = (assets || []).find((a) => String(a?.id) === idB);
|
|
@@ -320,7 +322,7 @@ async function run(cmd) {
|
|
|
320
322
|
process.exit(1);
|
|
321
323
|
process.exit(0);
|
|
322
324
|
}
|
|
323
|
-
const lookbackHours =
|
|
325
|
+
const lookbackHours = monthsToHours(months);
|
|
324
326
|
const bucketMs = INTERVAL_SECONDS * 1000;
|
|
325
327
|
const endMs = Math.floor(Date.now() / bucketMs) * bucketMs;
|
|
326
328
|
const startMs = endMs - lookbackHours * 3600 * 1000;
|
|
@@ -347,8 +349,8 @@ async function run(cmd) {
|
|
|
347
349
|
await waitForConnected();
|
|
348
350
|
let tmpFile = null;
|
|
349
351
|
try {
|
|
350
|
-
let assetA;
|
|
351
|
-
let assetB;
|
|
352
|
+
let assetA = {};
|
|
353
|
+
let assetB = {};
|
|
352
354
|
let poolId = null;
|
|
353
355
|
let feedCtx = null;
|
|
354
356
|
let sourceLabel = '';
|
|
@@ -373,7 +375,7 @@ async function run(cmd) {
|
|
|
373
375
|
}
|
|
374
376
|
else {
|
|
375
377
|
try {
|
|
376
|
-
poolId = (await findPoolByAssets(assetA.id, assetB.id, { bitsharesClient, sortBy: 'assetABalance' })).id;
|
|
378
|
+
poolId = (await findPoolByAssets(String(assetA.id), String(assetB.id), { bitsharesClient, sortBy: 'assetABalance' })).id ?? null;
|
|
377
379
|
}
|
|
378
380
|
catch (_) {
|
|
379
381
|
poolId = null;
|
|
@@ -401,7 +403,7 @@ async function run(cmd) {
|
|
|
401
403
|
}
|
|
402
404
|
else {
|
|
403
405
|
try {
|
|
404
|
-
poolId = (await findPoolByAssets(assetA.id, assetB.id, { bitsharesClient, sortBy: 'assetABalance' })).id;
|
|
406
|
+
poolId = (await findPoolByAssets(String(assetA.id), String(assetB.id), { bitsharesClient, sortBy: 'assetABalance' })).id ?? null;
|
|
405
407
|
}
|
|
406
408
|
catch (_) {
|
|
407
409
|
poolId = null;
|
|
@@ -485,8 +487,7 @@ async function run(cmd) {
|
|
|
485
487
|
// Both renderers resolve bot-scoped config themselves from the SAME
|
|
486
488
|
// --bot-key (AMA config via resolveAmaConfig; tv additionally grid
|
|
487
489
|
// bounds + order overlay). Explicit --ama-*-period forwarding was
|
|
488
|
-
// dropped on purpose: it duplicated that resolution
|
|
489
|
-
// 3 of 4 fields (silently losing erSmoothPeriod).
|
|
490
|
+
// dropped on purpose: it duplicated that resolution.
|
|
490
491
|
if (botKey)
|
|
491
492
|
analyzerArgs.push('--bot-key', botKey);
|
|
492
493
|
const result = spawnSync(process.execPath, [analyzer, ...analyzerArgs], { stdio: 'inherit' });
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* Explicit-`any` budget ratchet.
|
|
4
|
+
*
|
|
5
|
+
* DEXBot2 has ~5k explicit `any` occurrences. Removing them is a long program;
|
|
6
|
+
* this gate makes progress monotonic by failing when the code-line count rises
|
|
7
|
+
* above the committed budget in `any-budget.json`.
|
|
8
|
+
*
|
|
9
|
+
* Counts `any` tokens on code lines only (comment / JSDoc lines are ignored so
|
|
10
|
+
* documentation cleanup is not double-counted).
|
|
11
|
+
*
|
|
12
|
+
* Usage:
|
|
13
|
+
* node dist/scripts/check_any.js # compare against any-budget.json
|
|
14
|
+
* node dist/scripts/check_any.js --update # write the current count as budget
|
|
15
|
+
* node dist/scripts/check_any.js --list # print per-file counts
|
|
16
|
+
*/
|
|
17
|
+
export {};
|
|
18
|
+
//# sourceMappingURL=check_any.d.ts.map
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* Explicit-`any` budget ratchet.
|
|
4
|
+
*
|
|
5
|
+
* DEXBot2 has ~5k explicit `any` occurrences. Removing them is a long program;
|
|
6
|
+
* this gate makes progress monotonic by failing when the code-line count rises
|
|
7
|
+
* above the committed budget in `any-budget.json`.
|
|
8
|
+
*
|
|
9
|
+
* Counts `any` tokens on code lines only (comment / JSDoc lines are ignored so
|
|
10
|
+
* documentation cleanup is not double-counted).
|
|
11
|
+
*
|
|
12
|
+
* Usage:
|
|
13
|
+
* node dist/scripts/check_any.js # compare against any-budget.json
|
|
14
|
+
* node dist/scripts/check_any.js --update # write the current count as budget
|
|
15
|
+
* node dist/scripts/check_any.js --list # print per-file counts
|
|
16
|
+
*/
|
|
17
|
+
import { createRequire } from 'node:module';
|
|
18
|
+
const require = createRequire(import.meta.url);
|
|
19
|
+
const fs = require('fs');
|
|
20
|
+
const path = require('path');
|
|
21
|
+
const { PATHS } = require('../modules/paths');
|
|
22
|
+
const ROOT = PATHS.PROJECT_ROOT;
|
|
23
|
+
const BUDGET_FILE = path.join(ROOT, 'any-budget.json');
|
|
24
|
+
const SCAN_DIRS = ['modules', 'market_adapter', 'analysis', 'scripts'];
|
|
25
|
+
const SCAN_ROOT_FILES = true;
|
|
26
|
+
// `any` as an explicit type token only: not preceded by an identifier char or
|
|
27
|
+
// `.` (so the `Promise.any` built-in / member named `any` is not counted) and
|
|
28
|
+
// not inside a string or template literal (log/help prose is not counted).
|
|
29
|
+
const ANY_RE = new RegExp('(?<![\\w.])any\\b', 'g');
|
|
30
|
+
const COMMENT_LINE_RE = /^\s*(\/\/|\*|\/\*)/;
|
|
31
|
+
/** Blank out string and template-literal spans so their prose is not counted. */
|
|
32
|
+
function stripStrings(line) {
|
|
33
|
+
let out = '';
|
|
34
|
+
let i = 0;
|
|
35
|
+
while (i < line.length) {
|
|
36
|
+
const ch = line[i];
|
|
37
|
+
if (ch === "'" || ch === '"' || ch === '`') {
|
|
38
|
+
i++;
|
|
39
|
+
while (i < line.length && line[i] !== ch) {
|
|
40
|
+
if (line[i] === '\\')
|
|
41
|
+
i++;
|
|
42
|
+
i++;
|
|
43
|
+
}
|
|
44
|
+
i++; // closing quote
|
|
45
|
+
out += ' ';
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
|
+
out += ch;
|
|
49
|
+
i++;
|
|
50
|
+
}
|
|
51
|
+
return out;
|
|
52
|
+
}
|
|
53
|
+
function* walk(dir) {
|
|
54
|
+
if (!fs.existsSync(dir))
|
|
55
|
+
return;
|
|
56
|
+
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
57
|
+
const full = path.join(dir, entry.name);
|
|
58
|
+
if (entry.isDirectory()) {
|
|
59
|
+
if (entry.name === 'node_modules' || entry.name === 'dist' || entry.name === 'tests')
|
|
60
|
+
continue;
|
|
61
|
+
yield* walk(full);
|
|
62
|
+
}
|
|
63
|
+
else if (entry.isFile() && entry.name.endsWith('.ts') && !entry.name.endsWith('.d.ts')) {
|
|
64
|
+
yield full;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
function sourceFiles() {
|
|
69
|
+
const files = [];
|
|
70
|
+
for (const dir of SCAN_DIRS)
|
|
71
|
+
files.push(...walk(path.join(ROOT, dir)));
|
|
72
|
+
if (SCAN_ROOT_FILES) {
|
|
73
|
+
for (const entry of fs.readdirSync(ROOT, { withFileTypes: true })) {
|
|
74
|
+
if (entry.isFile() && entry.name.endsWith('.ts') && !entry.name.endsWith('.d.ts')) {
|
|
75
|
+
files.push(path.join(ROOT, entry.name));
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return files;
|
|
80
|
+
}
|
|
81
|
+
function countAny(file) {
|
|
82
|
+
const lines = fs.readFileSync(file, 'utf8').split(/\r?\n/);
|
|
83
|
+
let count = 0;
|
|
84
|
+
for (const line of lines) {
|
|
85
|
+
if (COMMENT_LINE_RE.test(line))
|
|
86
|
+
continue;
|
|
87
|
+
const matches = stripStrings(line).match(ANY_RE);
|
|
88
|
+
if (matches)
|
|
89
|
+
count += matches.length;
|
|
90
|
+
}
|
|
91
|
+
return count;
|
|
92
|
+
}
|
|
93
|
+
const counts = sourceFiles()
|
|
94
|
+
.map((file) => ({ file: path.relative(ROOT, file), count: countAny(file) }))
|
|
95
|
+
.filter((entry) => entry.count > 0)
|
|
96
|
+
.sort((a, b) => b.count - a.count);
|
|
97
|
+
const total = counts.reduce((sum, entry) => sum + entry.count, 0);
|
|
98
|
+
const listMode = process.argv.includes('--list');
|
|
99
|
+
const updateMode = process.argv.includes('--update');
|
|
100
|
+
if (listMode) {
|
|
101
|
+
for (const entry of counts)
|
|
102
|
+
console.log(`${String(entry.count).padStart(5)} ${entry.file}`);
|
|
103
|
+
console.log(`${String(total).padStart(5)} TOTAL (${counts.length} files)`);
|
|
104
|
+
process.exit(0);
|
|
105
|
+
}
|
|
106
|
+
if (updateMode) {
|
|
107
|
+
fs.writeFileSync(BUDGET_FILE, `${JSON.stringify({ total, updated: new Date().toISOString().slice(0, 10) }, null, 2)}\n`);
|
|
108
|
+
console.log(`budget file updated: total=${total}`);
|
|
109
|
+
process.exit(0);
|
|
110
|
+
}
|
|
111
|
+
let budget = Infinity;
|
|
112
|
+
if (fs.existsSync(BUDGET_FILE)) {
|
|
113
|
+
budget = JSON.parse(fs.readFileSync(BUDGET_FILE, 'utf8')).total;
|
|
114
|
+
}
|
|
115
|
+
if (total > budget) {
|
|
116
|
+
console.error(`\u2716 explicit type budget exceeded: ${total} > ${budget}`);
|
|
117
|
+
console.error(' Reduce usages, or run `node dist/scripts/check_any.js --update` only when lowering the budget.');
|
|
118
|
+
process.exit(1);
|
|
119
|
+
}
|
|
120
|
+
if (total < budget) {
|
|
121
|
+
console.log(`\u2713 explicit type count ${total} is below budget ${budget}. Lower the budget file to ${total} to lock in the gain.`);
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
console.log(`\u2713 explicit type count ${total} is at budget ${budget}.`);
|
|
125
|
+
}
|
|
126
|
+
//# sourceMappingURL=check_any.js.map
|
|
@@ -37,13 +37,16 @@ function parseChainTimeToMs(timeStr) {
|
|
|
37
37
|
return Date.parse(s.endsWith('Z') ? s : `${s}Z`);
|
|
38
38
|
}
|
|
39
39
|
function extractReceived(row) {
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
40
|
+
const r = row;
|
|
41
|
+
const resultPayload = Array.isArray(r?.op?.result) ? r.op.result[1] : null;
|
|
42
|
+
const rp = resultPayload;
|
|
43
|
+
return Array.isArray(rp?.received)
|
|
44
|
+
? rp.received[0]
|
|
45
|
+
: (rp?.received || null);
|
|
44
46
|
}
|
|
45
47
|
function rowHasTradePayload(row) {
|
|
46
|
-
const
|
|
48
|
+
const r = row;
|
|
49
|
+
const opPayload = Array.isArray(r?.op?.op) ? r.op.op[1] : null;
|
|
47
50
|
return !!(opPayload?.amount_to_sell && extractReceived(row));
|
|
48
51
|
}
|
|
49
52
|
async function collectRecentPoolHistory(poolId, sinceMs, limit, maxPages) {
|
|
@@ -59,7 +62,8 @@ async function collectRecentPoolHistory(poolId, sinceMs, limit, maxPages) {
|
|
|
59
62
|
if (!Array.isArray(page) || page.length === 0)
|
|
60
63
|
break;
|
|
61
64
|
pages++;
|
|
62
|
-
for (const
|
|
65
|
+
for (const raw of page) {
|
|
66
|
+
const row = raw;
|
|
63
67
|
const seq = Number(row?.sequence);
|
|
64
68
|
if (Number.isFinite(seq)) {
|
|
65
69
|
if (seenSequences.has(seq))
|
|
@@ -96,7 +100,8 @@ function summarizeRows(rows) {
|
|
|
96
100
|
}
|
|
97
101
|
const byHourMap = new Map();
|
|
98
102
|
let validTrades = 0;
|
|
99
|
-
for (const
|
|
103
|
+
for (const raw of rows) {
|
|
104
|
+
const row = raw;
|
|
100
105
|
if (rowHasTradePayload(row))
|
|
101
106
|
validTrades++;
|
|
102
107
|
const tsMs = parseChainTimeToMs(row?.time || row?.op?.block_time);
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
'use strict';
|
|
3
|
+
/**
|
|
4
|
+
* Usage:
|
|
5
|
+
* dexbot pnl <bot|account|1.2.x> [--month N] [--pair BASE/QUOTE] [--report <file>]
|
|
6
|
+
*
|
|
7
|
+
* Thin entry for the PnL analyzer (analysis/trade_profitability.ts) in HTML
|
|
8
|
+
* mode. The reference is resolved against local bot profiles first, then the
|
|
9
|
+
* chain; the account's fills for the requested window are analyzed and written
|
|
10
|
+
* as a self-contained HTML report. Terminal tables remain available by running
|
|
11
|
+
* the analyzer directly (node dist/analysis/trade_profitability.js); --json /
|
|
12
|
+
* --csv exports pass straight through.
|
|
13
|
+
*/
|
|
14
|
+
import { pathToFileURL } from 'node:url';
|
|
15
|
+
import { getErrorMessage } from '../modules/utils/errors.js';
|
|
16
|
+
import { run } from '../analysis/trade_profitability.js';
|
|
17
|
+
const invoked = process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href;
|
|
18
|
+
if (invoked) {
|
|
19
|
+
const args = process.argv.slice(2);
|
|
20
|
+
// HTML is this command's primary output, but only once an account/target is
|
|
21
|
+
// present: with no positional argument the analyzer should print its usage
|
|
22
|
+
// instead of treating the injected flag as the account. Leave --help/-h and
|
|
23
|
+
// explicit --html/--report untouched so their own handling wins.
|
|
24
|
+
// Append (never prepend) the injected flag: the analyzer treats argv[0] as
|
|
25
|
+
// the account/target positional, so a leading flag would be read as the
|
|
26
|
+
// account name (`dexbot pnl bbot9` would become `--html bbot9`).
|
|
27
|
+
const hasTarget = args.some(a => !a.startsWith('-'));
|
|
28
|
+
const ownsOutput = args.includes('--html') || args.includes('--report') || args.includes('--help') || args.includes('-h');
|
|
29
|
+
if (hasTarget && !ownsOutput)
|
|
30
|
+
args.push('--html');
|
|
31
|
+
run(args)
|
|
32
|
+
.then(() => process.exit(0))
|
|
33
|
+
.catch((err) => {
|
|
34
|
+
console.error(`[pnl] Error: ${getErrorMessage(err)}`);
|
|
35
|
+
if (process.env.DEBUG)
|
|
36
|
+
console.error(err);
|
|
37
|
+
process.exit(1);
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=pnl.js.map
|
|
@@ -49,7 +49,6 @@ function printGridSample() {
|
|
|
49
49
|
// Generate order grid using the configuration
|
|
50
50
|
// createOrderGrid returns { orders, boundaryIdx, initialSpreadCount }
|
|
51
51
|
const { orders, initialSpreadCount: _initialSpreadCount } = createOrderGrid(config);
|
|
52
|
-
// Separate sell and buy orders, extracting just the prices
|
|
53
52
|
const sell = orders.filter((o) => o.type === 'sell').map((o) => o.price);
|
|
54
53
|
const buy = orders.filter((o) => o.type === 'buy').map((o) => o.price);
|
|
55
54
|
// Display sell levels from highest (top) down toward market price
|
|
@@ -138,20 +138,52 @@ function runOne(testFile) {
|
|
|
138
138
|
});
|
|
139
139
|
});
|
|
140
140
|
}
|
|
141
|
-
// ── Main
|
|
141
|
+
// ── Main loop ────────────────────────────────────────────────────────
|
|
142
|
+
// Files run sequentially by default. Set DEXBOT_TEST_CONCURRENCY>1 to run
|
|
143
|
+
// that many files in parallel (opt-in: several tests share tests/tmp paths, so
|
|
144
|
+
// parallelism must be requested deliberately rather than assumed safe).
|
|
142
145
|
async function main() {
|
|
143
|
-
const results = [];
|
|
144
146
|
let startTotal = performance.now();
|
|
147
|
+
const concurrency = (() => {
|
|
148
|
+
const raw = Number(process.env.DEXBOT_TEST_CONCURRENCY);
|
|
149
|
+
return Number.isFinite(raw) && raw >= 1 ? Math.floor(raw) : 1;
|
|
150
|
+
})();
|
|
151
|
+
const toRun = [];
|
|
145
152
|
for (const testFile of testFiles) {
|
|
146
153
|
if (liveTestFiles.has(testFile) && !runLiveTests) {
|
|
147
154
|
skippedLive++;
|
|
148
155
|
continue;
|
|
149
156
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
157
|
+
toRun.push(testFile);
|
|
158
|
+
}
|
|
159
|
+
const results = new Array(toRun.length);
|
|
160
|
+
if (concurrency <= 1) {
|
|
161
|
+
for (let i = 0; i < toRun.length; i++) {
|
|
162
|
+
const testFile = toRun[i];
|
|
163
|
+
footer(`\n=== [TEST] ${testFile} ===`);
|
|
164
|
+
const r = await runOne(testFile);
|
|
165
|
+
results[i] = r;
|
|
166
|
+
const statusTag = r.timedOut ? 'TIMEOUT' : (r.failed ? 'FAIL' : 'PASS');
|
|
167
|
+
footer(`--- [${statusTag}] ${testFile} ${r.elapsedMs.toFixed(0)} ms${r.signal ? ` (signal ${r.signal})` : ''}`);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
footer(`\n(running up to ${concurrency} test files in parallel)`);
|
|
172
|
+
let next = 0;
|
|
173
|
+
const worker = async () => {
|
|
174
|
+
while (true) {
|
|
175
|
+
const i = next++;
|
|
176
|
+
if (i >= toRun.length)
|
|
177
|
+
return;
|
|
178
|
+
const testFile = toRun[i];
|
|
179
|
+
footer(`\n=== [TEST] ${testFile} ===`);
|
|
180
|
+
const r = await runOne(testFile);
|
|
181
|
+
results[i] = r;
|
|
182
|
+
const statusTag = r.timedOut ? 'TIMEOUT' : (r.failed ? 'FAIL' : 'PASS');
|
|
183
|
+
footer(`--- [${statusTag}] ${testFile} ${r.elapsedMs.toFixed(0)} ms${r.signal ? ` (signal ${r.signal})` : ''}`);
|
|
184
|
+
}
|
|
185
|
+
};
|
|
186
|
+
await Promise.all(Array.from({ length: Math.min(concurrency, toRun.length) }, worker));
|
|
155
187
|
}
|
|
156
188
|
const totalMs = performance.now() - startTotal;
|
|
157
189
|
// ── Summary ──────────────────────────────────────────────────────
|
package/dist/scripts/runner.js
CHANGED
|
@@ -82,7 +82,7 @@ async function runOrderManagerCalculation() {
|
|
|
82
82
|
const envName = Config.LIVE_BOT_NAME || Config.BOT_NAME;
|
|
83
83
|
let chosenBot = null;
|
|
84
84
|
if (envName)
|
|
85
|
-
chosenBot = bots.find((b) => String(b.name).toLowerCase() === String(envName).toLowerCase());
|
|
85
|
+
chosenBot = bots.find((b) => String(b.name).toLowerCase() === String(envName).toLowerCase()) ?? null;
|
|
86
86
|
if (!chosenBot)
|
|
87
87
|
chosenBot = bots[0];
|
|
88
88
|
if (!chosenBot) {
|
|
@@ -8,7 +8,7 @@ const CreditRuntime = require('../modules/credit_runtime').default;
|
|
|
8
8
|
const { disconnectClient, waitForConnected } = require('../modules/bitshares_client');
|
|
9
9
|
const chainOrders = require('../modules/chain_orders');
|
|
10
10
|
const { PATHS } = require('../modules/paths');
|
|
11
|
-
const { getErrorMessage } = require('../modules/utils/errors');
|
|
11
|
+
const { getErrorMessage, getErrorName } = require('../modules/utils/errors');
|
|
12
12
|
const { loadSettingsFile, normalizeBotEntries, resolveRawBotEntries } = require('../modules/bot_settings');
|
|
13
13
|
const { getStoredBotAccountId, persistBotAccountId } = require('../analysis/bot_key_utils');
|
|
14
14
|
const { isSameBotName } = require('../modules/utils/sanitize_key');
|
|
@@ -129,7 +129,10 @@ function ceilToPrecision(value, precision) {
|
|
|
129
129
|
return Math.ceil(value * scale) / scale;
|
|
130
130
|
}
|
|
131
131
|
function summarizeOperations(calls) {
|
|
132
|
-
return calls.flatMap((call) =>
|
|
132
|
+
return calls.flatMap((call) => {
|
|
133
|
+
const c = call;
|
|
134
|
+
return (c.operations || []).map((op) => op.op_name);
|
|
135
|
+
});
|
|
133
136
|
}
|
|
134
137
|
async function main() {
|
|
135
138
|
const args = parseArgs(process.argv.slice(2));
|
|
@@ -167,13 +170,13 @@ async function main() {
|
|
|
167
170
|
// Bot's own account: reuse the ID stamped by the bot editor when it still
|
|
168
171
|
// matches the current preferredAccount (no chain hit).
|
|
169
172
|
try {
|
|
170
|
-
accountId = getStoredBotAccountId(profileBot.botKey, accountRef);
|
|
173
|
+
accountId = getStoredBotAccountId(String(profileBot.botKey), accountRef);
|
|
171
174
|
}
|
|
172
175
|
catch (_) {
|
|
173
176
|
accountId = null;
|
|
174
177
|
}
|
|
175
178
|
if (accountId)
|
|
176
|
-
console.log(`Using stored accountId ${accountId} for bot "${profileBot
|
|
179
|
+
console.log(`Using stored accountId ${accountId} for bot "${getErrorName(profileBot)}" (no lookup needed)`);
|
|
177
180
|
}
|
|
178
181
|
if (!accountId) {
|
|
179
182
|
accountId = await chainOrders.resolveAccountId(accountRef);
|
|
@@ -183,8 +186,8 @@ async function main() {
|
|
|
183
186
|
// lookup. Explicit --account overrides resolve fresh and are never stored.
|
|
184
187
|
if (!args.account && profileBot.botKey) {
|
|
185
188
|
try {
|
|
186
|
-
if (persistBotAccountId(profileBot.botKey, accountId)) {
|
|
187
|
-
console.log(`Stored accountId ${accountId} in profiles/bots.json for bot "${profileBot
|
|
189
|
+
if (persistBotAccountId(String(profileBot.botKey), accountId)) {
|
|
190
|
+
console.log(`Stored accountId ${accountId} in profiles/bots.json for bot "${getErrorName(profileBot)}"`);
|
|
188
191
|
}
|
|
189
192
|
}
|
|
190
193
|
catch (_) {
|
|
@@ -241,25 +244,27 @@ async function main() {
|
|
|
241
244
|
throw new Error(`Unable to resolve collateral asset: ${collateralAssetRef}`);
|
|
242
245
|
await runtime.refreshState();
|
|
243
246
|
const posKey = `${debtAsset.id}:${collateralAsset.id}`;
|
|
244
|
-
const posState = runtime.state.positions[posKey] || {};
|
|
247
|
+
const posState = (runtime.state.positions[posKey] || {});
|
|
245
248
|
const deals = Array.isArray(posState.creditDeals) ? posState.creditDeals : [];
|
|
246
249
|
if (deals.length === 0) {
|
|
247
250
|
throw new Error(`No current credit deals found for ${accountName || accountRef} ${debtAsset.symbol}-${collateralAsset.symbol}. Renew-only mode has nothing to renew.`);
|
|
248
251
|
}
|
|
249
252
|
const offerById = new Map();
|
|
250
|
-
const enrichedDeals = await Promise.all(deals.map(async (
|
|
253
|
+
const enrichedDeals = await Promise.all(deals.map(async (dealInput) => {
|
|
254
|
+
const deal = dealInput;
|
|
251
255
|
const debtFloat = amountToFloat(deal.debtAmount, debtAsset);
|
|
252
256
|
const collateralFloat = amountToFloat(deal.collateralAmount, collateralAsset);
|
|
253
|
-
|
|
254
|
-
|
|
257
|
+
const offerKey = String(deal.offerId);
|
|
258
|
+
if (!offerById.has(offerKey)) {
|
|
259
|
+
offerById.set(offerKey, await runtime._getOfferById(deal.offerId));
|
|
255
260
|
}
|
|
256
|
-
const offer = offerById.get(
|
|
261
|
+
const offer = offerById.get(offerKey);
|
|
257
262
|
const collateralMap = offer?.acceptable_collateral instanceof Map
|
|
258
263
|
? offer.acceptable_collateral
|
|
259
264
|
: new Map(Array.isArray(offer?.acceptable_collateral)
|
|
260
265
|
? offer.acceptable_collateral
|
|
261
|
-
: Object.entries(offer?.acceptable_collateral || {}));
|
|
262
|
-
const collateralPrice = collateralMap.get(collateralAsset.id);
|
|
266
|
+
: Object.entries((offer?.acceptable_collateral || {})));
|
|
267
|
+
const collateralPrice = collateralMap.get(String(collateralAsset.id));
|
|
263
268
|
const marketValueInDebt = await runtime._calculateCollateralValueInDebtAsset(deal.collateralAmount, collateralAsset, debtAsset, collateralPrice);
|
|
264
269
|
const creditOfferValueInDebt = runtime._calculateCreditOfferCollateralValueInDebtAsset(deal.collateralAmount, collateralAsset, debtAsset, collateralPrice);
|
|
265
270
|
const feeDueFloat = amountToFloat(Math.ceil((Number(deal.debtAmount || 0) * Number(deal.feeRate || 0)) / CREDIT_FEE_RATE_DENOM), debtAsset);
|
|
@@ -276,8 +281,8 @@ async function main() {
|
|
|
276
281
|
hoursLeft: hoursUntil(deal.latestRepayTime),
|
|
277
282
|
};
|
|
278
283
|
}));
|
|
279
|
-
const currentDebt = enrichedDeals.reduce((sum, deal) => sum + (
|
|
280
|
-
const currentCollateral = enrichedDeals.reduce((sum, deal) => sum + (
|
|
284
|
+
const currentDebt = enrichedDeals.reduce((sum, deal) => sum + (deal.debtFloat ?? 0), 0);
|
|
285
|
+
const currentCollateral = enrichedDeals.reduce((sum, deal) => sum + (deal.collateralFloat ?? 0), 0);
|
|
281
286
|
const allowedOfferIds = Array.from(new Set(enrichedDeals.map((deal) => deal.offerId).filter(Boolean)));
|
|
282
287
|
const maxBorrowAmount = ceilToPrecision(currentDebt, debtAsset.precision);
|
|
283
288
|
const maxObservedCollateralRatio = enrichedDeals.reduce((max, deal) => (Number.isFinite(deal.collateralRatio) ? Math.max(max, deal.collateralRatio) : max), 0);
|
|
@@ -301,7 +306,7 @@ async function main() {
|
|
|
301
306
|
if (standaloneAccept) {
|
|
302
307
|
throw new Error('Renew-only guard failed: dry-run attempted a standalone credit_offer_accept.');
|
|
303
308
|
}
|
|
304
|
-
const dueDeals = enrichedDeals.filter((deal) => Number.isFinite(deal.hoursLeft) && deal.hoursLeft < args.thresholdHours);
|
|
309
|
+
const dueDeals = enrichedDeals.filter((deal) => deal.hoursLeft != null && Number.isFinite(deal.hoursLeft) && deal.hoursLeft < args.thresholdHours);
|
|
305
310
|
if (dueDeals.length > 0 && repayCount < dueDeals.length) {
|
|
306
311
|
throw new Error(`Renewal guard failed: ${dueDeals.length} due deal(s) but only ${repayCount} repay op(s).`);
|
|
307
312
|
}
|
|
@@ -331,11 +336,15 @@ async function main() {
|
|
|
331
336
|
console.log(`Renew threshold: ${args.thresholdHours} hours before latest_repay_time`);
|
|
332
337
|
console.log(`Deals due inside threshold: ${dueDeals.length}`);
|
|
333
338
|
for (const deal of enrichedDeals) {
|
|
334
|
-
const
|
|
335
|
-
const
|
|
336
|
-
const
|
|
337
|
-
const
|
|
338
|
-
const
|
|
339
|
+
const hoursLeft = deal.hoursLeft;
|
|
340
|
+
const collateralRatio = deal.collateralRatio;
|
|
341
|
+
const marketValueInDebt = deal.marketValueInDebt;
|
|
342
|
+
const creditOfferValueInDebt = deal.creditOfferValueInDebt;
|
|
343
|
+
const hours = hoursLeft != null && Number.isFinite(hoursLeft) ? hoursLeft.toFixed(2) : 'unknown';
|
|
344
|
+
const ratio = collateralRatio != null && Number.isFinite(collateralRatio) ? collateralRatio.toFixed(3) : 'unknown';
|
|
345
|
+
const due = hoursLeft != null && Number.isFinite(hoursLeft) && hoursLeft < args.thresholdHours ? 'DUE' : 'not due';
|
|
346
|
+
const marketValue = marketValueInDebt != null && Number.isFinite(marketValueInDebt) ? marketValueInDebt.toFixed(5) : 'unknown';
|
|
347
|
+
const creditValue = creditOfferValueInDebt != null && Number.isFinite(creditOfferValueInDebt) ? creditOfferValueInDebt.toFixed(5) : 'unknown';
|
|
339
348
|
console.log(`- ${deal.id}: debt=${deal.debtFloat} ${debtAsset.symbol}, collateral=${deal.collateralFloat} ${collateralAsset.symbol}, market_value=${marketValue} ${debtAsset.symbol}, credit_offer_value=${creditValue} ${debtAsset.symbol}, market_to_credit_ratio=${ratio}, offer=${deal.offerId}, auto_repay=${deal.autoRepay}, hours_left=${hours}, ${due}`);
|
|
340
349
|
}
|
|
341
350
|
console.log(`Dry-run operation sequence: ${opNames.length ? opNames.join(' -> ') : 'none'}`);
|
package/dist/scripts/update.d.ts
CHANGED
|
@@ -10,13 +10,18 @@
|
|
|
10
10
|
* - Handles branch switching if needed
|
|
11
11
|
* - Reinstalls npm dependencies and rebuilds TypeScript sources
|
|
12
12
|
*
|
|
13
|
-
* 2.
|
|
13
|
+
* 2. Package install (npm / pnpm / yarn):
|
|
14
|
+
* - Classifies the exact layout via scripts/update_layout.ts
|
|
14
15
|
* - Compares the installed version against the npm registry
|
|
15
|
-
* -
|
|
16
|
+
* - npm global: runs `npm install -g <pkg>@<latest>` in place (its package
|
|
17
|
+
* directory is stable across reinstalls), then verifies version + dist/
|
|
18
|
+
* - local / linked / pnpm / yarn: NOT replaced in place (the parent
|
|
19
|
+
* lockfile owns a local dep; pnpm/yarn global trees are
|
|
20
|
+
* content-addressed and version-hashed). Update is refused with the exact
|
|
21
|
+
* command to run instead.
|
|
16
22
|
* - Skips the git and local build steps (published packages are pre-built)
|
|
17
|
-
* -
|
|
18
|
-
*
|
|
19
|
-
* parent project with `npm update`)
|
|
23
|
+
* - Resolves the manager CLI next to the running Node (process.execPath) so
|
|
24
|
+
* a version-manager (nvm/fnm/volta) PATH mismatch is not a false failure
|
|
20
25
|
*
|
|
21
26
|
* Shared tail for both layouts:
|
|
22
27
|
* - Selectively restarts active runtime processes
|