dexbot 1.2.0 → 1.2.1

package/dist/modules/dexbot_class.js

@@ -349,7 +349,7 @@ class DEXBot {
             shadowLocks: this.manager?.shadowOrderIds?.size || 0,
             batchInFlight: this._batchInFlight,
             recoveryInFlight: this._recoverySyncInFlight,
-            broadcasting: this.manager?._state?.isBroadcastingActive() || false
+            broadcasting: this.manager?.isBroadcastingActive?.() || false
         };
     }
     /**
@@ -1279,6 +1279,30 @@ class DEXBot {
                         await this._processFillsWithBootstrapMode(chainOrders);
                     }
                     this.manager.finishBootstrap();
+                    // Refresh account totals after bootstrap to eliminate the timing
+                    // gap between the initial balance fetch and grid operations (sync,
+                    // reconcile, fills). Without this, the first maintenance cycle sees
+                    // a fund drift (expected at bootstrap) and triggers an unnecessary
+                    // invariant violation + full recovery cycle.
+                    // Bound by a timeout to avoid blocking _fillProcessingLock on a
+                    // flaky node. If the fetch times out, continue with cached values;
+                    // the next periodic maintenance cycle will retry.
+                    const FETCH_TIMEOUT_MS = 30000;
+                    let _fetchTimeoutHandle;
+                    try {
+                        await Promise.race([
+                            this.manager.fetchAccountTotals(),
+                            new Promise((_, reject) => {
+                                _fetchTimeoutHandle = setTimeout(() => reject(new Error('timeout')), FETCH_TIMEOUT_MS);
+                            })
+                        ]);
+                    }
+                    catch (fetchErr) {
+                        this._log(`[STARTUP] [${this.config?.botKey || 'unknown'}] fetchAccountTotals ${fetchErr.message === 'timeout' ? 'timed out' : 'failed'} (${fetchErr.message}). Continuing with cached account totals.`, 'warn');
+                    }
+                    finally {
+                        clearTimeout(_fetchTimeoutHandle);
+                    }
                     // Perform initial grid maintenance (thresholds, divergence, spread, health)
                     // Consolidated into shared logic to ensure consistent behavior at boot and runtime.
                     // CRITICAL: Pass lockAlreadyHeld since we're inside _fillProcessingLock.acquire()
@@ -1504,11 +1528,11 @@ class DEXBot {
         try {
             // BOOTSTRAP OPTIMIZATION: During bootstrap, prioritize fill processing over grid-wide checks
             // Process fills immediately with side-only rebalancing (no expensive full grid recalculations)
-            if (this.manager._state.isBootstrapping()) {
+            if (this.manager.isBootstrapping()) {
                 // During bootstrap: skip lock contention checks, process fills directly
                 let bootstrapSkipped = false;
                 await this.manager._fillProcessingLock.acquire(async () => {
-                    if (!this.manager._state.isBootstrapping()) {
+                    if (!this.manager.isBootstrapping()) {
                         // Bootstrap finished while waiting for the lock — no
                         // work to do, but the iteration is still healthy.
                         bootstrapSkipped = true;
@@ -2628,7 +2652,11 @@ class DEXBot {
                 fingerprint: entry.fingerprint
             });
             if (match) {
-                adopted.push({ slotId: entry.slotId, chainOrderId: match.id });
+                adopted.push({
+                    slotId: entry.slotId,
+                    chainOrderId: match.id,
+                    orderType: entry.orderType || entry.order?.type,
+                });
                 this.manager._pendingBroadcasts.delete(entry.fingerprint);
             }
             else {
@@ -2665,7 +2693,11 @@ class DEXBot {
                     fingerprint: entry.fingerprint
                 });
                 if (match) {
-                    adopted.push({ slotId: entry.slotId, chainOrderId: match.id });
+                    adopted.push({
+                        slotId: entry.slotId,
+                        chainOrderId: match.id,
+                        orderType: entry.orderType || entry.order?.type,
+                    });
                     this.manager.logger.log(`[COW][UNCERTAIN] CREATE re-adopted after ${recheckRound} block(s): ` +
                         `${entry.slotId}->${match.id}`, 'info');
                 }
@@ -2748,27 +2780,27 @@ class DEXBot {
             this.manager.logger.log(`[COW][UNCERTAIN] Auto-cancel pass failed: ${orphanErr?.message || orphanErr}`, 'warn');
         }
         // Boundary shift recovery: the COW batch that should have committed the
-        // boundary shift from this fill cycle failed before commit. Every planned
-        // CREATE in the batch represents a fill whose opposite-side boundary step
-        // was lost — regardless of whether the individual CREATE was later adopted
-        // on chain (adopted) or not (discarded). Manually adjust manager.boundaryIdx
-        // so the next COW cycle (triggered by the next fill or periodic maintenance)
-        // generates replacement opposite-side orders using the correct boundary.
+        // boundary shift from this fill cycle failed before commit. Only COUNT
+        // ADOPTED CREATEs — orders that actually landed on-chain. Discarded
+        // CREATEs represent orders that never existed, so the grid must NOT
+        // shift the boundary for them. The next fill cycle's
+        // calculateTargetGrid → deriveTargetBoundary will recompute the correct
+        // boundary from scratch for any discarded slots.
         //
         // NOTE: Direct mutation of manager.boundaryIdx outside a COW commit
         // violates the invariant stated in grid.ts:1217-1220 (boundary must only
         // be updated atomically inside _commitWorkingGrid). This is intentional
         // here because the COW commit already failed — the invariant was already
         // broken by the broadcast uncertainty, and the adjustment only restores
-        // the state to what the successful commit would have produced.
-        if (hadRotation && this.manager && pending.length > 0) {
+        // the state to what the successful commit would have produced for
+        // orders that are confirmed on-chain.
+        if (hadRotation && this.manager && adopted.length > 0) {
             let boundaryShift = 0;
-            for (const entry of pending) {
-                const orderType = entry.orderType || entry.order?.type;
-                if (orderType === ORDER_TYPES.SELL) {
+            for (const entry of adopted) {
+                if (entry.orderType === ORDER_TYPES.SELL) {
                     boundaryShift--; // SELL CREATE → fill was BUY → boundary LEFT
                 }
-                else if (orderType === ORDER_TYPES.BUY) {
+                else if (entry.orderType === ORDER_TYPES.BUY) {
                     boundaryShift++; // BUY CREATE → fill was SELL → boundary RIGHT
                 }
             }
@@ -2780,10 +2812,10 @@ class DEXBot {
                     if (newIdx !== oldIdx) {
                         this.manager.boundaryIdx = newIdx;
                         this.manager.logger.log(`[COW][UNCERTAIN] Boundary adjusted by ${boundaryShift} ` +
-                            `(${adopted.length} adopted / ${discarded.length} discarded CREATE(s)): ` +
+                            `(${adopted.length} adopted CREATE(s), ${discarded.length} discarded): ` +
                             `${oldIdx} → ${newIdx}. Next COW cycle will generate replacement opposite-side orders.`, 'warn');
                         if (typeof this.manager._markGridDirty === 'function') {
-                            this.manager._markGridDirty(`boundary adjustment after ${pending.length} planned CREATE(s)`);
+                            this.manager._markGridDirty();
                         }
                     }
                 }
@@ -3324,7 +3356,7 @@ class DEXBot {
         if (this._credentialRecoveryInFlight || !this._credentialRecoveryNeeded || this._shuttingDown) {
             return;
         }
-        if (this.manager?._state?.isBootstrapping?.() || this.manager?._state?.isBroadcastingActive?.()) {
+        if (this.manager?.isBootstrapping?.() || this.manager?.isBroadcastingActive?.()) {
             if (!this._credentialRecoveryDeferredTimer) {
                 this.manager?.logger?.log?.('[CREDENTIAL] Deferring credential recovery until startup/broadcast activity is idle.', 'info');
                 this._credentialRecoveryDeferredTimer = setTimeout(() => {