dexbot 1.6.3 → 1.6.4

package/dist/analysis/fills_source.js

@@ -0,0 +1,186 @@
+'use strict';
+/**
+ * SHARED FILLS SOURCE (analysis)
+ *
+ * Single implementation of the Kibana `fill_order` pipeline and the asset
+ * precision table/cache used by the fill-based analysis tools. Both
+ * trade_profitability.ts and grid_correction_check.ts carried verbatim copies
+ * of this (43-entry ASSETS table, toReal/assetPrec helpers, on-chain precision
+ * resolution, query builder and paginated fetch); all of it lives here now.
+ */
+import * as KC from '../market_adapter/core/kibana_client.js';
+import { withReadOnlyClient } from './chain_pool.js';
+const { kibanaSearch, DEFAULT_CONFIG: BASE_CONFIG } = KC;
+/** operation_type of a fill_order operation in the chain history index. */
+const OP_FILL_ORDER = 4;
+const BTS_ID = '1.3.0';
+const ASSETS = {
+    '1.3.0': { symbol: 'BTS', precision: 5 },
+    '1.3.118': { symbol: 'GBP', precision: 4 },
+    '1.3.119': { symbol: 'JPY', precision: 2 },
+    '1.3.120': { symbol: 'EUR', precision: 4 },
+    '1.3.1325': { symbol: 'RUBLE', precision: 5 },
+    '1.3.2512': { symbol: 'EVRAZ', precision: 4 },
+    '1.3.3291': { symbol: 'TWENTIX', precision: 5 },
+    '1.3.4099': { symbol: 'XBTSX.STH', precision: 6 },
+    '1.3.4156': { symbol: 'XBTSX.DOGE', precision: 5 },
+    '1.3.4157': { symbol: 'XBTSX.BTC', precision: 8 },
+    '1.3.4159': { symbol: 'XBTSX.LTC', precision: 8 },
+    '1.3.4176': { symbol: 'XBTSX.DASH', precision: 8 },
+    '1.3.4274': { symbol: 'XBTSX.BCH', precision: 8 },
+    '1.3.4760': { symbol: 'XBTSX.ETH', precision: 7 },
+    '1.3.5537': { symbol: 'IOB.XRP', precision: 4 },
+    '1.3.5541': { symbol: 'XBTSX.BNB', precision: 7 },
+    '1.3.5589': { symbol: 'XBTSX.USDT', precision: 6 },
+    '1.3.5641': { symbol: 'HONEST.CNY', precision: 4 },
+    '1.3.5649': { symbol: 'HONEST.USD', precision: 4 },
+    '1.3.5650': { symbol: 'HONEST.BTC', precision: 8 },
+    '1.3.5659': { symbol: 'HONEST.ETH', precision: 6 },
+    '1.3.5870': { symbol: 'XBTSX.FIL', precision: 6 },
+    '1.3.5887': { symbol: 'XBTSX.RUB', precision: 4 },
+    '1.3.5902': { symbol: 'XBTSX.USDC', precision: 6 },
+    '1.3.6013': { symbol: 'XBTSX.HIVE', precision: 6 },
+    '1.3.6124': { symbol: 'XBTSX.AVAX', precision: 6 },
+    '1.3.6139': { symbol: 'XBTSX.XAUT', precision: 6 },
+    '1.3.6166': { symbol: 'XBTSX.MATIC', precision: 5 },
+    '1.3.6241': { symbol: 'XBTSX.ETC', precision: 7 },
+    '1.3.6268': { symbol: 'BTWTY.EOS', precision: 4 },
+    '1.3.6301': { symbol: 'HONEST.MONEY', precision: 8 },
+    '1.3.6304': { symbol: 'HONEST.ADA', precision: 8 },
+    '1.3.6305': { symbol: 'HONEST.DOT', precision: 8 },
+    '1.3.6309': { symbol: 'HONEST.ATOM', precision: 8 },
+    '1.3.6311': { symbol: 'HONEST.ALGO', precision: 8 },
+    '1.3.6312': { symbol: 'HONEST.FIL', precision: 8 },
+    '1.3.6313': { symbol: 'HONEST.EOS', precision: 8 },
+    '1.3.6315': { symbol: 'HONEST.EUR', precision: 4 },
+    '1.3.6316': { symbol: 'HONEST.GBP', precision: 4 },
+    '1.3.6317': { symbol: 'HONEST.JPY', precision: 4 },
+    '1.3.6444': { symbol: 'IOB.XLM', precision: 4 },
+    '1.3.6573': { symbol: 'XBTSX.DAI', precision: 6 },
+    '1.3.6620': { symbol: 'XBTSX.A', precision: 6 },
+    '1.3.6627': { symbol: 'XBTSX.LINK', precision: 6 },
+};
+/** Precisions learned on-chain this run (populated by resolveAssetPrecisions). */
+const resolvedPrecisions = {};
+function assetSymbol(id) {
+    return ASSETS[id]?.symbol ?? id;
+}
+function assetPrec(id) {
+    return ASSETS[id]?.precision ?? resolvedPrecisions[id];
+}
+function toReal(amount, assetId) {
+    const p = assetPrec(assetId);
+    if (p === undefined)
+        return NaN;
+    return amount / Math.pow(10, p);
+}
+/**
+ * Collect all unique non-BTS asset IDs from fills, resolve unknown precisions
+ * from the blockchain, and populate the runtime cache.
+ */
+async function resolveAssetPrecisions(fills) {
+    const unknownIds = new Set();
+    for (const f of fills) {
+        for (const id of [f.pays.asset_id, f.receives.asset_id, f.fee.asset_id]) {
+            if (id !== BTS_ID && !(id in ASSETS) && !(id in resolvedPrecisions)) {
+                unknownIds.add(id);
+            }
+        }
+    }
+    if (unknownIds.size === 0)
+        return;
+    const ids = [...unknownIds];
+    console.log(`  Resolving ${ids.length} unknown asset(s) from blockchain...`);
+    try {
+        await withReadOnlyClient(async (client) => {
+            const assets = await client.db('get_assets', [ids]);
+            if (Array.isArray(assets)) {
+                for (const asset of assets) {
+                    if (asset?.id && asset.precision != null) {
+                        resolvedPrecisions[asset.id] = asset.precision;
+                        console.log(`    ${asset.id} → ${asset.symbol || '?'} (precision ${asset.precision})`);
+                    }
+                }
+            }
+            const missing = ids.filter(id => !(id in resolvedPrecisions));
+            if (missing.length > 0) {
+                console.warn(`  [warn] ${missing.length} asset(s) not found on chain: ${missing.join(', ')}. Fills referencing them will be skipped.`);
+            }
+        });
+    }
+    catch (e) {
+        console.warn(`  [warn] Asset resolution failed: ${e.message}. Fills with unknown assets will be skipped.`);
+    }
+}
+function buildFillQuery(accountId, gte, lte, size) {
+    return {
+        size,
+        track_total_hits: false,
+        _source: [
+            'block_data.block_time',
+            'block_data.block_num',
+            'operation_id_num',
+            'operation_history.op_object.pays',
+            'operation_history.op_object.receives',
+            'operation_history.op_object.fee',
+            'operation_history.op_object.order_id',
+            'operation_history.op_object.account_id',
+            'operation_history.op_object.is_maker',
+        ],
+        query: {
+            bool: {
+                filter: [
+                    { term: { operation_type: OP_FILL_ORDER } },
+                    { term: { 'operation_history.op_object.account_id.keyword': accountId } },
+                    { range: { 'block_data.block_time': { gte, lte } } },
+                ],
+            },
+        },
+        sort: [
+            { 'block_data.block_time': { order: 'asc' } },
+            { operation_id_num: { order: 'asc' } },
+        ],
+    };
+}
+/** Fetch every fill_order for an account in [gte, lte], paginated via search_after. */
+async function fetchAllFills(config, accountId, gte, lte) {
+    const pageSize = 10000;
+    const fills = [];
+    let searchAfter = null;
+    const cfg = { ...BASE_CONFIG, timeout: 60000, ...config };
+    while (true) {
+        const query = buildFillQuery(accountId, gte, lte, pageSize);
+        if (searchAfter)
+            query.search_after = searchAfter;
+        const result = await kibanaSearch(cfg, query);
+        const hits = result?.hits?.hits ?? [];
+        if (!hits.length)
+            break;
+        for (const hit of hits) {
+            const src = hit?._source;
+            const op = src?.operation_history?.op_object;
+            if (!op || !op.pays || !op.receives)
+                continue;
+            fills.push({
+                time: src.block_data?.block_time ?? '',
+                blockNum: src.block_data?.block_num ?? 0,
+                opNum: Number(src.operation_id_num ?? 0),
+                orderId: op.order_id ?? '',
+                accountId: op.account_id ?? '',
+                pays: { amount: Number(op.pays.amount ?? 0), asset_id: op.pays.asset_id ?? '' },
+                receives: { amount: Number(op.receives.amount ?? 0), asset_id: op.receives.asset_id ?? '' },
+                fee: { amount: Number(op.fee?.amount ?? 0), asset_id: op.fee?.asset_id ?? '' },
+                isMaker: op.is_maker ?? false,
+                sort: hit.sort,
+            });
+        }
+        if (hits.length < pageSize)
+            break;
+        searchAfter = hits[hits.length - 1].sort;
+        if (!Array.isArray(searchAfter))
+            break;
+    }
+    return fills;
+}
+export { BTS_ID, OP_FILL_ORDER, ASSETS, resolvedPrecisions, assetSymbol, assetPrec, toReal, resolveAssetPrecisions, buildFillQuery, fetchAllFills, };
+//# sourceMappingURL=fills_source.js.map

package/dist/analysis/fills_source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fills_source.js","sourceRoot":"","sources":["../../analysis/fills_source.ts"],"names":[],"mappings":"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"}

package/dist/analysis/grid_correction_check.d.ts

@@ -1,25 +1,5 @@
 #!/usr/bin/env node
-interface FillRecord {
-    time: string;
-    blockNum: number;
-    opNum: number;
-    orderId: string;
-    accountId: string;
-    pays: {
-        amount: number;
-        asset_id: string;
-    };
-    receives: {
-        amount: number;
-        asset_id: string;
-    };
-    fee: {
-        amount: number;
-        asset_id: string;
-    };
-    isMaker: boolean;
-    sort: any[];
-}
+import { FillRecord } from './fills_source.js';
 interface OrderUpdate {
     orderId: string;
     sequence: number;

package/dist/analysis/grid_correction_check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid_correction_check.d.ts","sourceRoot":"","sources":["../../analysis/grid_correction_check.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grid_correction_check.d.ts","sourceRoot":"","sources":["../../analysis/grid_correction_check.ts"],"names":[],"mappings":";AAyCA,OAAO,EAEH,UAAU,EAMb,MAAM,mBAAmB,CAAC;AAO3B,UAAU,WAAW;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB;AACD,UAAU,SAAS;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB;AACD,UAAU,SAAS;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACrB;AACD,UAAU,eAAe;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;CACpB;AAID;;;;;;;;;;;GAWG;AACH,iBAAS,sBAAsB,CAC3B,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,GAAG,EACd,QAAQ,EAAE,GAAG,EACb,gBAAgB,EAAE,GAAG,GACtB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAiBzF;AAsND,iBAAS,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG;IAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAuDpF;AAKD,iBAAS,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,OAAO,GAAE,WAAW,EAAO,GAAG,eAAe,EAAE,CAyD7F;AAGD,iBAAS,gBAAgB,CACrB,KAAK,EAAE,CAAC,SAAS,GAAG,eAAe,CAAC,EAAE,EACtC,gBAAgB,EAAE,OAAO,EACzB,gBAAgB,EAAE,MAAM,GACzB;IAAE,UAAU,EAAE,SAAS,EAAE,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,kBAAkB,EAAE,MAAM,CAAA;CAAE,CAyD/E;AA4PD,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC"}

package/dist/analysis/grid_correction_check.js

@@ -35,66 +35,11 @@ import fs from 'node:fs';
 import { pathToFileURL } from 'node:url';
 import * as KC from '../market_adapter/core/kibana_client.js';
 import * as C from '../modules/constants.js';
-import { loadBotMeta, loadBotSettings, computeBotKey, persistBotAccountId } from './bot_key_utils.js';
+import { loadBotSettings, computeBotKey } from './bot_key_utils.js';
+import { resolveBotAccount } from './account_resolver.js';
+import { BTS_ID, assetPrec, assetSymbol, fetchAllFills, resolveAssetPrecisions, toReal, } from './fills_source.js';
 const { kibanaSearch, DEFAULT_CONFIG: BASE_CONFIG } = KC;
-const OP_FILL_ORDER = 4;
 const OP_LIMIT_ORDER_UPDATE = 77;
-const BTS_ID = '1.3.0';
-const ASSETS = {
-    '1.3.0': { symbol: 'BTS', precision: 5 },
-    '1.3.118': { symbol: 'GBP', precision: 4 },
-    '1.3.119': { symbol: 'JPY', precision: 2 },
-    '1.3.120': { symbol: 'EUR', precision: 4 },
-    '1.3.1325': { symbol: 'RUBLE', precision: 5 },
-    '1.3.2512': { symbol: 'EVRAZ', precision: 4 },
-    '1.3.3291': { symbol: 'TWENTIX', precision: 5 },
-    '1.3.4099': { symbol: 'XBTSX.STH', precision: 6 },
-    '1.3.4156': { symbol: 'XBTSX.DOGE', precision: 5 },
-    '1.3.4157': { symbol: 'XBTSX.BTC', precision: 8 },
-    '1.3.4159': { symbol: 'XBTSX.LTC', precision: 8 },
-    '1.3.4176': { symbol: 'XBTSX.DASH', precision: 8 },
-    '1.3.4274': { symbol: 'XBTSX.BCH', precision: 8 },
-    '1.3.4760': { symbol: 'XBTSX.ETH', precision: 7 },
-    '1.3.5537': { symbol: 'IOB.XRP', precision: 4 },
-    '1.3.5541': { symbol: 'XBTSX.BNB', precision: 7 },
-    '1.3.5589': { symbol: 'XBTSX.USDT', precision: 6 },
-    '1.3.5641': { symbol: 'HONEST.CNY', precision: 4 },
-    '1.3.5649': { symbol: 'HONEST.USD', precision: 4 },
-    '1.3.5650': { symbol: 'HONEST.BTC', precision: 8 },
-    '1.3.5659': { symbol: 'HONEST.ETH', precision: 6 },
-    '1.3.5870': { symbol: 'XBTSX.FIL', precision: 6 },
-    '1.3.5887': { symbol: 'XBTSX.RUB', precision: 4 },
-    '1.3.5902': { symbol: 'XBTSX.USDC', precision: 6 },
-    '1.3.6013': { symbol: 'XBTSX.HIVE', precision: 6 },
-    '1.3.6124': { symbol: 'XBTSX.AVAX', precision: 6 },
-    '1.3.6139': { symbol: 'XBTSX.XAUT', precision: 6 },
-    '1.3.6166': { symbol: 'XBTSX.MATIC', precision: 5 },
-    '1.3.6241': { symbol: 'XBTSX.ETC', precision: 7 },
-    '1.3.6268': { symbol: 'BTWTY.EOS', precision: 4 },
-    '1.3.6301': { symbol: 'HONEST.MONEY', precision: 8 },
-    '1.3.6304': { symbol: 'HONEST.ADA', precision: 8 },
-    '1.3.6305': { symbol: 'HONEST.DOT', precision: 8 },
-    '1.3.6309': { symbol: 'HONEST.ATOM', precision: 8 },
-    '1.3.6311': { symbol: 'HONEST.ALGO', precision: 8 },
-    '1.3.6312': { symbol: 'HONEST.FIL', precision: 8 },
-    '1.3.6313': { symbol: 'HONEST.EOS', precision: 8 },
-    '1.3.6315': { symbol: 'HONEST.EUR', precision: 4 },
-    '1.3.6316': { symbol: 'HONEST.GBP', precision: 4 },
-    '1.3.6317': { symbol: 'HONEST.JPY', precision: 4 },
-    '1.3.6444': { symbol: 'IOB.XLM', precision: 4 },
-    '1.3.6573': { symbol: 'XBTSX.DAI', precision: 6 },
-    '1.3.6620': { symbol: 'XBTSX.A', precision: 6 },
-    '1.3.6627': { symbol: 'XBTSX.LINK', precision: 6 },
-};
-const resolvedPrecisions = {};
-function assetSymbol(id) { return ASSETS[id]?.symbol ?? id; }
-function assetPrec(id) { return ASSETS[id]?.precision ?? resolvedPrecisions[id]; }
-function toReal(amount, assetId) {
-    const p = assetPrec(assetId);
-    if (p === undefined)
-        return NaN;
-    return amount / Math.pow(10, p);
-}
 // ─── LAST-FILL-GUARD helper (1:1 with dexbot_cow_runtime.ts) ─────────────────
 /**
  * LAST-FILL-GUARD helper — pivot ± halfIncrement (replaces price-tolerance).
@@ -167,7 +112,6 @@ Options:
   --refresh-account      Force re-resolution of preferredAccount and update the
                          stored accountId when it changed (default: reuse the
                          stored accountId with no chain lookup)
-  --node <url>           BitShares node URL for account / precision resolution
   --increment <pct>      Grid increment percent (default: from bot config or ${Number(C?.DEFAULT_CONFIG?.incrementPercent ?? 0.5)})
   --tolerance <pct>      Deprecated alias for --increment (kept for compat, prefer --increment)
   --per-fill             Check at fill granularity (default: per-order aggregated)
@@ -212,7 +156,6 @@ function parseArgs() {
         account: null,
         lookup: false,
         refreshAccount: false,
-        node: C.NODE_MANAGEMENT.DEFAULT_NODES[0],
         perFill: false,
         includeCrossPair: false,
         incrementPercent: null,
@@ -243,9 +186,6 @@ function parseArgs() {
             case '--refresh-account':
                 opts.refreshAccount = true;
                 break;
-            case '--node':
-                opts.node = args[++i];
-                break;
             case '--per-fill':
                 opts.perFill = true;
                 break;
@@ -321,162 +261,25 @@ function resolveTimeRange(opts) {
     const label = `${gte} → ${lte}`;
     return { gte, lte, label };
 }
-// ─── Account resolution ───────────────────────────────────────────────────────
-async function resolveAccountId(name, nodeUrl) {
-    const { createReadOnlyClient } = await import('../modules/bitshares-native/index.js');
-    const client = createReadOnlyClient({ nodes: [nodeUrl] });
-    const prevLevel = process.env.LOG_LEVEL;
-    process.env.LOG_LEVEL = 'warn';
-    try {
-        await client.connect();
-        const accounts = await client.db('lookup_account_names', [[name]]);
-        if (Array.isArray(accounts) && accounts[0]?.id)
-            return accounts[0].id;
-        return null;
-    }
-    catch (e) {
-        console.warn(`  [warn] Account resolution failed: ${e.message}`);
-        return null;
-    }
-    finally {
-        try {
-            client.disconnect();
-        }
-        catch (_) { }
-        process.env.LOG_LEVEL = prevLevel;
-    }
-}
-async function resolveAccountForBot(botKey, overrideAccount, nodeUrl, doRefresh) {
-    const botMeta = loadBotMeta(botKey);
-    if (!botMeta && !overrideAccount) {
-        console.error(`Error: bot key '${botKey}' not found in profiles/bots.json and no --account provided.`);
-        console.error(`Use --list-bots to see available keys, or pass --account <1.2.x> explicitly.`);
-        process.exit(1);
-    }
-    // An explicit --account always wins and is never persisted.
-    if (overrideAccount) {
-        if (/^1\.2\.\d+$/.test(String(overrideAccount))) {
-            return { accountId: String(overrideAccount), botMeta };
-        }
-        console.log(`  Resolving account name '${overrideAccount}'...`);
-        const resolvedOverride = await resolveAccountId(String(overrideAccount), nodeUrl);
-        if (!resolvedOverride) {
-            console.error(`Error: failed to resolve --account '${overrideAccount}' to 1.2.x`);
-            process.exit(1);
-        }
-        console.log(`  → ${resolvedOverride}`);
-        return { accountId: String(resolvedOverride), botMeta };
-    }
-    const prefRaw = botMeta?.preferredAccount != null ? String(botMeta.preferredAccount) : null;
-    const prefIsId = !!prefRaw && /^1\.2\.\d+$/.test(prefRaw);
-    const storedId = /^1\.2\.\d+$/.test(String(botMeta?.accountId ?? '')) ? String(botMeta.accountId) : null;
-    // An explicit 1.2.x preferredAccount is authoritative: the stored accountId
-    // is a derived cache and must never override it. Self-heal the cache.
-    if (prefIsId) {
-        if (storedId && storedId !== prefRaw && persistBotAccountId(botKey, prefRaw)) {
-            console.log(`  Updated stale stored accountId ${storedId} → ${prefRaw} from preferredAccount`);
-        }
-        return { accountId: prefRaw, botMeta };
-    }
-    if (!prefRaw) {
-        console.error(`Error: bot '${botKey}' has no preferredAccount and no --account provided.`);
-        process.exit(1);
-    }
-    // Name + fresh-enough cache + no refresh requested: offline-friendly fast path.
-    if (storedId && !doRefresh) {
-        console.log(`  Using stored accountId ${storedId} from profiles/bots.json (no lookup needed; pass --refresh-account to re-verify)`);
-        return { accountId: storedId, botMeta };
-    }
-    // No cache, or --refresh-account: resolve the name on-chain.
-    console.log(`  Resolving account name '${prefRaw}'...`);
-    const resolved = await resolveAccountId(prefRaw, nodeUrl);
-    if (!resolved) {
-        console.error(`Error: failed to resolve account name '${prefRaw}' to 1.2.x`);
-        process.exit(1);
-    }
-    console.log(`  → ${resolved}`);
-    if (!storedId && persistBotAccountId(botKey, resolved)) {
-        console.log(`  Stored accountId ${resolved} in profiles/bots.json for '${botKey}'`);
-    }
-    else if (storedId && storedId !== resolved && persistBotAccountId(botKey, resolved)) {
-        console.log(`  Updated stored accountId ${storedId} → ${resolved} in profiles/bots.json for '${botKey}'`);
-    }
-    else if (storedId === resolved) {
-        console.log(`  Stored accountId ${resolved} confirmed up to date`);
-    }
-    return { accountId: String(resolved), botMeta };
-}
-// ─── Asset precision resolution ───────────────────────────────────────────────
-async function resolveAssetPrecisions(fills, nodeUrl) {
-    const unknownIds = new Set();
-    for (const f of fills) {
-        for (const id of [f.pays.asset_id, f.receives.asset_id, f.fee.asset_id]) {
-            if (id !== BTS_ID && !(id in ASSETS) && !(id in resolvedPrecisions))
-                unknownIds.add(id);
-        }
-    }
-    if (unknownIds.size === 0 || !nodeUrl)
-        return;
-    const ids = [...unknownIds];
-    console.log(`  Resolving ${ids.length} unknown asset(s) from blockchain...`);
-    const { createReadOnlyClient } = await import('../modules/bitshares-native/index.js');
-    const client = createReadOnlyClient({ nodes: [nodeUrl] });
-    try {
-        await client.connect();
-        const assets = await client.db('get_assets', [ids]);
-        if (Array.isArray(assets)) {
-            for (const asset of assets) {
-                if (asset?.id && asset.precision != null) {
-                    resolvedPrecisions[asset.id] = asset.precision;
-                    console.log(`    ${asset.id} → ${asset.symbol || '?'} (precision ${asset.precision})`);
-                }
-            }
-        }
-        const missing = ids.filter(id => !(id in resolvedPrecisions));
-        if (missing.length > 0)
-            console.warn(`  [warn] ${missing.length} asset(s) not found on chain: ${missing.join(', ')}`);
-    }
-    catch (e) {
-        console.warn(`  [warn] Asset resolution failed: ${e.message}`);
-    }
-    finally {
-        try {
-            client.disconnect();
-        }
-        catch (_) { }
+// ─── Account resolution errors ────────────────────────────────────────────────
+/** Map a shared account-resolver failure onto this tool's operator-facing hint. */
+function reportAccountFailure(resolved, opts) {
+    switch (resolved.reason) {
+        case 'bot-not-found':
+            console.error(`Error: bot key '${opts.botKey}' not found in profiles/bots.json and no --account provided.`);
+            console.error('Use --list-bots to see available keys, or pass --account <1.2.x> explicitly.');
+            break;
+        case 'override-unresolved':
+            console.error(`Error: failed to resolve --account '${opts.account}' to 1.2.x`);
+            break;
+        case 'no-preferred-account':
+            console.error(`Error: bot '${opts.botKey}' has no preferredAccount and no --account provided.`);
+            break;
+        default:
+            console.error(`Error: failed to resolve account name '${resolved?.botMeta?.preferredAccount ?? opts.botKey}' to 1.2.x`);
     }
 }
 // ─── Kibana fetch ─────────────────────────────────────────────────────────────
-function buildFillQuery(accountId, gte, lte, size) {
-    return {
-        size,
-        track_total_hits: false,
-        _source: [
-            'block_data.block_time',
-            'block_data.block_num',
-            'operation_id_num',
-            'operation_history.op_object.pays',
-            'operation_history.op_object.receives',
-            'operation_history.op_object.fee',
-            'operation_history.op_object.order_id',
-            'operation_history.op_object.account_id',
-            'operation_history.op_object.is_maker',
-        ],
-        query: {
-            bool: {
-                filter: [
-                    { term: { operation_type: OP_FILL_ORDER } },
-                    { term: { 'operation_history.op_object.account_id.keyword': accountId } },
-                    { range: { 'block_data.block_time': { gte, lte } } },
-                ],
-            },
-        },
-        sort: [
-            { 'block_data.block_time': { order: 'asc' } },
-            { operation_id_num: { order: 'asc' } },
-        ],
-    };
-}
 async function fetchAllOrderUpdates(config, accountId, gte, lte) {
     const pageSize = 10000;
     const updates = [];
@@ -524,45 +327,6 @@ async function fetchAllOrderUpdates(config, accountId, gte, lte) {
     }
     return updates;
 }
-async function fetchAllFills(config, accountId, gte, lte) {
-    const pageSize = 10000;
-    const fills = [];
-    let searchAfter = null;
-    const cfg = { ...BASE_CONFIG, timeout: 60000, ...config };
-    while (true) {
-        const query = buildFillQuery(accountId, gte, lte, pageSize);
-        if (searchAfter)
-            query.search_after = searchAfter;
-        const result = await kibanaSearch(cfg, query);
-        const hits = result?.hits?.hits ?? [];
-        if (!hits.length)
-            break;
-        for (const hit of hits) {
-            const src = hit?._source;
-            const op = src?.operation_history?.op_object;
-            if (!op || !op.pays || !op.receives)
-                continue;
-            fills.push({
-                time: src.block_data?.block_time ?? '',
-                blockNum: src.block_data?.block_num ?? 0,
-                opNum: Number(src.operation_id_num ?? 0),
-                orderId: op.order_id ?? '',
-                accountId: op.account_id ?? '',
-                pays: { amount: Number(op.pays.amount ?? 0), asset_id: op.pays.asset_id ?? '' },
-                receives: { amount: Number(op.receives.amount ?? 0), asset_id: op.receives.asset_id ?? '' },
-                fee: { amount: Number(op.fee?.amount ?? 0), asset_id: op.fee?.asset_id ?? '' },
-                isMaker: op.is_maker ?? false,
-                sort: hit.sort,
-            });
-        }
-        if (hits.length < pageSize)
-            break;
-        searchAfter = hits[hits.length - 1].sort;
-        if (!Array.isArray(searchAfter))
-            break;
-    }
-    return fills;
-}
 // ─── Fill classification ─────────────────────────────────────────────────────
 function classifyFills(fills) {
     const trades = [];
@@ -912,7 +676,16 @@ async function main() {
     const { gte, lte, label } = resolveTimeRange(opts);
     console.log(`\nGrid correction check — bot-key: ${opts.botKey}`);
     console.log(`Range: ${label}`);
-    const { accountId, botMeta } = await resolveAccountForBot(opts.botKey, opts.account, opts.node, opts.refreshAccount);
+    const resolvedAccount = await resolveBotAccount(opts.botKey, {
+        overrideAccount: opts.account,
+        refresh: opts.refreshAccount,
+    });
+    if (!resolvedAccount.accountId) {
+        reportAccountFailure(resolvedAccount, opts);
+        process.exit(1);
+    }
+    const accountId = resolvedAccount.accountId;
+    const botMeta = resolvedAccount.botMeta;
     console.log(`Account: ${accountId}${botMeta ? `  (${botMeta.assetA}/${botMeta.assetB})` : ''}`);
     const incrementPercent = resolveIncrementPercent(botMeta, opts.incrementPercent);
     console.log(`Increment: ${incrementPercent}% (halfInc ${incrementPercent / 2}%)${opts.incrementPercent == null && botMeta?.incrementPercent != null ? ' — from bot config' : opts.incrementPercent != null ? ' — from --increment' : ' — default'}`);
@@ -927,7 +700,7 @@ async function main() {
         console.log('\nNo fills in range — nothing to check.');
         process.exit(0);
     }
-    await resolveAssetPrecisions(fills, opts.node);
+    await resolveAssetPrecisions(fills);
     const { trades, skipped } = classifyFills(fills);
     console.log(`  Classified ${trades.length} trade(s)${skipped > 0 ? `, ${skipped} skipped (unknown precision)` : ''}`);
     if (trades.length < 2) {