dexbot 1.6.4 → 1.6.6
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 +75 -3
- package/README.md +109 -40
- package/analysis/README.md +19 -17
- package/analysis/account_resolver.ts +1 -11
- package/analysis/analyze_dynamic_weight.ts +9 -3
- package/analysis/bot_usage/kibana_bot_queries.ts +1 -1
- package/analysis/chain_pool.ts +1 -1
- package/analysis/fills_source.ts +0 -6
- package/analysis/grid_correction_check.ts +20 -26
- package/analysis/resolve_source.ts +1 -1
- package/analysis/trade_profitability.ts +2 -5
- package/analysis/tradingview/analyze_tradingview.ts +5 -0
- package/analysis/tradingview/tradingview_uplot_chart_generator.ts +2 -2
- package/analysis/trend_detection/DYNAMIC_WEIGHT_RESEARCH.md +35 -2
- package/analysis/trend_detection/README.md +1 -3
- package/analysis/trend_detection/dynamic_weight_chart_generator.ts +82 -10
- package/analysis/trend_detection/package.json +1 -1
- package/claw/modules/dexbot_profiles.ts +4 -3
- 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/claw/tests/test_claw_mcp_transport.ts +2 -2
- package/claw/tests/test_dexbot_profiles.ts +18 -1
- package/dist/analysis/account_resolver.d.ts +1 -4
- package/dist/analysis/account_resolver.d.ts.map +1 -1
- package/dist/analysis/account_resolver.js +1 -1
- package/dist/analysis/account_resolver.js.map +1 -1
- package/dist/analysis/analyze_dynamic_weight.js +9 -3
- package/dist/analysis/analyze_dynamic_weight.js.map +1 -1
- package/dist/analysis/bot_usage/kibana_bot_queries.d.ts +1 -2
- package/dist/analysis/bot_usage/kibana_bot_queries.d.ts.map +1 -1
- package/dist/analysis/bot_usage/kibana_bot_queries.js +1 -1
- package/dist/analysis/bot_usage/kibana_bot_queries.js.map +1 -1
- package/dist/analysis/chain_pool.d.ts +1 -3
- package/dist/analysis/chain_pool.d.ts.map +1 -1
- package/dist/analysis/chain_pool.js +1 -1
- package/dist/analysis/chain_pool.js.map +1 -1
- package/dist/analysis/fills_source.d.ts +1 -51
- package/dist/analysis/fills_source.d.ts.map +1 -1
- package/dist/analysis/fills_source.js +1 -1
- package/dist/analysis/fills_source.js.map +1 -1
- package/dist/analysis/grid_correction_check.d.ts +2 -3
- package/dist/analysis/grid_correction_check.d.ts.map +1 -1
- package/dist/analysis/grid_correction_check.js +18 -26
- package/dist/analysis/grid_correction_check.js.map +1 -1
- package/dist/analysis/resolve_source.d.ts +1 -1
- package/dist/analysis/resolve_source.d.ts.map +1 -1
- package/dist/analysis/trade_profitability.d.ts.map +1 -1
- package/dist/analysis/trade_profitability.js +2 -7
- package/dist/analysis/trade_profitability.js.map +1 -1
- package/dist/analysis/tradingview/analyze_tradingview.d.ts.map +1 -1
- package/dist/analysis/tradingview/analyze_tradingview.js +5 -0
- package/dist/analysis/tradingview/analyze_tradingview.js.map +1 -1
- package/dist/analysis/tradingview/tradingview_uplot_chart_generator.js +2 -2
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.d.ts.map +1 -1
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.js +82 -10
- package/dist/analysis/trend_detection/dynamic_weight_chart_generator.js.map +1 -1
- package/dist/dexbot.d.ts.map +1 -1
- package/dist/dexbot.js +85 -140
- package/dist/dexbot.js.map +1 -1
- package/dist/market_adapter/core/asymmetric_bounds.d.ts +2 -2
- package/dist/market_adapter/core/asymmetric_bounds.d.ts.map +1 -1
- package/dist/market_adapter/core/asymmetric_bounds.js +15 -12
- package/dist/market_adapter/core/asymmetric_bounds.js.map +1 -1
- package/dist/market_adapter/core/kibana_candles.d.ts +1 -15
- package/dist/market_adapter/core/kibana_candles.d.ts.map +1 -1
- package/dist/market_adapter/core/kibana_candles.js +1 -1
- package/dist/market_adapter/core/kibana_candles.js.map +1 -1
- package/dist/market_adapter/inputs/fetch_lp_data.d.ts +1 -35
- package/dist/market_adapter/inputs/fetch_lp_data.d.ts.map +1 -1
- package/dist/market_adapter/inputs/fetch_lp_data.js +10 -54
- package/dist/market_adapter/inputs/fetch_lp_data.js.map +1 -1
- package/dist/market_adapter/inputs/kibana_feed_source.d.ts +1 -8
- package/dist/market_adapter/inputs/kibana_feed_source.d.ts.map +1 -1
- package/dist/market_adapter/inputs/kibana_feed_source.js +1 -1
- package/dist/market_adapter/inputs/kibana_feed_source.js.map +1 -1
- package/dist/market_adapter/inputs/window_cache.d.ts +2 -63
- package/dist/market_adapter/inputs/window_cache.d.ts.map +1 -1
- package/dist/market_adapter/inputs/window_cache.js +22 -102
- package/dist/market_adapter/inputs/window_cache.js.map +1 -1
- package/dist/market_adapter/interval_utils.d.ts +1 -1
- package/dist/market_adapter/interval_utils.js +1 -1
- package/dist/modules/account_bots.d.ts +70 -6
- package/dist/modules/account_bots.d.ts.map +1 -1
- package/dist/modules/account_bots.js +353 -149
- package/dist/modules/account_bots.js.map +1 -1
- package/dist/modules/bitshares-native/crypto/ecc.browser.d.ts.map +1 -1
- package/dist/modules/bitshares-native/crypto/ecc.browser.js +0 -31
- package/dist/modules/bitshares-native/crypto/ecc.browser.js.map +1 -1
- package/dist/modules/bot_defaults.d.ts +98 -0
- package/dist/modules/bot_defaults.d.ts.map +1 -0
- package/dist/modules/bot_defaults.js +169 -0
- package/dist/modules/bot_defaults.js.map +1 -0
- package/dist/modules/bot_settings.d.ts.map +1 -1
- package/dist/modules/bot_settings.js +4 -1
- package/dist/modules/bot_settings.js.map +1 -1
- package/dist/modules/config.d.ts +1 -0
- package/dist/modules/config.d.ts.map +1 -1
- package/dist/modules/config.js +1 -0
- package/dist/modules/config.js.map +1 -1
- package/dist/modules/constants.d.ts +11 -2
- package/dist/modules/constants.d.ts.map +1 -1
- package/dist/modules/constants.js +40 -27
- package/dist/modules/constants.js.map +1 -1
- package/dist/modules/credit_runtime.d.ts +0 -2
- package/dist/modules/credit_runtime.d.ts.map +1 -1
- package/dist/modules/credit_runtime.js +1 -10
- package/dist/modules/credit_runtime.js.map +1 -1
- package/dist/modules/dexbot_class.d.ts +13 -10
- package/dist/modules/dexbot_class.d.ts.map +1 -1
- package/dist/modules/dexbot_class.js +0 -9
- package/dist/modules/dexbot_class.js.map +1 -1
- package/dist/modules/dexbot_cow_runtime.d.ts +13 -0
- package/dist/modules/dexbot_cow_runtime.d.ts.map +1 -1
- package/dist/modules/dexbot_cow_runtime.js +13 -1
- package/dist/modules/dexbot_cow_runtime.js.map +1 -1
- package/dist/modules/dexbot_maintenance_runtime.d.ts +1 -1
- package/dist/modules/dexbot_maintenance_runtime.d.ts.map +1 -1
- package/dist/modules/dexbot_maintenance_runtime.js +9 -4
- package/dist/modules/dexbot_maintenance_runtime.js.map +1 -1
- package/dist/modules/launcher/adapter_requirement.js +1 -1
- package/dist/modules/launcher/launch_modes.d.ts +17 -1
- package/dist/modules/launcher/launch_modes.d.ts.map +1 -1
- package/dist/modules/launcher/launch_modes.js +18 -1
- package/dist/modules/launcher/launch_modes.js.map +1 -1
- package/dist/modules/launcher/monolithic_runtime.d.ts.map +1 -1
- package/dist/modules/launcher/monolithic_runtime.js +8 -1
- package/dist/modules/launcher/monolithic_runtime.js.map +1 -1
- package/dist/modules/market_adapter_whitelist.d.ts +40 -1
- package/dist/modules/market_adapter_whitelist.d.ts.map +1 -1
- package/dist/modules/market_adapter_whitelist.js +161 -11
- package/dist/modules/market_adapter_whitelist.js.map +1 -1
- package/dist/modules/order/accounting.d.ts +4 -18
- package/dist/modules/order/accounting.d.ts.map +1 -1
- package/dist/modules/order/accounting.js +4 -34
- package/dist/modules/order/accounting.js.map +1 -1
- package/dist/modules/order/export.d.ts +9 -12
- package/dist/modules/order/export.d.ts.map +1 -1
- package/dist/modules/order/export.js +9 -12
- package/dist/modules/order/export.js.map +1 -1
- package/dist/modules/order/grid.d.ts +44 -40
- package/dist/modules/order/grid.d.ts.map +1 -1
- package/dist/modules/order/grid.js +66 -48
- package/dist/modules/order/grid.js.map +1 -1
- package/dist/modules/order/grid_reconcile.d.ts.map +1 -1
- package/dist/modules/order/grid_reconcile.js +111 -20
- package/dist/modules/order/grid_reconcile.js.map +1 -1
- package/dist/modules/order/grid_reconcile_internal.d.ts +5 -3
- package/dist/modules/order/grid_reconcile_internal.d.ts.map +1 -1
- package/dist/modules/order/grid_reconcile_internal.js +18 -3
- package/dist/modules/order/grid_reconcile_internal.js.map +1 -1
- package/dist/modules/order/manager.d.ts +0 -8
- package/dist/modules/order/manager.d.ts.map +1 -1
- package/dist/modules/order/manager.js +3 -12
- package/dist/modules/order/manager.js.map +1 -1
- package/dist/modules/order/utils/order.d.ts +22 -7
- package/dist/modules/order/utils/order.d.ts.map +1 -1
- package/dist/modules/order/utils/order.js +103 -21
- package/dist/modules/order/utils/order.js.map +1 -1
- package/dist/modules/order/utils/system.d.ts +5 -1
- package/dist/modules/order/utils/system.d.ts.map +1 -1
- package/dist/modules/order/utils/system.js +5 -2
- package/dist/modules/order/utils/system.js.map +1 -1
- package/dist/modules/order/utils/withPoolRef.d.ts +12 -0
- package/dist/modules/order/utils/withPoolRef.d.ts.map +1 -1
- package/dist/modules/order/utils/withPoolRef.js +17 -0
- package/dist/modules/order/utils/withPoolRef.js.map +1 -1
- package/dist/modules/order/working_grid.d.ts +8 -13
- package/dist/modules/order/working_grid.d.ts.map +1 -1
- package/dist/modules/order/working_grid.js +8 -29
- package/dist/modules/order/working_grid.js.map +1 -1
- package/dist/modules/settings_merge.d.ts +10 -1
- package/dist/modules/settings_merge.d.ts.map +1 -1
- package/dist/modules/settings_merge.js +27 -17
- package/dist/modules/settings_merge.js.map +1 -1
- package/dist/modules/validate_profiles.d.ts.map +1 -1
- package/dist/modules/validate_profiles.js +4 -3
- package/dist/modules/validate_profiles.js.map +1 -1
- package/dist/scripts/chart_command.d.ts +48 -0
- package/dist/scripts/chart_command.d.ts.map +1 -0
- package/dist/scripts/chart_command.js +504 -0
- package/dist/scripts/chart_command.js.map +1 -0
- package/dist/scripts/dw.d.ts +3 -0
- package/dist/scripts/dw.d.ts.map +1 -0
- package/dist/scripts/dw.js +30 -0
- package/dist/scripts/dw.js.map +1 -0
- package/dist/scripts/sync-version.js +0 -22
- package/dist/scripts/sync-version.js.map +1 -1
- package/dist/scripts/tv.d.ts +1 -31
- package/dist/scripts/tv.d.ts.map +1 -1
- package/dist/scripts/tv.js +10 -463
- package/dist/scripts/tv.js.map +1 -1
- package/dist/scripts/update.js +99 -62
- package/dist/scripts/update.js.map +1 -1
- package/dist/scripts/update_dist_freshness.d.ts +58 -0
- package/dist/scripts/update_dist_freshness.d.ts.map +1 -0
- package/dist/scripts/update_dist_freshness.js +144 -0
- package/dist/scripts/update_dist_freshness.js.map +1 -0
- package/dist/unlock.js +1 -1
- package/dist/unlock.js.map +1 -1
- package/docs/BITSHARES_ONBOARDING.md +16 -10
- package/docs/COW_INVARIANTS.md +1 -0
- package/docs/DEXBOT_COMPARISON.md +11 -11
- package/docs/EVOLUTION.md +9 -7
- package/docs/FUND_MOVEMENT_AND_ACCOUNTING.md +4 -4
- package/docs/GRID_PRICE_INVARIANT.md +518 -0
- package/docs/GRID_RECALCULATION.md +20 -24
- package/docs/GRID_RECONCILE.md +62 -41
- package/docs/LOGGING.md +1 -0
- package/docs/ORDER_ENGINE_POST_1.0_RETROSPECTIVE.md +556 -0
- package/docs/README.md +18 -18
- package/docs/WORKFLOW.md +13 -8
- package/docs/architecture.md +42 -40
- package/docs/developer_guide.md +5 -8
- package/market_adapter/README.md +45 -65
- package/modules/README.md +3 -2
- package/package.json +7 -4
- package/scripts/README.md +18 -34
- package/scripts/reset-settings.sh +1 -1
- package/analysis/ama_fitting/package.json +0 -12
- package/analysis/analyze_derivatives.ts +0 -320
- package/analysis/derivative_chart_generator.ts +0 -874
- package/analysis/trend_detection/SIGNAL_DOCUMENTATION.md +0 -403
- package/analysis/trend_detection/derivative_analyzer.ts +0 -1059
- package/dist/analysis/analyze_derivatives.d.ts +0 -68
- package/dist/analysis/analyze_derivatives.d.ts.map +0 -1
- package/dist/analysis/analyze_derivatives.js +0 -287
- package/dist/analysis/analyze_derivatives.js.map +0 -1
- package/dist/analysis/derivative_chart_generator.d.ts +0 -12
- package/dist/analysis/derivative_chart_generator.d.ts.map +0 -1
- package/dist/analysis/derivative_chart_generator.js +0 -891
- package/dist/analysis/derivative_chart_generator.js.map +0 -1
- package/dist/analysis/trend_detection/derivative_analyzer.d.ts +0 -248
- package/dist/analysis/trend_detection/derivative_analyzer.d.ts.map +0 -1
- package/dist/analysis/trend_detection/derivative_analyzer.js +0 -910
- package/dist/analysis/trend_detection/derivative_analyzer.js.map +0 -1
- package/dist/scripts/generate_market_adapter_whitelist.d.ts +0 -15
- package/dist/scripts/generate_market_adapter_whitelist.d.ts.map +0 -1
- package/dist/scripts/generate_market_adapter_whitelist.js +0 -191
- package/dist/scripts/generate_market_adapter_whitelist.js.map +0 -1
|
@@ -4,9 +4,50 @@ import { _countActiveOnGrid, _cancelChainOrder, _recoverStartupSyncFailure, _ref
|
|
|
4
4
|
import { ORDER_TYPES, ORDER_STATES, TIMING } from '../constants.js';
|
|
5
5
|
import { readOpenOrdersGuarded } from '../chain_orders.js';
|
|
6
6
|
import { getAssetFeesSafe, priceSlotEqual } from './utils/math.js';
|
|
7
|
-
import { isOrderPlaced, parseChainOrder, isOrderOnChain, chainOrderMatchesSlotWithTolerance, duplicateOrphanLogInfo, resolveReserveCount, } from './utils/order.js';
|
|
7
|
+
import { isOrderPlaced, parseChainOrder, isOrderOnChain, findLiveOrderOwnerByChainId, chainOrderMatchesSlotWithTolerance, duplicateOrphanLogInfo, resolveReserveCount, } from './utils/order.js';
|
|
8
8
|
import * as Format from './format.js';
|
|
9
9
|
import { getErrorMessage } from '../utils/errors.js';
|
|
10
|
+
function _startupChainSnapshotSignature(orders, manager) {
|
|
11
|
+
const signature = new Map();
|
|
12
|
+
for (const raw of Array.isArray(orders) ? orders : []) {
|
|
13
|
+
if (!raw?.id)
|
|
14
|
+
continue;
|
|
15
|
+
const parsed = parseChainOrder(raw, manager.assets);
|
|
16
|
+
if (!parsed)
|
|
17
|
+
continue;
|
|
18
|
+
signature.set(String(raw.id), `${parsed.type}|${parsed.price}|${parsed.size}`);
|
|
19
|
+
}
|
|
20
|
+
return signature;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Validate a Phase-1 startup cancellation immediately before Phase 2.
|
|
24
|
+
* The plan is only safe if its specific chain order is still unchanged and
|
|
25
|
+
* the live grid still has the same ownership/role that justified the
|
|
26
|
+
* cancellation. Other orders may have legitimately changed since planning.
|
|
27
|
+
*/
|
|
28
|
+
function _startupCancelPlanStillCurrent(plan, manager, initialChainSignature, currentChainSignature) {
|
|
29
|
+
const chainOrderId = String(plan?.chainOrderId || '');
|
|
30
|
+
if (!chainOrderId || !currentChainSignature.has(chainOrderId))
|
|
31
|
+
return false;
|
|
32
|
+
if (currentChainSignature.get(chainOrderId) !== initialChainSignature.get(chainOrderId))
|
|
33
|
+
return false;
|
|
34
|
+
if (plan.gridOrderId) {
|
|
35
|
+
if (plan.boundaryIdx !== undefined && (plan.boundaryIdx !== manager?.boundaryIdx || plan.gapSlots !== manager?._gapSlots))
|
|
36
|
+
return false;
|
|
37
|
+
const slot = manager?.orders instanceof Map ? manager.orders.get(plan.gridOrderId) : null;
|
|
38
|
+
if (!slot || !isOrderOnChain(slot) || slot.orderId !== plan.chainOrderId)
|
|
39
|
+
return false;
|
|
40
|
+
if (plan.orderType && slot.type !== plan.orderType)
|
|
41
|
+
return false;
|
|
42
|
+
if (plan.gridOrder && Number.isFinite(Number(plan.gridOrder.price))
|
|
43
|
+
&& Number(slot.price) !== Number(plan.gridOrder.price))
|
|
44
|
+
return false;
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
47
|
+
// An originally unmatched plan is safe only while the chain order is still
|
|
48
|
+
// untracked. If it has since been adopted into any live slot, skip it.
|
|
49
|
+
return !findLiveOrderOwnerByChainId(manager, plan.chainOrderId);
|
|
50
|
+
}
|
|
10
51
|
/**
|
|
11
52
|
* Returns { resumed: boolean, matchedCount: number }.
|
|
12
53
|
* @param {Object} params - Destructured parameters
|
|
@@ -307,27 +348,66 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
307
348
|
try {
|
|
308
349
|
const { plannedCreates, plannedUpdates, plannedCancels, chainSellCount, chainBuyCount } = phase1Result;
|
|
309
350
|
// Execute planned cancellations (duplicates, edge, excess) outside lock.
|
|
310
|
-
//
|
|
351
|
+
// Re-read immediately before the first cancellation: Phase 1 is pure
|
|
352
|
+
// planning and releases _gridLock, so the ownership/role snapshot that
|
|
353
|
+
// justified a cancel can become stale before any broadcast is sent.
|
|
354
|
+
const phase2CancellationPlanIds = new Set();
|
|
311
355
|
if (!dryRun && plannedCancels.length > 0) {
|
|
312
|
-
|
|
356
|
+
// An empty, non-truncated read is intentionally authoritative here:
|
|
357
|
+
// every plan is an explicit cancel target, so [] safely skips all
|
|
358
|
+
// plans. We do not use deferEmpty because this is not a retry probe.
|
|
313
359
|
for (const cancelPlan of plannedCancels) {
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
logger?.log?.(`Startup:
|
|
360
|
+
if (cancelPlan?.chainOrderId)
|
|
361
|
+
phase2CancellationPlanIds.add(String(cancelPlan.chainOrderId));
|
|
362
|
+
}
|
|
363
|
+
const initialChainSignature = _startupChainSnapshotSignature(chainOpenOrders || [], manager);
|
|
364
|
+
let currentChainSignature = null;
|
|
365
|
+
try {
|
|
366
|
+
const currentChainOrders = await readOpenOrdersGuarded(chainOrders, account, {
|
|
367
|
+
log: (message, level) => logger?.log?.(message, level),
|
|
368
|
+
label: 'STARTUP-PHASE2-CANCEL',
|
|
369
|
+
});
|
|
370
|
+
if (currentChainOrders === null) {
|
|
371
|
+
logger?.log?.(`Startup: Skipping ${plannedCancels.length} stale cancellation plan(s): ` +
|
|
372
|
+
`the pre-cancel chain read was ambiguous or truncated`, 'warn');
|
|
373
|
+
}
|
|
374
|
+
else {
|
|
375
|
+
currentChainSignature = _startupChainSnapshotSignature(currentChainOrders, manager);
|
|
326
376
|
}
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
377
|
+
}
|
|
378
|
+
catch (readErr) {
|
|
379
|
+
logger?.log?.(`Startup: Skipping ${plannedCancels.length} stale cancellation plan(s): ` +
|
|
380
|
+
`pre-cancel chain read failed (${getErrorMessage(readErr)})`, 'warn');
|
|
381
|
+
}
|
|
382
|
+
if (currentChainSignature) {
|
|
383
|
+
logger?.log?.(`Startup: Executing ${plannedCancels.length} queued cancellations (Phase 2)`, 'info');
|
|
384
|
+
// The chain signature is intentionally read once for the loop,
|
|
385
|
+
// not once per broadcast. If an earlier plan cancels, the next
|
|
386
|
+
// order-gone handling covers that intra-loop drift safely.
|
|
387
|
+
for (const cancelPlan of plannedCancels) {
|
|
388
|
+
try {
|
|
389
|
+
const submitted = await _cancelChainOrder({
|
|
390
|
+
chainOrders,
|
|
391
|
+
account,
|
|
392
|
+
privateKey,
|
|
393
|
+
manager,
|
|
394
|
+
chainOrderId: cancelPlan.chainOrderId,
|
|
395
|
+
dryRun,
|
|
396
|
+
chainOrderObj: cancelPlan.chainOrderObj,
|
|
397
|
+
releaseUntrackedFunds: cancelPlan.releaseUntrackedFunds,
|
|
398
|
+
shouldCancel: () => _startupCancelPlanStillCurrent(cancelPlan, manager, initialChainSignature, currentChainSignature),
|
|
399
|
+
});
|
|
400
|
+
if (!submitted) {
|
|
401
|
+
logger?.log?.(`Startup: Skipping stale planned cancellation ${cancelPlan.chainOrderId} (ownership, role, geometry, or chain snapshot changed)`, 'warn');
|
|
402
|
+
continue;
|
|
403
|
+
}
|
|
404
|
+
logger?.log?.(`Startup: Cancelled queued order ${cancelPlan.chainOrderId} (Phase 2)`, 'info');
|
|
405
|
+
}
|
|
406
|
+
catch (cancelErr) {
|
|
407
|
+
logger?.log?.(`Startup: Failed to cancel queued order ${cancelPlan.chainOrderId}: ${getErrorMessage(cancelErr)}. ` +
|
|
408
|
+
`The order stays live: the relocation/create phases will skip any placement ` +
|
|
409
|
+
`that would cross it (STARTUP-CROSS-GUARD) and re-align on the next cycle.`, 'error');
|
|
410
|
+
}
|
|
331
411
|
}
|
|
332
412
|
}
|
|
333
413
|
}
|
|
@@ -490,6 +570,9 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
490
570
|
gridOrderIds.add(co.id);
|
|
491
571
|
}
|
|
492
572
|
}
|
|
573
|
+
const queuedCancellationIds = new Set((Array.isArray(manager.ordersNeedingPriceCorrection) ? manager.ordersNeedingPriceCorrection : [])
|
|
574
|
+
.filter((entry) => entry?.chainOrderId && (entry?.cancelOnly === true || entry?.isSurplus === true))
|
|
575
|
+
.map((entry) => String(entry.chainOrderId)));
|
|
493
576
|
const staleSurplusCancels = [];
|
|
494
577
|
for (const side of [ORDER_TYPES.SELL, ORDER_TYPES.BUY]) {
|
|
495
578
|
const targetCount = side === ORDER_TYPES.SELL ? targetSell : targetBuy;
|
|
@@ -499,10 +582,18 @@ export async function reconcileGridOrders({ manager, config, account, privateKey
|
|
|
499
582
|
// Sort by chain ID for deterministic cancellation order.
|
|
500
583
|
sideOrders = sideOrders.sort((a, b) => (a.chain.id || '').localeCompare(b.chain.id || ''));
|
|
501
584
|
let cancelLimit = sideOrders.length - targetCount;
|
|
585
|
+
// Protected candidates do not consume cancelLimit;
|
|
586
|
+
// selection therefore moves to the next eligible
|
|
587
|
+
// sorted order instead of the pre-guard candidate.
|
|
502
588
|
for (const so of sideOrders) {
|
|
503
589
|
if (cancelLimit <= 0)
|
|
504
590
|
break;
|
|
505
|
-
|
|
591
|
+
const recentlyCancelled = typeof chainOrders.wasRecentlyOwnCancelled === 'function'
|
|
592
|
+
&& chainOrders.wasRecentlyOwnCancelled(so.chain.id);
|
|
593
|
+
if (!gridOrderIds.has(so.chain.id)
|
|
594
|
+
&& !queuedCancellationIds.has(String(so.chain.id))
|
|
595
|
+
&& !phase2CancellationPlanIds.has(String(so.chain.id))
|
|
596
|
+
&& !recentlyCancelled) {
|
|
506
597
|
staleSurplusCancels.push({ chainOrderObj: so.chain, sideLabel });
|
|
507
598
|
cancelLimit--;
|
|
508
599
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid_reconcile.js","sourceRoot":"","sources":["../../../modules/order/grid_reconcile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"grid_reconcile.js","sourceRoot":"","sources":["../../../modules/order/grid_reconcile.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,10 +59,11 @@ declare function _createOrderFromGrid({ chainOrders, account, privateKey, manage
|
|
|
59
59
|
* @param {boolean} [params.releaseUntrackedFunds=false] - If true, release the cancelled order's
|
|
60
60
|
* committed funds via addToChainFree. Use only for unmatched chain orders that have no
|
|
61
61
|
* corresponding ACTIVE/PARTIAL grid slot (where synchronizeWithChain cannot release them).
|
|
62
|
-
* @
|
|
62
|
+
* @param {Function} [params.shouldCancel] - Optional final pre-broadcast ownership/geometry guard.
|
|
63
|
+
* @returns {Promise<boolean>} true when a cancellation was actually submitted
|
|
63
64
|
* @private
|
|
64
65
|
*/
|
|
65
|
-
declare function _cancelChainOrder({ chainOrders, account, privateKey, manager, chainOrderId, dryRun, chainOrderObj, releaseUntrackedFunds }: {
|
|
66
|
+
declare function _cancelChainOrder({ chainOrders, account, privateKey, manager, chainOrderId, dryRun, chainOrderObj, releaseUntrackedFunds, shouldCancel }: {
|
|
66
67
|
chainOrders: any;
|
|
67
68
|
account: any;
|
|
68
69
|
privateKey: any;
|
|
@@ -71,7 +72,8 @@ declare function _cancelChainOrder({ chainOrders, account, privateKey, manager,
|
|
|
71
72
|
dryRun: any;
|
|
72
73
|
chainOrderObj: any;
|
|
73
74
|
releaseUntrackedFunds?: boolean;
|
|
74
|
-
|
|
75
|
+
shouldCancel?: (() => boolean) | null;
|
|
76
|
+
}): Promise<boolean>;
|
|
75
77
|
declare function _recoverStartupSyncFailure({ chainOrders, manager, account, logger, triggerMessage, source }: {
|
|
76
78
|
chainOrders: any;
|
|
77
79
|
manager: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grid_reconcile_internal.d.ts","sourceRoot":"","sources":["../../../modules/order/grid_reconcile_internal.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuDH;;;;;;GAMG;AACH,iBAAS,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAW3D;AAsFD;;;;;;;GAOG;AACH,iBAAS,2BAA2B,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG,EAAE,CAiF/E;AA2ND;;;;;;;;;;;;;;;GAeG;AACH,iBAAe,oBAAoB,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,YAAiB,EAAE,EAAE;IAAE,WAAW,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC;IAAC,SAAS,EAAE,GAAG,CAAC;IAAC,MAAM,EAAE,GAAG,CAAC;IAAC,YAAY,CAAC,EAAE,GAAG,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiJnQ;AAED
|
|
1
|
+
{"version":3,"file":"grid_reconcile_internal.d.ts","sourceRoot":"","sources":["../../../modules/order/grid_reconcile_internal.ts"],"names":[],"mappings":"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"}
|
|
@@ -582,12 +582,15 @@ async function _createOrderFromGrid({ chainOrders, account, privateKey, manager,
|
|
|
582
582
|
* @param {boolean} [params.releaseUntrackedFunds=false] - If true, release the cancelled order's
|
|
583
583
|
* committed funds via addToChainFree. Use only for unmatched chain orders that have no
|
|
584
584
|
* corresponding ACTIVE/PARTIAL grid slot (where synchronizeWithChain cannot release them).
|
|
585
|
-
* @
|
|
585
|
+
* @param {Function} [params.shouldCancel] - Optional final pre-broadcast ownership/geometry guard.
|
|
586
|
+
* @returns {Promise<boolean>} true when a cancellation was actually submitted
|
|
586
587
|
* @private
|
|
587
588
|
*/
|
|
588
|
-
async function _cancelChainOrder({ chainOrders, account, privateKey, manager, chainOrderId, dryRun, chainOrderObj, releaseUntrackedFunds = false }) {
|
|
589
|
+
async function _cancelChainOrder({ chainOrders, account, privateKey, manager, chainOrderId, dryRun, chainOrderObj, releaseUntrackedFunds = false, shouldCancel = null }) {
|
|
589
590
|
if (dryRun)
|
|
590
|
-
return;
|
|
591
|
+
return false;
|
|
592
|
+
if (typeof shouldCancel === 'function' && !shouldCancel())
|
|
593
|
+
return false;
|
|
591
594
|
// The snapshot this cancel is based on may be stale: another path (e.g. the
|
|
592
595
|
// sync-layer cancel-only correction) may already have cancelled the order and
|
|
593
596
|
// the wasRecentlyOwnCancelled 5s TTL lapsed before reconcile's Phase-2 ran.
|
|
@@ -645,6 +648,7 @@ async function _cancelChainOrder({ chainOrders, account, privateKey, manager, ch
|
|
|
645
648
|
});
|
|
646
649
|
}
|
|
647
650
|
}
|
|
651
|
+
return true;
|
|
648
652
|
}
|
|
649
653
|
/**
|
|
650
654
|
* Recovery sync from a fresh chain read, guarded against ambiguous snapshots.
|
|
@@ -1489,6 +1493,9 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1489
1493
|
chainOrderId: cancelInfo.chainOrderObj.id,
|
|
1490
1494
|
chainOrderObj: cancelInfo.chainOrderObj,
|
|
1491
1495
|
releaseUntrackedFunds: true,
|
|
1496
|
+
orderType,
|
|
1497
|
+
boundaryIdx: manager?.boundaryIdx,
|
|
1498
|
+
gapSlots: manager?._gapSlots,
|
|
1492
1499
|
});
|
|
1493
1500
|
}
|
|
1494
1501
|
}
|
|
@@ -1673,6 +1680,9 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1673
1680
|
chainOrderId: x.chain.id,
|
|
1674
1681
|
chainOrderObj: x.chain,
|
|
1675
1682
|
releaseUntrackedFunds: true,
|
|
1683
|
+
orderType,
|
|
1684
|
+
boundaryIdx: manager?.boundaryIdx,
|
|
1685
|
+
gapSlots: manager?._gapSlots,
|
|
1676
1686
|
});
|
|
1677
1687
|
cancelCount--;
|
|
1678
1688
|
}
|
|
@@ -1694,6 +1704,11 @@ async function _reconcileStartupSide({ orderType, targetCount, chainSideOrders,
|
|
|
1694
1704
|
plannedCancels.push({
|
|
1695
1705
|
chainOrderId: o.orderId,
|
|
1696
1706
|
chainOrderObj: o,
|
|
1707
|
+
gridOrderId: o.id,
|
|
1708
|
+
gridOrder: { ...o },
|
|
1709
|
+
orderType,
|
|
1710
|
+
boundaryIdx: manager?.boundaryIdx,
|
|
1711
|
+
gapSlots: manager?._gapSlots,
|
|
1697
1712
|
// Matched-slot funds are tracked on the grid slot; only
|
|
1698
1713
|
// unmatched orphans release untracked funds (mirrors the
|
|
1699
1714
|
// execute branch, which passes no release flag here).
|