dexbot 1.4.20 → 1.4.22

package/analysis/bot_fitting/shared_utils.ts

@@ -1,7 +1,8 @@
+'use strict';
 
 import { getStorage } from '../../modules/storage/index.js';
 const { readJSON } = getStorage();
-'use strict';
+import { normalizeCandle } from '../math_utils.js';
 
 /**
  * Shared utilities for bot-fitting scripts.
@@ -9,14 +10,19 @@ const { readJSON } = getStorage();
 
 
 function toCandles(arr: any[]) {
-    return arr.map((c: any) => ({
-        timestamp: c[0],
-        open: c[1],
-        high: c[2],
-        low: c[3],
-        close: c[4],
-        volume: c[5],
-    }));
+    // Canonical accessor transform (market_adapter/candle_utils via math_utils)
+    // instead of hand-rolled array indexing.
+    return arr
+        .map((c: any) => normalizeCandle(c))
+        .filter(Boolean)
+        .map((c: any) => ({
+            timestamp: c.time * 1000,
+            open: c.open,
+            high: c.high,
+            low: c.low,
+            close: c.close,
+            volume: c.volume,
+        }));
 }
 
 function parseListOrRange(spec: any, fallback: any) {
@@ -42,5 +48,5 @@ function fmt(x: number, d = 2) {
     return Number(x).toFixed(d);
 }
 
-export { toCandles, parseListOrRange, loadLpData, fmt }
+export { parseListOrRange, loadLpData, fmt }
 

package/analysis/bot_key_utils.ts

@@ -1,3 +1,4 @@
+'use strict';
 
 import fs from 'node:fs';
 import path from 'node:path';
@@ -6,7 +7,10 @@ import { getStorage } from '../modules/storage/index.js';
 const { readJSON } = getStorage();
 import { MARKET_ADAPTER } from '../modules/constants.js';
 import { loadMarketProfiles } from './tradingview/tradingview_uplot_chart_generator.js';
-'use strict';
+import { sanitizeKey } from '../modules/utils/sanitize_key.js';
+// Single source of truth for bot keys (named AND unnamed bots) so analysis
+// tools resolve the same files production writes.
+import { createBotKey } from '../modules/account_orders.js';
 
 
 const DEFAULT_AMA_KEY = String(MARKET_ADAPTER.DEFAULT_AMA_KEY).toUpperCase();
@@ -22,16 +26,12 @@ function loadBotSettings(filePath = PATHS.PROFILES.BOTS_JSON) {
     }
 }
 
-function sanitizeKey(source: any) {
-    if (!source) return 'bot';
-    return String(source).trim().toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '') || 'bot';
-}
-
 function computeBotKey(bot: any, index: number) {
-    if (bot && bot.name) {
-        return sanitizeKey(bot.name);
-    }
-    return `${sanitizeKey(bot?.name || `bot-${index}`)}-${index}`;
+    // Delegate to the production key generator (modules/account_orders.ts):
+    // named bots → sanitized name; unnamed bots → sanitized asset pair + index.
+    // The previous local fallback produced `bot-<idx>-<idx>` keys that could
+    // never match what the bot runtime actually wrote to disk.
+    return createBotKey(bot, index);
 }
 
 function resolveBotKey(botName: any, filePath = PATHS.PROFILES.BOTS_JSON) {
@@ -72,7 +72,10 @@ function loadBotMeta(botKey: any, filePath = PATHS.PROFILES.BOTS_JSON) {
 
 function resolveAmaConfig(botKey: any) {
     const botMeta = loadBotMeta(botKey);
-    if (!botMeta) return { ...MARKET_ADAPTER.AMAS.AMA3, erSmoothPeriod: 0 };
+    // Unknown bot key: fall back to the global erSmoothPeriod default (same
+    // resolution path production uses) instead of forcing 0 — a typo'd
+    // --bot-key must not silently research with different ER smoothing.
+    if (!botMeta) return { ...MARKET_ADAPTER.AMAS.AMA3, erSmoothPeriod: Number(MARKET_ADAPTER.AMA_ER_SMOOTH_FAST_PERIOD) };
 
     const rawGridPrice = String(botMeta?.gridPrice || '').trim().toLowerCase();
     const isAmaKeyword = AMA_KEYWORDS.has(rawGridPrice);

package/analysis/bot_usage/discover_bot_accounts.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
+'use strict';
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
-'use strict';
 
 import { getStorage } from '../../modules/storage/index.js';
 const { writeJSON } = getStorage();
@@ -53,6 +53,7 @@ import {
     buildTopFilledAccountsQuery,
     DEFAULT_CONFIG,
 } from './kibana_bot_queries.js';
+import { NODE_MANAGEMENT } from '../../modules/constants.js';
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -83,7 +84,8 @@ interface CandidateInfo {
 
 // ─── Configuration ────────────────────────────────────────────────────────────
 
-const BTS_NODE    = 'wss://dex.iobanker.com/ws';
+// Node pool from central node management (failover-capable) instead of a
+// single hardcoded WSS endpoint.
 const KIBANA_CFG  = { ...DEFAULT_CONFIG, timeout: 30000 };
 
 const ASSET_PRECISION = {
@@ -269,7 +271,7 @@ function dexScore(creates: number, fills: number, _cancels: number, gridScore: n
 
 async function resolveNames(ids: string[]): Promise<Record<string, string>> {
     const { createReadOnlyClient } = require('../../modules/bitshares-native');
-    const client = createReadOnlyClient({ nodes: [BTS_NODE] });
+    const client = createReadOnlyClient({ nodes: NODE_MANAGEMENT.DEFAULT_NODES });
 
     const map: Record<string, any> = {};
     try {

package/analysis/bot_usage/kibana_bot_queries.ts

@@ -1,3 +1,4 @@
+'use strict';
 /**
  * KIBANA BOT QUERIES
  *
@@ -34,9 +35,7 @@
  */
 
 
-import { toIntervalLabel } from '../../market_adapter/interval_utils.js';
 import { kibanaSearch, DEFAULT_CONFIG as BASE_CONFIG } from '../../market_adapter/core/kibana_client.js';
-'use strict';
 
 // ─── Constants ────────────────────────────────────────────────────────────────
 
@@ -49,159 +48,6 @@ const DEFAULT_CONFIG = {
     timeout: 25000,
 };
 
-// ─── Aggregation query builders (size:0, for counts & timelines) ───────────────
-
-/**
- * Time-bucketed count of limit_order_create ops for an account.
- * Optionally filtered to orders selling a specific asset.
- */
-function buildOrderCreateQuery(accountId: string, lookbackHours: number, intervalSeconds: number = 3600, sellAssetId: string | null = null) {
-    const filters = [
-        { term:  { operation_type: OP_LIMIT_ORDER_CREATE } },
-        { term:  { 'operation_history.op_object.seller.keyword': accountId } },
-        { range: { 'block_data.block_time': { gte: `now-${lookbackHours}h`, lte: 'now' } } },
-    ];
-    if (sellAssetId) {
-        filters.push({ term: { 'operation_history.op_object.amount_to_sell.asset_id.keyword': sellAssetId } } as any);
-    }
-    return {
-        size: 0,
-        query: { bool: { filter: filters } },
-        aggs: {
-            by_time: {
-                date_histogram: {
-                    field:          'block_data.block_time',
-                    fixed_interval: toIntervalLabel(intervalSeconds),
-                    min_doc_count:  1,
-                },
-            },
-            total: { value_count: { field: 'operation_type' } },
-        },
-    };
-}
-
-/**
- * Time-bucketed count of fill_order ops for an account.
- * Optionally filtered to fills where account pays a specific asset.
- */
-function buildFillOrderQuery(accountId: string, lookbackHours: number, intervalSeconds: number = 3600, paysAssetId: string | null = null) {
-    const filters = [
-        { term:  { operation_type: OP_FILL_ORDER } },
-        { term:  { 'operation_history.op_object.account_id.keyword': accountId } },
-        { range: { 'block_data.block_time': { gte: `now-${lookbackHours}h`, lte: 'now' } } },
-    ];
-    if (paysAssetId) {
-        filters.push({ term: { 'operation_history.op_object.pays.asset_id.keyword': paysAssetId } } as any);
-    }
-    return {
-        size: 0,
-        query: { bool: { filter: filters } },
-        aggs: {
-            by_time: {
-                date_histogram: {
-                    field:          'block_data.block_time',
-                    fixed_interval: toIntervalLabel(intervalSeconds),
-                    min_doc_count:  1,
-                },
-            },
-            total: { value_count: { field: 'operation_type' } },
-        },
-    };
-}
-
-/**
- * Time-bucketed count of limit_order_cancel ops for an account.
- */
-function buildOrderCancelQuery(accountId: string, lookbackHours: number, intervalSeconds: number = 3600) {
-    return {
-        size: 0,
-        query: {
-            bool: {
-                filter: [
-                    { term:  { operation_type: OP_LIMIT_ORDER_CANCEL } },
-                    { term:  { 'operation_history.op_object.fee_paying_account.keyword': accountId } },
-                    { range: { 'block_data.block_time': { gte: `now-${lookbackHours}h`, lte: 'now' } } },
-                ],
-            },
-        },
-        aggs: {
-            by_time: {
-                date_histogram: {
-                    field:          'block_data.block_time',
-                    fixed_interval: toIntervalLabel(intervalSeconds),
-                    min_doc_count:  1,
-                },
-            },
-            total: { value_count: { field: 'operation_type' } },
-        },
-    };
-}
-
-/**
- * Daily activity breakdown by operation type for an account.
- * Merges creates (by seller), fills (by account_id), cancels (by fee_paying_account)
- * into one aggregation using a filter per op type.
- */
-function buildDailyActivityQuery(accountId: string, lookbackHours: number) {
-    return {
-        size: 0,
-        query: {
-            bool: {
-                filter: [
-                    { range: { 'block_data.block_time': { gte: `now-${lookbackHours}h`, lte: 'now' } } },
-                ],
-            },
-        },
-        aggs: {
-            creates: {
-                filter: {
-                    bool: {
-                        filter: [
-                            { term: { operation_type: OP_LIMIT_ORDER_CREATE } },
-                            { term: { 'operation_history.op_object.seller.keyword': accountId } },
-                        ],
-                    },
-                },
-                aggs: {
-                    by_day: {
-                        date_histogram: { field: 'block_data.block_time', fixed_interval: '1d', min_doc_count: 1 },
-                    },
-                },
-            },
-            fills: {
-                filter: {
-                    bool: {
-                        filter: [
-                            { term: { operation_type: OP_FILL_ORDER } },
-                            { term: { 'operation_history.op_object.account_id.keyword': accountId } },
-                        ],
-                    },
-                },
-                aggs: {
-                    by_day: {
-                        date_histogram: { field: 'block_data.block_time', fixed_interval: '1d', min_doc_count: 1 },
-                    },
-                },
-            },
-            cancels: {
-                filter: {
-                    bool: {
-                        filter: [
-                            { term: { operation_type: OP_LIMIT_ORDER_CANCEL } },
-                            { term: { 'operation_history.op_object.fee_paying_account.keyword': accountId } },
-                        ],
-                    },
-                },
-                aggs: {
-                    by_day: {
-                        date_histogram: { field: 'block_data.block_time', fixed_interval: '1d', min_doc_count: 1 },
-                    },
-                },
-            },
-        },
-    };
-}
-
 // ─── Raw document query builders (size>0, for price/grid analysis) ────────────
 
 /**
@@ -236,107 +82,6 @@ function buildOrderPriceQuery(accountId: string, lookbackHours: number, sellAsse
     };
 }
 
-/**
- * Fetch raw fill_order documents for fill-price analysis.
- *
- * @param {string}  accountId
- * @param {number}  lookbackHours
- * @param {string}  [paysAssetId]
- * @param {number}  [maxResults]
- * @returns {Object} Elasticsearch query object
- */
-function buildFillPriceQuery(accountId: string, lookbackHours: number, paysAssetId: string | null = null, maxResults: number = 500) {
-    const filters = [
-        { term:  { operation_type: OP_FILL_ORDER } },
-        { term:  { 'operation_history.op_object.account_id.keyword': accountId } },
-        { range: { 'block_data.block_time': { gte: `now-${lookbackHours}h`, lte: 'now' } } },
-    ];
-    if (paysAssetId) {
-        filters.push({ term: { 'operation_history.op_object.pays.asset_id.keyword': paysAssetId } } as any);
-    }
-    return {
-        size: maxResults,
-        _source: [
-            'block_data.block_time',
-            'operation_history.op_object.pays',
-            'operation_history.op_object.receives',
-            'operation_history.op_object.order_id',
-        ],
-        query: { bool: { filter: filters } },
-        sort:  [{ 'block_data.block_time': { order: 'desc' } }],
-    };
-}
-
-/**
- * Discover which asset pairs an account trades by aggregating the sell asset IDs.
- * Returns top asset IDs by order count.
- */
-function buildAssetDiscoveryQuery(accountId: string, lookbackHours: number) {
-    return {
-        size: 0,
-        query: {
-            bool: {
-                filter: [
-                    { term:  { operation_type: OP_LIMIT_ORDER_CREATE } },
-                    { term:  { 'operation_history.op_object.seller.keyword': accountId } },
-                    { range: { 'block_data.block_time': { gte: `now-${lookbackHours}h`, lte: 'now' } } },
-                ],
-            },
-        },
-        aggs: {
-            sell_assets: {
-                terms: {
-                    field: 'operation_history.op_object.amount_to_sell.asset_id.keyword',
-                    size:  10,
-                },
-            },
-            recv_assets: {
-                terms: {
-                    field: 'operation_history.op_object.min_to_receive.asset_id.keyword',
-                    size:  10,
-                },
-            },
-        },
-    };
-}
-
-// ─── Fetch helpers ────────────────────────────────────────────────────────────
-
-async function fetchOrderCreate(accountId: string, lookbackHours: number, config: any = {}, sellAssetId: string | null = null, intervalSeconds: number = 3600) {
-    const cfg = { ...DEFAULT_CONFIG, ...config };
-    return kibanaSearch(cfg, buildOrderCreateQuery(accountId, lookbackHours, intervalSeconds, sellAssetId));
-}
-
-async function fetchFillOrder(accountId: string, lookbackHours: number, config: any = {}, paysAssetId: string | null = null, intervalSeconds: number = 3600) {
-    const cfg = { ...DEFAULT_CONFIG, ...config };
-    return kibanaSearch(cfg, buildFillOrderQuery(accountId, lookbackHours, intervalSeconds, paysAssetId));
-}
-
-async function fetchOrderCancel(accountId: string, lookbackHours: number, config: any = {}, intervalSeconds: number = 3600) {
-    const cfg = { ...DEFAULT_CONFIG, ...config };
-    return kibanaSearch(cfg, buildOrderCancelQuery(accountId, lookbackHours, intervalSeconds));
-}
-
-async function fetchOrderPrices(accountId: string, lookbackHours: number, config: any = {}, sellAssetId: string | null = null, maxResults: number = 1000) {
-    const cfg = { ...DEFAULT_CONFIG, ...config };
-    return kibanaSearch(cfg, buildOrderPriceQuery(accountId, lookbackHours, sellAssetId, maxResults));
-}
-
-async function fetchFillPrices(accountId: string, lookbackHours: number, config: any = {}, paysAssetId: string | null = null, maxResults: number = 500) {
-    const cfg = { ...DEFAULT_CONFIG, ...config };
-    return kibanaSearch(cfg, buildFillPriceQuery(accountId, lookbackHours, paysAssetId, maxResults));
-}
-
-async function fetchDailyActivity(accountId: string, lookbackHours: number, config: any = {}) {
-    const cfg = { ...DEFAULT_CONFIG, ...config };
-    return kibanaSearch(cfg, buildDailyActivityQuery(accountId, lookbackHours));
-}
-
-async function fetchAssetDiscovery(accountId: string, lookbackHours: number, config: any = {}) {
-    const cfg = { ...DEFAULT_CONFIG, ...config };
-    return kibanaSearch(cfg, buildAssetDiscoveryQuery(accountId, lookbackHours));
-}
-
 // ─── Discovery query builders ─────────────────────────────────────────────────
 
 /**
@@ -423,5 +168,5 @@ function buildTopFilledAccountsQuery(lookbackHours: number, topN: number = 100,
 
 // ─── Exports ──────────────────────────────────────────────────────────────────
 
-export { OP_LIMIT_ORDER_CREATE, OP_LIMIT_ORDER_CANCEL, OP_FILL_ORDER, DEFAULT_CONFIG, kibanaSearch, buildOrderCreateQuery, buildFillOrderQuery, buildOrderCancelQuery, buildDailyActivityQuery, buildAssetDiscoveryQuery, buildOrderPriceQuery, buildFillPriceQuery, fetchOrderCreate, fetchFillOrder, fetchOrderCancel, fetchOrderPrices, fetchFillPrices, fetchDailyActivity, fetchAssetDiscovery, buildTopSellerAccountsQuery, buildTopCancellerAccountsQuery, buildTopFilledAccountsQuery }
+export { DEFAULT_CONFIG, kibanaSearch, buildOrderPriceQuery, buildTopSellerAccountsQuery, buildTopCancellerAccountsQuery, buildTopFilledAccountsQuery }
 

package/analysis/chart_css.ts

@@ -1,4 +1,3 @@
-
 'use strict';
 
 /**
@@ -21,8 +20,8 @@ function panelsCSS(headerHeight = 45): string {
     return `#panels { display: flex; flex-direction: column; height: calc(100vh - ${headerHeight}px); width: 100vw; }`;
 }
 
-function uplotBgCSS(): string {
-    return `.uplot { background: #0b0e14; }`;
+function uplotBgCSS(bgColor = '#0b0e14'): string {
+    return `.uplot { background: ${bgColor}; }`;
 }
 
 function dotCSS(): string {
@@ -57,4 +56,7 @@ function sharedChartCSS(): string {
     ].join('\n        ');
 }
 
-export { baseResetCSS, headerCSS, panelsCSS, uplotBgCSS, dotCSS, cursorCSS, sectionLabelCSS, legendCSS, sharedChartCSS }
+// Only the composed sheet and the single fragments with external consumers are
+// exported; page-specific generators interpolate these inside their own
+// <style> blocks while keeping their layout rules inline.
+export { sharedChartCSS, uplotBgCSS, cursorCSS }

package/analysis/chart_ui.ts

@@ -1,4 +1,3 @@
-
 'use strict';
 
 /**

package/analysis/chart_utils.ts

@@ -1,10 +1,10 @@
+'use strict';
 
 import fs from 'node:fs';
 import path from 'node:path';
 import { getStorage } from '../modules/storage/index.js';
 import { PATHS } from '../modules/paths.js';
 const { ensureDir } = getStorage();
-'use strict';
 
 /**
  * Chart utilities for analysis HTML generators.
@@ -58,7 +58,16 @@ function writeChartFile(filePath: any, html: any) {
     const chartDir = path.dirname(filePath);
     if (!fs.existsSync(chartDir)) ensureDir(chartDir);
     ensureSiblingUplotAssets(chartDir);
-    fs.writeFileSync(filePath, html, 'utf8');
+    // Atomic write (tmp + rename, matching the production storage adapter
+    // pattern) so a crash mid-write can never leave a truncated chart file.
+    const tmpPath = `${filePath}.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2, 10)}.tmp`;
+    try {
+        fs.writeFileSync(tmpPath, html, 'utf8');
+        fs.renameSync(tmpPath, filePath);
+    } catch (err) {
+        try { fs.unlinkSync(tmpPath); } catch (_) { /* best-effort cleanup */ }
+        throw err;
+    }
 }
 
 /**

package/analysis/derivative_chart_generator.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+'use strict';
 
 import fs from 'node:fs';
 import path from 'node:path';
@@ -9,7 +10,6 @@ const { ensureDir, readJSON } = getStorage();
 import { fixedTo } from '../modules/order/utils/math.js';
 import { bindHoverStateFn, zoomResetScript } from './chart_ui.js';
 import { PATHS } from '../modules/paths.js';
-'use strict';
 function parseArgs(argv = process.argv.slice(2)) {
     const cfg: { inputFile: string | null; outputFile: string; title: string; quiet: boolean } = {
         inputFile: null,
@@ -39,7 +39,7 @@ function showHelp() {
     console.log(`
 Derivative Chart Generator (uPlot)
 Usage:
-  tsx analysis/derivative_chart_generator.ts --input <file.json> [options]
+  node dist/analysis/derivative_chart_generator.js --input <file.json> [options]
 Options:
   --output FILE   Output HTML (default: <analysis charts dir>/derivative_chart.html)
   --title TEXT    Chart title

package/analysis/math_utils.ts

@@ -5,19 +5,15 @@ import { getStorage } from '../modules/storage/index.js';
 const { readJSON } = getStorage();
 import {
     getCandleClose,
-    getCandleHigh,
-    getCandleLow,
     getCandleTimestamp,
     normalizeCandle,
 } from '../market_adapter/candle_utils.js';
-import { computeATRSeries } from '../market_adapter/core/strategies/atr/calculator.js';
 
 
 /**
  * Math utilities for analysis scripts.
  *
- * Candle accessors and ATR series computation are centralized in
- * market_adapter (candle_utils.ts / strategies/atr/calculator.ts) and
+ * Candle accessors are centralized in market_adapter (candle_utils.ts) and
  * re-exported here so analysis tooling shares one logic path with the
  * live adapter and the browser-embedded chart scripts.
  */
@@ -50,10 +46,7 @@ function loadCandleFile(filePath: any) {
 export {
     range,
     calcStdDev,
-    computeATRSeries,
     getCandleClose,
-    getCandleHigh,
-    getCandleLow,
     getCandleTimestamp,
     normalizeCandle,
     loadCandleFile,

package/analysis/price_sources.ts

@@ -1,3 +1,4 @@
+'use strict';
 
 import fs from 'node:fs';
 import path from 'node:path';
@@ -7,7 +8,6 @@ import { PATHS } from '../modules/paths.js';
 import { getStorage } from '../modules/storage/index.js';
 const { readJSON } = getStorage();
 import { getErrorMessage } from '../modules/utils/errors.js';
-'use strict';
 
 /**
  * Price Source Abstraction
@@ -70,17 +70,23 @@ interface MarketAdapterConfig {
 
 class MarketAdapterSource {
     stateDir: string;
+    centersFile: string;
     botKey: string;
     name: string;
 
     constructor(config: MarketAdapterConfig) {
         this.stateDir = config.stateDir || PATHS.MARKET_ADAPTER.STATE_DIR;
+        // Canonical filename from modules/paths.ts when using the default
+        // state dir; custom state dirs keep the sibling-file layout.
+        this.centersFile = config.stateDir
+            ? path.join(this.stateDir, 'market_adapter_centers.json')
+            : PATHS.MARKET_ADAPTER.CENTERS_FILE;
         this.botKey = config.botKey;
         this.name = `market_adapter:${this.botKey}`;
     }
 
     async fetchCandles(): Promise<any[]> {
-        const centersFile = path.join(this.stateDir, 'market_adapter_centers.json');
+        const centersFile = this.centersFile;
         if (!fs.existsSync(centersFile)) {
             throw new Error(`[MarketAdapterSource] Centers file not found: ${centersFile}`);
         }

package/analysis/resolve_source.ts

@@ -1,3 +1,4 @@
+'use strict';
 
 import path from 'node:path';
 import { PATHS } from '../modules/paths.js';
@@ -5,7 +6,6 @@ import { MARKET_ADAPTER } from '../modules/constants.js';
 import { createSource } from './price_sources.js';
 import { resolveCandleFile, resolveAmaConfig, resolveAmaKey, loadBotSettings, computeBotKey } from './bot_key_utils.js';
 import { findLatestLpData } from '../market_adapter/utils/data_discovery.js';
-'use strict';
 
 const INTERVAL_LABEL = MARKET_ADAPTER.RUNTIME_DEFAULTS.intervalLabel;