@bsv/wallet-toolbox 2.1.24 → 3.0.0-alpha.0

package/out/src/services/chaintracker/chaintracks/Chaintracks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chaintracks.d.ts","sourceRoot":"","sources":["../../../../../src/services/chaintracker/chaintracks/Chaintracks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Chaintracks.d.ts","sourceRoot":"","sources":["../../../../../src/services/chaintracker/chaintracks/Chaintracks.ts"],"names":[],"mappings":"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"}

package/out/src/services/chaintracker/chaintracks/Chaintracks.js

@@ -26,7 +26,7 @@ class Chaintracks {
         this.log = () => { };
         // Collection of all long running "threads": main thread (liveHeaders consumer / monitor) and each live header ingestor.
         this.promises = [];
-        this.callbacks = { header: [], reorg: [] };
+        this.callbacks = { header: {}, reorg: {} };
         this.baseHeaders = [];
         this.liveHeaders = [];
         this.addLiveRecursionLimit = 11;
@@ -38,19 +38,21 @@ class Chaintracks {
         this.lastPresentHeightMsecs = 0;
         this.lastPresentHeightMaxAge = 60 * 1000; // 1 minute, in milliseconds
         this.lock = new SingleWriterMultiReaderLock_1.SingleWriterMultiReaderLock();
-        if (!options.storage)
+        if (options.storage == null)
             throw new Error('storage is required.');
-        if (!options.bulkIngestors || options.bulkIngestors.length < 1)
+        if (!options.bulkIngestors || options.bulkIngestors.length < 1) {
             throw new Error('At least one bulk ingestor is required.');
-        if (!options.liveIngestors || options.liveIngestors.length < 1)
+        }
+        if (!options.liveIngestors || options.liveIngestors.length < 1) {
             throw new Error('At least one live ingestor is required.');
+        }
         this.chain = options.chain;
         this.readonly = options.readonly;
         this.storage = options.storage;
         this.bulkIngestors = options.bulkIngestors;
         this.liveIngestors = options.liveIngestors;
         this.addLiveRecursionLimit = options.addLiveRecursionLimit;
-        if (options.logging)
+        if (options.logging != null)
             this.log = options.logging;
         this.storage.log = this.log;
         this.log(`New ChaintracksBase Instance Constructed ${options.chain}Net`);
@@ -78,7 +80,7 @@ class Chaintracks {
                 console.error(uerr);
             }
         }
-        const presentHeight = presentHeights.length ? Math.max(...presentHeights) : undefined;
+        const presentHeight = (presentHeights.length > 0) ? Math.max(...presentHeights) : undefined;
         if (!presentHeight)
             throw new Error('At least one bulk ingestor must implement getPresentHeight.');
         this.lastPresentHeight = presentHeight;
@@ -101,9 +103,9 @@ class Chaintracks {
     async unsubscribe(subscriptionId) {
         let success = true;
         if (this.callbacks.header[subscriptionId])
-            delete this.callbacks.header[subscriptionId];
+            this.callbacks.header[subscriptionId] = null;
         else if (this.callbacks.reorg[subscriptionId])
-            delete this.callbacks.reorg[subscriptionId];
+            this.callbacks.reorg[subscriptionId] = null;
         else
             success = false;
         return success;
@@ -148,15 +150,15 @@ class Chaintracks {
             // Start mai loop to shift out liveHeaders...once sync'd, will set `available` true.
             this.promises.push(this.mainThreadShiftLiveHeaders());
             // Wait for the main thread to finish initial sync.
-            while (!this.available && !this.startupError) {
+            while (!this.available && (this.startupError == null)) {
                 await (0, utilityHelpers_1.wait)(100);
             }
-            if (this.startupError)
+            if (this.startupError != null)
                 throw this.startupError;
         });
     }
     async startPromises() {
-        if (this.promises.length > 0 || this.stopMainThread !== true)
+        if (this.promises.length > 0 || !this.stopMainThread)
             return;
     }
     async destroy() {
@@ -179,40 +181,39 @@ class Chaintracks {
         });
     }
     async listening() {
-        return this.makeAvailable();
+        return await this.makeAvailable();
     }
     async isListening() {
         return this.available;
     }
     async isSynchronized() {
         await this.makeAvailable();
-        // TODO add synchronized flag... false while bulksyncing...
         return true;
     }
     async findHeaderForHeight(height) {
         await this.makeAvailable();
-        return this.lock.withReadLock(async () => this.findHeaderForHeightNoLock(height));
+        return await this.lock.withReadLock(async () => await this.findHeaderForHeightNoLock(height));
     }
     async findHeaderForHeightNoLock(height) {
         return await this.storage.findHeaderForHeightOrUndefined(height);
     }
     async findHeaderForBlockHash(hash) {
         await this.makeAvailable();
-        return this.lock.withReadLock(async () => this.findHeaderForBlockHashNoLock(hash));
+        return await this.lock.withReadLock(async () => await this.findHeaderForBlockHashNoLock(hash));
     }
     async findHeaderForBlockHashNoLock(hash) {
         return (await this.storage.findLiveHeaderForBlockHash(hash)) || undefined;
     }
     async isValidRootForHeight(root, height) {
         const r = await this.findHeaderForHeight(height);
-        if (!r)
+        if (r == null)
             return false;
         const isValid = root === r.merkleRoot;
         return isValid;
     }
     async getInfo() {
         await this.makeAvailable();
-        return this.lock.withReadLock(async () => this.getInfoNoLock());
+        return await this.lock.withReadLock(async () => await this.getInfoNoLock());
     }
     async getInfoNoLock() {
         const liveRange = await this.storage.findLiveHeightRange();
@@ -229,15 +230,15 @@ class Chaintracks {
     }
     async getHeaders(height, count) {
         await this.makeAvailable();
-        return this.lock.withReadLock(async () => (0, utilityHelpers_noBuffer_1.asString)(await this.storage.getHeadersUint8Array(height, count)));
+        return await this.lock.withReadLock(async () => (0, utilityHelpers_noBuffer_1.asString)(await this.storage.getHeadersUint8Array(height, count)));
     }
     async findChainTipHeader() {
         await this.makeAvailable();
-        return this.lock.withReadLock(async () => await this.storage.findChainTipHeader());
+        return await this.lock.withReadLock(async () => await this.storage.findChainTipHeader());
     }
     async findChainTipHash() {
         await this.makeAvailable();
-        return this.lock.withReadLock(async () => await this.storage.findChainTipHash());
+        return await this.lock.withReadLock(async () => await this.storage.findChainTipHash());
     }
     async findLiveHeaderForBlockHash(hash) {
         await this.makeAvailable();
@@ -255,7 +256,7 @@ class Chaintracks {
         let h = await this.findChainTipHeader();
         while (h.height > 0) {
             const hp = await this.findHeaderForHeight(h.height - 1);
-            if (!hp || hp.hash !== h.previousHash)
+            if ((hp === null || hp === void 0 ? void 0 : hp.hash) !== h.previousHash)
                 throw new Error(`validation fails at height ${h.height}`);
             h = hp;
             if (10000 * Math.floor(h.height / 10000) === h.height)
@@ -281,46 +282,17 @@ class Chaintracks {
         let after = before;
         let added = HeightRange_1.HeightRange.empty;
         const maxSyncRounds = Math.max(1, this.bulkIngestors.length * 2);
-        let done = false;
-        for (let round = 1; !done && round <= maxSyncRounds; round++) {
-            let bulkSyncError;
-            let roundMadeProgress = false;
-            let roundHadSuccess = false;
-            for (const bulk of this.bulkIngestors) {
-                try {
-                    const beforeBulkMax = before.bulk.maxHeight;
-                    const beforeLiveRange = HeightRange_1.HeightRange.from(newLiveHeaders);
-                    const r = await bulk.synchronize(presentHeight, before, newLiveHeaders);
-                    roundHadSuccess = true;
-                    newLiveHeaders = r.liveHeaders;
-                    after = await this.storage.getAvailableHeightRanges();
-                    added = after.bulk.above(before.bulk);
-                    const afterLiveRange = HeightRange_1.HeightRange.from(newLiveHeaders);
-                    if (after.bulk.maxHeight > beforeBulkMax || afterLiveRange.maxHeight > beforeLiveRange.maxHeight) {
-                        roundMadeProgress = true;
-                    }
-                    before = after;
-                    this.log(`Bulk Ingestor: ${added.length} added with ${newLiveHeaders.length} live headers from ${bulk.constructor.name}`);
-                    if (r.done) {
-                        done = true;
-                        break;
-                    }
-                }
-                catch (eu) {
-                    const e = (bulkSyncError = WalletError_1.WalletError.fromUnknown(eu));
-                    this.log(`bulk sync error: ${e.message}`);
-                    if (!this.available)
-                        // During initial startup, bulk ingestors must be available.
-                        break;
-                }
-            }
-            if (!this.available && bulkSyncError && !roundHadSuccess) {
-                this.startupError = bulkSyncError;
+        for (let round = 1; round <= maxSyncRounds; round++) {
+            const result = await this.runBulkSyncRound(before, presentHeight, newLiveHeaders);
+            after = result.after;
+            newLiveHeaders = result.newLiveHeaders;
+            added = after.bulk.above(before.bulk);
+            before = after;
+            if (this.startupError != null)
                 break;
-            }
-            if (done)
+            if (result.done)
                 break;
-            if (!roundMadeProgress) {
+            if (!result.madeProgress) {
                 this.log(`Bulk sync stalled after round ${round}. Deferring further bulk sync attempts to continue live header processing.`);
                 break;
             }
@@ -328,7 +300,7 @@ class Chaintracks {
                 this.log(`Bulk sync paused after ${maxSyncRounds} rounds to avoid runaway retries. Will retry in a later sync cycle.`);
             }
         }
-        if (!this.startupError) {
+        if (this.startupError == null) {
             this.liveHeaders.unshift(...newLiveHeaders);
             added = after.bulk.above(initialRanges.bulk);
             this.log(`syncBulkStorage done
@@ -339,10 +311,47 @@ class Chaintracks {
 `);
         }
     }
+    async runBulkSyncRound(before, presentHeight, newLiveHeaders) {
+        let after = before;
+        let bulkSyncError;
+        let madeProgress = false;
+        let hadSuccess = false;
+        let done = false;
+        for (const bulk of this.bulkIngestors) {
+            try {
+                const beforeBulkMax = before.bulk.maxHeight;
+                const beforeLiveRange = HeightRange_1.HeightRange.from(newLiveHeaders);
+                const r = await bulk.synchronize(presentHeight, before, newLiveHeaders);
+                hadSuccess = true;
+                newLiveHeaders = r.liveHeaders;
+                after = await this.storage.getAvailableHeightRanges();
+                const added = after.bulk.above(before.bulk);
+                const afterLiveRange = HeightRange_1.HeightRange.from(newLiveHeaders);
+                if (after.bulk.maxHeight > beforeBulkMax || afterLiveRange.maxHeight > beforeLiveRange.maxHeight)
+                    madeProgress = true;
+                before = after;
+                this.log(`Bulk Ingestor: ${added.length} added with ${newLiveHeaders.length} live headers from ${bulk.constructor.name}`);
+                if (r.done) {
+                    done = true;
+                    break;
+                }
+            }
+            catch (error_) {
+                const e = (bulkSyncError = WalletError_1.WalletError.fromUnknown(error_));
+                this.log(`bulk sync error: ${e.message}`);
+                // During initial startup, bulk ingestors must be available.
+                if (!this.available)
+                    break;
+            }
+        }
+        if (!this.available && (bulkSyncError != null) && !hadSuccess)
+            this.startupError = bulkSyncError;
+        return { after, newLiveHeaders, done, madeProgress };
+    }
     async getMissingBlockHeader(hash) {
         for (const live of this.liveIngestors) {
             const header = await live.getHeaderByHash(hash);
-            if (header)
+            if (header != null)
                 return header;
         }
         return undefined;
@@ -359,36 +368,36 @@ class Chaintracks {
         if (this.invalidInsertHeaderResult(ihr))
             return ihr;
         if (this.subscriberCallbacksEnabled && ihr.added && ihr.isActiveTip) {
-            // If a new active chaintip has been added, notify subscribed event listeners...
-            for (const id in this.callbacks.header) {
-                const addListener = this.callbacks.header[id];
-                if (addListener) {
-                    try {
-                        addListener(header);
-                    }
-                    catch (_a) {
-                        /* ignore all errors thrown */
-                    }
+            this.notifyHeaderListeners(header);
+            if (ihr.reorgDepth > 0 && (ihr.priorTip != null)) {
+                this.notifyReorgListeners(ihr, header);
+            }
+        }
+        return ihr;
+    }
+    notifyHeaderListeners(header) {
+        for (const id in this.callbacks.header) {
+            const listener = this.callbacks.header[id];
+            if (listener != null) {
+                try {
+                    listener(header);
                 }
+                catch ( /* ignore all errors thrown */_a) { /* ignore all errors thrown */ }
             }
-            if (ihr.reorgDepth > 0 && ihr.priorTip) {
-                // If the new header was also a reorg, notify subscribed event listeners...
-                for (const id in this.callbacks.reorg) {
-                    const reorgListener = this.callbacks.reorg[id];
-                    if (reorgListener) {
-                        try {
-                            const priorTip = { ...ihr.priorTip };
-                            const deactivated = ihr.deactivatedHeaders.map(lbh => ({ ...lbh }));
-                            reorgListener(ihr.reorgDepth, priorTip, header, deactivated);
-                        }
-                        catch (_b) {
-                            /* ignore all errors thrown */
-                        }
-                    }
+        }
+    }
+    notifyReorgListeners(ihr, header) {
+        const priorTip = { ...ihr.priorTip };
+        const deactivated = ihr.deactivatedHeaders.map(lbh => ({ ...lbh }));
+        for (const id in this.callbacks.reorg) {
+            const listener = this.callbacks.reorg[id];
+            if (listener != null) {
+                try {
+                    listener(ihr.reorgDepth, priorTip, header, deactivated);
                 }
+                catch ( /* ignore all errors thrown */_a) { /* ignore all errors thrown */ }
             }
         }
-        return ihr;
     }
     /**
      * Long running method terminated by setting `stopMainThread` false.
@@ -404,161 +413,159 @@ class Chaintracks {
      */
     async mainThreadShiftLiveHeaders() {
         this.stopMainThread = false;
-        let lastSyncCheck = Date.now();
+        let lastSyncCheck = 0;
         let lastBulkSync = Date.now();
         const cdnSyncRepeatMsecs = 24 * 60 * 60 * 1000; // 24 hours
         const syncCheckRepeatMsecs = 30 * 60 * 1000; // 30 minutes
         while (!this.stopMainThread) {
             try {
-                // Review the need for bulk sync...
                 const now = Date.now();
                 lastSyncCheck = now;
-                const presentHeight = await this.getPresentHeight();
-                const before = await this.storage.getAvailableHeightRanges();
-                // Skip bulk sync if within less than half the recursion limit of present height
-                let skipBulkSync = !before.live.isEmpty && before.live.maxHeight >= presentHeight - this.addLiveRecursionLimit / 2;
-                if (skipBulkSync && now - lastBulkSync > cdnSyncRepeatMsecs) {
-                    // If we haven't re-synced in a long time, do it just to check for a CDN update.
-                    skipBulkSync = false;
+                lastBulkSync = await this.runBulkSyncIfNeeded(now, lastBulkSync, cdnSyncRepeatMsecs);
+                await this.processLiveHeaderQueue(lastSyncCheck, syncCheckRepeatMsecs);
+            }
+            catch (error_) {
+                const e = WalletError_1.WalletError.fromUnknown(error_);
+                if (this.available) {
+                    this.log(`Error occurred during chaintracks main thread processing: ${e.stack || e.message}`);
                 }
-                this.log(`Chaintracks Update Services: Bulk Header Sync Review
+                else {
+                    this.startupError = e;
+                    this.stopMainThread = true;
+                }
+            }
+        }
+    }
+    /** Returns (potentially updated) lastBulkSync timestamp. */
+    async runBulkSyncIfNeeded(now, lastBulkSync, cdnSyncRepeatMsecs) {
+        const presentHeight = await this.getPresentHeight();
+        const before = await this.storage.getAvailableHeightRanges();
+        let skipBulkSync = !before.live.isEmpty && before.live.maxHeight >= presentHeight - this.addLiveRecursionLimit / 2;
+        // If we haven't re-synced in a long time, do it just to check for a CDN update.
+        if (skipBulkSync && now - lastBulkSync > cdnSyncRepeatMsecs)
+            skipBulkSync = false;
+        this.log(`Chaintracks Update Services: Bulk Header Sync Review
   presentHeight=${presentHeight}   addLiveRecursionLimit=${this.addLiveRecursionLimit}
   Before synchronize: bulk ${before.bulk}, live ${before.live}
   ${skipBulkSync ? 'Skipping' : 'Starting'} syncBulkStorage.
 `);
-                if (!skipBulkSync) {
-                    // Bring bulk storage up-to-date and (re-)initialize liveHeaders
-                    lastBulkSync = now;
-                    if (this.available)
-                        // Once available, initial write lock is released, take a new one to update bulk storage.
-                        await this.syncBulkStorage(presentHeight, before);
-                    else
-                        // While still not available, the makeAvailable write lock is held.
-                        await this.syncBulkStorageNoLock(presentHeight, before);
-                    if (this.startupError)
-                        throw this.startupError;
+        if (!skipBulkSync) {
+            // Once available, the initial write lock is released; take a new one to update bulk storage.
+            // While not yet available, the makeAvailable write lock is still held.
+            if (this.available)
+                await this.syncBulkStorage(presentHeight, before);
+            else
+                await this.syncBulkStorageNoLock(presentHeight, before);
+            if (this.startupError != null)
+                throw this.startupError;
+            return now;
+        }
+        return lastBulkSync;
+    }
+    async processLiveHeaderQueue(lastSyncCheck, syncCheckRepeatMsecs) {
+        let count = 0;
+        let liveHeaderDupes = 0;
+        let needSyncCheck = false;
+        while (!needSyncCheck && !this.stopMainThread) {
+            const liveHeader = this.liveHeaders.shift();
+            if (liveHeader != null) {
+                const result = await this.processOneLiveHeader(liveHeader);
+                if (result.needSyncCheck) {
+                    needSyncCheck = true;
+                    continue;
                 }
-                let count = 0;
-                let liveHeaderDupes = 0;
-                let needSyncCheck = false;
-                for (; !needSyncCheck && !this.stopMainThread;) {
-                    let header = this.liveHeaders.shift();
-                    if (header) {
-                        // Process a "live" block header...
-                        let recursions = this.addLiveRecursionLimit;
-                        for (; !needSyncCheck && !this.stopMainThread;) {
-                            //console.log(`Processing liveHeader: height: ${header.height} hash: ${header.hash} ${new Date().toISOString()}`)
-                            const ihr = await this.addLiveHeader(header);
-                            if (this.invalidInsertHeaderResult(ihr)) {
-                                this.log(`Ignoring liveHeader ${header.height} ${header.hash} due to invalid insert result.`);
-                                needSyncCheck = true;
-                            }
-                            else if (ihr.noPrev) {
-                                // Previous header is unknown, request it by hash from the network and try adding it first...
-                                if (recursions-- <= 0) {
-                                    // Ignore this header...
-                                    this.log(`Ignoring liveHeader ${header.height} ${header.hash} addLiveRecursionLimit=${this.addLiveRecursionLimit} exceeded.`);
-                                    needSyncCheck = true;
-                                }
-                                else {
-                                    const hash = header.previousHash;
-                                    const prevHeader = await this.getMissingBlockHeader(hash);
-                                    if (!prevHeader) {
-                                        this.log(`Ignoring liveHeader ${header.height} ${header.hash} failed to find previous header by hash ${(0, utilityHelpers_noBuffer_1.asString)(hash)}`);
-                                        needSyncCheck = true;
-                                    }
-                                    else {
-                                        // Switch to trying to add prevHeader, unshifting current header to try it again after prevHeader exists.
-                                        this.liveHeaders.unshift(header);
-                                        header = prevHeader;
-                                    }
-                                }
-                            }
-                            else {
-                                if (this.subscriberCallbacksEnabled)
-                                    this.log(`addLiveHeader ${header.height}${ihr.added ? ' added' : ''}${ihr.dupe ? ' dupe' : ''}${ihr.isActiveTip ? ' isActiveTip' : ''}${ihr.reorgDepth ? ' reorg depth ' + ihr.reorgDepth : ''}${ihr.noPrev ? ' noPrev' : ''}${ihr.noActiveAncestor || ihr.noTip || ihr.badPrev ? ' error' : ''}`);
-                                if (ihr.dupe) {
-                                    liveHeaderDupes++;
-                                }
-                                // Header wasn't invalid and previous header is known. If it was successfully added, count it as a win.
-                                if (ihr.added) {
-                                    count++;
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    else {
-                        // There are no liveHeaders currently to process, check the out-of-band baseHeaders channel (`addHeader` method called by a client).
-                        const bheader = this.baseHeaders.shift();
-                        if (bheader) {
-                            const prev = await this.storage.findLiveHeaderForBlockHash(bheader.previousHash);
-                            if (!prev) {
-                                // Ignoring attempt to add a baseHeader with unknown previous hash, no attempt made to find previous header(s).
-                                this.log(`Ignoring header with unknown previousHash ${bheader.previousHash} in live storage.`);
-                                // Does not trigger a re-sync.
-                            }
-                            else {
-                                const header = {
-                                    ...bheader,
-                                    height: prev.height + 1,
-                                    hash: (0, blockHeaderUtilities_1.blockHash)(bheader)
-                                };
-                                const ihr = await this.addLiveHeader(header);
-                                if (this.invalidInsertHeaderResult(ihr)) {
-                                    this.log(`Ignoring invalid baseHeader ${header.height} ${header.hash}.`);
-                                }
-                                else {
-                                    if (this.subscriberCallbacksEnabled)
-                                        this.log(`addBaseHeader ${header.height}${ihr.added ? ' added' : ''}${ihr.dupe ? ' dupe' : ''}${ihr.isActiveTip ? ' isActiveTip' : ''}${ihr.reorgDepth ? ' reorg depth ' + ihr.reorgDepth : ''}${ihr.noPrev ? ' noPrev' : ''}${ihr.noActiveAncestor || ihr.noTip || ihr.badPrev ? ' error' : ''}`);
-                                    // baseHeader was successfully added.
-                                    if (ihr.added) {
-                                        count++;
-                                    }
-                                }
-                            }
-                        }
-                        else {
-                            // There are no liveHeaders and no baseHeaders to add,
-                            if (count > 0) {
-                                if (liveHeaderDupes > 0) {
-                                    this.log(`${liveHeaderDupes} duplicate headers ignored.`);
-                                    liveHeaderDupes = 0;
-                                }
-                                const updated = await this.storage.getAvailableHeightRanges();
-                                this.log(`After adding ${count} live headers
-   After live: bulk ${updated.bulk}, live ${updated.live}
-`);
-                                count = 0;
-                            }
-                            if (!this.subscriberCallbacksEnabled) {
-                                const live = await this.storage.findLiveHeightRange();
-                                if (!live.isEmpty) {
-                                    this.subscriberCallbacksEnabled = true;
-                                    this.log(`listening at height of ${live.maxHeight}`);
-                                }
-                            }
-                            if (!this.available) {
-                                this.available = true;
-                            }
-                            needSyncCheck = Date.now() - lastSyncCheck > syncCheckRepeatMsecs;
-                            // If we aren't going to review sync, wait before checking input queues again
-                            if (!needSyncCheck)
-                                await (0, utilityHelpers_1.wait)(1000);
+                if (result.dupe)
+                    liveHeaderDupes++;
+                if (result.added)
+                    count++;
+            }
+            else {
+                const bheader = this.baseHeaders.shift();
+                if (bheader != null) {
+                    const added = await this.processOneBaseHeader(bheader);
+                    if (added)
+                        count++;
+                }
+                else {
+                    // No live or base headers queued — idle path.
+                    if (count > 0) {
+                        if (liveHeaderDupes > 0) {
+                            this.log(`${liveHeaderDupes} duplicate headers ignored.`);
+                            liveHeaderDupes = 0;
                         }
+                        const updated = await this.storage.getAvailableHeightRanges();
+                        this.log(`After adding ${count} live headers\n   After live: bulk ${updated.bulk}, live ${updated.live}\n`);
+                        count = 0;
                     }
+                    await this.checkAndEnableSubscribers();
+                    if (!this.available)
+                        this.available = true;
+                    needSyncCheck = Date.now() - lastSyncCheck > syncCheckRepeatMsecs;
+                    if (!needSyncCheck)
+                        await (0, utilityHelpers_1.wait)(1000);
                 }
             }
-            catch (eu) {
-                const e = WalletError_1.WalletError.fromUnknown(eu);
-                if (!this.available) {
-                    this.startupError = e;
-                    this.stopMainThread = true;
+        }
+    }
+    formatIhrLog(prefix, header, ihr) {
+        return `${prefix} ${header.height}${ihr.added ? ' added' : ''}${ihr.dupe ? ' dupe' : ''}${ihr.isActiveTip ? ' isActiveTip' : ''}${ihr.reorgDepth ? ' reorg depth ' + ihr.reorgDepth : ''}${ihr.noPrev ? ' noPrev' : ''}${ihr.noActiveAncestor || ihr.noTip || ihr.badPrev ? ' error' : ''}`;
+    }
+    async processOneLiveHeader(startHeader) {
+        let header = startHeader;
+        let recursions = this.addLiveRecursionLimit;
+        while (!this.stopMainThread) {
+            const ihr = await this.addLiveHeader(header);
+            if (this.invalidInsertHeaderResult(ihr)) {
+                this.log(`Ignoring liveHeader ${header.height} ${header.hash} due to invalid insert result.`);
+                return { needSyncCheck: true, dupe: false, added: false };
+            }
+            if (ihr.noPrev) {
+                // Previous header is unknown; request it by hash from the network and try adding it first.
+                if (recursions-- <= 0) {
+                    this.log(`Ignoring liveHeader ${header.height} ${header.hash} addLiveRecursionLimit=${this.addLiveRecursionLimit} exceeded.`);
+                    return { needSyncCheck: true, dupe: false, added: false };
                 }
-                else {
-                    this.log(`Error occurred during chaintracks main thread processing: ${e.stack || e.message}`);
+                const prevHeader = await this.getMissingBlockHeader(header.previousHash);
+                if (prevHeader == null) {
+                    this.log(`Ignoring liveHeader ${header.height} ${header.hash} failed to find previous header by hash ${(0, utilityHelpers_noBuffer_1.asString)(header.previousHash)}`);
+                    return { needSyncCheck: true, dupe: false, added: false };
                 }
+                // Retry adding prevHeader first; then re-queue current header.
+                this.liveHeaders.unshift(header);
+                header = prevHeader;
             }
+            else {
+                if (this.subscriberCallbacksEnabled)
+                    this.log(this.formatIhrLog('addLiveHeader', header, ihr));
+                return { needSyncCheck: false, dupe: ihr.dupe, added: ihr.added };
+            }
+        }
+        return { needSyncCheck: false, dupe: false, added: false };
+    }
+    async processOneBaseHeader(bheader) {
+        const prev = await this.storage.findLiveHeaderForBlockHash(bheader.previousHash);
+        if (prev == null) {
+            // Unknown previous hash — ignore without triggering a re-sync.
+            this.log(`Ignoring header with unknown previousHash ${bheader.previousHash} in live storage.`);
+            return false;
+        }
+        const header = { ...bheader, height: prev.height + 1, hash: (0, blockHeaderUtilities_1.blockHash)(bheader) };
+        const ihr = await this.addLiveHeader(header);
+        if (this.invalidInsertHeaderResult(ihr)) {
+            this.log(`Ignoring invalid baseHeader ${header.height} ${header.hash}.`);
+            return false;
+        }
+        if (this.subscriberCallbacksEnabled)
+            this.log(this.formatIhrLog('addBaseHeader', header, ihr));
+        return ihr.added;
+    }
+    async checkAndEnableSubscribers() {
+        if (this.subscriberCallbacksEnabled)
+            return;
+        const live = await this.storage.findLiveHeightRange();
+        if (!live.isEmpty) {
+            this.subscriberCallbacksEnabled = true;
+            this.log(`listening at height of ${live.maxHeight}`);
         }
     }
 }