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
|
@@ -57,6 +57,20 @@ function writeJsonFileAtomic(targetPath, data) {
|
|
|
57
57
|
// Uses AsyncLock which supports nested acquire calls via
|
|
58
58
|
// AsyncLocalStorage-based re-entrancy detection.
|
|
59
59
|
const botsFileLock = new AsyncLock();
|
|
60
|
+
/**
|
|
61
|
+
* Parse a bots.json payload, applying the shared empty-file fallback. Both the
|
|
62
|
+
* locked async read and the startup sync read go through this so the
|
|
63
|
+
* empty-file default cannot drift between them.
|
|
64
|
+
* @param {string} content - Raw file content
|
|
65
|
+
* @param {Function} parseFunction - JSON parser function
|
|
66
|
+
* @returns {{content: string, config: Object}} Content and parsed config
|
|
67
|
+
*/
|
|
68
|
+
function parseBotsContent(content, parseFunction) {
|
|
69
|
+
if (!content || !content.trim()) {
|
|
70
|
+
return { content: '', config: { bots: [] } };
|
|
71
|
+
}
|
|
72
|
+
return { content, config: parseFunction(content) };
|
|
73
|
+
}
|
|
60
74
|
/**
|
|
61
75
|
* Safely read bots.json with lock protection (re-entrant safe).
|
|
62
76
|
* @param {string} botsJsonPath - Path to bots.json file
|
|
@@ -69,12 +83,7 @@ async function readBotsFileWithLock(botsJsonPath, parseFunction) {
|
|
|
69
83
|
if (!storage.exists(botsJsonPath)) {
|
|
70
84
|
throw new Error(`bots.json not found at ${botsJsonPath}`);
|
|
71
85
|
}
|
|
72
|
-
|
|
73
|
-
if (!content || !content.trim()) {
|
|
74
|
-
return { content: '', config: { bots: [] } };
|
|
75
|
-
}
|
|
76
|
-
const config = parseFunction(content);
|
|
77
|
-
return { content, config };
|
|
86
|
+
return parseBotsContent(storage.readFile(botsJsonPath), parseFunction);
|
|
78
87
|
});
|
|
79
88
|
}
|
|
80
89
|
/**
|
|
@@ -107,12 +116,7 @@ function readBotsFileSync(botsJsonPath, parseFunction) {
|
|
|
107
116
|
if (!storage.exists(botsJsonPath)) {
|
|
108
117
|
throw new Error(`bots.json not found at ${botsJsonPath}`);
|
|
109
118
|
}
|
|
110
|
-
|
|
111
|
-
if (!content || !content.trim()) {
|
|
112
|
-
return { content: '', config: { bots: [] } };
|
|
113
|
-
}
|
|
114
|
-
const config = parseFunction(content);
|
|
115
|
-
return { content, config };
|
|
119
|
+
return parseBotsContent(storage.readFile(botsJsonPath), parseFunction);
|
|
116
120
|
}
|
|
117
121
|
export { readBotsFileWithLock, writeBotsFileWithLock, readBotsFileSync, writeJsonFileAtomic };
|
|
118
122
|
//# sourceMappingURL=bots_file_lock.js.map
|
|
@@ -26,8 +26,8 @@ export type BroadcastFailureClass = 'retryable' | 'uncertain' | 'definite';
|
|
|
26
26
|
* be built: nothing landed and retrying the identical ops
|
|
27
27
|
* cannot change the outcome.
|
|
28
28
|
*
|
|
29
|
-
* @param {
|
|
29
|
+
* @param {unknown} err - The thrown error (code + message).
|
|
30
30
|
* @returns {BroadcastFailureClass}
|
|
31
31
|
*/
|
|
32
|
-
export declare function classifyBroadcastFailure(err:
|
|
32
|
+
export declare function classifyBroadcastFailure(err: unknown): BroadcastFailureClass;
|
|
33
33
|
//# sourceMappingURL=broadcast_failure.d.ts.map
|
|
@@ -13,15 +13,16 @@
|
|
|
13
13
|
* be built: nothing landed and retrying the identical ops
|
|
14
14
|
* cannot change the outcome.
|
|
15
15
|
*
|
|
16
|
-
* @param {
|
|
16
|
+
* @param {unknown} err - The thrown error (code + message).
|
|
17
17
|
* @returns {BroadcastFailureClass}
|
|
18
18
|
*/
|
|
19
19
|
export function classifyBroadcastFailure(err) {
|
|
20
20
|
if (!err)
|
|
21
21
|
return 'definite';
|
|
22
|
-
const
|
|
22
|
+
const e = err;
|
|
23
|
+
const code = String(e.code || '');
|
|
23
24
|
if (code === 'CONNECTION_ERROR') {
|
|
24
|
-
const msg = String(
|
|
25
|
+
const msg = String(e.message || '');
|
|
25
26
|
// Pre-send rejections in transport.call() — the RPC frame was never
|
|
26
27
|
// written to the socket, so no transaction was transmitted.
|
|
27
28
|
if (msg === 'WebSocket not open' || msg.startsWith('Failed to send') || msg === 'No servers provided') {
|
|
@@ -56,7 +57,7 @@ export function classifyBroadcastFailure(err) {
|
|
|
56
57
|
// another node and nothing landed.
|
|
57
58
|
if (code === 'TX_TOO_LARGE')
|
|
58
59
|
return 'definite';
|
|
59
|
-
const msg = String(
|
|
60
|
+
const msg = String(e.message || '');
|
|
60
61
|
if (msg === 'Operation must have op_name and op_data'
|
|
61
62
|
|| msg === 'Each operation requires op_name and op_data'
|
|
62
63
|
|| /^Max operations per tx/.test(msg)
|
|
@@ -90,39 +90,50 @@
|
|
|
90
90
|
*
|
|
91
91
|
* ===============================================================================
|
|
92
92
|
*/
|
|
93
|
+
interface AccountsData {
|
|
94
|
+
vaultVersion: number;
|
|
95
|
+
vaultSalt: string;
|
|
96
|
+
vaultVerifier: string;
|
|
97
|
+
accounts: Record<string, Record<string, unknown>>;
|
|
98
|
+
}
|
|
99
|
+
interface DaemonPathOptions {
|
|
100
|
+
socketPath?: string;
|
|
101
|
+
readyFilePath?: string;
|
|
102
|
+
runtimeDir?: string;
|
|
103
|
+
}
|
|
104
|
+
interface DaemonSigningOptions extends DaemonPathOptions {
|
|
105
|
+
sessionId?: string | null;
|
|
106
|
+
botHmacSecret?: string | null;
|
|
107
|
+
}
|
|
93
108
|
/**
|
|
94
109
|
* Pick the onboarding link to show: the copy shipped with this installation
|
|
95
110
|
* when present, otherwise the hosted document. Exported for testing.
|
|
96
111
|
*/
|
|
97
112
|
export declare function resolveOnboardingUrl(localExists?: boolean, localHref?: string): string;
|
|
98
|
-
declare function isVaultSecret(value:
|
|
99
|
-
declare function createVaultSecret(vaultKey:
|
|
100
|
-
|
|
101
|
-
version: any;
|
|
102
|
-
vaultKeyHex: string;
|
|
103
|
-
};
|
|
104
|
-
declare function createSessionSecret(vaultKey: any, sessionSalt?: any): {
|
|
113
|
+
declare function isVaultSecret(value: unknown): boolean;
|
|
114
|
+
declare function createVaultSecret(vaultKey: unknown, extra?: Record<string, unknown>): VaultSecret;
|
|
115
|
+
declare function createSessionSecret(vaultKey: unknown, sessionSalt?: unknown): {
|
|
105
116
|
kind: string;
|
|
106
117
|
version: number;
|
|
107
118
|
sessionSaltHex: string;
|
|
108
119
|
vaultKeyHex: string;
|
|
109
120
|
};
|
|
110
|
-
declare function createDaemonSigningToken(accountName: string, options?:
|
|
121
|
+
declare function createDaemonSigningToken(accountName: string, options?: DaemonSigningOptions): {
|
|
111
122
|
kind: string;
|
|
112
123
|
accountName: string;
|
|
113
|
-
socketPath:
|
|
114
|
-
sessionId:
|
|
115
|
-
botHmacSecret:
|
|
124
|
+
socketPath: string;
|
|
125
|
+
sessionId: string | null;
|
|
126
|
+
botHmacSecret: string | null;
|
|
116
127
|
};
|
|
117
|
-
declare function isDaemonSigningToken(value:
|
|
118
|
-
declare function deriveVaultKey(password:
|
|
128
|
+
declare function isDaemonSigningToken(value: unknown): boolean;
|
|
129
|
+
declare function deriveVaultKey(password: string, vaultSalt: unknown): NonSharedBuffer;
|
|
119
130
|
/**
|
|
120
131
|
* Encrypt text using the v2 AES-256-GCM vault format.
|
|
121
132
|
* @param {string} text - Plain text to encrypt
|
|
122
133
|
* @param {Object|Buffer} secret - Derived vault secret
|
|
123
134
|
* @returns {string} Encrypted data as hex string
|
|
124
135
|
*/
|
|
125
|
-
declare function encrypt(text:
|
|
136
|
+
declare function encrypt(text: string, secret: unknown): string;
|
|
126
137
|
/**
|
|
127
138
|
* Decrypt text encrypted with the encrypt() function.
|
|
128
139
|
* @param {string} encrypted - Colon-separated encrypted data
|
|
@@ -130,14 +141,14 @@ declare function encrypt(text: any, secret: any): string;
|
|
|
130
141
|
* @returns {string} Decrypted plain text
|
|
131
142
|
* @throws {Error} If decryption fails (wrong password or corrupted data)
|
|
132
143
|
*/
|
|
133
|
-
declare function decrypt(encrypted:
|
|
144
|
+
declare function decrypt(encrypted: unknown, secret: unknown): string;
|
|
134
145
|
/**
|
|
135
146
|
* Validate a private key format.
|
|
136
147
|
* Supports WIF (Base58Check), PVT_K1_* style, and 64-char hex.
|
|
137
148
|
* @param {string} key - Private key to validate
|
|
138
149
|
* @returns {Object} { valid: boolean, reason?: string }
|
|
139
150
|
*/
|
|
140
|
-
declare function validatePrivateKey(key:
|
|
151
|
+
declare function validatePrivateKey(key: unknown): {
|
|
141
152
|
valid: boolean;
|
|
142
153
|
reason: string;
|
|
143
154
|
} | {
|
|
@@ -149,18 +160,13 @@ declare function validatePrivateKey(key: any): {
|
|
|
149
160
|
* Returns empty structure if file doesn't exist or is corrupted.
|
|
150
161
|
* @returns {Object} { vaultVersion: number, vaultSalt: string, vaultVerifier: string, accounts: Object }
|
|
151
162
|
*/
|
|
152
|
-
declare function loadAccounts():
|
|
153
|
-
vaultVersion: number;
|
|
154
|
-
vaultSalt: string;
|
|
155
|
-
vaultVerifier: string;
|
|
156
|
-
accounts: any;
|
|
157
|
-
};
|
|
163
|
+
declare function loadAccounts(): AccountsData;
|
|
158
164
|
/**
|
|
159
165
|
* Report whether the key vault has a usable account entry.
|
|
160
166
|
* Password metadata alone is not sufficient: cancelling key setup can leave
|
|
161
167
|
* a valid-looking vault with no account key to use at runtime.
|
|
162
168
|
*/
|
|
163
|
-
declare function hasKeySetup(accountsData?:
|
|
169
|
+
declare function hasKeySetup(accountsData?: AccountsData): boolean;
|
|
164
170
|
/**
|
|
165
171
|
* Check that the keys file has restrictive permissions (0o600) and is owned by
|
|
166
172
|
* the current user. Returns silently if the file doesn't exist yet (it will be
|
|
@@ -174,16 +180,12 @@ declare function checkKeysFileSecurity(): void;
|
|
|
174
180
|
* Unlock the key vault with a master password.
|
|
175
181
|
* Uses modern scrypt v2 vault format with HMAC verification.
|
|
176
182
|
* @param {string} password - Master password
|
|
177
|
-
* @param {
|
|
178
|
-
* @returns {
|
|
183
|
+
* @param {unknown} [accountsData=loadAccounts()] - Accounts data object
|
|
184
|
+
* @returns {unknown} Derived vault secret
|
|
179
185
|
* @throws {MasterPasswordError} If password is incorrect
|
|
180
186
|
* @throws {Error} If vault format is unsupported
|
|
181
187
|
*/
|
|
182
|
-
declare function unlockWithPassword(password:
|
|
183
|
-
kind: string;
|
|
184
|
-
version: any;
|
|
185
|
-
vaultKeyHex: string;
|
|
186
|
-
};
|
|
188
|
+
declare function unlockWithPassword(password: string, accountsData?: AccountsData): VaultSecret;
|
|
187
189
|
declare class MasterPasswordError extends Error {
|
|
188
190
|
static code: string;
|
|
189
191
|
code: string;
|
|
@@ -195,10 +197,10 @@ declare class MasterPasswordError extends Error {
|
|
|
195
197
|
* @param {Error} err - Error to check
|
|
196
198
|
* @returns {boolean} True if the error indicates authentication could not complete
|
|
197
199
|
*/
|
|
198
|
-
declare function isMasterPasswordFailure(err:
|
|
200
|
+
declare function isMasterPasswordFailure(err: unknown): boolean;
|
|
199
201
|
type VaultSecret = {
|
|
200
202
|
kind: string;
|
|
201
|
-
version:
|
|
203
|
+
version: number;
|
|
202
204
|
vaultKeyHex: string;
|
|
203
205
|
};
|
|
204
206
|
/**
|
|
@@ -217,7 +219,7 @@ declare function authenticate(): Promise<VaultSecret>;
|
|
|
217
219
|
* @returns {string} Decrypted private key
|
|
218
220
|
* @throws {Error} If account not found
|
|
219
221
|
*/
|
|
220
|
-
declare function getPrivateKey(accountName:
|
|
222
|
+
declare function getPrivateKey(accountName: string, vaultSecret: unknown): string;
|
|
221
223
|
/**
|
|
222
224
|
* Resolve a signing key for an account, following on-chain authority structures
|
|
223
225
|
* (account_auths, key_auths) when no direct key is stored.
|
|
@@ -228,7 +230,7 @@ declare function getPrivateKey(accountName: any, vaultSecret: any): any;
|
|
|
228
230
|
* @returns {Promise<string>} Private key WIF string
|
|
229
231
|
* @throws {Error} If no key can be found through direct lookup or authority resolution
|
|
230
232
|
*/
|
|
231
|
-
declare function resolvePrivateKey(accountName:
|
|
233
|
+
declare function resolvePrivateKey(accountName: string, vaultSecret: unknown, chainClient: unknown): Promise<string>;
|
|
232
234
|
/**
|
|
233
235
|
* Save accounts data to profiles/keys.json atomically with restrictive permissions.
|
|
234
236
|
* Writes to a temp file in the same directory, fsyncs, then renames over the target.
|
|
@@ -237,7 +239,7 @@ declare function resolvePrivateKey(accountName: any, vaultSecret: any, chainClie
|
|
|
237
239
|
*
|
|
238
240
|
* @param {Object} data - Accounts data to save
|
|
239
241
|
*/
|
|
240
|
-
declare function saveAccounts(data:
|
|
242
|
+
declare function saveAccounts(data: AccountsData): void;
|
|
241
243
|
/**
|
|
242
244
|
* Launch the interactive key management CLI.
|
|
243
245
|
* Provides menu for: add/modify/remove keys, test decryption,
|
|
@@ -249,7 +251,7 @@ declare function main(): Promise<boolean>;
|
|
|
249
251
|
* @param {Object} [options={}] - Optional socket/ready-file path overrides
|
|
250
252
|
* @returns {boolean} True if daemon socket is responsive
|
|
251
253
|
*/
|
|
252
|
-
declare function isDaemonReady(options?:
|
|
254
|
+
declare function isDaemonReady(options?: DaemonPathOptions): boolean;
|
|
253
255
|
/**
|
|
254
256
|
* Check if dexbot-cred daemon is actually responsive by opening a socket
|
|
255
257
|
* connection and waiting for any reply. This catches stale socket/ready
|
|
@@ -258,7 +260,7 @@ declare function isDaemonReady(options?: any): boolean;
|
|
|
258
260
|
* @param {number} timeout - Probe timeout in milliseconds (default 2000)
|
|
259
261
|
* @returns {Promise<boolean>} True if the daemon accepts connections and replies
|
|
260
262
|
*/
|
|
261
|
-
declare function isDaemonResponsive(options?:
|
|
263
|
+
declare function isDaemonResponsive(options?: DaemonPathOptions, timeout?: number): Promise<boolean>;
|
|
262
264
|
/**
|
|
263
265
|
* Wait for dexbot-cred daemon to be ready
|
|
264
266
|
* @param {number} maxWaitMs - Maximum time to wait in milliseconds (default 60000)
|
|
@@ -266,7 +268,7 @@ declare function isDaemonResponsive(options?: any, timeout?: any): Promise<unkno
|
|
|
266
268
|
* @returns {Promise<void>} Resolves when daemon is ready
|
|
267
269
|
* @throws {Error} If daemon doesn't start within timeout
|
|
268
270
|
*/
|
|
269
|
-
declare function waitForDaemon(maxWaitMs?:
|
|
271
|
+
declare function waitForDaemon(maxWaitMs?: number, options?: DaemonPathOptions): Promise<void>;
|
|
270
272
|
/**
|
|
271
273
|
* Lightweight daemon health check. Does NOT create a session or write
|
|
272
274
|
* an audit log entry — used by the credential daemon watchdog and
|
|
@@ -276,7 +278,7 @@ declare function waitForDaemon(maxWaitMs?: any, options?: any): Promise<void>;
|
|
|
276
278
|
* @param {Object} options - Optional socket path overrides
|
|
277
279
|
* @returns {Promise<boolean>} Resolves with true if daemon responds
|
|
278
280
|
*/
|
|
279
|
-
declare function pingDaemon(accountName:
|
|
281
|
+
declare function pingDaemon(accountName: string | null, timeout?: number, options?: DaemonPathOptions): Promise<boolean>;
|
|
280
282
|
/**
|
|
281
283
|
* Verifies the account exists in the daemon's session cache.
|
|
282
284
|
* @param {string} accountName - Name of the account to probe
|
|
@@ -284,6 +286,6 @@ declare function pingDaemon(accountName: any, timeout?: any, options?: any): Pro
|
|
|
284
286
|
* @param {Object} options - Optional socket path overrides
|
|
285
287
|
* @returns {Promise<string|null>} Resolves with sessionId if account is available, rejects otherwise
|
|
286
288
|
*/
|
|
287
|
-
declare function probeAccountInDaemon(accountName:
|
|
289
|
+
declare function probeAccountInDaemon(accountName: string | null, timeout?: number, options?: DaemonPathOptions): Promise<string | null>;
|
|
288
290
|
export { validatePrivateKey, loadAccounts, hasKeySetup, saveAccounts, checkKeysFileSecurity, encrypt, decrypt, deriveVaultKey, createDaemonSigningToken, createSessionSecret, createVaultSecret, isVaultSecret, isDaemonSigningToken, unlockWithPassword, main, authenticate, getPrivateKey, resolvePrivateKey, isMasterPasswordFailure, MasterPasswordError, isDaemonReady, isDaemonResponsive, waitForDaemon, probeAccountInDaemon, pingDaemon };
|
|
289
291
|
//# sourceMappingURL=chain_keys.d.ts.map
|
|
@@ -122,7 +122,7 @@ function getNet() {
|
|
|
122
122
|
return _net;
|
|
123
123
|
}
|
|
124
124
|
import { getCredentialReadyFilePath, getCredentialSocketPath, assertPrivatePathSecurity, } from './credential_runtime.js';
|
|
125
|
-
import { getErrorMessage } from './utils/errors.js';
|
|
125
|
+
import { getErrorMessage, getErrorCode } from './utils/errors.js';
|
|
126
126
|
import { hasProcess } from './env.js';
|
|
127
127
|
const storage = getStorage();
|
|
128
128
|
const { ensureDir } = storage;
|
|
@@ -210,14 +210,12 @@ function resolveVaultKey(secret) {
|
|
|
210
210
|
if (Buffer.isBuffer(secret)) {
|
|
211
211
|
return Buffer.from(secret);
|
|
212
212
|
}
|
|
213
|
-
|
|
214
|
-
|
|
213
|
+
const rec = secret;
|
|
214
|
+
if ((isVaultSecret(secret) || typeof secret === 'object') && typeof rec.vaultKeyHex === 'string') {
|
|
215
|
+
return toBuffer(rec.vaultKeyHex);
|
|
215
216
|
}
|
|
216
|
-
if (typeof secret === 'object' &&
|
|
217
|
-
return
|
|
218
|
-
}
|
|
219
|
-
if (typeof secret === 'object' && Buffer.isBuffer(secret.vaultKey)) {
|
|
220
|
-
return Buffer.from(secret.vaultKey);
|
|
217
|
+
if (typeof secret === 'object' && Buffer.isBuffer(rec.vaultKey)) {
|
|
218
|
+
return Buffer.from(rec.vaultKey);
|
|
221
219
|
}
|
|
222
220
|
return null;
|
|
223
221
|
}
|
|
@@ -228,7 +226,7 @@ function createVaultSecret(vaultKey, extra = {}) {
|
|
|
228
226
|
}
|
|
229
227
|
return {
|
|
230
228
|
kind: VAULT_SECRET_KIND,
|
|
231
|
-
version: extra.version
|
|
229
|
+
version: typeof extra.version === 'number' ? extra.version : VAULT_VERSION,
|
|
232
230
|
vaultKeyHex: keyBuffer.toString('hex'),
|
|
233
231
|
};
|
|
234
232
|
}
|
|
@@ -259,7 +257,10 @@ function createDaemonSigningToken(accountName, options = {}) {
|
|
|
259
257
|
};
|
|
260
258
|
}
|
|
261
259
|
function isDaemonSigningToken(value) {
|
|
262
|
-
|
|
260
|
+
if (!value || typeof value !== 'object')
|
|
261
|
+
return false;
|
|
262
|
+
const rec = value;
|
|
263
|
+
return rec.kind === VAULT_DAEMON_SIGNING_TOKEN_KIND && typeof rec.accountName === 'string';
|
|
263
264
|
}
|
|
264
265
|
function deriveVaultKey(password, vaultSalt) {
|
|
265
266
|
const saltBuffer = toBuffer(vaultSalt) || randomBytes(VAULT_SALT_BYTES);
|
|
@@ -292,13 +293,14 @@ function timingSafeEqualHex(leftHex, rightHex) {
|
|
|
292
293
|
return timingSafeEqual(left, right);
|
|
293
294
|
}
|
|
294
295
|
function normalizeAccountsData(data = {}) {
|
|
295
|
-
const
|
|
296
|
-
|
|
296
|
+
const source = (data && typeof data === 'object') ? data : {};
|
|
297
|
+
const accountsSource = (source.accounts && typeof source.accounts === 'object')
|
|
298
|
+
? source.accounts
|
|
297
299
|
: {};
|
|
298
300
|
return {
|
|
299
|
-
vaultVersion: Number(
|
|
300
|
-
vaultSalt: typeof
|
|
301
|
-
vaultVerifier: typeof
|
|
301
|
+
vaultVersion: Number(source.vaultVersion) || 0,
|
|
302
|
+
vaultSalt: typeof source.vaultSalt === 'string' ? source.vaultSalt : '',
|
|
303
|
+
vaultVerifier: typeof source.vaultVerifier === 'string' ? source.vaultVerifier : '',
|
|
302
304
|
accounts: accountsSource,
|
|
303
305
|
};
|
|
304
306
|
}
|
|
@@ -440,7 +442,7 @@ function loadAccounts() {
|
|
|
440
442
|
return normalizeAccountsData(storage.readJSON(PROFILES_KEYS_FILE));
|
|
441
443
|
}
|
|
442
444
|
catch (error) {
|
|
443
|
-
if (error
|
|
445
|
+
if (getErrorCode(error) !== 'ENOENT' && !(error instanceof SyntaxError)) {
|
|
444
446
|
console.error('Error loading accounts file, resetting to default:', getErrorMessage(error));
|
|
445
447
|
}
|
|
446
448
|
return normalizeAccountsData();
|
|
@@ -491,8 +493,8 @@ function checkKeysFileSecurity() {
|
|
|
491
493
|
* Unlock the key vault with a master password.
|
|
492
494
|
* Uses modern scrypt v2 vault format with HMAC verification.
|
|
493
495
|
* @param {string} password - Master password
|
|
494
|
-
* @param {
|
|
495
|
-
* @returns {
|
|
496
|
+
* @param {unknown} [accountsData=loadAccounts()] - Accounts data object
|
|
497
|
+
* @returns {unknown} Derived vault secret
|
|
496
498
|
* @throws {MasterPasswordError} If password is incorrect
|
|
497
499
|
* @throws {Error} If vault format is unsupported
|
|
498
500
|
*/
|
|
@@ -544,8 +546,8 @@ function isMasterPasswordFailure(err) {
|
|
|
544
546
|
return !!(err &&
|
|
545
547
|
(err instanceof MasterPasswordError ||
|
|
546
548
|
err instanceof MasterPasswordCancelledError ||
|
|
547
|
-
err
|
|
548
|
-
err
|
|
549
|
+
getErrorCode(err) === MasterPasswordError.code ||
|
|
550
|
+
getErrorCode(err) === MasterPasswordCancelledError.code));
|
|
549
551
|
}
|
|
550
552
|
const MASTER_PASSWORD_MAX_ATTEMPTS = CREDENTIAL_PROMPTS.MAX_MASTER_PASSWORD_ATTEMPTS;
|
|
551
553
|
let masterPasswordAttempts = 0;
|
|
@@ -795,6 +797,27 @@ function saveAccounts(data) {
|
|
|
795
797
|
// then rename over target.
|
|
796
798
|
storage.writeJSON(PROFILES_KEYS_FILE, serialized, { mode: 0o600, fsync: true });
|
|
797
799
|
}
|
|
800
|
+
/**
|
|
801
|
+
* Prompt for, validate, and encrypt a private key for the keymanager's add
|
|
802
|
+
* and modify flows. Centralized so key validation and vault encryption cannot
|
|
803
|
+
* drift between the two paths.
|
|
804
|
+
* @param secret - Vault secret used for encryption
|
|
805
|
+
* @returns The encrypted key, or null when cancelled (ESC) or invalid
|
|
806
|
+
* (the reason has already been printed)
|
|
807
|
+
*/
|
|
808
|
+
async function promptEncryptedPrivateKey(secret) {
|
|
809
|
+
const privateKeyRaw = await readPassword('Enter private key: ');
|
|
810
|
+
if (privateKeyRaw === '\x1b')
|
|
811
|
+
return null;
|
|
812
|
+
const privateKey = privateKeyRaw.replace(/\s+/g, '');
|
|
813
|
+
const validation = validatePrivateKey(privateKey);
|
|
814
|
+
if (!validation.valid) {
|
|
815
|
+
console.log(`Invalid private key: ${validation.reason}`);
|
|
816
|
+
console.log('Accepted formats: WIF (51/52 chars), PVT_* keys, or 64-hex');
|
|
817
|
+
return null;
|
|
818
|
+
}
|
|
819
|
+
return encrypt(privateKey, secret);
|
|
820
|
+
}
|
|
798
821
|
/**
|
|
799
822
|
* Launch the interactive key management CLI.
|
|
800
823
|
* Provides menu for: add/modify/remove keys, test decryption,
|
|
@@ -871,17 +894,9 @@ async function main() {
|
|
|
871
894
|
if (!accountName) {
|
|
872
895
|
continue;
|
|
873
896
|
}
|
|
874
|
-
const
|
|
875
|
-
if (
|
|
876
|
-
continue;
|
|
877
|
-
const privateKey = privateKeyRaw.replace(/\s+/g, '');
|
|
878
|
-
const validation = validatePrivateKey(privateKey);
|
|
879
|
-
if (!validation.valid) {
|
|
880
|
-
console.log(`Invalid private key: ${validation.reason}`);
|
|
881
|
-
console.log('Accepted formats: WIF (51/52 chars), PVT_* keys, or 64-hex');
|
|
897
|
+
const encryptedKey = await promptEncryptedPrivateKey(vaultSecret);
|
|
898
|
+
if (!encryptedKey)
|
|
882
899
|
continue;
|
|
883
|
-
}
|
|
884
|
-
const encryptedKey = encrypt(privateKey, vaultSecret);
|
|
885
900
|
accountsData.accounts[accountName] = { encryptedKey };
|
|
886
901
|
saveAccounts(accountsData);
|
|
887
902
|
console.log(`Account '${accountName}' added successfully.`);
|
|
@@ -890,17 +905,9 @@ async function main() {
|
|
|
890
905
|
const accountName = await selectKeyName(accountsData.accounts, 'Select key to modify');
|
|
891
906
|
if (!accountName)
|
|
892
907
|
continue;
|
|
893
|
-
const
|
|
894
|
-
if (
|
|
895
|
-
continue;
|
|
896
|
-
const privateKey = privateKeyRaw.replace(/\s+/g, '');
|
|
897
|
-
const validation = validatePrivateKey(privateKey);
|
|
898
|
-
if (!validation.valid) {
|
|
899
|
-
console.log(`Invalid private key: ${validation.reason}`);
|
|
900
|
-
console.log('Accepted formats: WIF (51/52 chars), PVT_* keys, or 64-hex');
|
|
908
|
+
const encryptedKey = await promptEncryptedPrivateKey(vaultSecret);
|
|
909
|
+
if (!encryptedKey)
|
|
901
910
|
continue;
|
|
902
|
-
}
|
|
903
|
-
const encryptedKey = encrypt(privateKey, vaultSecret);
|
|
904
911
|
accountsData.accounts[accountName] = { ...accountsData.accounts[accountName], encryptedKey };
|
|
905
912
|
saveAccounts(accountsData);
|
|
906
913
|
console.log(`Account '${accountName}' updated successfully.`);
|
|
@@ -939,7 +946,7 @@ async function main() {
|
|
|
939
946
|
}
|
|
940
947
|
else if (choice === '6') {
|
|
941
948
|
try {
|
|
942
|
-
vaultSecret = await changeMasterPassword(accountsData, vaultSecret);
|
|
949
|
+
vaultSecret = (await changeMasterPassword(accountsData, vaultSecret));
|
|
943
950
|
}
|
|
944
951
|
catch (err) {
|
|
945
952
|
if (err instanceof MasterPasswordCancelledError) {
|
|
@@ -1083,15 +1090,16 @@ function sendDaemonRequest(requestType, accountName, timeout = TIMING.DAEMON_PIN
|
|
|
1083
1090
|
}
|
|
1084
1091
|
},
|
|
1085
1092
|
handleResponse: (parsed, resolve, reject) => {
|
|
1093
|
+
const p = parsed;
|
|
1086
1094
|
try {
|
|
1087
1095
|
if (extractResult) {
|
|
1088
|
-
resolve(extractResult(
|
|
1096
|
+
resolve(extractResult(p));
|
|
1089
1097
|
}
|
|
1090
|
-
else if (
|
|
1091
|
-
resolve(
|
|
1098
|
+
else if (p.success) {
|
|
1099
|
+
resolve(p);
|
|
1092
1100
|
}
|
|
1093
1101
|
else {
|
|
1094
|
-
reject(new Error(
|
|
1102
|
+
reject(new Error(p.error || `Daemon ${label} failed`));
|
|
1095
1103
|
}
|
|
1096
1104
|
}
|
|
1097
1105
|
catch (handlerErr) {
|