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,3 +1,4 @@
|
|
|
1
|
+
import type { OrderManagerLike, ChainOrder, ChainOrdersLike, ManagedOrder, GridConfig, LoggerLike } from '../types.js';
|
|
1
2
|
/**
|
|
2
3
|
* Resume a persisted grid whose order ids no longer match the book, by
|
|
3
4
|
* re-adopting the live chain orders into the frozen ladder (nearest-slot).
|
|
@@ -18,13 +19,13 @@
|
|
|
18
19
|
* @returns {Promise<{resumed: boolean, matchedCount: number}>}
|
|
19
20
|
*/
|
|
20
21
|
export declare function attemptResumePersistedGridByPriceMatch({ manager, persistedGrid, chainOpenOrders, logger, storeGrid, boundaryIdx, genesis, }: {
|
|
21
|
-
manager:
|
|
22
|
-
persistedGrid:
|
|
23
|
-
chainOpenOrders:
|
|
24
|
-
logger:
|
|
25
|
-
storeGrid:
|
|
22
|
+
manager: OrderManagerLike;
|
|
23
|
+
persistedGrid: ManagedOrder[];
|
|
24
|
+
chainOpenOrders: ChainOrder[];
|
|
25
|
+
logger: LoggerLike;
|
|
26
|
+
storeGrid: (orders: ManagedOrder[]) => unknown;
|
|
26
27
|
boundaryIdx?: number | null;
|
|
27
|
-
genesis?:
|
|
28
|
+
genesis?: unknown;
|
|
28
29
|
}): Promise<{
|
|
29
30
|
resumed: boolean;
|
|
30
31
|
matchedCount: number;
|
|
@@ -47,19 +48,19 @@ export declare function attemptResumePersistedGridByPriceMatch({ manager, persis
|
|
|
47
48
|
* @returns {Promise<Object>} { shouldRegenerate, hasActiveMatch, resumedByPrice, matchedCount }
|
|
48
49
|
*/
|
|
49
50
|
export declare function decideStartupGridAction({ persistedGrid, chainOpenOrders, manager, logger, storeGrid, boundaryIdx, genesis, attemptResumeFn, }: {
|
|
50
|
-
persistedGrid:
|
|
51
|
-
chainOpenOrders:
|
|
52
|
-
manager:
|
|
53
|
-
logger:
|
|
54
|
-
storeGrid:
|
|
51
|
+
persistedGrid: ManagedOrder[];
|
|
52
|
+
chainOpenOrders: ChainOrder[];
|
|
53
|
+
manager: OrderManagerLike;
|
|
54
|
+
logger: LoggerLike;
|
|
55
|
+
storeGrid: (orders: ManagedOrder[]) => unknown;
|
|
55
56
|
boundaryIdx?: number | null;
|
|
56
|
-
genesis?:
|
|
57
|
-
attemptResumeFn?:
|
|
57
|
+
genesis?: unknown;
|
|
58
|
+
attemptResumeFn?: typeof attemptResumePersistedGridByPriceMatch;
|
|
58
59
|
}): Promise<{
|
|
59
60
|
shouldRegenerate: boolean;
|
|
60
61
|
hasActiveMatch: boolean;
|
|
61
62
|
resumedByPrice: boolean;
|
|
62
|
-
matchedCount:
|
|
63
|
+
matchedCount: number;
|
|
63
64
|
}>;
|
|
64
65
|
/**
|
|
65
66
|
* Reconcile existing on-chain orders to a newly generated grid.
|
|
@@ -81,11 +82,11 @@ export declare function decideStartupGridAction({ persistedGrid, chainOpenOrders
|
|
|
81
82
|
* @returns {Promise<Object|null>} Reconciliation result, or null when reconciliation completes without a summary object
|
|
82
83
|
*/
|
|
83
84
|
export declare function reconcileGridOrders({ manager, config, account, privateKey, chainOrders, chainOpenOrders, }: {
|
|
84
|
-
manager:
|
|
85
|
-
config:
|
|
86
|
-
account:
|
|
87
|
-
privateKey:
|
|
88
|
-
chainOrders:
|
|
89
|
-
chainOpenOrders:
|
|
85
|
+
manager: OrderManagerLike;
|
|
86
|
+
config: GridConfig;
|
|
87
|
+
account: string;
|
|
88
|
+
privateKey: string;
|
|
89
|
+
chainOrders: ChainOrdersLike;
|
|
90
|
+
chainOpenOrders: ChainOrder[];
|
|
90
91
|
}): Promise<null>;
|
|
91
92
|
//# sourceMappingURL=grid_reconcile.d.ts.map
|
|
@@ -78,10 +78,10 @@ export async function attemptResumePersistedGridByPriceMatch({ manager, persiste
|
|
|
78
78
|
logger && logger.log && logger.log('No matching active order IDs found. Attempting to re-adopt by ladder level...', 'info');
|
|
79
79
|
const { loadGrid } = require('./grid');
|
|
80
80
|
// Prefer explicit genesis if caller wired it, else fall back to manager._genesis
|
|
81
|
-
const genesisArg = genesis ?? manager
|
|
81
|
+
const genesisArg = genesis ?? manager._genesis ?? null;
|
|
82
82
|
await loadGrid(manager, persistedGrid, boundaryIdx, genesisArg);
|
|
83
83
|
await manager.synchronizeWithChain(chainOpenOrders, 'readOpenOrders');
|
|
84
|
-
const matchedOrderIds = new Set(Array.from(manager.orders.values())
|
|
84
|
+
const matchedOrderIds = new Set((Array.from(manager.orders.values()))
|
|
85
85
|
.filter((o) => o && isOrderOnChain(o))
|
|
86
86
|
.map((o) => o.orderId)
|
|
87
87
|
.filter(Boolean));
|
|
@@ -179,7 +179,7 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
179
179
|
const dryRun = !!(config && config.dryRun);
|
|
180
180
|
const parsedChain = (chainOpenOrders || [])
|
|
181
181
|
.map((co) => ({ chain: co, parsed: parseChainOrder(co, manager.assets) }))
|
|
182
|
-
.filter((x) => x.parsed);
|
|
182
|
+
.filter((x) => x.parsed !== null);
|
|
183
183
|
const activeCfg = (config && config.activeOrders) ? config.activeOrders : {};
|
|
184
184
|
let targetBuy = Math.max(0, Number.isFinite(Number(activeCfg.buy)) ? Number(activeCfg.buy) : 1)
|
|
185
185
|
+ resolveReserveCount(config, 'buy');
|
|
@@ -195,10 +195,10 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
195
195
|
throw new Error('manager._applyOrderUpdate is required for startup reconciliation');
|
|
196
196
|
}
|
|
197
197
|
const applyUpdate = manager._applyOrderUpdate.bind(manager);
|
|
198
|
-
const chainIds = new Set((Array.isArray(chainOpenOrders) ? chainOpenOrders : []).map(o => o
|
|
198
|
+
const chainIds = new Set((Array.isArray(chainOpenOrders) ? chainOpenOrders : []).map(o => o?.id).filter((id) => Boolean(id)));
|
|
199
199
|
for (const order of manager.orders.values()) {
|
|
200
200
|
if (isOrderPlaced(order)) {
|
|
201
|
-
if (!chainIds.has(order.orderId)) {
|
|
201
|
+
if (!order.orderId || !chainIds.has(order.orderId)) {
|
|
202
202
|
// Absence-decision guard: only virtualize as a phantom when
|
|
203
203
|
// the absence is trustworthy. An orderId assigned within the
|
|
204
204
|
// sync-lock window may be an in-flight create/adopt whose
|
|
@@ -208,7 +208,7 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
208
208
|
// reconcile-timeout death-spiral root cause). Mirror the
|
|
209
209
|
// sync_engine committed-order guard; ghost orders (PARTIAL +
|
|
210
210
|
// size=0) still pass through so known fills get cleaned up.
|
|
211
|
-
const assignedAt = manager._orderIdAssignedAt?.get(order.orderId) || 0;
|
|
211
|
+
const assignedAt = manager._orderIdAssignedAt?.get(order.orderId ?? '') || 0;
|
|
212
212
|
const isGhost = order.size <= 0 && order.state === ORDER_STATES.PARTIAL;
|
|
213
213
|
if (!isGhost && assignedAt > 0 && Date.now() - assignedAt < TIMING.SYNC_LOCK_TIMEOUT_MS) {
|
|
214
214
|
logger?.log?.(`Startup: Order ${order.id} (ID ${order.orderId}) absent from snapshot but freshly assigned ` +
|
|
@@ -234,10 +234,10 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
234
234
|
const unmatchedChain = (Array.isArray(chainOpenOrders) ? chainOpenOrders : []).filter((co) => co && !matchedChainOrderIds.has(co.id));
|
|
235
235
|
let unmatchedParsed = unmatchedChain
|
|
236
236
|
.map((co) => ({ chain: co, parsed: parseChainOrder(co, manager.assets) }))
|
|
237
|
-
.filter((x) => x.parsed);
|
|
237
|
+
.filter((x) => x.parsed !== null);
|
|
238
238
|
const plannedCancels = [];
|
|
239
239
|
const cancelledDuplicateIds = new Set();
|
|
240
|
-
const activeGridOrders = Array.from(manager.orders.values()).filter((o) => o && o.orderId && isOrderPlaced(o));
|
|
240
|
+
const activeGridOrders = (Array.from(manager.orders.values())).filter((o) => o && o.orderId && isOrderPlaced(o));
|
|
241
241
|
// Update-first policy: unmatched chain orders are NEVER cancelled here.
|
|
242
242
|
// They flow into _reconcileStartupSide below, which price-updates them onto
|
|
243
243
|
// rail slots in a single batch (plannedUpdates), creates missing orders, and
|
|
@@ -271,8 +271,9 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
271
271
|
chainOrders.wasRecentlyOwnCancelled(p.orderId);
|
|
272
272
|
if (alreadyQueued || alreadyCancelled) {
|
|
273
273
|
if (manager.accountant && manager._fundLock && p.size != null && p.size > 0) {
|
|
274
|
+
const size = p.size;
|
|
274
275
|
await manager._fundLock.acquire(async () => {
|
|
275
|
-
await manager.accountant.addToChainFree(p.type,
|
|
276
|
+
await manager.accountant.addToChainFree(p.type, size, 'startup-skip-duplicate');
|
|
276
277
|
});
|
|
277
278
|
}
|
|
278
279
|
cancelledDuplicateIds.add(p.orderId);
|
|
@@ -414,7 +415,7 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
414
415
|
}
|
|
415
416
|
catch (cancelErr) {
|
|
416
417
|
logger?.log?.(`Startup: Failed to cancel queued order ${cancelPlan.chainOrderId}: ${getErrorMessage(cancelErr)}. ` +
|
|
417
|
-
`The order stays live: the relocation/create phases will skip
|
|
418
|
+
`The order stays live: the relocation/create phases will skip a placement ` +
|
|
418
419
|
`that would cross it (STARTUP-CROSS-GUARD) and re-align on the next cycle.`, 'error');
|
|
419
420
|
}
|
|
420
421
|
}
|
|
@@ -451,7 +452,7 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
451
452
|
triggerMessage: `Startup: Triggering recovery sync after update batch failure (attempt ${attempt}/${maxBatchAttempts})`,
|
|
452
453
|
source: 'startupReconcileUpdateBatchFailure',
|
|
453
454
|
});
|
|
454
|
-
updatePlans = _refreshStartupUpdatePlans(updatePlans, refreshedChainOrders);
|
|
455
|
+
updatePlans = _refreshStartupUpdatePlans(updatePlans, refreshedChainOrders ?? []);
|
|
455
456
|
if (updatePlans.length === 0) {
|
|
456
457
|
logger?.log?.('Startup: No update plans remain after recovery sync; skipping further update attempts', 'warn');
|
|
457
458
|
batchCompleted = true;
|
|
@@ -518,7 +519,7 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
518
519
|
if (freshOpenOrders !== null) {
|
|
519
520
|
const freshParsed = (Array.isArray(freshOpenOrders) ? freshOpenOrders : [])
|
|
520
521
|
.map((co) => ({ chain: co, parsed: parseChainOrder(co, manager.assets) }))
|
|
521
|
-
.filter((x) => x.parsed);
|
|
522
|
+
.filter((x) => x.parsed !== null);
|
|
522
523
|
const gridOrderIds = new Set();
|
|
523
524
|
for (const order of manager.orders.values()) {
|
|
524
525
|
if (order && order.orderId)
|
|
@@ -4,6 +4,19 @@
|
|
|
4
4
|
* Extracted from grid_reconcile.ts for file-size management.
|
|
5
5
|
* All helpers are prefixed with _ and are NOT part of the public API.
|
|
6
6
|
*/
|
|
7
|
+
import type { OrderManagerLike, ManagedOrder, ChainOrder, ParsedChainOrder, ChainOrdersLike, LoggerLike, UnknownRecord, StartupCreatePlan, StartupUpdatePlan, StartupCancelPlan, OrderType } from '../types.js';
|
|
8
|
+
interface PreparedStartupUpdate {
|
|
9
|
+
plan: StartupUpdatePlan;
|
|
10
|
+
chainOrderId: string;
|
|
11
|
+
gridOrder: ManagedOrder;
|
|
12
|
+
parsedChain: ParsedChainOrder | null;
|
|
13
|
+
updateParams: {
|
|
14
|
+
newPrice: number;
|
|
15
|
+
amountToSell: unknown;
|
|
16
|
+
minToReceive: unknown;
|
|
17
|
+
orderType: OrderType;
|
|
18
|
+
};
|
|
19
|
+
}
|
|
7
20
|
/**
|
|
8
21
|
* Count active orders on the grid for a given type.
|
|
9
22
|
* @param {Object} manager - OrderManager instance.
|
|
@@ -11,7 +24,7 @@
|
|
|
11
24
|
* @returns {number} Count of active and partial orders with orderId.
|
|
12
25
|
* @private
|
|
13
26
|
*/
|
|
14
|
-
declare function _countActiveOnGrid(manager:
|
|
27
|
+
declare function _countActiveOnGrid(manager: OrderManagerLike, type: OrderType): number;
|
|
15
28
|
/**
|
|
16
29
|
* Pick virtual slots to activate based on type and count.
|
|
17
30
|
* @param {Object} manager - OrderManager instance.
|
|
@@ -20,7 +33,7 @@ declare function _countActiveOnGrid(manager: any, type: any): number;
|
|
|
20
33
|
* @returns {Array<Object>} Array of picked virtual slots.
|
|
21
34
|
* @private
|
|
22
35
|
*/
|
|
23
|
-
declare function _pickVirtualSlotsToActivate(manager:
|
|
36
|
+
declare function _pickVirtualSlotsToActivate(manager: OrderManagerLike, type: OrderType, count: number): ManagedOrder[];
|
|
24
37
|
/**
|
|
25
38
|
* Create a new chain order from a grid slot.
|
|
26
39
|
*
|
|
@@ -38,13 +51,13 @@ declare function _pickVirtualSlotsToActivate(manager: any, type: any, count: any
|
|
|
38
51
|
* @returns {Promise<void>}
|
|
39
52
|
*/
|
|
40
53
|
declare function _createOrderFromGrid({ chainOrders, account, privateKey, manager, gridOrder, dryRun, extraOptions }: {
|
|
41
|
-
chainOrders:
|
|
42
|
-
account:
|
|
43
|
-
privateKey:
|
|
44
|
-
manager:
|
|
45
|
-
gridOrder:
|
|
46
|
-
dryRun:
|
|
47
|
-
extraOptions?:
|
|
54
|
+
chainOrders: ChainOrdersLike;
|
|
55
|
+
account: string;
|
|
56
|
+
privateKey: string;
|
|
57
|
+
manager: OrderManagerLike;
|
|
58
|
+
gridOrder: ManagedOrder;
|
|
59
|
+
dryRun: boolean;
|
|
60
|
+
extraOptions?: UnknownRecord;
|
|
48
61
|
}): Promise<string | null>;
|
|
49
62
|
/**
|
|
50
63
|
* Cancel a chain order and sync with manager.
|
|
@@ -64,94 +77,94 @@ declare function _createOrderFromGrid({ chainOrders, account, privateKey, manage
|
|
|
64
77
|
* @private
|
|
65
78
|
*/
|
|
66
79
|
declare function _cancelChainOrder({ chainOrders, account, privateKey, manager, chainOrderId, dryRun, chainOrderObj, releaseUntrackedFunds, shouldCancel }: {
|
|
67
|
-
chainOrders:
|
|
68
|
-
account:
|
|
69
|
-
privateKey:
|
|
70
|
-
manager:
|
|
71
|
-
chainOrderId:
|
|
72
|
-
dryRun:
|
|
73
|
-
chainOrderObj:
|
|
80
|
+
chainOrders: ChainOrdersLike;
|
|
81
|
+
account: string;
|
|
82
|
+
privateKey: string;
|
|
83
|
+
manager: OrderManagerLike;
|
|
84
|
+
chainOrderId: string;
|
|
85
|
+
dryRun: boolean;
|
|
86
|
+
chainOrderObj: ChainOrder | ManagedOrder | null;
|
|
74
87
|
releaseUntrackedFunds?: boolean;
|
|
75
88
|
shouldCancel?: (() => boolean) | null;
|
|
76
89
|
}): Promise<boolean>;
|
|
77
90
|
declare function _recoverStartupSyncFailure({ chainOrders, manager, account, logger, triggerMessage, source }: {
|
|
78
|
-
chainOrders:
|
|
79
|
-
manager:
|
|
80
|
-
account:
|
|
81
|
-
logger:
|
|
82
|
-
triggerMessage:
|
|
83
|
-
source:
|
|
84
|
-
}): Promise<
|
|
85
|
-
declare function _refreshStartupUpdatePlans(updatePlans:
|
|
86
|
-
declare function _prepareStartupUpdatePlan(plan:
|
|
91
|
+
chainOrders: ChainOrdersLike;
|
|
92
|
+
manager: OrderManagerLike;
|
|
93
|
+
account: string;
|
|
94
|
+
logger: LoggerLike;
|
|
95
|
+
triggerMessage: string;
|
|
96
|
+
source: string;
|
|
97
|
+
}): Promise<ChainOrder[] | null>;
|
|
98
|
+
declare function _refreshStartupUpdatePlans(updatePlans: StartupUpdatePlan[], chainOpenOrders: ChainOrder[]): StartupUpdatePlan[];
|
|
99
|
+
declare function _prepareStartupUpdatePlan(plan: StartupUpdatePlan, manager: OrderManagerLike, logger: LoggerLike): PreparedStartupUpdate | null;
|
|
87
100
|
declare function _executeStartupUpdateBatch({ updatePlans, chainOrders, account, privateKey, manager, dryRun, }: {
|
|
88
|
-
updatePlans:
|
|
89
|
-
chainOrders:
|
|
90
|
-
account:
|
|
91
|
-
privateKey:
|
|
92
|
-
manager:
|
|
93
|
-
dryRun:
|
|
101
|
+
updatePlans: StartupUpdatePlan[];
|
|
102
|
+
chainOrders: ChainOrdersLike;
|
|
103
|
+
account: string;
|
|
104
|
+
privateKey: string;
|
|
105
|
+
manager: OrderManagerLike;
|
|
106
|
+
dryRun: boolean;
|
|
94
107
|
}): Promise<{
|
|
95
108
|
executed: boolean;
|
|
96
109
|
prepared: number;
|
|
97
110
|
skipped: boolean;
|
|
98
111
|
}>;
|
|
99
112
|
declare function _executeStartupSequentialUpdateFallback({ updatePlans, chainOrders, account, privateKey, manager, dryRun, }: {
|
|
100
|
-
updatePlans:
|
|
101
|
-
chainOrders:
|
|
102
|
-
account:
|
|
103
|
-
privateKey:
|
|
104
|
-
manager:
|
|
105
|
-
dryRun:
|
|
113
|
+
updatePlans: StartupUpdatePlan[];
|
|
114
|
+
chainOrders: ChainOrdersLike;
|
|
115
|
+
account: string;
|
|
116
|
+
privateKey: string;
|
|
117
|
+
manager: OrderManagerLike;
|
|
118
|
+
dryRun: boolean;
|
|
106
119
|
}): Promise<{
|
|
107
120
|
executed: number;
|
|
108
121
|
skipped: number;
|
|
109
122
|
failed: number;
|
|
110
123
|
}>;
|
|
111
124
|
declare function _createStartupOrderWithHandling({ chainOrders, account, privateKey, manager, gridOrder, orderLabel, dryRun, recovery, }: {
|
|
112
|
-
chainOrders:
|
|
113
|
-
account:
|
|
114
|
-
privateKey:
|
|
115
|
-
manager:
|
|
116
|
-
gridOrder:
|
|
117
|
-
orderLabel
|
|
118
|
-
dryRun:
|
|
119
|
-
recovery:
|
|
125
|
+
chainOrders: ChainOrdersLike;
|
|
126
|
+
account: string;
|
|
127
|
+
privateKey: string;
|
|
128
|
+
manager: OrderManagerLike;
|
|
129
|
+
gridOrder: ManagedOrder;
|
|
130
|
+
orderLabel?: string;
|
|
131
|
+
dryRun: boolean;
|
|
132
|
+
recovery: StartupCreatePlan['recovery'];
|
|
120
133
|
}): Promise<string | null>;
|
|
121
134
|
declare function _executeStartupCreateGroupBatch({ group, chainOrders, account, privateKey, manager, dryRun, groupIndex, totalGroups, }: {
|
|
122
|
-
group:
|
|
123
|
-
chainOrders:
|
|
124
|
-
account:
|
|
125
|
-
privateKey:
|
|
126
|
-
manager:
|
|
127
|
-
dryRun:
|
|
128
|
-
groupIndex:
|
|
129
|
-
totalGroups:
|
|
135
|
+
group: StartupCreatePlan[];
|
|
136
|
+
chainOrders: ChainOrdersLike;
|
|
137
|
+
account: string;
|
|
138
|
+
privateKey: string;
|
|
139
|
+
manager: OrderManagerLike;
|
|
140
|
+
dryRun: boolean;
|
|
141
|
+
groupIndex: number;
|
|
142
|
+
totalGroups: number;
|
|
130
143
|
}): Promise<string[]>;
|
|
131
144
|
declare function _executePlannedStartupCreates({ createPlans, chainOrders, account, privateKey, manager, dryRun, }: {
|
|
132
|
-
createPlans:
|
|
133
|
-
chainOrders:
|
|
134
|
-
account:
|
|
135
|
-
privateKey:
|
|
136
|
-
manager:
|
|
137
|
-
dryRun:
|
|
145
|
+
createPlans: StartupCreatePlan[];
|
|
146
|
+
chainOrders: ChainOrdersLike;
|
|
147
|
+
account: string;
|
|
148
|
+
privateKey: string;
|
|
149
|
+
manager: OrderManagerLike;
|
|
150
|
+
dryRun: boolean;
|
|
138
151
|
}): Promise<Set<string>>;
|
|
139
152
|
declare function _reconcileStartupSide({ orderType, targetCount, chainSideOrders, unmatchedSideOrders, manager, chainOrders, account, privateKey, dryRun, plannedCreates, plannedUpdates, plannedCancels, planOnly, }: {
|
|
140
|
-
orderType:
|
|
141
|
-
targetCount:
|
|
142
|
-
chainSideOrders:
|
|
143
|
-
unmatchedSideOrders:
|
|
144
|
-
manager:
|
|
145
|
-
chainOrders:
|
|
146
|
-
account:
|
|
147
|
-
privateKey:
|
|
148
|
-
dryRun:
|
|
149
|
-
plannedCreates:
|
|
150
|
-
plannedUpdates:
|
|
151
|
-
plannedCancels:
|
|
153
|
+
orderType: OrderType;
|
|
154
|
+
targetCount: number;
|
|
155
|
+
chainSideOrders: ChainOrder[];
|
|
156
|
+
unmatchedSideOrders: ChainOrder[];
|
|
157
|
+
manager: OrderManagerLike;
|
|
158
|
+
chainOrders: ChainOrdersLike;
|
|
159
|
+
account: string;
|
|
160
|
+
privateKey: string;
|
|
161
|
+
dryRun: boolean;
|
|
162
|
+
plannedCreates: StartupCreatePlan[];
|
|
163
|
+
plannedUpdates: StartupUpdatePlan[];
|
|
164
|
+
plannedCancels: StartupCancelPlan[];
|
|
152
165
|
planOnly?: boolean;
|
|
153
166
|
}): Promise<{
|
|
154
|
-
chainCount:
|
|
167
|
+
chainCount: number;
|
|
155
168
|
}>;
|
|
156
169
|
export { _countActiveOnGrid, _pickVirtualSlotsToActivate, _createOrderFromGrid, _prepareStartupUpdatePlan, _cancelChainOrder, _recoverStartupSyncFailure, _refreshStartupUpdatePlans, _executeStartupUpdateBatch, _executeStartupSequentialUpdateFallback, _executeStartupCreateGroupBatch, _createStartupOrderWithHandling, _executePlannedStartupCreates, _reconcileStartupSide };
|
|
157
170
|
//# sourceMappingURL=grid_reconcile_internal.d.ts.map
|
|
@@ -10,7 +10,7 @@ import { getMinOrderSize, getAssetFees, getAssetFeesSafe, blockchainToFloat, fin
|
|
|
10
10
|
import { isOrderPlaced, parseChainOrder, buildCreateOrderArgs, buildOutsideInPairGroups, extractBatchOperationResults, chainOrderMatchesSlotWithTolerance, buildCrossingCheckCandidates, isCrossingCheckCandidate, getSideBudget, calculateBudgetedSizes, getActiveOrdersTotal, convertToSpreadPlaceholder, isOrderGoneErrorMessage, clearDuplicateOrphanDetection, resolveReserveCount, resolveLiveReserveEdgeAnchorPrice, reserveEdgeIdSet, compareReserveEdge, parseSlotIndex, reportGridPriceInvariant, liveWindowIdSet } from './utils/order.js';
|
|
11
11
|
import { resolveAccountRef } from './utils/system.js';
|
|
12
12
|
import * as Format from './format.js';
|
|
13
|
-
import { getErrorMessage } from '../utils/errors.js';
|
|
13
|
+
import { getErrorMessage, getErrorCode, getErrorName } from '../utils/errors.js';
|
|
14
14
|
function computePlacementPriceCollision(manager, gridOrder) {
|
|
15
15
|
const precision = gridOrder.type === ORDER_TYPES.SELL ? manager.assets.assetA.precision : manager.assets.assetB.precision;
|
|
16
16
|
for (const o of manager.orders.values()) {
|
|
@@ -378,7 +378,7 @@ function _findLargestOrder(unmatchedOrders, updateCount) {
|
|
|
378
378
|
largestIndex = i;
|
|
379
379
|
}
|
|
380
380
|
}
|
|
381
|
-
return largestIndex >= 0 ? { order: largestOrder, index: largestIndex } : null;
|
|
381
|
+
return largestIndex >= 0 && largestOrder ? { order: largestOrder, index: largestIndex } : null;
|
|
382
382
|
}
|
|
383
383
|
/**
|
|
384
384
|
* Cancel the largest unmatched order to free up maximum funds.
|
|
@@ -474,7 +474,7 @@ async function _createOrderFromGrid({ chainOrders, account, privateKey, manager,
|
|
|
474
474
|
manager.logger?.log?.(`[_createOrderFromGrid] SKIP (STARTUP-CROSS-GUARD): Create for ${gridOrder.id} at ` +
|
|
475
475
|
`${Format.formatPrice6(createPrice)} crosses live ${crossed.type || crossed.order?.type} ` +
|
|
476
476
|
`${crossed.id || crossed.chainOrderId || crossed.slotId || 'chain'} (${crossed.orderId || crossed.chainOrderId || crossed.slotId}) ` +
|
|
477
|
-
`@${Format.formatPrice6(crossed.price ?? crossed.order?.price)}`, 'warn');
|
|
477
|
+
`@${Format.formatPrice6(crossed.price ?? crossed.order?.price ?? 0)}`, 'warn');
|
|
478
478
|
return null;
|
|
479
479
|
}
|
|
480
480
|
// Price collision guard: reject if another placed order already exists at this price level.
|
|
@@ -498,7 +498,8 @@ async function _createOrderFromGrid({ chainOrders, account, privateKey, manager,
|
|
|
498
498
|
return null;
|
|
499
499
|
}
|
|
500
500
|
const operationResults = extractBatchOperationResults(result) || [];
|
|
501
|
-
const
|
|
501
|
+
const rawChainOrderId = operationResults[0] ? operationResults[0][1] : undefined;
|
|
502
|
+
const chainOrderId = typeof rawChainOrderId === 'string' ? rawChainOrderId : null;
|
|
502
503
|
if (chainOrderId) {
|
|
503
504
|
// Capture chain order ID BEFORE _applySync, so even if _applySync
|
|
504
505
|
// fails (leaving the order unregistered in manager.orders), Phase 3
|
|
@@ -643,8 +644,9 @@ async function _cancelChainOrder({ chainOrders, account, privateKey, manager, ch
|
|
|
643
644
|
if (releaseUntrackedFunds && manager.accountant && chainOrderObj) {
|
|
644
645
|
const parsed = parseChainOrder(chainOrderObj, manager.assets);
|
|
645
646
|
if (parsed && parsed.size != null && parsed.size > 0) {
|
|
647
|
+
const size = parsed.size;
|
|
646
648
|
await manager._fundLock.acquire(async () => {
|
|
647
|
-
await manager.accountant.addToChainFree(parsed.type,
|
|
649
|
+
await manager.accountant.addToChainFree(parsed.type, size, 'startup-cancel-unmatched');
|
|
648
650
|
});
|
|
649
651
|
}
|
|
650
652
|
}
|
|
@@ -659,7 +661,7 @@ async function _cancelChainOrder({ chainOrders, account, privateKey, manager, ch
|
|
|
659
661
|
* cleanup virtualize ACTIVE/PARTIAL slots that are actually live on chain,
|
|
660
662
|
* after which the next cycle re-creates them and duplicates the orders.
|
|
661
663
|
* Returns the fresh orders when the sync ran, null when skipped/failed.
|
|
662
|
-
* @returns {Promise<
|
|
664
|
+
* @returns {Promise<ChainOrder[] | null>}
|
|
663
665
|
* @private
|
|
664
666
|
*/
|
|
665
667
|
async function _recoverSyncFromChain({ chainOrders, manager, account, logger, source, triggerMessage, skipMessage }) {
|
|
@@ -749,7 +751,7 @@ function _prepareStartupUpdatePlan(plan, manager, logger) {
|
|
|
749
751
|
logger?.log?.(`[STARTUP-CROSS-GUARD] Skipping relocation update ${chainOrderId} -> ${gridOrder.id}: ` +
|
|
750
752
|
`new ${gridOrder.type} @${Format.formatPrice6(gridOrder.price)} crosses live ` +
|
|
751
753
|
`${crossed.type} ${crossed.id || crossed.chainOrderId || 'chain'} ` +
|
|
752
|
-
`(${crossed.orderId || crossed.chainOrderId}) @${Format.formatPrice6(crossed.price)}; ` +
|
|
754
|
+
`(${crossed.orderId || crossed.chainOrderId}) @${Format.formatPrice6(crossed.price ?? 0)}; ` +
|
|
753
755
|
`re-align on the next reconcile cycle.`, 'warn');
|
|
754
756
|
return null;
|
|
755
757
|
}
|
|
@@ -768,9 +770,10 @@ function _prepareStartupUpdatePlan(plan, manager, logger) {
|
|
|
768
770
|
}
|
|
769
771
|
async function _finalizeStartupUpdate({ manager, preparedUpdate }) {
|
|
770
772
|
const { plan, parsedChain } = preparedUpdate;
|
|
771
|
-
if (parsedChain && parsedChain.size > 0 && manager.accountant) {
|
|
773
|
+
if (parsedChain?.size != null && parsedChain.size > 0 && manager.accountant) {
|
|
774
|
+
const parsedSize = parsedChain.size;
|
|
772
775
|
await manager._fundLock.acquire(async () => {
|
|
773
|
-
await manager.accountant.addToChainFree(plan.gridOrder.type,
|
|
776
|
+
await manager.accountant.addToChainFree(plan.gridOrder.type, parsedSize, 'startup-align');
|
|
774
777
|
});
|
|
775
778
|
}
|
|
776
779
|
// Extract deferred_fee from the raw chain order object so the fee
|
|
@@ -929,7 +932,7 @@ async function _executeStartupSequentialUpdateFallback({ updatePlans, chainOrder
|
|
|
929
932
|
triggerMessage: `Startup: Triggering recovery sync after sequential update failure for ${plan.chainOrderId}`,
|
|
930
933
|
source: 'startupReconcileSequentialUpdateFailure',
|
|
931
934
|
});
|
|
932
|
-
queue = _refreshStartupUpdatePlans(queue, refreshedChainOrders);
|
|
935
|
+
queue = _refreshStartupUpdatePlans(queue, refreshedChainOrders ?? []);
|
|
933
936
|
}
|
|
934
937
|
}
|
|
935
938
|
return { executed, skipped, failed };
|
|
@@ -1051,7 +1054,7 @@ async function _createStartupOrderWithHandling({ chainOrders, account, privateKe
|
|
|
1051
1054
|
return null;
|
|
1052
1055
|
}
|
|
1053
1056
|
catch (err) {
|
|
1054
|
-
const isUncertain = err
|
|
1057
|
+
const isUncertain = getErrorCode(err) === 'BROADCAST_UNCERTAIN' || getErrorName(err) === 'BroadcastUncertainError';
|
|
1055
1058
|
manager?.logger?.log?.(`Startup: Failed to create ${orderLabel} (attempt ${attempt}/${maxAttempts}${isUncertain ? ', uncertain broadcast' : ''}): ${getErrorMessage(err)}`, 'error');
|
|
1056
1059
|
if (!isUncertain)
|
|
1057
1060
|
break;
|
|
@@ -1140,7 +1143,7 @@ async function _executeStartupCreateGroupBatch({ group, chainOrders, account, pr
|
|
|
1140
1143
|
logger?.log?.(`Startup: Skip create ${plan.orderLabel} (STARTUP-CROSS-GUARD) - price ` +
|
|
1141
1144
|
`${Format.formatPrice6(createPrice)} crosses live ${crossed.type || crossed.order?.type} ` +
|
|
1142
1145
|
`${crossed.id || crossed.chainOrderId || crossed.slotId || 'chain'} (${crossed.orderId || crossed.chainOrderId || crossed.slotId}) ` +
|
|
1143
|
-
`@${Format.formatPrice6(crossed.price ?? crossed.order?.price)}`, 'warn');
|
|
1146
|
+
`@${Format.formatPrice6(crossed.price ?? crossed.order?.price ?? 0)}`, 'warn');
|
|
1144
1147
|
continue;
|
|
1145
1148
|
}
|
|
1146
1149
|
const { amountToSell, sellAssetId, minToReceive, receiveAssetId } = buildCreateOrderArgs(gridOrder, manager.assets.assetA, manager.assets.assetB);
|
|
@@ -1170,7 +1173,8 @@ async function _executeStartupCreateGroupBatch({ group, chainOrders, account, pr
|
|
|
1170
1173
|
const batchResults = [];
|
|
1171
1174
|
let missingChainOrderId = false;
|
|
1172
1175
|
for (let i = 0; i < prepared.length; i++) {
|
|
1173
|
-
const
|
|
1176
|
+
const rawChainOrderId = opResults[i] ? opResults[i][1] : undefined;
|
|
1177
|
+
const chainOrderId = typeof rawChainOrderId === 'string' ? rawChainOrderId : null;
|
|
1174
1178
|
const plan = prepared[i].plan;
|
|
1175
1179
|
if (!chainOrderId) {
|
|
1176
1180
|
logger?.log?.(`Startup: create result missing chainOrderId for ${plan.orderLabel}`, 'error');
|
|
@@ -1210,13 +1214,13 @@ async function _executeStartupCreateGroupBatch({ group, chainOrders, account, pr
|
|
|
1210
1214
|
}
|
|
1211
1215
|
}
|
|
1212
1216
|
catch (err) {
|
|
1213
|
-
const isUncertain = err
|
|
1217
|
+
const isUncertain = getErrorCode(err) === 'BROADCAST_UNCERTAIN' || getErrorName(err) === 'BroadcastUncertainError';
|
|
1214
1218
|
logger?.log?.(`Startup: Failed to create group ${groupIndex + 1}/${totalGroups}${isUncertain ? ' (uncertain broadcast)' : ''}: ${getErrorMessage(err)}`, 'error');
|
|
1215
1219
|
if (isUncertain) {
|
|
1216
1220
|
// The batch may have landed despite the deadline. Verify on chain and
|
|
1217
1221
|
// adopt any landed orders via chain sync instead of blindly
|
|
1218
1222
|
// re-broadcasting (duplicate order risk).
|
|
1219
|
-
logger?.log?.(`Startup: Verifying uncertain create group ${groupIndex + 1}/${totalGroups} on chain; adopting
|
|
1223
|
+
logger?.log?.(`Startup: Verifying uncertain create group ${groupIndex + 1}/${totalGroups} on chain; adopting landed orders`, 'warn');
|
|
1220
1224
|
try {
|
|
1221
1225
|
// An empty/truncated verification read is ambiguous, NOT
|
|
1222
1226
|
// proof that nothing landed: a truncated get_full_accounts
|
|
@@ -1450,6 +1454,7 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1450
1454
|
const chainPrice = parsedChain?.price;
|
|
1451
1455
|
if (!Number.isFinite(Number(chainPrice)))
|
|
1452
1456
|
return;
|
|
1457
|
+
const chainPriceNum = Number(chainPrice);
|
|
1453
1458
|
const sidePrecision = orderType === ORDER_TYPES.SELL ? manager.assets?.assetA?.precision : manager.assets?.assetB?.precision;
|
|
1454
1459
|
for (const slotOrder of manager.orders.values()) {
|
|
1455
1460
|
if (!slotOrder || !slotOrder.id)
|
|
@@ -1474,7 +1479,7 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1474
1479
|
continue;
|
|
1475
1480
|
if (Number(slotOrder.size) <= 0)
|
|
1476
1481
|
continue;
|
|
1477
|
-
if (!priceSlotEqual(slotOrder.price,
|
|
1482
|
+
if (!priceSlotEqual(slotOrder.price, chainPriceNum, sidePrecision))
|
|
1478
1483
|
continue;
|
|
1479
1484
|
vacatedRefillPlanned.add(slotOrder.id);
|
|
1480
1485
|
refillCandidates.push(slotOrder);
|
|
@@ -1580,7 +1585,7 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1580
1585
|
let chainCount = chainSideOrders.length;
|
|
1581
1586
|
try {
|
|
1582
1587
|
const shelfOrderIds = new Set();
|
|
1583
|
-
for (const s of
|
|
1588
|
+
for (const s of manager.orders.values()) {
|
|
1584
1589
|
if (s?.orderId && parseSlotIndex(s?.id) === null)
|
|
1585
1590
|
shelfOrderIds.add(String(s.orderId));
|
|
1586
1591
|
}
|
|
@@ -1620,7 +1625,7 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1620
1625
|
if (cancelCount > 0) {
|
|
1621
1626
|
const parsedUnmatched = processedUnmatched
|
|
1622
1627
|
.map((co) => ({ chain: co, parsed: parseChainOrder(co, manager.assets) }))
|
|
1623
|
-
.filter((x) => x.parsed)
|
|
1628
|
+
.filter((x) => x.parsed !== null)
|
|
1624
1629
|
.sort(sortExcessCancelComparator);
|
|
1625
1630
|
// Reserve ladder: edge-priced orphans cancel last (they are adoption
|
|
1626
1631
|
// candidates at reserve prices, not first-to-cut).
|
|
@@ -1711,6 +1716,8 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1711
1716
|
for (const o of matchedExcess) {
|
|
1712
1717
|
if (cancelCount <= 0)
|
|
1713
1718
|
break;
|
|
1719
|
+
if (!o.orderId)
|
|
1720
|
+
continue;
|
|
1714
1721
|
logger?.log?.(`Startup: ${sideUpper} excess matched ${o.orderId} (grid ${o.id}) queued for cancellation (Phase 2)`, 'warn');
|
|
1715
1722
|
plannedCancels.push({
|
|
1716
1723
|
chainOrderId: o.orderId,
|
|
@@ -1754,9 +1761,11 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1754
1761
|
for (const o of matchedExcess) {
|
|
1755
1762
|
if (cancelCount <= 0)
|
|
1756
1763
|
break;
|
|
1764
|
+
if (!o.orderId)
|
|
1765
|
+
continue;
|
|
1757
1766
|
logger?.log?.(`Startup: Cancelling excess matched ${sideUpper} ${o.orderId} (grid ${o.id})`, 'warn');
|
|
1758
1767
|
try {
|
|
1759
|
-
await _cancelChainOrder({ chainOrders, account, privateKey, manager, chainOrderId: o.orderId, dryRun, chainOrderObj:
|
|
1768
|
+
await _cancelChainOrder({ chainOrders, account, privateKey, manager, chainOrderId: o.orderId, dryRun, chainOrderObj: null });
|
|
1760
1769
|
logger?.log?.(`Startup: Successfully cancelled excess matched ${sideUpper} order ${o.orderId} (grid ${o.id})`, 'info');
|
|
1761
1770
|
cancelCount--;
|
|
1762
1771
|
}
|