Merge branch 'master' into simon/bumping-electrum-client

Reconnect to electrum an unlimited amount of times every 1 seconds upon disconnection

backend/package-lock.json

@@ -10,7 +10,7 @@
       "license": "GNU Affero General Public License v3.0",
       "dependencies": {
         "@babel/core": "^7.20.12",
-        "@mempool/electrum-client": "^1.1.7",
+        "@mempool/electrum-client": "1.1.9",
         "@types/node": "^16.18.11",
         "axios": "~0.27.2",
         "bitcoinjs-lib": "~6.1.0",
@@ -1272,9 +1272,9 @@
       }
     },
     "node_modules/@mempool/electrum-client": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@mempool/electrum-client/-/electrum-client-1.1.8.tgz",
-      "integrity": "sha512-6YP6UJstlk2GgC++NwPJthMPvLozyEMlqPq7RjvIWSwrL0smvM0Q0PAOohwZJtJFDWspuEUtNRF7aHQT2ztnYg==",
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@mempool/electrum-client/-/electrum-client-1.1.9.tgz",
+      "integrity": "sha512-mlvPiCzUlaETpYW3i6V87A24jjMYgsebaXtUo3WQyyLnYUuxs0KiXQ2mnKh3h15j8Xg/hfxeGIi+5OC9u0nftQ==",
       "engines": {
         "node": ">=6"
       }
@@ -7248,9 +7248,9 @@
       }
     },
     "@mempool/electrum-client": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@mempool/electrum-client/-/electrum-client-1.1.8.tgz",
-      "integrity": "sha512-6YP6UJstlk2GgC++NwPJthMPvLozyEMlqPq7RjvIWSwrL0smvM0Q0PAOohwZJtJFDWspuEUtNRF7aHQT2ztnYg=="
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@mempool/electrum-client/-/electrum-client-1.1.9.tgz",
+      "integrity": "sha512-mlvPiCzUlaETpYW3i6V87A24jjMYgsebaXtUo3WQyyLnYUuxs0KiXQ2mnKh3h15j8Xg/hfxeGIi+5OC9u0nftQ=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",

backend/package.json

@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@babel/core": "^7.20.12",
-    "@mempool/electrum-client": "^1.1.7",
+    "@mempool/electrum-client": "1.1.9",
     "@types/node": "^16.18.11",
     "axios": "~0.27.2",
     "bitcoinjs-lib": "~6.1.0",

backend/src/api/bitcoin/electrum-api.ts

@@ -16,7 +16,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
     super(bitcoinClient);
 
     const electrumConfig = { client: 'mempool-v2', version: '1.4' };
-    const electrumPersistencePolicy = { retryPeriod: 10000, maxRetry: 1000, callback: null };
+    const electrumPersistencePolicy = { retryPeriod: 1000, maxRetry: Number.MAX_SAFE_INTEGER, callback: null };
 
     const electrumCallbacks = {
       onConnect: (client, versionInfo) => { logger.info(`Connected to Electrum Server at ${config.ELECTRUM.HOST}:${config.ELECTRUM.PORT} (${JSON.stringify(versionInfo)})`); },

backend/src/api/mempool-blocks.ts

@@ -1,5 +1,5 @@
 import logger from '../logger';
-import { MempoolBlock, TransactionExtended, ThreadTransaction, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, GbtCandidates } from '../mempool.interfaces';
+import { MempoolBlock, TransactionExtended, ThreadTransaction, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor } from '../mempool.interfaces';
 import { Common } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
@@ -147,23 +147,19 @@ class MempoolBlocks {
     return mempoolBlockDeltas;
   }
 
-  public async makeBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, saveResults: boolean = false, candidates?: GbtCandidates): Promise<MempoolBlockWithTransactions[]> {
+  public async makeBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, saveResults: boolean = false): Promise<MempoolBlockWithTransactions[]> {
     // prepare a stripped down version of the mempool with only the minimum necessary data
     // to reduce the overhead of passing this data to the worker thread
-    const txids = candidates ? Object.keys(candidates.txs) : Object.keys(newMempool);
     const strippedMempool: { [txid: string]: ThreadTransaction } = {};
-    txids.forEach(txid => {
-      const entry = newMempool[txid];
-      if (entry) {
-        strippedMempool[entry.txid] = {
-          txid: entry.txid,
-          fee: entry.fee,
-          weight: entry.weight,
-          feePerVsize: entry.fee / (entry.weight / 4),
-          effectiveFeePerVsize: entry.fee / (entry.weight / 4),
-          vin: entry.vin.map(v => v.txid),
-        };
-      }
+    Object.values(newMempool).forEach(entry => {
+      strippedMempool[entry.txid] = {
+        txid: entry.txid,
+        fee: entry.fee,
+        weight: entry.weight,
+        feePerVsize: entry.fee / (entry.weight / 4),
+        effectiveFeePerVsize: entry.fee / (entry.weight / 4),
+        vin: entry.vin.map(v => v.txid),
+      };
     });
 
     // (re)initialize tx selection worker thread
@@ -195,49 +191,31 @@ class MempoolBlocks {
       // clean up thread error listener
       this.txSelectionWorker?.removeListener('error', threadErrorListener);
 
-      return this.processBlockTemplates(newMempool, blocks, clusters, saveResults, candidates);
+      return this.processBlockTemplates(newMempool, blocks, clusters, saveResults);
     } catch (e) {
       logger.err('makeBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
     }
     return this.mempoolBlocks;
   }
 
-  public async updateBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, added: TransactionExtended[], removed: string[], saveResults: boolean = false, candidates?: GbtCandidates): Promise<void> {
+  public async updateBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, added: TransactionExtended[], removed: string[], saveResults: boolean = false): Promise<void> {
     if (!this.txSelectionWorker) {
       // need to reset the worker
-      this.makeBlockTemplates(newMempool, saveResults, candidates);
+      this.makeBlockTemplates(newMempool, saveResults);
       return;
     }
     // prepare a stripped down version of the mempool with only the minimum necessary data
     // to reduce the overhead of passing this data to the worker thread
-    let addedStripped: ThreadTransaction[] = [];
-    let removedList;
-    if (candidates) {
-      addedStripped = candidates.added.filter(txid => newMempool[txid]).map(txid => {
-        const entry = newMempool[txid];
-        return {
-          txid: entry.txid,
-          fee: entry.fee,
-          weight: entry.weight,
-          feePerVsize: entry.fee / (entry.weight / 4),
-          effectiveFeePerVsize: entry.fee / (entry.weight / 4),
-          vin: entry.vin.map(v => v.txid),
-        };
-      });
-      removedList = candidates.removed;
-    } else {
-      addedStripped = added.map(entry => {
-        return {
-          txid: entry.txid,
-          fee: entry.fee,
-          weight: entry.weight,
-          feePerVsize: entry.fee / (entry.weight / 4),
-          effectiveFeePerVsize: entry.fee / (entry.weight / 4),
-          vin: entry.vin.map(v => v.txid),
-        };
-      });
-      removedList = removed;
-    }
+    const addedStripped: ThreadTransaction[] = added.map(entry => {
+      return {
+        txid: entry.txid,
+        fee: entry.fee,
+        weight: entry.weight,
+        feePerVsize: entry.fee / (entry.weight / 4),
+        effectiveFeePerVsize: entry.fee / (entry.weight / 4),
+        vin: entry.vin.map(v => v.txid),
+      };
+    });
 
     // run the block construction algorithm in a separate thread, and wait for a result
     let threadErrorListener;
@@ -249,19 +227,19 @@ class MempoolBlocks {
         });
         this.txSelectionWorker?.once('error', reject);
       });
-      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed: removedList });
+      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed });
       const { blocks, clusters } = await workerResultPromise;
 
       // clean up thread error listener
       this.txSelectionWorker?.removeListener('error', threadErrorListener);
 
-      this.processBlockTemplates(newMempool, blocks, clusters, saveResults, candidates);
+      this.processBlockTemplates(newMempool, blocks, clusters, saveResults);
     } catch (e) {
       logger.err('updateBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
     }
   }
 
-  private processBlockTemplates(mempool: { [txid: string ]: TransactionExtended }, blocks, clusters, saveResults, candidates?: GbtCandidates): MempoolBlockWithTransactions[] {
+  private processBlockTemplates(mempool, blocks, clusters, saveResults): MempoolBlockWithTransactions[] {
     // update this thread's mempool with the results
     blocks.forEach(block => {
       block.forEach(tx => {
@@ -299,32 +277,6 @@ class MempoolBlocks {
       });
     });
 
-    // Add purged transactions at the end, if required
-    if (candidates) {
-      const purged: string[] = [];
-      Object.values(mempool).forEach(tx => {
-        if (!candidates.txs[tx.txid]) {
-          purged.push(tx.txid);
-        }
-      });
-      if (!blocks.length) {
-        blocks = [[]];
-      }
-      let blockIndex = blocks.length - 1;
-      let weight = blocks[blockIndex].reduce((acc, tx) => acc + tx.weight, 0);
-      purged.sort((a,b) => { return mempool[b].effectiveFeePerVsize - mempool[a].effectiveFeePerVsize});
-      purged.forEach(txid => {
-        const tx = mempool[txid];
-        if ((weight + tx.weight) >= (config.MEMPOOL.BLOCK_WEIGHT_UNITS - 4000) && blockIndex < 7) {
-          blocks.push([]);
-          blockIndex++;
-          weight = 0;
-        }
-        blocks[blockIndex].push(tx);
-        weight += tx.weight;
-      });
-    }
-
     // unpack the condensed blocks into proper mempool blocks
     const mempoolBlocks = blocks.map((transactions, blockIndex) => {
       return this.dataToMempoolBlocks(transactions.map(tx => {

backend/src/api/mempool.ts

@@ -1,6 +1,6 @@
 import config from '../config';
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
-import { GbtCandidates, TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
+import { TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
 import logger from '../logger';
 import { Common } from './common';
 import transactionUtils from './transaction-utils';
@@ -9,7 +9,6 @@ import loadingIndicators from './loading-indicators';
 import bitcoinClient from './bitcoin/bitcoin-client';
 import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';
-import blocks from './blocks';
 
 class Mempool {
   private static WEBSOCKET_REFRESH_RATE_MS = 10000;
@@ -17,16 +16,12 @@ class Mempool {
   private inSync: boolean = false;
   private mempoolCacheDelta: number = -1;
   private mempoolCache: { [txId: string]: TransactionExtended } = {};
-  private mempoolCandidates: { [txid: string ]: boolean } = {};
-  private minFeeMempool: { [txId: string]: boolean } = {};
   private mempoolInfo: IBitcoinApi.MempoolInfo = { loaded: false, size: 0, bytes: 0, usage: 0, total_fee: 0,
                                                     maxmempool: 300000000, mempoolminfee: 0.00001000, minrelaytxfee: 0.00001000 };
-  private secondMempoolInfo: IBitcoinApi.MempoolInfo = { loaded: false, size: 0, bytes: 0, usage: 0, total_fee: 0,
-                                                    maxmempool: 300000000, mempoolminfee: 0.00001000, minrelaytxfee: 0.00001000 };
   private mempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
     deletedTransactions: TransactionExtended[]) => void) | undefined;
   private asyncMempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
-    deletedTransactions: TransactionExtended[], candidates?: GbtCandidates) => Promise<void>) | undefined;
+    deletedTransactions: TransactionExtended[]) => Promise<void>) | undefined;
 
   private txPerSecondArray: number[] = [];
   private txPerSecond: number = 0;
@@ -76,7 +71,7 @@ class Mempool {
   }
 
   public setAsyncMempoolChangedCallback(fn: (newMempool: { [txId: string]: TransactionExtended; },
-    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[], candidates?: GbtCandidates) => Promise<void>) {
+    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]) => Promise<void>) {
     this.asyncMempoolChangedCallback = fn;
   }
 
@@ -90,18 +85,10 @@ class Mempool {
       this.mempoolChangedCallback(this.mempoolCache, [], []);
     }
     if (this.asyncMempoolChangedCallback) {
-      if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE) {
-        this.asyncMempoolChangedCallback(this.mempoolCache, [], [], { txs: {}, added: [], removed: [] });
-      } else {
-        this.asyncMempoolChangedCallback(this.mempoolCache, [], [], );
-      }
+      this.asyncMempoolChangedCallback(this.mempoolCache, [], []);
     }
   }
 
-  public getMempoolCandidates(): { [txid: string]: boolean } {
-    return this.mempoolCandidates;
-  }
-
   public async $updateMemPoolInfo() {
     this.mempoolInfo = await this.$getMempoolInfo();
   }
@@ -137,7 +124,6 @@ class Mempool {
     let hasChange: boolean = false;
     const currentMempoolSize = Object.keys(this.mempoolCache).length;
     const transactions = await bitcoinApi.$getRawMempool();
-    const candidates = await this.getNextCandidates();
     const diff = transactions.length - currentMempoolSize;
     const newTransactions: TransactionExtended[] = [];
 
@@ -237,8 +223,8 @@ class Mempool {
     if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
       this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
     }
-    if (this.asyncMempoolChangedCallback && (hasChange || deletedTransactions.length || candidates?.added.length || candidates?.removed.length)) {
-      await this.asyncMempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions, candidates);
+    if (this.asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
+      await this.asyncMempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
     }
 
     const end = new Date().getTime();
@@ -246,55 +232,6 @@ class Mempool {
     logger.debug(`Mempool updated in ${time / 1000} seconds. New size: ${Object.keys(this.mempoolCache).length} (${diff > 0 ? '+' + diff : diff})`);
   }
 
-  public isTxPurged(txid: string): boolean {
-    return !this.minFeeMempool[txid];
-  }
-
-  public async getNextCandidates(): Promise<GbtCandidates | undefined> {
-    if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE) {
-      const minFeeTransactions = await bitcoinSecondClient.getRawMemPool();
-      const blockHeight = await bitcoinSecondClient.getChainTips()
-        .then((result: IBitcoinApi.ChainTips[]) => {
-          return result.find(tip => tip.status === 'active')!.height;
-        });
-      const newCandidateTxMap = {};
-      this.minFeeMempool = {};
-      for (const txid of minFeeTransactions) {
-        if (this.mempoolCache[txid]) {
-          newCandidateTxMap[txid] = true;
-        }
-        this.minFeeMempool[txid] = true;
-      }
-      const removed: string[] = [];
-      const added: string[] = [];
-      // don't prematurely remove txs included in a new block
-      if (blockHeight > blocks.getCurrentBlockHeight()) {
-        for (const txid of Object.keys(this.mempoolCandidates)) {
-          newCandidateTxMap[txid] = true;
-        }
-      } else {
-        for (const txid of Object.keys(this.mempoolCandidates)) {
-          if (!newCandidateTxMap[txid]) {
-            removed.push(txid);
-          }
-        }
-      }
-
-      for (const txid of Object.keys(newCandidateTxMap)) {
-        if (!this.mempoolCandidates[txid]) {
-          added.push(txid);
-        }
-      }
-
-      this.mempoolCandidates = newCandidateTxMap;
-      return {
-        txs: this.mempoolCandidates,
-        added,
-        removed
-      };
-    }
-  }
-
   public handleRbfTransactions(rbfTransactions: { [txid: string]: TransactionExtended; }) {
     for (const rbfTransaction in rbfTransactions) {
       if (this.mempoolCache[rbfTransaction]) {

backend/src/api/websocket-handler.ts

@@ -2,7 +2,7 @@ import logger from '../logger';
 import * as WebSocket from 'ws';
 import {
   BlockExtended, TransactionExtended, WebsocketResponse,
-  OptimizedStatistic, ILoadingIndicators, GbtCandidates
+  OptimizedStatistic, ILoadingIndicators
 } from '../mempool.interfaces';
 import blocks from './blocks';
 import memPool from './mempool';
@@ -92,9 +92,6 @@ class WebsocketHandler {
                   }
                 }
               }
-              if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE && memPool.getMempool()[client['track-tx']]) {
-                response['txPurged'] = memPool.isTxPurged(client['track-tx']);
-              }
             } else {
               client['track-tx'] = null;
             }
@@ -250,14 +247,13 @@ class WebsocketHandler {
   }
 
   async handleMempoolChange(newMempool: { [txid: string]: TransactionExtended },
-    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[],
-    candidates?: GbtCandidates): Promise<void> {
+    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]): Promise<void> {
     if (!this.wss) {
       throw new Error('WebSocket.Server is not set');
     }
 
     if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
-      await mempoolBlocks.updateBlockTemplates(newMempool, newTransactions, deletedTransactions.map(tx => tx.txid), true, candidates);
+      await mempoolBlocks.updateBlockTemplates(newMempool, newTransactions, deletedTransactions.map(tx => tx.txid), true);
     } else {
       mempoolBlocks.updateMempoolBlocks(newMempool, true);
     }
@@ -399,11 +395,6 @@ class WebsocketHandler {
             }
           }
         }
-
-        // update purge status of unconfirmed tracked txs
-        if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE && newMempool[client['track-tx']]) {
-          response['txPurged'] = memPool.isTxPurged(client['track-tx']);
-        }
       }
 
       if (client['track-mempool-block'] >= 0) {
@@ -428,7 +419,6 @@ class WebsocketHandler {
     }
 
     const _memPool = memPool.getMempool();
-    const candidateTxs = await memPool.getMempoolCandidates();
 
     if (config.MEMPOOL.AUDIT) {
       let projectedBlocks;
@@ -436,15 +426,7 @@ class WebsocketHandler {
       // a cloned copy of the mempool if we're running a different algorithm for mempool updates
       const auditMempool = (config.MEMPOOL.ADVANCED_GBT_AUDIT === config.MEMPOOL.ADVANCED_GBT_MEMPOOL) ? _memPool : deepClone(_memPool);
       if (config.MEMPOOL.ADVANCED_GBT_AUDIT) {
-        let candidates;
-        if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE) {
-          candidates = {
-            txs: candidateTxs,
-            added: [],
-            removed: [],
-          };
-        }
-        projectedBlocks = await mempoolBlocks.makeBlockTemplates(auditMempool, false, candidates);
+        projectedBlocks = await mempoolBlocks.makeBlockTemplates(auditMempool, false);
       } else {
         projectedBlocks = mempoolBlocks.updateMempoolBlocks(auditMempool, false);
       }
@@ -496,21 +478,12 @@ class WebsocketHandler {
     // Update mempool to remove transactions included in the new block
     for (const txId of txIds) {
       delete _memPool[txId];
-      delete candidateTxs[txId];
       removed.push(txId);
       rbfCache.evict(txId);
     }
 
     if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
-      let candidates;
-      if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE) {
-        candidates = {
-          txs: candidateTxs,
-          added: [],
-          removed: removed,
-        };
-      }
-      await mempoolBlocks.updateBlockTemplates(_memPool, [], removed, true, candidates);
+      await mempoolBlocks.updateBlockTemplates(_memPool, [], removed, true);
     } else {
       mempoolBlocks.updateMempoolBlocks(_memPool, true);
     }

backend/src/mempool.interfaces.ts

@@ -100,12 +100,6 @@ export interface AuditTransaction {
   modifiedNode: HeapNode<AuditTransaction>;
 }
 
-export interface GbtCandidates {
-  txs: { [txid: string ]: boolean },
-  added: string[];
-  removed: string[];
-}
-
 export interface ThreadTransaction {
   txid: string;
   fee: number;

frontend/README.md

@@ -106,6 +106,7 @@ https://www.transifex.com/mempool/mempool/dashboard/
 
 * Arabic @baro0k
 * Czech @pixelmade2
+* Danish @pierrevendelboe
 * German @Emzy
 * English (default)
 * Spanish @maxhodler @bisqes
@@ -113,6 +114,7 @@ https://www.transifex.com/mempool/mempool/dashboard/
 * French @Bayernatoor
 * Korean @kcalvinalvinn @sogoagain
 * Italian @HodlBits
+* Lithuanian @eimze21
 * Hebrew @rapidlab309
 * Georgian @wyd_idk
 * Hungarian @btcdragonlord

frontend/src/app/components/transaction/transaction.component.html

@@ -1,10 +1,6 @@
 <div class="container-xl">
 
   <div class="title-block">
-    <div *ngIf="isPurged" class="alert alert-mempool" role="alert">
-      <span i18n="transaction.purged|Purged from mempool">This transaction has been purged from our default sized 300MB mempool</span>
-    </div>
-
     <div *ngIf="rbfTransaction" class="alert alert-mempool" role="alert">
       <span i18n="transaction.rbf.replacement|RBF replacement">This transaction has been replaced by:</span>
       <app-truncate [text]="rbfTransaction.txid" [lastChars]="12" [link]="['/tx/' | relativeUrl, rbfTransaction.txid]"></app-truncate>

frontend/src/app/components/transaction/transaction.component.ts

@@ -46,7 +46,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   fetchRbfSubscription: Subscription;
   fetchCachedTxSubscription: Subscription;
   txReplacedSubscription: Subscription;
-  txPurgedSubscription: Subscription;
   blocksSubscription: Subscription;
   queryParamsSubscription: Subscription;
   urlFragmentSubscription: Subscription;
@@ -60,7 +59,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   fetchRbfHistory$ = new Subject<string>();
   fetchCachedTx$ = new Subject<string>();
   isCached: boolean = false;
-  isPurged: boolean = false;
   now = new Date().getTime();
   timeAvg$: Observable<number>;
   liquidUnblinding = new LiquidUnblinding();
@@ -382,10 +380,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
       }
     });
 
-    this.txPurgedSubscription = this.stateService.txPurged$.subscribe((isPurged) => {
-      this.isPurged = isPurged;
-    });
-
     this.queryParamsSubscription = this.route.queryParams.subscribe((params) => {
       if (params.showFlow === 'false') {
         this.overrideFlowPreference = false;
@@ -538,7 +532,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.fetchRbfSubscription.unsubscribe();
     this.fetchCachedTxSubscription.unsubscribe();
     this.txReplacedSubscription.unsubscribe();
-    this.txPurgedSubscription.unsubscribe();
     this.blocksSubscription.unsubscribe();
     this.queryParamsSubscription.unsubscribe();
     this.flowPrefSubscription.unsubscribe();

frontend/src/app/interfaces/websocket.interface.ts

@@ -16,7 +16,6 @@ export interface WebsocketResponse {
   tx?: Transaction;
   rbfTransaction?: ReplacedTransaction;
   txReplaced?: ReplacedTransaction;
-  txPurged?: boolean;
   utxoSpent?: object;
   transactions?: TransactionStripped[];
   loadingIndicators?: ILoadingIndicators;

frontend/src/app/lightning/node-fee-chart/node-fee-chart.component.ts

@@ -101,8 +101,15 @@ export class NodeFeeChartComponent implements OnInit {
   }
 
   prepareChartOptions(outgoingData, incomingData): void {
+    let sum = outgoingData.reduce((accumulator, object) => {
+      return accumulator + object.count;
+    }, 0);
+    sum += incomingData.reduce((accumulator, object) => {
+      return accumulator + object.count;
+    }, 0);
+
     let title: object;
-    if (outgoingData.length === 0) {
+    if (sum === 0) {
       title = {
         textStyle: {
           color: 'grey',
@@ -115,7 +122,7 @@ export class NodeFeeChartComponent implements OnInit {
     }
 
     this.chartOptions = {
-      title: outgoingData.length === 0 ? title : undefined,
+      title: sum === 0 ? title : undefined,
       animation: false,
       grid: {
         top: 30,
@@ -151,7 +158,7 @@ export class NodeFeeChartComponent implements OnInit {
           `;
         }
       },
-      xAxis: outgoingData.length === 0 ? undefined : {
+      xAxis: sum === 0 ? undefined : {
         type: 'category',
         axisLine: { onZero: true },
         axisLabel: {
@@ -163,7 +170,7 @@ export class NodeFeeChartComponent implements OnInit {
         },
         data: outgoingData.map(bucket => bucket.label)
       },
-      legend: outgoingData.length === 0 ? undefined : {
+      legend: sum === 0 ? undefined : {
         padding: 10,
         data: [
           {
@@ -184,7 +191,7 @@ export class NodeFeeChartComponent implements OnInit {
           },
         ],
       },
-      yAxis: outgoingData.length === 0 ? undefined : [
+      yAxis: sum === 0 ? undefined : [
         {
           type: 'value',
           axisLabel: {
@@ -202,7 +209,7 @@ export class NodeFeeChartComponent implements OnInit {
           },
         },
       ],
-      series: outgoingData.length === 0 ? undefined : [
+      series: sum === 0 ? undefined : [
         {
           zlevel: 0,
           name: $localize`Outgoing Fees`,

frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts

@@ -75,13 +75,13 @@ export class NodeStatisticsChartComponent implements OnInit {
 
   prepareChartOptions(data) {
     let title: object;
-    if (data.channels.length === 0) {
+    if (data.channels.length < 2) {
       title = {
         textStyle: {
           color: 'grey',
           fontSize: 15
         },
-        text: `Loading`,
+        text: $localize`No data to display yet. Try again later.`,
         left: 'center',
         top: 'center'
       };
@@ -135,14 +135,14 @@ export class NodeStatisticsChartComponent implements OnInit {
           return tooltip;
         }
       },
-      xAxis: data.channels.length === 0 ? undefined : {
+      xAxis: data.channels.length < 2 ? undefined : {
         type: 'time',
         splitNumber: this.isMobile() ? 5 : 10,
         axisLabel: {
           hideOverlap: true,
         }
       },
-      legend: data.channels.length === 0 ? undefined : {
+      legend: data.channels.length < 2 ? undefined : {
         padding: 10,
         data: [
           {
@@ -167,7 +167,7 @@ export class NodeStatisticsChartComponent implements OnInit {
           'Capacity': true,
         }
       },
-      yAxis: data.channels.length === 0 ? undefined : [
+      yAxis: data.channels.length < 2 ? undefined : [
         {
           type: 'value',
           axisLabel: {
@@ -198,7 +198,7 @@ export class NodeStatisticsChartComponent implements OnInit {
           }
         }
       ],
-      series: data.channels.length === 0 ? [] : [
+      series: data.channels.length < 2 ? [] : [
         {
           zlevel: 1,
           name: $localize`:@@807cf11e6ac1cde912496f764c176bdfdd6b7e19:Channels`,

frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.html

@@ -18,8 +18,5 @@
     <div class="text-center loading-spinner" [class]="style" *ngIf="isLoading && !disableSpinner">
       <div class="spinner-border text-light"></div>
     </div>
-    <div *ngIf="showIndexingInProgress" class="indexing-message">
-      <span class="badge badge-pill badge-warning" i18n="lightning.indexing-in-progress">Indexing in progress</span>
-    </div>
   </ng-container>
 </div>

frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts

@@ -36,7 +36,6 @@ export class NodesChannelsMap implements OnInit {
   channelCurve = 0;
   nodeSize = 4;
   isLoading = false;
-  showIndexingInProgress = false;
 
   chartInstance = undefined;
   chartOptions: EChartsOption = {};
@@ -205,26 +204,33 @@ export class NodesChannelsMap implements OnInit {
 
   prepareChartOptions(nodes, channels) {
     let title: object;
-    if (channels.length === 0 && !this.placeholder) {
-      this.chartOptions = null;
-      this.showIndexingInProgress = true;
-      this.isLoading = false;
-      return;
-    }
-
-    // empty map fallback
-    if (channels.length === 0 && this.placeholder) {
-      title = {
-        textStyle: {
-          color: 'white',
-          fontSize: 18
-        },
-        text: $localize`No geolocation data available`,
-        left: 'center',
-        top: 'center'
-      };
-      this.zoom = 1.5;
-      this.center = [0, 20];
+    if (channels.length === 0) {
+      if (!this.placeholder) {
+        this.isLoading = false;
+        title = {
+          textStyle: {
+            color: 'white',
+            fontSize: 18
+          },
+          text: $localize`No data to display yet. Try again later.`,
+          left: 'center',
+          top: 'center'
+        };
+        this.zoom = 1.5;
+        this.center = [0, 20];
+      } else { // used for Node and Channel preview components
+        title = {
+          textStyle: {
+            color: 'white',
+            fontSize: 18
+          },
+          text: $localize`No geolocation data available`,
+          left: 'center',
+          top: 'center'
+        };
+        this.zoom = 1.5;
+        this.center = [0, 20];
+      }
     }
 
     this.chartOptions = {

frontend/src/app/services/state.service.ts

@@ -98,7 +98,6 @@ export class StateService {
   mempoolBlockTransactions$ = new Subject<TransactionStripped[]>();
   mempoolBlockDelta$ = new Subject<MempoolBlockDelta>();
   txReplaced$ = new Subject<ReplacedTransaction>();
-  txPurged$ = new Subject<boolean>();
   utxoSpent$ = new Subject<object>();
   difficultyAdjustment$ = new ReplaySubject<DifficultyAdjustment>(1);
   mempoolTransactions$ = new Subject<Transaction>();

frontend/src/app/services/websocket.service.ts

@@ -261,10 +261,6 @@ export class WebsocketService {
       this.stateService.txReplaced$.next(response.txReplaced);
     }
 
-    if (response.txPurged != null) {
-      this.stateService.txPurged$.next(response.txPurged);
-    }
-
     if (response['mempool-blocks']) {
       this.stateService.mempoolBlocks$.next(response['mempool-blocks']);
     }