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
|
@@ -3,6 +3,7 @@ import { createRequire } from 'node:module';
|
|
|
3
3
|
const require = createRequire(import.meta.url);
|
|
4
4
|
import { API_LIMITS } from '../../modules/constants.js';
|
|
5
5
|
import { normalizeAssetSymbol } from '../../modules/utils/asset_symbols.js';
|
|
6
|
+
import { isUnknownRecord } from '../../modules/types.js';
|
|
6
7
|
let _bitsharesClient = null;
|
|
7
8
|
function getBitsharesClient() {
|
|
8
9
|
// lazy require to avoid circular dependencies at module load time
|
|
@@ -16,7 +17,7 @@ function setBitsharesClientForTests(client) {
|
|
|
16
17
|
}
|
|
17
18
|
async function resolveAsset(symbol, bitsharesClient = null) {
|
|
18
19
|
if (!symbol || typeof symbol !== 'string') {
|
|
19
|
-
throw new Error(`Cannot resolve asset: invalid or missing symbol "${symbol}"`);
|
|
20
|
+
throw new Error(`Cannot resolve asset: invalid or missing symbol "${String(symbol)}"`);
|
|
20
21
|
}
|
|
21
22
|
// BitShares symbols are canonical UPPERCASE; nodes answer lowercase lookups
|
|
22
23
|
// silently, so normalize here and hand the canonical symbol downstream
|
|
@@ -24,12 +25,26 @@ async function resolveAsset(symbol, bitsharesClient = null) {
|
|
|
24
25
|
const canonical = normalizeAssetSymbol(symbol);
|
|
25
26
|
const client = bitsharesClient || getBitsharesClient();
|
|
26
27
|
const results = await client.BitShares.db.lookup_asset_symbols([canonical]);
|
|
27
|
-
const asset = results
|
|
28
|
-
if (!asset
|
|
28
|
+
const asset = Array.isArray(results) ? results[0] : undefined;
|
|
29
|
+
if (!isUnknownRecord(asset) || typeof asset.id !== 'string' || typeof asset.precision !== 'number') {
|
|
29
30
|
throw new Error(`Cannot resolve asset "${canonical}": lookup failed`);
|
|
30
31
|
}
|
|
31
32
|
return { id: asset.id, precision: asset.precision, symbol: String(asset.symbol || canonical) };
|
|
32
33
|
}
|
|
34
|
+
/** Balance of `idAStr` in a pool object (both `asset_a` and `asset_ids[]` shapes). */
|
|
35
|
+
function poolBalanceFor(idAStr, p) {
|
|
36
|
+
const assetIds = Array.isArray(p.asset_ids) ? p.asset_ids : null;
|
|
37
|
+
const value = String(p.asset_a ?? assetIds?.[0] ?? '') === idAStr
|
|
38
|
+
? Number(p.balance_a)
|
|
39
|
+
: String(p.asset_b ?? assetIds?.[1] ?? '') === idAStr
|
|
40
|
+
? Number(p.balance_b)
|
|
41
|
+
: Number.NEGATIVE_INFINITY;
|
|
42
|
+
return Number.isFinite(value) ? value : Number.NEGATIVE_INFINITY;
|
|
43
|
+
}
|
|
44
|
+
/** Total liquidity of a pool object. */
|
|
45
|
+
function poolTotalBalance(p) {
|
|
46
|
+
return Number(p.balance_a ?? 0) + Number(p.balance_b ?? 0);
|
|
47
|
+
}
|
|
33
48
|
async function findPoolByAssets(assetAId, assetBId, options = {}) {
|
|
34
49
|
const client = options.bitsharesClient || getBitsharesClient();
|
|
35
50
|
const { BitShares } = client;
|
|
@@ -38,26 +53,13 @@ async function findPoolByAssets(assetAId, assetBId, options = {}) {
|
|
|
38
53
|
try {
|
|
39
54
|
const pools = await BitShares.db.get_liquidity_pools_by_both_assets(assetAId, assetBId);
|
|
40
55
|
if (Array.isArray(pools) && pools.length > 0) {
|
|
41
|
-
const valid = pools.filter(p => p
|
|
56
|
+
const valid = pools.filter((p) => isUnknownRecord(p) && Boolean(p.id));
|
|
42
57
|
if (valid.length) {
|
|
43
58
|
const idAStr = String(assetAId);
|
|
44
59
|
if (sortBy === 'assetABalance') {
|
|
45
|
-
return valid.sort((a, b) =>
|
|
46
|
-
const bal = (p) => {
|
|
47
|
-
const value = String(p.asset_a ?? p.asset_ids?.[0] ?? '') === idAStr
|
|
48
|
-
? Number(p.balance_a)
|
|
49
|
-
: String(p.asset_b ?? p.asset_ids?.[1] ?? '') === idAStr
|
|
50
|
-
? Number(p.balance_b)
|
|
51
|
-
: Number.NEGATIVE_INFINITY;
|
|
52
|
-
return Number.isFinite(value) ? value : Number.NEGATIVE_INFINITY;
|
|
53
|
-
};
|
|
54
|
-
return bal(b) - bal(a);
|
|
55
|
-
})[0];
|
|
60
|
+
return valid.slice().sort((a, b) => poolBalanceFor(idAStr, b) - poolBalanceFor(idAStr, a))[0];
|
|
56
61
|
}
|
|
57
|
-
return valid.sort((x, y) =>
|
|
58
|
-
const bal = (p) => Number(p.balance_a ?? 0) + Number(p.balance_b ?? 0);
|
|
59
|
-
return bal(y) - bal(x);
|
|
60
|
-
})[0];
|
|
62
|
+
return valid.slice().sort((x, y) => poolTotalBalance(y) - poolTotalBalance(x))[0];
|
|
61
63
|
}
|
|
62
64
|
}
|
|
63
65
|
}
|
|
@@ -80,34 +82,24 @@ async function findPoolByAssets(assetAId, assetBId, options = {}) {
|
|
|
80
82
|
break;
|
|
81
83
|
const effective = startId === '1.19.0' ? pools : pools.slice(1);
|
|
82
84
|
const matches = effective.filter((p) => {
|
|
83
|
-
|
|
85
|
+
if (!isUnknownRecord(p))
|
|
86
|
+
return false;
|
|
87
|
+
const ids = (Array.isArray(p.asset_ids) ? p.asset_ids : [p.asset_a, p.asset_b]).map(String);
|
|
84
88
|
return ids.includes(a) && ids.includes(b);
|
|
85
89
|
});
|
|
86
90
|
if (matches.length > 0) {
|
|
87
91
|
if (sortBy === 'assetABalance') {
|
|
88
92
|
const idAStr = String(assetAId);
|
|
89
|
-
return matches.sort((
|
|
90
|
-
const bal = (p) => {
|
|
91
|
-
const assetA = String(p.asset_a ?? p.asset_ids?.[0] ?? '');
|
|
92
|
-
const assetB = String(p.asset_b ?? p.asset_ids?.[1] ?? '');
|
|
93
|
-
const value = assetA === idAStr
|
|
94
|
-
? Number(p.balance_a)
|
|
95
|
-
: assetB === idAStr
|
|
96
|
-
? Number(p.balance_b)
|
|
97
|
-
: Number.NEGATIVE_INFINITY;
|
|
98
|
-
return Number.isFinite(value) ? value : Number.NEGATIVE_INFINITY;
|
|
99
|
-
};
|
|
100
|
-
return bal(b) - bal(a);
|
|
101
|
-
})[0];
|
|
93
|
+
return matches.slice().sort((x, y) => poolBalanceFor(idAStr, y) - poolBalanceFor(idAStr, x))[0];
|
|
102
94
|
}
|
|
103
|
-
return matches.sort((x, y) =>
|
|
104
|
-
const bal = (p) => Number(p.balance_a ?? 0) + Number(p.balance_b ?? 0);
|
|
105
|
-
return bal(y) - bal(x);
|
|
106
|
-
})[0];
|
|
95
|
+
return matches.slice().sort((x, y) => poolTotalBalance(y) - poolTotalBalance(x))[0];
|
|
107
96
|
}
|
|
108
97
|
if (pools.length < page)
|
|
109
98
|
break;
|
|
110
|
-
|
|
99
|
+
const last = pools[pools.length - 1];
|
|
100
|
+
if (!isUnknownRecord(last) || typeof last.id !== 'string')
|
|
101
|
+
break;
|
|
102
|
+
startId = last.id;
|
|
111
103
|
}
|
|
112
104
|
}
|
|
113
105
|
throw new Error(`No liquidity pool found for ${assetAId}/${assetBId}`);
|
|
@@ -144,9 +136,11 @@ function hasNumericStartPrice(raw) {
|
|
|
144
136
|
return typeof raw === 'number' && Number.isFinite(raw) && raw > 0;
|
|
145
137
|
}
|
|
146
138
|
function resolveMarketSourceForBot(bot) {
|
|
147
|
-
if (
|
|
139
|
+
if (!isUnknownRecord(bot))
|
|
140
|
+
return 'pool';
|
|
141
|
+
if (hasNumericStartPrice(bot.startPrice))
|
|
148
142
|
return null;
|
|
149
|
-
return normalizeMarketSource(bot
|
|
143
|
+
return normalizeMarketSource(bot.startPrice) || 'pool';
|
|
150
144
|
}
|
|
151
145
|
function normalizePoolId(id) {
|
|
152
146
|
if (id == null)
|
|
@@ -156,16 +150,16 @@ function normalizePoolId(id) {
|
|
|
156
150
|
}
|
|
157
151
|
async function resolveBotContext(bot) {
|
|
158
152
|
if (!bot.assetAId && !bot.assetA) {
|
|
159
|
-
throw new Error(`Bot "${bot.botKey}" config is missing assetA symbol or ID`);
|
|
153
|
+
throw new Error(`Bot "${String(bot.botKey)}" config is missing assetA symbol or ID`);
|
|
160
154
|
}
|
|
161
155
|
if (!bot.assetBId && !bot.assetB) {
|
|
162
|
-
throw new Error(`Bot "${bot.botKey}" config is missing assetB symbol or ID`);
|
|
156
|
+
throw new Error(`Bot "${String(bot.botKey)}" config is missing assetB symbol or ID`);
|
|
163
157
|
}
|
|
164
|
-
const assetA = bot.assetAId && Number.isFinite(bot.assetAPrecision)
|
|
165
|
-
? { id: bot.assetAId, precision: bot.assetAPrecision, symbol: bot.assetA }
|
|
158
|
+
const assetA = typeof bot.assetAId === 'string' && typeof bot.assetAPrecision === 'number' && Number.isFinite(bot.assetAPrecision)
|
|
159
|
+
? { id: bot.assetAId, precision: bot.assetAPrecision, symbol: String(bot.assetA ?? '') }
|
|
166
160
|
: await resolveAsset(bot.assetA);
|
|
167
|
-
const assetB = bot.assetBId && Number.isFinite(bot.assetBPrecision)
|
|
168
|
-
? { id: bot.assetBId, precision: bot.assetBPrecision, symbol: bot.assetB }
|
|
161
|
+
const assetB = typeof bot.assetBId === 'string' && typeof bot.assetBPrecision === 'number' && Number.isFinite(bot.assetBPrecision)
|
|
162
|
+
? { id: bot.assetBId, precision: bot.assetBPrecision, symbol: String(bot.assetB ?? '') }
|
|
169
163
|
: await resolveAsset(bot.assetB);
|
|
170
164
|
if (hasNumericStartPrice(bot.startPrice)) {
|
|
171
165
|
return {
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
interface FindLatestLpDataOptions {
|
|
2
|
+
dataDir?: string;
|
|
3
|
+
}
|
|
4
|
+
declare function findLatestLpData(options?: FindLatestLpDataOptions): string | null;
|
|
2
5
|
export { findLatestLpData };
|
|
3
6
|
//# sourceMappingURL=data_discovery.d.ts.map
|
|
@@ -1,8 +1,17 @@
|
|
|
1
|
-
|
|
1
|
+
interface SnapshotMutationResult {
|
|
2
|
+
write?: boolean;
|
|
3
|
+
ok?: boolean;
|
|
4
|
+
snapshot?: unknown;
|
|
5
|
+
[key: string]: unknown;
|
|
6
|
+
}
|
|
7
|
+
interface UpdateSnapshotOptions {
|
|
8
|
+
lock?: unknown;
|
|
9
|
+
}
|
|
10
|
+
declare function updateDynamicGridSnapshotSync(filePath: string, mutator: (previous: unknown) => SnapshotMutationResult | null | undefined, options?: UpdateSnapshotOptions): {
|
|
2
11
|
ok: boolean;
|
|
3
12
|
written: boolean;
|
|
4
|
-
previous:
|
|
5
|
-
snapshot:
|
|
13
|
+
previous: unknown;
|
|
14
|
+
snapshot: unknown;
|
|
6
15
|
};
|
|
7
16
|
export { updateDynamicGridSnapshotSync };
|
|
8
17
|
//# sourceMappingURL=dynamic_grid_snapshot.d.ts.map
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* wrote earlier only while the file is provably unchanged. The entry is
|
|
4
4
|
* consumed on use, so at most one cycle benefits from any single write.
|
|
5
5
|
*/
|
|
6
|
-
declare function readCachedJson(filePath:
|
|
6
|
+
declare function readCachedJson<T>(filePath: string, loader: () => T): T;
|
|
7
7
|
/**
|
|
8
8
|
* Record that `filePath` now holds exactly `value` on disk, so the next read can
|
|
9
9
|
* skip the parse. Call this right after writing.
|
|
@@ -22,7 +22,7 @@ declare function readCachedJson(filePath: any, loader: () => any): any;
|
|
|
22
22
|
* cross-process writer is far better served by the mtime check failing on its
|
|
23
23
|
* own write than by a cache that guesses.
|
|
24
24
|
*/
|
|
25
|
-
declare function noteJsonWritten(filePath:
|
|
25
|
+
declare function noteJsonWritten(filePath: string, value: unknown): void;
|
|
26
26
|
/** Drop every cached entry (config reload, tests, explicit cache busting). */
|
|
27
27
|
declare function clearJsonCache(): void;
|
|
28
28
|
export { readCachedJson, noteJsonWritten, clearJsonCache };
|
|
@@ -1,24 +1,38 @@
|
|
|
1
|
-
|
|
1
|
+
import type { UnknownRecord } from '../../modules/types.js';
|
|
2
|
+
interface AcquireLockOptions {
|
|
3
|
+
staleMs?: number;
|
|
4
|
+
timeoutMs?: number;
|
|
5
|
+
retryMs?: number;
|
|
6
|
+
maxAttempts?: number;
|
|
7
|
+
contention?: 'throw' | 'wait';
|
|
8
|
+
aliveCheck?: ((pid: number) => boolean) | null;
|
|
9
|
+
buildPayload?: () => UnknownRecord;
|
|
10
|
+
alreadyRunningMsg?: string | (() => string);
|
|
11
|
+
timeoutMsg?: string;
|
|
12
|
+
}
|
|
13
|
+
interface AcquiredLock {
|
|
14
|
+
fd: number | null;
|
|
15
|
+
lockPath: string;
|
|
16
|
+
heartbeat: ReturnType<typeof setInterval> | null;
|
|
17
|
+
ownerId: number | string;
|
|
18
|
+
}
|
|
19
|
+
declare function isLikelyMarketAdapterProcess(pid: number): boolean;
|
|
2
20
|
/**
|
|
3
21
|
* Market-adapter lifecycle lock: long stale window + heartbeat + process-aware
|
|
4
22
|
* ownership check, so a live adapter lock is never stolen by a newer process.
|
|
5
23
|
*/
|
|
6
|
-
declare function acquireFileLockSync(lockPath:
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
24
|
+
declare function acquireFileLockSync(lockPath: string, opts?: AcquireLockOptions): AcquiredLock;
|
|
25
|
+
declare function releaseFileLockSync(lock: {
|
|
26
|
+
heartbeat?: ReturnType<typeof setInterval> | null;
|
|
27
|
+
fd?: number | null;
|
|
28
|
+
lockPath?: string;
|
|
29
|
+
ownerId?: number | string;
|
|
30
|
+
} | null): void;
|
|
13
31
|
/**
|
|
14
32
|
* Short-lived per-path lock (e.g. dynamic grid snapshots): waits for the holder
|
|
15
33
|
* to release (or for the lock to go stale) up to timeoutMs.
|
|
16
34
|
*/
|
|
17
|
-
declare function acquirePathLockSync(filePath:
|
|
18
|
-
|
|
19
|
-
lockPath: any;
|
|
20
|
-
ownerId: string | number;
|
|
21
|
-
};
|
|
22
|
-
declare function acquireFileLock(filePath: any, opts?: any): Promise<() => void>;
|
|
35
|
+
declare function acquirePathLockSync(filePath: string, opts?: AcquireLockOptions): AcquiredLock;
|
|
36
|
+
declare function acquireFileLock(filePath: string, opts?: AcquireLockOptions): Promise<() => void>;
|
|
23
37
|
export { acquireFileLockSync, releaseFileLockSync, acquirePathLockSync, acquireFileLock, isLikelyMarketAdapterProcess };
|
|
24
38
|
//# sourceMappingURL=file_lock.d.ts.map
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
'use strict';
|
|
2
|
+
import { getErrorCode } from '../../modules/utils/errors.js';
|
|
2
3
|
import { getStorage } from '../../modules/storage/index.js';
|
|
3
4
|
import { getProcessDiscovery } from '../../modules/process_discovery.js';
|
|
4
5
|
import { runtime } from '../../modules/runtime.js';
|
|
@@ -74,6 +75,23 @@ function _isLockStaleOrDead(lockPath, staleMs, now, aliveCheck) {
|
|
|
74
75
|
}
|
|
75
76
|
return false;
|
|
76
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* Resolve the ownership token, payload builder, and lazy error messages shared
|
|
80
|
+
* by the sync and async lock cores.
|
|
81
|
+
*/
|
|
82
|
+
function _resolveLockPayload(lockPath, opts, timeoutMs) {
|
|
83
|
+
const ownerId = _lockOwnerId();
|
|
84
|
+
const buildPayloadFn = opts.buildPayload;
|
|
85
|
+
const buildPayload = typeof buildPayloadFn === 'function'
|
|
86
|
+
? () => ({ ...buildPayloadFn(), ownerId })
|
|
87
|
+
: () => ({ pid: _lockOwnerId(), at: Date.now(), ownerId });
|
|
88
|
+
const alreadyRunningMsg = opts.alreadyRunningMsg;
|
|
89
|
+
const resolveRunningMsg = typeof alreadyRunningMsg === 'function'
|
|
90
|
+
? alreadyRunningMsg
|
|
91
|
+
: () => (alreadyRunningMsg || `already locked: `);
|
|
92
|
+
const timeoutMsg = opts.timeoutMsg || `Could not acquire lock on ${lockPath} within ${timeoutMs}ms`;
|
|
93
|
+
return { ownerId, buildPayload, resolveRunningMsg, timeoutMsg };
|
|
94
|
+
}
|
|
77
95
|
/**
|
|
78
96
|
* Shared file-lock primitive.
|
|
79
97
|
*
|
|
@@ -95,23 +113,16 @@ function _isLockStaleOrDead(lockPath, staleMs, now, aliveCheck) {
|
|
|
95
113
|
* from the lock file only when contention is actually hit)
|
|
96
114
|
*/
|
|
97
115
|
function _acquireLockCore(lockPath, opts = {}) {
|
|
98
|
-
const staleMs = Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
99
|
-
const timeoutMs = Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : Infinity;
|
|
100
|
-
const retryMs = Number.isFinite(opts.retryMs) && opts.retryMs > 0 ? opts.retryMs : 0;
|
|
101
|
-
const maxAttempts = Number.isFinite(opts.maxAttempts) && opts.maxAttempts > 0 ? opts.maxAttempts : Infinity;
|
|
116
|
+
const staleMs = typeof opts.staleMs === 'number' && Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
117
|
+
const timeoutMs = typeof opts.timeoutMs === 'number' && Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : Infinity;
|
|
118
|
+
const retryMs = typeof opts.retryMs === 'number' && Number.isFinite(opts.retryMs) && opts.retryMs > 0 ? opts.retryMs : 0;
|
|
119
|
+
const maxAttempts = typeof opts.maxAttempts === 'number' && Number.isFinite(opts.maxAttempts) && opts.maxAttempts > 0 ? opts.maxAttempts : Infinity;
|
|
102
120
|
const contention = opts.contention === 'wait' ? 'wait' : 'throw';
|
|
103
121
|
const aliveCheck = typeof opts.aliveCheck === 'function' ? opts.aliveCheck : null;
|
|
104
122
|
// The heartbeat must fire strictly inside the staleness window, otherwise a
|
|
105
123
|
// live-held lock looks stale between beats and can be stolen.
|
|
106
124
|
const heartbeatMs = Math.min(MARKET_ADAPTER.FILE_LOCK_HEARTBEAT_MAX_MS, Math.max(MARKET_ADAPTER.FILE_LOCK_HEARTBEAT_MIN_MS, Math.floor(staleMs / 2)));
|
|
107
|
-
const ownerId =
|
|
108
|
-
const buildPayload = typeof opts.buildPayload === 'function'
|
|
109
|
-
? () => ({ ...opts.buildPayload(), ownerId })
|
|
110
|
-
: () => ({ pid: _lockOwnerId(), at: Date.now(), ownerId });
|
|
111
|
-
const resolveRunningMsg = typeof opts.alreadyRunningMsg === 'function'
|
|
112
|
-
? opts.alreadyRunningMsg
|
|
113
|
-
: () => (opts.alreadyRunningMsg || `already locked: ${lockPath}`);
|
|
114
|
-
const timeoutMsg = opts.timeoutMsg || `Could not acquire lock on ${lockPath} within ${timeoutMs}ms`;
|
|
125
|
+
const { ownerId, buildPayload, resolveRunningMsg, timeoutMsg } = _resolveLockPayload(lockPath, opts, timeoutMs);
|
|
115
126
|
const deadline = Number.isFinite(timeoutMs) ? Date.now() + timeoutMs : Infinity;
|
|
116
127
|
let attempts = 0;
|
|
117
128
|
while (attempts < maxAttempts && Date.now() < deadline) {
|
|
@@ -151,7 +162,7 @@ function _acquireLockCore(lockPath, opts = {}) {
|
|
|
151
162
|
}
|
|
152
163
|
catch (_) { }
|
|
153
164
|
}
|
|
154
|
-
if (err
|
|
165
|
+
if (getErrorCode(err) !== 'EEXIST')
|
|
155
166
|
throw err;
|
|
156
167
|
attempts++;
|
|
157
168
|
if (_isLockStaleOrDead(lockPath, staleMs, Date.now(), aliveCheck)) {
|
|
@@ -184,18 +195,11 @@ function _releaseOwnedLock(lockPath, ownerId, unlinkFn) {
|
|
|
184
195
|
return true;
|
|
185
196
|
}
|
|
186
197
|
async function _acquireLockCoreAsync(lockPath, opts = {}) {
|
|
187
|
-
const staleMs = Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
188
|
-
const timeoutMs = Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : 5000;
|
|
189
|
-
const retryMs = Number.isFinite(opts.retryMs) && opts.retryMs > 0 ? opts.retryMs : 50;
|
|
198
|
+
const staleMs = typeof opts.staleMs === 'number' && Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
199
|
+
const timeoutMs = typeof opts.timeoutMs === 'number' && Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : 5000;
|
|
200
|
+
const retryMs = typeof opts.retryMs === 'number' && Number.isFinite(opts.retryMs) && opts.retryMs > 0 ? opts.retryMs : 50;
|
|
190
201
|
const aliveCheck = typeof opts.aliveCheck === 'function' ? opts.aliveCheck : null;
|
|
191
|
-
const ownerId =
|
|
192
|
-
const buildPayload = typeof opts.buildPayload === 'function'
|
|
193
|
-
? () => ({ ...opts.buildPayload(), ownerId })
|
|
194
|
-
: () => ({ pid: _lockOwnerId(), at: Date.now(), ownerId });
|
|
195
|
-
const resolveRunningMsg = typeof opts.alreadyRunningMsg === 'function'
|
|
196
|
-
? opts.alreadyRunningMsg
|
|
197
|
-
: () => (opts.alreadyRunningMsg || `already locked: ${lockPath}`);
|
|
198
|
-
const timeoutMsg = opts.timeoutMsg || `Could not acquire lock on ${lockPath} within ${timeoutMs}ms`;
|
|
202
|
+
const { ownerId, buildPayload, resolveRunningMsg, timeoutMsg } = _resolveLockPayload(lockPath, opts, timeoutMs);
|
|
199
203
|
const deadline = Date.now() + timeoutMs;
|
|
200
204
|
while (Date.now() < deadline) {
|
|
201
205
|
try {
|
|
@@ -205,7 +209,7 @@ async function _acquireLockCoreAsync(lockPath, opts = {}) {
|
|
|
205
209
|
};
|
|
206
210
|
}
|
|
207
211
|
catch (err) {
|
|
208
|
-
if (err
|
|
212
|
+
if (getErrorCode(err) !== 'EEXIST') {
|
|
209
213
|
// A non-EEXIST failure may have left a partially written lock
|
|
210
214
|
// file behind — clean it up if it still carries our token.
|
|
211
215
|
try {
|
|
@@ -244,7 +248,7 @@ async function _acquireLockCoreAsync(lockPath, opts = {}) {
|
|
|
244
248
|
* ownership check, so a live adapter lock is never stolen by a newer process.
|
|
245
249
|
*/
|
|
246
250
|
function acquireFileLockSync(lockPath, opts = {}) {
|
|
247
|
-
const staleMs = Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : (6 * 3600 * 1000);
|
|
251
|
+
const staleMs = typeof opts.staleMs === 'number' && Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : (6 * 3600 * 1000);
|
|
248
252
|
return _acquireLockCore(lockPath, {
|
|
249
253
|
staleMs,
|
|
250
254
|
maxAttempts: 2,
|
|
@@ -287,9 +291,9 @@ function releaseFileLockSync(lock) {
|
|
|
287
291
|
*/
|
|
288
292
|
function acquirePathLockSync(filePath, opts = {}) {
|
|
289
293
|
const lockPath = `${filePath}.lock`;
|
|
290
|
-
const staleMs = Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
291
|
-
const timeoutMs = Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : 5000;
|
|
292
|
-
const retryMs = Number.isFinite(opts.retryMs) && opts.retryMs > 0 ? opts.retryMs : 50;
|
|
294
|
+
const staleMs = typeof opts.staleMs === 'number' && Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
295
|
+
const timeoutMs = typeof opts.timeoutMs === 'number' && Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : 5000;
|
|
296
|
+
const retryMs = typeof opts.retryMs === 'number' && Number.isFinite(opts.retryMs) && opts.retryMs > 0 ? opts.retryMs : 50;
|
|
293
297
|
const lock = _acquireLockCore(lockPath, {
|
|
294
298
|
staleMs,
|
|
295
299
|
timeoutMs,
|
|
@@ -297,12 +301,12 @@ function acquirePathLockSync(filePath, opts = {}) {
|
|
|
297
301
|
contention: 'wait',
|
|
298
302
|
timeoutMsg: `Could not acquire lock on ${filePath} within ${timeoutMs}ms`,
|
|
299
303
|
});
|
|
300
|
-
return { fd: lock.fd, lockPath: lock.lockPath, ownerId: lock.ownerId };
|
|
304
|
+
return { fd: lock.fd, lockPath: lock.lockPath, heartbeat: lock.heartbeat, ownerId: lock.ownerId };
|
|
301
305
|
}
|
|
302
306
|
async function acquireFileLock(filePath, opts = {}) {
|
|
303
307
|
const lockPath = `${filePath}.lock`;
|
|
304
|
-
const staleMs = Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
305
|
-
const timeoutMs = Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : 5000;
|
|
308
|
+
const staleMs = typeof opts.staleMs === 'number' && Number.isFinite(opts.staleMs) && opts.staleMs > 0 ? opts.staleMs : 30000;
|
|
309
|
+
const timeoutMs = typeof opts.timeoutMs === 'number' && Number.isFinite(opts.timeoutMs) && opts.timeoutMs > 0 ? opts.timeoutMs : 5000;
|
|
306
310
|
return _acquireLockCoreAsync(lockPath, {
|
|
307
311
|
staleMs,
|
|
308
312
|
timeoutMs,
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
/** Asset identity/precision needed to convert chain amounts. */
|
|
2
|
+
export interface NativeHistoryAssetMeta {
|
|
3
|
+
id?: unknown;
|
|
4
|
+
precision?: number;
|
|
5
|
+
}
|
|
6
|
+
/** Normalized OHLCV candle: [tsMs, open, high, low, close, volume]. */
|
|
7
|
+
export type NativeHistoryCandle = [number, number, number, number, number, number];
|
|
1
8
|
/**
|
|
2
9
|
* Native BitShares market history parsing utilities.
|
|
3
10
|
*
|
|
@@ -5,7 +12,7 @@
|
|
|
5
12
|
* normalized OHLCV candles. Handles both the compact array format and
|
|
6
13
|
* the raw object format with key.base / key.quote / open_base / etc.
|
|
7
14
|
*/
|
|
8
|
-
declare function parseNativeMarketHistoryTimestamp(entry:
|
|
9
|
-
declare function normalizeNativeMarketHistoryCandles(history:
|
|
15
|
+
declare function parseNativeMarketHistoryTimestamp(entry: unknown): number | null;
|
|
16
|
+
declare function normalizeNativeMarketHistoryCandles(history: unknown, assetA: NativeHistoryAssetMeta, assetB: NativeHistoryAssetMeta): NativeHistoryCandle[];
|
|
10
17
|
export { parseNativeMarketHistoryTimestamp, normalizeNativeMarketHistoryCandles };
|
|
11
18
|
//# sourceMappingURL=native_history.d.ts.map
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
import { blockchainToFloat } from '../../modules/order/utils/math.js';
|
|
3
|
+
import { isUnknownRecord } from '../../modules/types.js';
|
|
3
4
|
/**
|
|
4
5
|
* Native BitShares market history parsing utilities.
|
|
5
6
|
*
|
|
@@ -8,15 +9,18 @@ import { blockchainToFloat } from '../../modules/order/utils/math.js';
|
|
|
8
9
|
* the raw object format with key.base / key.quote / open_base / etc.
|
|
9
10
|
*/
|
|
10
11
|
function parseNativeMarketHistoryTimestamp(entry) {
|
|
12
|
+
if (!isUnknownRecord(entry))
|
|
13
|
+
return null;
|
|
14
|
+
const historyEntry = entry;
|
|
11
15
|
const candidates = [
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
historyEntry.key?.open,
|
|
17
|
+
historyEntry.key?.time,
|
|
18
|
+
historyEntry.key?.timestamp,
|
|
19
|
+
historyEntry.key?.date,
|
|
20
|
+
historyEntry.open_time,
|
|
21
|
+
historyEntry.time,
|
|
22
|
+
historyEntry.timestamp,
|
|
23
|
+
historyEntry.block_time,
|
|
20
24
|
];
|
|
21
25
|
for (const candidate of candidates) {
|
|
22
26
|
if (candidate == null)
|
|
@@ -75,8 +79,9 @@ function resolveNativeMarketHistoryRatio(entry, field, assetA, assetB) {
|
|
|
75
79
|
}
|
|
76
80
|
const nested = entry?.[field];
|
|
77
81
|
if (nested && typeof nested === 'object') {
|
|
78
|
-
const
|
|
79
|
-
const
|
|
82
|
+
const nestedRecord = nested;
|
|
83
|
+
const base = Number(nestedRecord.base ?? nestedRecord.amount_base ?? nestedRecord.base_amount ?? nestedRecord.amount);
|
|
84
|
+
const quote = Number(nestedRecord.quote ?? nestedRecord.amount_quote ?? nestedRecord.quote_amount ?? nestedRecord.value);
|
|
80
85
|
if (!Number.isFinite(base) || !Number.isFinite(quote) || base <= 0 || quote <= 0) {
|
|
81
86
|
return Number.NaN;
|
|
82
87
|
}
|
|
@@ -84,15 +89,16 @@ function resolveNativeMarketHistoryRatio(entry, field, assetA, assetB) {
|
|
|
84
89
|
}
|
|
85
90
|
return Number.NaN;
|
|
86
91
|
}
|
|
87
|
-
function normalizeNativeMarketHistoryCandles(history, assetA, assetB
|
|
92
|
+
function normalizeNativeMarketHistoryCandles(history, assetA, assetB) {
|
|
93
|
+
const historyRecord = isUnknownRecord(history) ? history : undefined;
|
|
88
94
|
const source = Array.isArray(history)
|
|
89
95
|
? history
|
|
90
|
-
: Array.isArray(
|
|
91
|
-
?
|
|
92
|
-
: Array.isArray(
|
|
93
|
-
?
|
|
94
|
-
: Array.isArray(
|
|
95
|
-
?
|
|
96
|
+
: Array.isArray(historyRecord?.buckets)
|
|
97
|
+
? historyRecord.buckets
|
|
98
|
+
: Array.isArray(historyRecord?.history)
|
|
99
|
+
? historyRecord.history
|
|
100
|
+
: Array.isArray(historyRecord?.result)
|
|
101
|
+
? historyRecord.result
|
|
96
102
|
: [];
|
|
97
103
|
if (!Array.isArray(source) || source.length === 0)
|
|
98
104
|
return [];
|
|
@@ -117,25 +123,26 @@ function normalizeNativeMarketHistoryCandles(history, assetA, assetB, _intervalS
|
|
|
117
123
|
}
|
|
118
124
|
const candles = [];
|
|
119
125
|
for (const entry of source) {
|
|
120
|
-
if (!entry
|
|
126
|
+
if (!isUnknownRecord(entry))
|
|
121
127
|
continue;
|
|
122
|
-
const
|
|
123
|
-
|
|
128
|
+
const historyEntry = entry;
|
|
129
|
+
const tsMs = parseNativeMarketHistoryTimestamp(historyEntry);
|
|
130
|
+
if (tsMs === null || !Number.isFinite(tsMs))
|
|
124
131
|
continue;
|
|
125
|
-
const keyBase = String(
|
|
126
|
-
const keyQuote = String(
|
|
132
|
+
const keyBase = String(historyEntry?.key?.base || '');
|
|
133
|
+
const keyQuote = String(historyEntry?.key?.quote || '');
|
|
127
134
|
const orientation = resolvePairOrientation(keyBase, keyQuote, assetA, assetB);
|
|
128
135
|
if (!orientation)
|
|
129
136
|
continue;
|
|
130
137
|
const { baseIsAssetA, basePrecision, quotePrecision } = orientation;
|
|
131
|
-
const baseVolume = Number(
|
|
132
|
-
const quoteVolume = Number(
|
|
133
|
-
const open = resolveNativeMarketHistoryRatio(
|
|
134
|
-
const resolvedHigh = resolveNativeMarketHistoryRatio(
|
|
135
|
-
const resolvedLow = resolveNativeMarketHistoryRatio(
|
|
138
|
+
const baseVolume = Number(historyEntry?.base_volume);
|
|
139
|
+
const quoteVolume = Number(historyEntry?.quote_volume);
|
|
140
|
+
const open = resolveNativeMarketHistoryRatio(historyEntry, 'open', assetA, assetB);
|
|
141
|
+
const resolvedHigh = resolveNativeMarketHistoryRatio(historyEntry, 'high', assetA, assetB);
|
|
142
|
+
const resolvedLow = resolveNativeMarketHistoryRatio(historyEntry, 'low', assetA, assetB);
|
|
136
143
|
const high = Math.max(resolvedHigh, resolvedLow);
|
|
137
144
|
const low = Math.min(resolvedHigh, resolvedLow);
|
|
138
|
-
const close = resolveNativeMarketHistoryRatio(
|
|
145
|
+
const close = resolveNativeMarketHistoryRatio(historyEntry, 'close', assetA, assetB);
|
|
139
146
|
if (![open, high, low, close].every((value) => Number.isFinite(value) && value > 0)) {
|
|
140
147
|
continue;
|
|
141
148
|
}
|