Release v2.5.1

Contains CLN related hotfixes for StartOS
Merge pull request #4679 from mempool/knorrium/v2.5.1
2024-03-01 11:24:47 +09:00 · 2024-03-01 11:21:15 +09:00 · 2024-02-11 13:17:21 -08:00 · 2024-02-11 13:17:11 -08:00
208 changed files with 3677 additions and 9728 deletions
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -43,9 +43,7 @@
    "TLS_ENABLED": true
  },
  "ESPLORA": {
-    "REST_API_URL": "http://127.0.0.1:3000",
-    "UNIX_SOCKET_PATH": "/tmp/esplora-bitcoin-mainnet",
-    "RETRY_UNIX_SOCKET_AFTER": 30000
+    "REST_API_URL": "http://127.0.0.1:3000"
  },
  "SECOND_CORE_RPC": {
    "HOST": "127.0.0.1",
@@ -61,8 +59,7 @@
    "SOCKET": "/var/run/mysql/mysql.sock",
    "DATABASE": "mempool",
    "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 180000
+    "PASSWORD": "mempool"
  },
  "SYSLOG": {
    "ENABLED": true,
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mempool-backend",
-  "version": "2.6.0-dev",
+  "version": "2.5.1",
  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
  "license": "GNU Affero General Public License v3.0",
  "homepage": "https://mempool.space",
@@ -34,35 +34,35 @@
    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
  },
  "dependencies": {
-    "@babel/core": "^7.21.3",
+    "@babel/core": "^7.20.12",
    "@mempool/electrum-client": "1.1.9",
-    "@types/node": "^18.15.3",
+    "@types/node": "^16.18.11",
    "axios": "~0.27.2",
    "bitcoinjs-lib": "~6.1.0",
    "crypto-js": "~4.1.1",
    "express": "~4.18.2",
    "maxmind": "~4.3.8",
-    "mysql2": "~3.2.0",
+    "mysql2": "~2.3.3",
    "node-worker-threads-pool": "~1.5.1",
    "socks-proxy-agent": "~7.0.0",
    "typescript": "~4.7.4",
-    "ws": "~8.13.0"
+    "ws": "~8.11.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.21.3",
+    "@babel/core": "^7.20.7",
    "@babel/code-frame": "^7.18.6",
    "@types/compression": "^1.7.2",
    "@types/crypto-js": "^4.1.1",
    "@types/express": "^4.17.15",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.2.5",
    "@types/ws": "~8.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.55.0",
-    "@typescript-eslint/parser": "^5.55.0",
-    "eslint": "^8.36.0",
-    "eslint-config-prettier": "^8.7.0",
-    "jest": "^29.5.0",
-    "prettier": "^2.8.4",
-    "ts-jest": "^29.0.5",
+    "@typescript-eslint/eslint-plugin": "^5.48.1",
+    "@typescript-eslint/parser": "^5.48.1",
+    "eslint": "^8.31.0",
+    "eslint-config-prettier": "^8.5.0",
+    "jest": "^29.3.1",
+    "prettier": "^2.8.2",
+    "ts-jest": "^29.0.3",
    "ts-node": "^10.9.1"
  }
 }
--- a/backend/src/fixtures/mempool-config.template.json
+++ b/backend/src/fixtures/mempool-config.template.json
@@ -44,9 +44,7 @@
    "TLS_ENABLED": true
  },
  "ESPLORA": {
-    "REST_API_URL": "__ESPLORA_REST_API_URL__",
-    "UNIX_SOCKET_PATH": "__ESPLORA_UNIX_SOCKET_PATH__",
-    "RETRY_UNIX_SOCKET_AFTER": "__ESPLORA_RETRY_UNIX_SOCKET_AFTER__"
+    "REST_API_URL": "__ESPLORA_REST_API_URL__"
  },
  "SECOND_CORE_RPC": {
    "HOST": "__SECOND_CORE_RPC_HOST__",
@@ -62,8 +60,7 @@
    "PORT": 18,
    "DATABASE": "__DATABASE_DATABASE__",
    "USERNAME": "__DATABASE_USERNAME__",
-    "PASSWORD": "__DATABASE_PASSWORD__",
-    "TIMEOUT": "__DATABASE_TIMEOUT__"
+    "PASSWORD": "__DATABASE_PASSWORD__"
  },
  "SYSLOG": {
    "ENABLED": false,
--- a/backend/src/tests/api/difficulty-adjustment.test.ts
+++ b/backend/src/tests/api/difficulty-adjustment.test.ts
@@ -14,11 +14,11 @@ describe('Mempool Difficulty Adjustment', () => {
          750134,                         // Current block height
          0.6280047707459726,             // Previous retarget % (Passed through)
          'mainnet',                      // Network (if testnet, next value is non-zero)
-          0,                              // Latest block timestamp in seconds (only used if difficulty already locked in)
+          0,                              // If not testnet, not used
        ],
        { // Expected Result
          progressPercent: 9.027777777777777,
-          difficultyChange: 13.180707740199772,
+          difficultyChange: 12.562233927411782,
          estimatedRetargetDate: 1661895424692,
          remainingBlocks: 1834,
          remainingTime: 977591692,
@@ -41,7 +41,7 @@ describe('Mempool Difficulty Adjustment', () => {
        ],
        { // Expected Result is same other than timeOffset
          progressPercent: 9.027777777777777,
-          difficultyChange: 13.180707740199772,
+          difficultyChange: 12.562233927411782,
          estimatedRetargetDate: 1661895424692,
          remainingBlocks: 1834,
          remainingTime: 977591692,
@@ -54,29 +54,6 @@ describe('Mempool Difficulty Adjustment', () => {
          expectedBlocks: 161.68833333333333,
        },
      ],
-      [ // Vector 3 (mainnet lock-in (epoch ending 788255))
-        [ // Inputs
-          dt('2023-04-20T09:57:33.000Z'), // Last DA time (in seconds)
-          dt('2023-05-04T14:54:09.000Z'), // Current time (now) (in seconds)
-          788255,                         // Current block height
-          1.7220298879531821,             // Previous retarget % (Passed through)
-          'mainnet',                      // Network (if testnet, next value is non-zero)
-          dt('2023-05-04T14:54:26.000Z'), // Latest block timestamp in seconds
-        ],
-        { // Expected Result
-          progressPercent: 99.95039682539682,
-          difficultyChange: -1.4512637555574193,
-          estimatedRetargetDate: 1683212658129,
-          remainingBlocks: 1,
-          remainingTime: 609129,
-          previousRetarget: 1.7220298879531821,
-          previousTime: 1681984653,
-          nextRetargetHeight: 788256,
-          timeAvg: 609129,
-          timeOffset: 0,
-          expectedBlocks: 2045.66,
-        },
-      ],
    ] as [[number, number, number, number, string, number], DifficultyAdjustment][];

    for (const vector of vectors) {
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -47,7 +47,7 @@ describe('Mempool Backend Config', () => {

      expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true });

-      expect(config.ESPLORA).toStrictEqual({ REST_API_URL: 'http://127.0.0.1:3000', UNIX_SOCKET_PATH: null, RETRY_UNIX_SOCKET_AFTER: 30000 });
+      expect(config.ESPLORA).toStrictEqual({ REST_API_URL: 'http://127.0.0.1:3000' });

      expect(config.CORE_RPC).toStrictEqual({
        HOST: '127.0.0.1',
@@ -72,8 +72,7 @@ describe('Mempool Backend Config', () => {
        PORT: 3306,
        DATABASE: 'mempool',
        USERNAME: 'mempool',
-        PASSWORD: 'mempool',
-        TIMEOUT: 180000,
+        PASSWORD: 'mempool'
      });

      expect(config.SYSLOG).toStrictEqual({
--- a/backend/src/api/audit.ts
+++ b/backend/src/api/audit.ts
@@ -6,15 +6,14 @@ const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first

 class Audit {
  auditBlock(transactions: TransactionExtended[], projectedBlocks: MempoolBlockWithTransactions[], mempool: { [txId: string]: TransactionExtended })
-   : { censored: string[], added: string[], fresh: string[], sigop: string[], score: number, similarity: number } {
+   : { censored: string[], added: string[], fresh: string[], score: number, similarity: number } {
    if (!projectedBlocks?.[0]?.transactionIds || !mempool) {
-      return { censored: [], added: [], fresh: [], sigop: [], score: 0, similarity: 1 };
+      return { censored: [], added: [], fresh: [], score: 0, similarity: 1 };
    }

    const matches: string[] = []; // present in both mined block and template
    const added: string[] = []; // present in mined block, not in template
    const fresh: string[] = []; // missing, but firstSeen within PROPAGATION_MARGIN
-    const sigop: string[] = []; // missing, but possibly has an adjusted vsize due to high sigop count
    const isCensored = {}; // missing, without excuse
    const isDisplaced = {};
    let displacedWeight = 0;
@@ -38,8 +37,6 @@ class Audit {
        // tx is recent, may have reached the miner too late for inclusion
        if (mempool[txid]?.firstSeen != null && (now - (mempool[txid]?.firstSeen || 0)) <= PROPAGATION_MARGIN) {
          fresh.push(txid);
-        } else if (this.isPossibleHighSigop(mempool[txid])) {
-          sigop.push(txid);
        } else {
          isCensored[txid] = true;
        }
@@ -96,7 +93,17 @@ class Audit {
      } else {
        if (!isDisplaced[tx.txid]) {
          added.push(tx.txid);
+        } else {
        }
+        let blockIndex = -1;
+        let index = -1;
+        projectedBlocks.forEach((block, bi) => {
+          const i = block.transactionIds.indexOf(tx.txid);
+          if (i >= 0) {
+            blockIndex = bi;
+            index = i;
+          }
+        });
        overflowWeight += tx.weight;
      }
      totalWeight += tx.weight;
@@ -140,19 +147,10 @@ class Audit {
      censored: Object.keys(isCensored),
      added,
      fresh,
-      sigop,
      score,
      similarity,
    };
  }
-
-  // Detect transactions with a possibly adjusted vsize due to high sigop count
-  // very rough heuristic based on number of OP_CHECKMULTISIG outputs
-  // will miss cases with other sources of sigops
-  isPossibleHighSigop(tx: TransactionExtended): boolean {
-    const numBareMultisig = tx.vout.reduce((count, vout) => count + (vout.scriptpubkey_asm.includes('OP_CHECKMULTISIG') ? 1 : 0), 0);
-    return (numBareMultisig * 400) > tx.vsize;
-  }
 }

 export default new Audit();
--- a/backend/src/api/bitcoin/bitcoin.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -32,10 +32,8 @@ class BitcoinRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'backend-info', this.getBackendInfo)
      .get(config.MEMPOOL.API_URL_PREFIX + 'init-data', this.getInitData)
      .get(config.MEMPOOL.API_URL_PREFIX + 'validate-address/:address', this.validateAddress)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/rbf', this.getRbfHistory)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/replaces', this.getRbfHistory)
      .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/cached', this.getCachedTx)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'replacements', this.getRbfReplacements)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'fullrbf/replacements', this.getFullRbfReplacements)
      .post(config.MEMPOOL.API_URL_PREFIX + 'tx/push', this.$postTransactionForm)
      .get(config.MEMPOOL.API_URL_PREFIX + 'donations', async (req, res) => {
        try {
@@ -96,7 +94,6 @@ class BitcoinRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash', this.getBlock)
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/summary', this.getStrippedBlockTransactions)
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/audit-summary', this.getBlockAuditSummary)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/height', this.getBlockTipHeight)
      .post(config.MEMPOOL.API_URL_PREFIX + 'psbt/addparents', this.postPsbtCompletion)
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks-bulk/:from', this.getBlocksByBulk.bind(this))
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks-bulk/:from/:to', this.getBlocksByBulk.bind(this))
@@ -113,6 +110,7 @@ class BitcoinRoutes {
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/status', this.getTransactionStatus)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/outspends', this.getTransactionOutspends)
          .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/header', this.getBlockHeader)
+          .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/height', this.getBlockTipHeight)
          .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/hash', this.getBlockTipHash)
          .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/raw', this.getRawBlock)
          .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/txids', this.getTxIdsForBlock)
@@ -130,9 +128,8 @@ class BitcoinRoutes {

  private getInitData(req: Request, res: Response) {
    try {
-      const result = websocketHandler.getSerializedInitData();
-      res.set('Content-Type', 'application/json');
-      res.send(result);
+      const result = websocketHandler.getInitData();
+      res.json(result);
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
@@ -592,14 +589,10 @@ class BitcoinRoutes {
    }
  }

-  private getBlockTipHeight(req: Request, res: Response) {
+  private async getBlockTipHeight(req: Request, res: Response) {
    try {
-      const result = blocks.getCurrentBlockHeight();
-      if (!result) {
-        return res.status(503).send(`Service Temporarily Unavailable`);
-      }
-      res.setHeader('content-type', 'text/plain');
-      res.send(result.toString());
+      const result = await bitcoinApi.$getBlockHeightTip();
+      res.json(result);
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
@@ -645,30 +638,8 @@ class BitcoinRoutes {

  private async getRbfHistory(req: Request, res: Response) {
    try {
-      const replacements = rbfCache.getRbfTree(req.params.txId) || null;
-      const replaces = rbfCache.getReplaces(req.params.txId) || null;
-      res.json({
-        replacements,
-        replaces
-      });
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getRbfReplacements(req: Request, res: Response) {
-    try {
-      const result = rbfCache.getRbfTrees(false);
-      res.json(result);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async getFullRbfReplacements(req: Request, res: Response) {
-    try {
-      const result = rbfCache.getRbfTrees(true);
-      res.json(result);
+      const result = rbfCache.getReplaces(req.params.txId);
+      res.json(result || []);
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
--- a/backend/src/api/bitcoin/esplora-api.ts
+++ b/backend/src/api/bitcoin/esplora-api.ts
@@ -3,102 +3,65 @@ import axios, { AxiosRequestConfig } from 'axios';
 import http from 'http';
 import { AbstractBitcoinApi } from './bitcoin-api-abstract-factory';
 import { IEsploraApi } from './esplora-api.interface';
-import logger from '../../logger';

 const axiosConnection = axios.create({
-  httpAgent: new http.Agent({ keepAlive: true, })
+  httpAgent: new http.Agent({ keepAlive: true })
 });

 class ElectrsApi implements AbstractBitcoinApi {
-  private axiosConfigWithUnixSocket: AxiosRequestConfig = config.ESPLORA.UNIX_SOCKET_PATH ? {
-    socketPath: config.ESPLORA.UNIX_SOCKET_PATH,
-    timeout: 10000,
-  } : {
-    timeout: 10000,
-  };
-  private axiosConfigTcpSocketOnly: AxiosRequestConfig = {
+  axiosConfig: AxiosRequestConfig = {
    timeout: 10000,
  };

-  unixSocketRetryTimeout;
-  activeAxiosConfig;
-
-  constructor() {
-    this.activeAxiosConfig = this.axiosConfigWithUnixSocket;
-  }
-
-  fallbackToTcpSocket() {
-    if (!this.unixSocketRetryTimeout) {
-      logger.err(`Unable to connect to esplora unix socket. Falling back to tcp socket. Retrying unix socket in ${config.ESPLORA.RETRY_UNIX_SOCKET_AFTER / 1000} seconds`);
-      // Retry the unix socket after a few seconds
-      this.unixSocketRetryTimeout = setTimeout(() => {
-        logger.info(`Retrying to use unix socket for esplora now (applied for the next query)`);
-        this.activeAxiosConfig = this.axiosConfigWithUnixSocket;
-        this.unixSocketRetryTimeout = undefined;
-      }, config.ESPLORA.RETRY_UNIX_SOCKET_AFTER);
-    }
-
-    // Use the TCP socket (reach a different esplora instance through nginx)
-    this.activeAxiosConfig = this.axiosConfigTcpSocketOnly;
-  }
-
-  $queryWrapper<T>(url, responseType = 'json'): Promise<T> {
-    return axiosConnection.get<T>(url, { ...this.activeAxiosConfig, responseType: responseType })
-      .then((response) => response.data)
-      .catch((e) => {
-        if (e?.code === 'ECONNREFUSED') {
-          this.fallbackToTcpSocket();
-          // Retry immediately
-          return axiosConnection.get<T>(url, this.activeAxiosConfig)
-            .then((response) => response.data)
-            .catch((e) => {
-              logger.warn(`Cannot query esplora through the unix socket nor the tcp socket. Exception ${e}`);
-              throw e;
-            });
-        } else {
-          throw e;
-        }
-      });
-  }
+  constructor() { }

  $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]> {
-    return this.$queryWrapper<IEsploraApi.Transaction['txid'][]>(config.ESPLORA.REST_API_URL + '/mempool/txids');
+    return axiosConnection.get<IEsploraApi.Transaction['txid'][]>(config.ESPLORA.REST_API_URL + '/mempool/txids', this.axiosConfig)
+      .then((response) => response.data);
  }

  $getRawTransaction(txId: string): Promise<IEsploraApi.Transaction> {
-    return this.$queryWrapper<IEsploraApi.Transaction>(config.ESPLORA.REST_API_URL + '/tx/' + txId);
+    return axiosConnection.get<IEsploraApi.Transaction>(config.ESPLORA.REST_API_URL + '/tx/' + txId, this.axiosConfig)
+      .then((response) => response.data);
  }

  $getTransactionHex(txId: string): Promise<string> {
-    return this.$queryWrapper<string>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/hex');
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/hex', this.axiosConfig)
+      .then((response) => response.data);
  }

  $getBlockHeightTip(): Promise<number> {
-    return this.$queryWrapper<number>(config.ESPLORA.REST_API_URL + '/blocks/tip/height');
+    return axiosConnection.get<number>(config.ESPLORA.REST_API_URL + '/blocks/tip/height', this.axiosConfig)
+      .then((response) => response.data);
  }

  $getBlockHashTip(): Promise<string> {
-    return this.$queryWrapper<string>(config.ESPLORA.REST_API_URL + '/blocks/tip/hash');
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/blocks/tip/hash', this.axiosConfig)
+      .then((response) => response.data);
  }

  $getTxIdsForBlock(hash: string): Promise<string[]> {
-    return this.$queryWrapper<string[]>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/txids');
+    return axiosConnection.get<string[]>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/txids', this.axiosConfig)
+      .then((response) => response.data);
  }

  $getBlockHash(height: number): Promise<string> {
-    return this.$queryWrapper<string>(config.ESPLORA.REST_API_URL + '/block-height/' + height);
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/block-height/' + height, this.axiosConfig)
+      .then((response) => response.data);
  }

  $getBlockHeader(hash: string): Promise<string> {
-    return this.$queryWrapper<string>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/header');
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/header', this.axiosConfig)
+      .then((response) => response.data);
  }

  $getBlock(hash: string): Promise<IEsploraApi.Block> {
-    return this.$queryWrapper<IEsploraApi.Block>(config.ESPLORA.REST_API_URL + '/block/' + hash);
+    return axiosConnection.get<IEsploraApi.Block>(config.ESPLORA.REST_API_URL + '/block/' + hash, this.axiosConfig)
+      .then((response) => response.data);
  }

  $getRawBlock(hash: string): Promise<Buffer> {
-    return this.$queryWrapper<any>(config.ESPLORA.REST_API_URL + '/block/' + hash + "/raw", 'arraybuffer')
+    return axiosConnection.get<string>(config.ESPLORA.REST_API_URL + '/block/' + hash + "/raw", { ...this.axiosConfig, responseType: 'arraybuffer' })
      .then((response) => { return Buffer.from(response.data); });
  }

@@ -119,11 +82,13 @@ class ElectrsApi implements AbstractBitcoinApi {
  }

  $getOutspend(txId: string, vout: number): Promise<IEsploraApi.Outspend> {
-    return this.$queryWrapper<IEsploraApi.Outspend>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/outspend/' + vout);
+    return axiosConnection.get<IEsploraApi.Outspend>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/outspend/' + vout, this.axiosConfig)
+      .then((response) => response.data);
  }

  $getOutspends(txId: string): Promise<IEsploraApi.Outspend[]> {
-    return this.$queryWrapper<IEsploraApi.Outspend[]>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/outspends');
+    return axiosConnection.get<IEsploraApi.Outspend[]>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/outspends', this.axiosConfig)
+      .then((response) => response.data);
  }

  async $getBatchedOutspends(txId: string[]): Promise<IEsploraApi.Outspend[][]> {
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -2,7 +2,7 @@ import config from '../config';
 import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory';
 import logger from '../logger';
 import memPool from './mempool';
-import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionStripped, TransactionMinerInfo, CpfpSummary } from '../mempool.interfaces';
+import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionStripped, TransactionMinerInfo } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
@@ -36,8 +36,6 @@ class Blocks {
  private newBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => void)[] = [];
  private newAsyncBlockCallbacks: ((block: BlockExtended, txIds: string[], transactions: TransactionExtended[]) => Promise<void>)[] = [];

-  private mainLoopTimeout: number = 120000;
-
  constructor() { }

  public getBlocks(): BlockExtended[] {
@@ -202,15 +200,8 @@ class Blocks {
      extras.segwitTotalWeight = 0;
    } else {
      const stats: IBitcoinApi.BlockStats = await bitcoinClient.getBlockStats(block.id);
-      let feeStats = {
-        medianFee: stats.feerate_percentiles[2], // 50th percentiles
-        feeRange: [stats.minfeerate, stats.feerate_percentiles, stats.maxfeerate].flat(),
-      };
-      if (transactions?.length > 1) {
-        feeStats = Common.calcEffectiveFeeStatistics(transactions);
-      }
-      extras.medianFee = feeStats.medianFee;
-      extras.feeRange = feeStats.feeRange;
+      extras.medianFee = stats.feerate_percentiles[2]; // 50th percentiles
+      extras.feeRange = [stats.minfeerate, stats.feerate_percentiles, stats.maxfeerate].flat();
      extras.totalFees = stats.totalfee;
      extras.avgFee = stats.avgfee;
      extras.avgFeeRate = stats.avgfeerate;
@@ -412,13 +403,12 @@ class Blocks {
    try {
      // Get all indexed block hash
      const unindexedBlockHeights = await blocksRepository.$getCPFPUnindexedBlocks();
+      logger.info(`Indexing cpfp data for ${unindexedBlockHeights.length} blocks`);

      if (!unindexedBlockHeights?.length) {
        return;
      }

-      logger.info(`Indexing cpfp data for ${unindexedBlockHeights.length} blocks`);
-
      // Logging
      let count = 0;
      let countThisRun = 0;
@@ -529,16 +519,9 @@ class Blocks {
    return await BlocksRepository.$validateChain();
  }

-  public async $updateBlocks(): Promise<number> {
-    // warn if this run stalls the main loop for more than 2 minutes
-    const timer = this.startTimer();
-
-    diskCache.lock();
-
+  public async $updateBlocks() {
    let fastForwarded = false;
-    let handledBlocks = 0;
    const blockHeightTip = await bitcoinApi.$getBlockHeightTip();
-    this.updateTimerProgress(timer, 'got block height tip');

    if (this.blocks.length === 0) {
      this.currentBlockHeight = Math.max(blockHeightTip - config.MEMPOOL.INITIAL_BLOCKS_AMOUNT, -1);
@@ -556,21 +539,16 @@ class Blocks {

    if (!this.lastDifficultyAdjustmentTime) {
      const blockchainInfo = await bitcoinClient.getBlockchainInfo();
-      this.updateTimerProgress(timer, 'got blockchain info for initial difficulty adjustment');
      if (blockchainInfo.blocks === blockchainInfo.headers) {
        const heightDiff = blockHeightTip % 2016;
        const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff);
-        this.updateTimerProgress(timer, 'got block hash for initial difficulty adjustment');
        const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(blockHash);
-        this.updateTimerProgress(timer, 'got block for initial difficulty adjustment');
        this.lastDifficultyAdjustmentTime = block.timestamp;
        this.currentDifficulty = block.difficulty;

        if (blockHeightTip >= 2016) {
          const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016);
-          this.updateTimerProgress(timer, 'got previous block hash for initial difficulty adjustment');
          const previousPeriodBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(previousPeriodBlockHash);
-          this.updateTimerProgress(timer, 'got previous block for initial difficulty adjustment');
          this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100;
          logger.debug(`Initial difficulty adjustment data set.`);
        }
@@ -585,66 +563,52 @@ class Blocks {
      } else {
        this.currentBlockHeight++;
        logger.debug(`New block found (#${this.currentBlockHeight})!`);
-        this.updateTimerProgress(timer, `getting orphaned blocks for ${this.currentBlockHeight}`);
        await chainTips.updateOrphanedBlocks();
      }

-      this.updateTimerProgress(timer, `getting block data for ${this.currentBlockHeight}`);
      const blockHash = await bitcoinApi.$getBlockHash(this.currentBlockHeight);
      const verboseBlock = await bitcoinClient.getBlock(blockHash, 2);
      const block = BitcoinApi.convertBlock(verboseBlock);
      const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
      const transactions = await this.$getTransactionsExtended(blockHash, block.height, false);
-      const cpfpSummary: CpfpSummary = Common.calculateCpfp(block.height, transactions);
-      const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions);
+      const blockExtended: BlockExtended = await this.$getBlockExtended(block, transactions);
      const blockSummary: BlockSummary = this.summarizeBlock(verboseBlock);
-      this.updateTimerProgress(timer, `got block data for ${this.currentBlockHeight}`);

      // start async callbacks
-      this.updateTimerProgress(timer, `starting async callbacks for ${this.currentBlockHeight}`);
      const callbackPromises = this.newAsyncBlockCallbacks.map((cb) => cb(blockExtended, txIds, transactions));

      if (Common.indexingEnabled()) {
        if (!fastForwarded) {
          const lastBlock = await blocksRepository.$getBlockByHeight(blockExtended.height - 1);
-          this.updateTimerProgress(timer, `got block by height for ${this.currentBlockHeight}`);
          if (lastBlock !== null && blockExtended.previousblockhash !== lastBlock.id) {
-            logger.warn(`Chain divergence detected at block ${lastBlock.height}, re-indexing most recent data`, logger.tags.mining);
+            logger.warn(`Chain divergence detected at block ${lastBlock.height}, re-indexing most recent data`);
            // We assume there won't be a reorg with more than 10 block depth
-            this.updateTimerProgress(timer, `rolling back diverged chain from ${this.currentBlockHeight}`);
            await BlocksRepository.$deleteBlocksFrom(lastBlock.height - 10);
            await HashratesRepository.$deleteLastEntries();
+            await BlocksSummariesRepository.$deleteBlocksFrom(lastBlock.height - 10);
            await cpfpRepository.$deleteClustersFrom(lastBlock.height - 10);
-            this.updateTimerProgress(timer, `rolled back chain divergence from ${this.currentBlockHeight}`);
            for (let i = 10; i >= 0; --i) {
              const newBlock = await this.$indexBlock(lastBlock.height - i);
-              this.updateTimerProgress(timer, `reindexed block`);
              await this.$getStrippedBlockTransactions(newBlock.id, true, true);
-              this.updateTimerProgress(timer, `reindexed block summary`);
              if (config.MEMPOOL.CPFP_INDEXING) {
                await this.$indexCPFP(newBlock.id, lastBlock.height - i);
-                this.updateTimerProgress(timer, `reindexed block cpfp`);
              }
            }
            await mining.$indexDifficultyAdjustments();
            await DifficultyAdjustmentsRepository.$deleteLastAdjustment();
-            this.updateTimerProgress(timer, `reindexed difficulty adjustments`);
-            logger.info(`Re-indexed 10 blocks and summaries. Also re-indexed the last difficulty adjustments. Will re-index latest hashrates in a few seconds.`, logger.tags.mining);
+            logger.info(`Re-indexed 10 blocks and summaries. Also re-indexed the last difficulty adjustments. Will re-index latest hashrates in a few seconds.`);
            indexer.reindex();
          }
          await blocksRepository.$saveBlockInDatabase(blockExtended);
-          this.updateTimerProgress(timer, `saved ${this.currentBlockHeight} to database`);

          const lastestPriceId = await PricesRepository.$getLatestPriceId();
-          this.updateTimerProgress(timer, `got latest price id ${this.currentBlockHeight}`);
          if (priceUpdater.historyInserted === true && lastestPriceId !== null) {
            await blocksRepository.$saveBlockPrices([{
              height: blockExtended.height,
              priceId: lastestPriceId,
            }]);
-            this.updateTimerProgress(timer, `saved prices for ${this.currentBlockHeight}`);
          } else {
-            logger.debug(`Cannot save block price for ${blockExtended.height} because the price updater hasnt completed yet. Trying again in 10 seconds.`, logger.tags.mining);
+            logger.info(`Cannot save block price for ${blockExtended.height} because the price updater hasnt completed yet. Trying again in 10 seconds.`, logger.tags.mining);
            setTimeout(() => {
              indexer.runSingleTask('blocksPrices');
            }, 10000);
@@ -653,11 +617,9 @@ class Blocks {
          // Save blocks summary for visualization if it's enabled
          if (Common.blocksSummariesIndexingEnabled() === true) {
            await this.$getStrippedBlockTransactions(blockExtended.id, true);
-            this.updateTimerProgress(timer, `saved block summary for ${this.currentBlockHeight}`);
          }
          if (config.MEMPOOL.CPFP_INDEXING) {
-            this.$saveCpfp(blockExtended.id, this.currentBlockHeight, cpfpSummary);
-            this.updateTimerProgress(timer, `saved cpfp for ${this.currentBlockHeight}`);
+            this.$indexCPFP(blockExtended.id, this.currentBlockHeight);
          }
        }
      }
@@ -670,7 +632,6 @@ class Blocks {
            difficulty: block.difficulty,
            adjustment: Math.round((block.difficulty / this.currentDifficulty) * 1000000) / 1000000, // Remove float point noise
          });
-          this.updateTimerProgress(timer, `saved difficulty adjustment for ${this.currentBlockHeight}`);
        }

        this.previousDifficultyRetarget = (block.difficulty - this.currentDifficulty) / this.currentDifficulty * 100;
@@ -695,39 +656,7 @@ class Blocks {
      }

      // wait for pending async callbacks to finish
-      this.updateTimerProgress(timer, `waiting for async callbacks to complete for ${this.currentBlockHeight}`);
      await Promise.all(callbackPromises);
-      this.updateTimerProgress(timer, `async callbacks completed for ${this.currentBlockHeight}`);
-
-      handledBlocks++;
-    }
-
-    diskCache.unlock();
-
-    this.clearTimer(timer);
-
-    return handledBlocks;
-  }
-
-  private startTimer() {
-    const state: any = {
-      start: Date.now(),
-      progress: 'begin $updateBlocks',
-      timer: null,
-    };
-    state.timer = setTimeout(() => {
-      logger.err(`$updateBlocks stalled at "${state.progress}"`);
-    }, this.mainLoopTimeout);
-    return state;
-  }
-
-  private updateTimerProgress(state, msg) {
-    state.progress = msg;
-  }
-
-  private clearTimer(state) {
-    if (state.timer) {
-      clearTimeout(state.timer);
    }
  }

@@ -799,7 +728,7 @@ class Blocks {

    // Index the response if needed
    if (Common.blocksSummariesIndexingEnabled() === true) {
-      await BlocksSummariesRepository.$saveTransactions(block.height, block.hash, summary.transactions);
+      await BlocksSummariesRepository.$saveSummary({height: block.height, mined: summary});
    }

    return summary.transactions;
@@ -915,12 +844,11 @@ class Blocks {
        if (cleanBlock.fee_amt_percentiles === null) {
          const block = await bitcoinClient.getBlock(cleanBlock.hash, 2);
          const summary = this.summarizeBlock(block);
-          await BlocksSummariesRepository.$saveTransactions(cleanBlock.height, cleanBlock.hash, summary.transactions);
+          await BlocksSummariesRepository.$saveSummary({ height: block.height, mined: summary });
          cleanBlock.fee_amt_percentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(cleanBlock.hash);
        }
        if (cleanBlock.fee_amt_percentiles !== null) {
          cleanBlock.median_fee_amt = cleanBlock.fee_amt_percentiles[3];
-          await blocksRepository.$updateFeeAmounts(cleanBlock.hash, cleanBlock.fee_amt_percentiles, cleanBlock.median_fee_amt);
        }
      }

@@ -985,20 +913,42 @@ class Blocks {
  public async $indexCPFP(hash: string, height: number): Promise<void> {
    const block = await bitcoinClient.getBlock(hash, 2);
    const transactions = block.tx.map(tx => {
+      tx.vsize = tx.weight / 4;
      tx.fee *= 100_000_000;
      return tx;
    });

-    const summary = Common.calculateCpfp(height, transactions);
+    const clusters: any[] = [];

-    await this.$saveCpfp(hash, height, summary);
-
-    const effectiveFeeStats = Common.calcEffectiveFeeStatistics(summary.transactions);
-    await blocksRepository.$saveEffectiveFeeStats(hash, effectiveFeeStats);
-  }
-
-  public async $saveCpfp(hash: string, height: number, cpfpSummary: CpfpSummary): Promise<void> {
-    const result = await cpfpRepository.$batchSaveClusters(cpfpSummary.clusters);
+    let cluster: TransactionStripped[] = [];
+    let ancestors: { [txid: string]: boolean } = {};
+    for (let i = transactions.length - 1; i >= 0; i--) {
+      const tx = transactions[i];
+      if (!ancestors[tx.txid]) {
+        let totalFee = 0;
+        let totalVSize = 0;
+        cluster.forEach(tx => {
+          totalFee += tx?.fee || 0;
+          totalVSize += tx.vsize;
+        });
+        const effectiveFeePerVsize = totalFee / totalVSize;
+        if (cluster.length > 1) {
+          clusters.push({
+            root: cluster[0].txid,
+            height,
+            txs: cluster.map(tx => { return { txid: tx.txid, weight: tx.vsize * 4, fee: tx.fee || 0 }; }),
+            effectiveFeePerVsize,
+          });
+        }
+        cluster = [];
+        ancestors = {};
+      }
+      cluster.push(tx);
+      tx.vin.forEach(vin => {
+        ancestors[vin.txid] = true;
+      });
+    }
+    const result = await cpfpRepository.$batchSaveClusters(clusters);
    if (!result) {
      await cpfpRepository.$insertProgressMarker(height);
    }
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -1,4 +1,4 @@
-import { Ancestor, CpfpInfo, CpfpSummary, EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, TransactionStripped, WorkingEffectiveFeeStats } from '../mempool.interfaces';
+import { CpfpInfo, MempoolBlockWithTransactions, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
 import config from '../config';
 import { NodeSocket } from '../repositories/NodesSocketsRepository';
 import { isIP } from 'net';
@@ -57,11 +57,11 @@ export class Common {
    return arr;
  }

-  static findRbfTransactions(added: TransactionExtended[], deleted: TransactionExtended[]): { [txid: string]: TransactionExtended[] } {
-    const matches: { [txid: string]: TransactionExtended[] } = {};
-    added
-      .forEach((addedTx) => {
-        const foundMatches = deleted.filter((deletedTx) => {
+  static findRbfTransactions(added: TransactionExtended[], deleted: TransactionExtended[]): { [txid: string]: TransactionExtended } {
+    const matches: { [txid: string]: TransactionExtended } = {};
+    deleted
+      .forEach((deletedTx) => {
+        const foundMatches = added.find((addedTx) => {
          // The new tx must, absolutely speaking, pay at least as much fee as the replaced tx.
          return addedTx.fee > deletedTx.fee
            // The new transaction must pay more fee per kB than the replaced tx.
@@ -70,8 +70,8 @@ export class Common {
            && deletedTx.vin.some((deletedVin) =>
              addedTx.vin.some((vin) => vin.txid === deletedVin.txid && vin.vout === deletedVin.vout));
            });
-        if (foundMatches?.length) {
-          matches[addedTx.txid] = foundMatches;
+        if (foundMatches) {
+          matches[deletedTx.txid] = foundMatches;
        }
      });
    return matches;
@@ -83,7 +83,6 @@ export class Common {
      fee: tx.fee,
      vsize: tx.weight / 4,
      value: tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0),
-      rate: tx.effectiveFeePerVsize,
    };
  }

@@ -346,215 +345,4 @@ export class Common {
      };
    }
  }
-
-  static calculateCpfp(height: number, transactions: TransactionExtended[]): CpfpSummary {
-    const clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[] = [];
-    let cluster: TransactionExtended[] = [];
-    let ancestors: { [txid: string]: boolean } = {};
-    const txMap = {};
-    for (let i = transactions.length - 1; i >= 0; i--) {
-      const tx = transactions[i];
-      txMap[tx.txid] = tx;
-      if (!ancestors[tx.txid]) {
-        let totalFee = 0;
-        let totalVSize = 0;
-        cluster.forEach(tx => {
-          totalFee += tx?.fee || 0;
-          totalVSize += (tx.weight / 4);
-        });
-        const effectiveFeePerVsize = totalFee / totalVSize;
-        if (cluster.length > 1) {
-          clusters.push({
-            root: cluster[0].txid,
-            height,
-            txs: cluster.map(tx => { return { txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }; }),
-            effectiveFeePerVsize,
-          });
-        }
-        cluster.forEach(tx => {
-          txMap[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
-        });
-        cluster = [];
-        ancestors = {};
-      }
-      cluster.push(tx);
-      tx.vin.forEach(vin => {
-        ancestors[vin.txid] = true;
-      });
-    }
-    return {
-      transactions,
-      clusters,
-    };
-  }
-
-  static calcEffectiveFeeStatistics(transactions: { weight: number, fee: number, effectiveFeePerVsize?: number, txid: string }[]): EffectiveFeeStats {
-    const sortedTxs = transactions.map(tx => { return { txid: tx.txid, weight: tx.weight, rate: tx.effectiveFeePerVsize || ((tx.fee || 0) / (tx.weight / 4)) }; }).sort((a, b) => a.rate - b.rate);
-
-    let weightCount = 0;
-    let medianFee = 0;
-    let medianWeight = 0;
-
-    // calculate the "medianFee" as the average fee rate of the middle 10000 weight units of transactions
-    const leftBound = 1995000;
-    const rightBound = 2005000;
-    for (let i = 0; i < sortedTxs.length && weightCount < rightBound; i++) {
-      const left = weightCount;
-      const right = weightCount + sortedTxs[i].weight;
-      if (right > leftBound) {
-        const weight = Math.min(right, rightBound) - Math.max(left, leftBound);
-        medianFee += (sortedTxs[i].rate * (weight / 4) );
-        medianWeight += weight;
-      }
-      weightCount += sortedTxs[i].weight;
-    }
-    const medianFeeRate = medianWeight ? (medianFee / (medianWeight / 4)) : 0;
-
-    // minimum effective fee heuristic:
-    // lowest of
-    // a) the 1st percentile of effective fee rates
-    // b) the minimum effective fee rate in the last 2% of transactions (in block order)
-    const minFee = Math.min(
-      Common.getNthPercentile(1, sortedTxs).rate,
-      transactions.slice(-transactions.length / 50).reduce((min, tx) => { return Math.min(min, tx.effectiveFeePerVsize || ((tx.fee || 0) / (tx.weight / 4))); }, Infinity)
-    );
-
-    // maximum effective fee heuristic:
-    // highest of
-    // a) the 99th percentile of effective fee rates
-    // b) the maximum effective fee rate in the first 2% of transactions (in block order)
-    const maxFee = Math.max(
-      Common.getNthPercentile(99, sortedTxs).rate,
-      transactions.slice(0, transactions.length / 50).reduce((max, tx) => { return Math.max(max, tx.effectiveFeePerVsize || ((tx.fee || 0) / (tx.weight / 4))); }, 0)
-    );
-
-    return {
-      medianFee: medianFeeRate,
-      feeRange: [
-        minFee,
-        [10,25,50,75,90].map(n => Common.getNthPercentile(n, sortedTxs).rate),
-        maxFee,
-      ].flat(),
-    };
-  }
-
-  static getNthPercentile(n: number, sortedDistribution: any[]): any {
-    return sortedDistribution[Math.floor((sortedDistribution.length - 1) * (n / 100))];
-  }
-}
-
-/**
- * Class to calculate average fee rates of a list of transactions
- * at certain weight percentiles, in a single pass
- * 
- * init with:
- *   maxWeight - the total weight to measure percentiles relative to (e.g. 4MW for a single block)
- *   percentileBandWidth - how many weight units to average over for each percentile (as a % of maxWeight)
- *   percentiles - an array of weight percentiles to compute, in %
- * 
- * then call .processNext(tx) for each transaction, in descending order
- * 
- * retrieve the final results with .getFeeStats()
- */
-export class OnlineFeeStatsCalculator {
-  private maxWeight: number;
-  private percentiles = [10,25,50,75,90];
-
-  private bandWidthPercent = 2;
-  private bandWidth: number = 0;
-  private bandIndex = 0;
-  private leftBound = 0;
-  private rightBound = 0;
-  private inBand = false;
-  private totalBandFee = 0;
-  private totalBandWeight = 0;
-  private minBandRate = Infinity;
-  private maxBandRate = 0;
-
-  private feeRange: { avg: number, min: number, max: number }[] = [];
-  private totalWeight: number = 0;
-
-  constructor (maxWeight: number, percentileBandWidth?: number, percentiles?: number[]) {
-    this.maxWeight = maxWeight;
-    if (percentiles && percentiles.length) {
-      this.percentiles = percentiles;
-    }
-    if (percentileBandWidth != null) {
-      this.bandWidthPercent = percentileBandWidth;
-    }
-    this.bandWidth = this.maxWeight * (this.bandWidthPercent / 100);
-    // add min/max percentiles aligned to the ends of the range
-    this.percentiles.unshift(this.bandWidthPercent / 2);
-    this.percentiles.push(100 - (this.bandWidthPercent / 2));
-    this.setNextBounds();
-  }
-
-  processNext(tx: { weight: number, fee: number, effectiveFeePerVsize?: number, feePerVsize?: number, rate?: number, txid: string }): void {
-    let left = this.totalWeight;
-    const right = this.totalWeight + tx.weight;
-    if (!this.inBand && right <= this.leftBound) {
-      this.totalWeight += tx.weight;
-      return;
-    }
-
-    while (left < right) {
-      if (right > this.leftBound) {
-        this.inBand = true;
-        const txRate = (tx.rate || tx.effectiveFeePerVsize || tx.feePerVsize || 0);
-        const weight = Math.min(right, this.rightBound) - Math.max(left, this.leftBound);
-        this.totalBandFee += (txRate * weight);
-        this.totalBandWeight += weight;
-        this.maxBandRate = Math.max(this.maxBandRate, txRate);
-        this.minBandRate = Math.min(this.minBandRate, txRate);
-      }
-      left = Math.min(right, this.rightBound);
-
-      if (left >= this.rightBound) {
-        this.inBand = false;
-        const avgBandFeeRate = this.totalBandWeight ? (this.totalBandFee / this.totalBandWeight) : 0;
-        this.feeRange.unshift({ avg: avgBandFeeRate, min: this.minBandRate, max: this.maxBandRate });
-        this.bandIndex++;
-        this.setNextBounds();
-        this.totalBandFee = 0;
-        this.totalBandWeight = 0;
-        this.minBandRate = Infinity;
-        this.maxBandRate = 0;
-      }
-    }
-    this.totalWeight += tx.weight;
-  }
-
-  private setNextBounds(): void {
-    const nextPercentile = this.percentiles[this.bandIndex];
-    if (nextPercentile != null) {
-      this.leftBound = ((nextPercentile / 100) * this.maxWeight) - (this.bandWidth / 2);
-      this.rightBound = this.leftBound + this.bandWidth;
-    } else {
-      this.leftBound = Infinity;
-      this.rightBound = Infinity;
-    }
-  }
-
-  getRawFeeStats(): WorkingEffectiveFeeStats {
-    if (this.totalBandWeight > 0) {
-      const avgBandFeeRate = this.totalBandWeight ? (this.totalBandFee / this.totalBandWeight) : 0;
-      this.feeRange.unshift({ avg: avgBandFeeRate, min: this.minBandRate, max: this.maxBandRate });
-    }
-    while (this.feeRange.length < this.percentiles.length) {
-      this.feeRange.unshift({ avg: 0, min: 0, max: 0 });
-    }
-    return {
-      minFee: this.feeRange[0].min,
-      medianFee: this.feeRange[Math.floor(this.feeRange.length / 2)].avg,
-      maxFee: this.feeRange[this.feeRange.length - 1].max,
-      feeRange: this.feeRange.map(f => f.avg),
-    };
-  }
-
-  getFeeStats(): EffectiveFeeStats {
-    const stats = this.getRawFeeStats();
-    stats.feeRange[0] = stats.minFee;
-    stats.feeRange[stats.feeRange.length - 1] = stats.maxFee;
-    return stats;
-  }
 }
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -7,7 +7,7 @@ import cpfpRepository from '../repositories/CpfpRepository';
 import { RowDataPacket } from 'mysql2';

 class DatabaseMigration {
-  private static currentVersion = 60;
+  private static currentVersion = 59;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -516,11 +516,6 @@ class DatabaseMigration {
      // https://github.com/mempool/mempool/issues/3360
      await this.$executeQuery(`TRUNCATE prices`);
    }
-
-    if (databaseSchemaVersion < 60 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD sigop_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(60);
-    }
  }

  /**
--- a/backend/src/api/difficulty-adjustment.ts
+++ b/backend/src/api/difficulty-adjustment.ts
@@ -34,12 +34,11 @@ export function calcDifficultyAdjustment(
  const remainingBlocks = EPOCH_BLOCK_LENGTH - blocksInEpoch;
  const nextRetargetHeight = (blockHeight >= 0) ? blockHeight + remainingBlocks : 0;
  const expectedBlocks = diffSeconds / BLOCK_SECONDS_TARGET;
-  const actualTimespan = (blocksInEpoch === 2015 ? latestBlockTimestamp : nowSeconds) - DATime;

  let difficultyChange = 0;
  let timeAvgSecs = blocksInEpoch ? diffSeconds / blocksInEpoch : BLOCK_SECONDS_TARGET;

-  difficultyChange = (BLOCK_SECONDS_TARGET / (actualTimespan / (blocksInEpoch + 1)) - 1) * 100;
+  difficultyChange = (BLOCK_SECONDS_TARGET / timeAvgSecs - 1) * 100;
  // Max increase is x4 (+300%)
  if (difficultyChange > 300) {
    difficultyChange = 300;
--- a/backend/src/api/disk-cache.ts
+++ b/backend/src/api/disk-cache.ts
@@ -7,26 +7,17 @@ import logger from '../logger';
 import config from '../config';
 import { TransactionExtended } from '../mempool.interfaces';
 import { Common } from './common';
-import rbfCache from './rbf-cache';

 class DiskCache {
  private cacheSchemaVersion = 3;
-  private rbfCacheSchemaVersion = 1;

  private static TMP_FILE_NAME = config.MEMPOOL.CACHE_DIR + '/tmp-cache.json';
  private static TMP_FILE_NAMES = config.MEMPOOL.CACHE_DIR + '/tmp-cache{number}.json';
  private static FILE_NAME = config.MEMPOOL.CACHE_DIR + '/cache.json';
  private static FILE_NAMES = config.MEMPOOL.CACHE_DIR + '/cache{number}.json';
-  private static TMP_RBF_FILE_NAME = config.MEMPOOL.CACHE_DIR + '/tmp-rbfcache.json';
-  private static RBF_FILE_NAME = config.MEMPOOL.CACHE_DIR + '/rbfcache.json';
  private static CHUNK_FILES = 25;
  private isWritingCache = false;

-  private semaphore: { resume: (() => void)[], locks: number } = {
-    resume: [],
-    locks: 0,
-  };
-
  constructor() {
    if (!cluster.isPrimary) {
      return;
@@ -52,7 +43,7 @@ class DiskCache {
      const mempool = memPool.getMempool();
      const mempoolArray: TransactionExtended[] = [];
      for (const tx in mempool) {
-        if (mempool[tx]) {
+        if (mempool[tx] && !mempool[tx].deleteAfter) {
          mempoolArray.push(mempool[tx]);
        }
      }
@@ -82,7 +73,6 @@ class DiskCache {
          fs.renameSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString()));
        }
      } else {
-        await this.$yield();
        await fsPromises.writeFile(DiskCache.TMP_FILE_NAME, JSON.stringify({
          network: config.MEMPOOL.NETWORK,
          cacheSchemaVersion: this.cacheSchemaVersion,
@@ -92,7 +82,6 @@ class DiskCache {
          mempoolArray: mempoolArray.splice(0, chunkSize),
        }), { flag: 'w' });
        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          await this.$yield();
          await fsPromises.writeFile(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
            mempool: {},
            mempoolArray: mempoolArray.splice(0, chunkSize),
@@ -111,32 +100,6 @@ class DiskCache {
      logger.warn('Error writing to cache file: ' + (e instanceof Error ? e.message : e));
      this.isWritingCache = false;
    }
-
-    try {
-      logger.debug('Writing rbf data to disk cache (async)...');
-      this.isWritingCache = true;
-      const rbfData = rbfCache.dump();
-      if (sync) {
-        fs.writeFileSync(DiskCache.TMP_RBF_FILE_NAME, JSON.stringify({
-          network: config.MEMPOOL.NETWORK,
-          rbfCacheSchemaVersion: this.rbfCacheSchemaVersion,
-          rbf: rbfData,
-        }), { flag: 'w' });
-        fs.renameSync(DiskCache.TMP_RBF_FILE_NAME, DiskCache.RBF_FILE_NAME);
-      } else {
-        await fsPromises.writeFile(DiskCache.TMP_RBF_FILE_NAME, JSON.stringify({
-          network: config.MEMPOOL.NETWORK,
-          rbfCacheSchemaVersion: this.rbfCacheSchemaVersion,
-          rbf: rbfData,
-        }), { flag: 'w' });
-        await fsPromises.rename(DiskCache.TMP_RBF_FILE_NAME, DiskCache.RBF_FILE_NAME);
-      }
-      logger.debug('Rbf data saved to disk cache');
-      this.isWritingCache = false;
-    } catch (e) {
-      logger.warn('Error writing rbf data to cache file: ' + (e instanceof Error ? e.message : e));
-      this.isWritingCache = false;
-    }
  }

  wipeCache(): void {
@@ -161,19 +124,7 @@ class DiskCache {
    }
  }

-  wipeRbfCache() {
-    logger.notice(`Wipping nodejs backend cache/rbfcache.json file`);
-
-    try {
-      fs.unlinkSync(DiskCache.RBF_FILE_NAME);
-    } catch (e: any) {
-      if (e?.code !== 'ENOENT') {
-        logger.err(`Cannot wipe cache file ${DiskCache.RBF_FILE_NAME}. Exception ${JSON.stringify(e)}`);
-      }
-    }
-  }
-
-  async $loadMempoolCache(): Promise<void> {
+  loadMempoolCache(): void {
    if (!fs.existsSync(DiskCache.FILE_NAME)) {
      return;
    }
@@ -213,65 +164,16 @@ class DiskCache {
            }
          }
        } catch (e) {
-          logger.err('Error parsing ' + fileName + '. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
+          logger.info('Error parsing ' + fileName + '. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
        }
      }

-      await memPool.$setMempool(data.mempool);
+      memPool.setMempool(data.mempool);
      blocks.setBlocks(data.blocks);
      blocks.setBlockSummaries(data.blockSummaries || []);
    } catch (e) {
      logger.warn('Failed to parse mempoool and blocks cache. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
    }
-
-    try {
-      let rbfData: any = {};
-      const rbfCacheData = fs.readFileSync(DiskCache.RBF_FILE_NAME, 'utf8');
-      if (rbfCacheData) {
-        logger.info('Restoring rbf data from disk cache');
-        rbfData = JSON.parse(rbfCacheData);
-        if (rbfData.rbfCacheSchemaVersion === undefined || rbfData.rbfCacheSchemaVersion !== this.rbfCacheSchemaVersion) {
-          logger.notice('Rbf disk cache contains an outdated schema version. Clearing it and skipping the cache loading.');
-          return this.wipeRbfCache();
-        }
-        if (rbfData.network && rbfData.network !== config.MEMPOOL.NETWORK) {
-          logger.notice('Rbf disk cache contains data from a different network. Clearing it and skipping the cache loading.');
-          return this.wipeRbfCache();
-        }
-      }
-
-      if (rbfData?.rbf) {
-        rbfCache.load(rbfData.rbf);
-      }
-    } catch (e) {
-      logger.warn('Failed to parse rbf cache. Skipping. Reason: ' + (e instanceof Error ? e.message : e));
-    }
-  }
-
-  private $yield(): Promise<void> {
-    if (this.semaphore.locks) {
-      logger.debug('Pause writing mempool and blocks data to disk cache (async)');
-      return new Promise((resolve) => {
-        this.semaphore.resume.push(resolve);
-      });
-    } else {
-      return Promise.resolve();
-    }
-  }
-
-  public lock(): void {
-    this.semaphore.locks++;
-  }
-
-  public unlock(): void {
-    this.semaphore.locks = Math.max(0, this.semaphore.locks - 1);
-    if (!this.semaphore.locks && this.semaphore.resume.length) {
-      const nextResume = this.semaphore.resume.shift();
-      if (nextResume) {
-        logger.debug('Resume writing mempool and blocks data to disk cache (async)');
-        nextResume();
-      }
-    }
  }
 }

--- a/backend/src/api/lightning/clightning/clightning-convert.ts
+++ b/backend/src/api/lightning/clightning/clightning-convert.ts
@@ -108,7 +108,7 @@ async function buildFullChannel(clChannelA: any, clChannelB: any): Promise<ILigh

  return {
    channel_id: Common.channelShortIdToIntegerId(clChannelA.short_channel_id),
-    capacity: clChannelA.satoshis,
+    capacity: (clChannelA.amount_msat / 1000).toString(),
    last_update: lastUpdate,
    node1_policy: convertPolicy(clChannelA),
    node2_policy: convertPolicy(clChannelB),
@@ -132,7 +132,7 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha

  return {
    channel_id: Common.channelShortIdToIntegerId(clChannel.short_channel_id),
-    capacity: clChannel.satoshis,
+    capacity: (clChannel.amount_msat / 1000).toString(),
    last_update: clChannel.last_update ?? 0,
    node1_policy: convertPolicy(clChannel),
    node2_policy: null,
@@ -148,8 +148,8 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha
 function convertPolicy(clChannel: any): ILightningApi.RoutingPolicy {
  return {
    time_lock_delta: clChannel.delay,
-    min_htlc: clChannel.htlc_minimum_msat.slice(0, -4),
-    max_htlc_msat: clChannel.htlc_maximum_msat.slice(0, -4),
+    min_htlc: clChannel.htlc_minimum_msat.toString(),
+    max_htlc_msat: clChannel.htlc_maximum_msat.toString(),
    fee_base_msat: clChannel.base_fee_millisatoshi,
    fee_rate_milli_msat: clChannel.fee_per_millionth,
    disabled: !clChannel.active,
--- a/backend/src/api/liquid/icons.ts
+++ b/backend/src/api/liquid/icons.ts
@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import logger from '../../logger';

 class Icons {
-  private static FILE_NAME = '/elements/asset_registry_db/icons.json';
+  private static FILE_NAME = './icons.json';
  private iconIds: string[] = [];
  private icons: { [assetId: string]: string; } = {};

--- a/backend/src/api/mempool-blocks.ts
+++ b/backend/src/api/mempool-blocks.ts
@@ -1,6 +1,6 @@
 import logger from '../logger';
-import { MempoolBlock, TransactionExtended, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats } from '../mempool.interfaces';
-import { Common, OnlineFeeStatsCalculator } from './common';
+import { MempoolBlock, TransactionExtended, ThreadTransaction, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor } from '../mempool.interfaces';
+import { Common } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
 import path from 'path';
@@ -10,9 +10,6 @@ class MempoolBlocks {
  private mempoolBlockDeltas: MempoolBlockDelta[] = [];
  private txSelectionWorker: Worker | null = null;

-  private nextUid: number = 1;
-  private uidMap: Map<number, string> = new Map(); // map short numerical uids to full txids
-
  constructor() {}

  public getMempoolBlocks(): MempoolBlock[] {
@@ -57,19 +54,12 @@ class MempoolBlocks {
    });

    // First sort
-    memPoolArray.sort((a, b) => {
-      if (a.feePerVsize === b.feePerVsize) {
-        // tie-break by lexicographic txid order for stability
-        return a.txid < b.txid ? -1 : 1;
-      } else {
-        return b.feePerVsize - a.feePerVsize;
-      }
-    });
+    memPoolArray.sort((a, b) => b.feePerVsize - a.feePerVsize);

    // Loop through and traverse all ancestors and sum up all the sizes + fees
    // Pass down size + fee to all unconfirmed children
    let sizes = 0;
-    memPoolArray.forEach((tx) => {
+    memPoolArray.forEach((tx, i) => {
      sizes += tx.weight;
      if (sizes > 4000000 * 8) {
        return;
@@ -78,20 +68,13 @@ class MempoolBlocks {
    });

    // Final sort, by effective fee
-    memPoolArray.sort((a, b) => {
-      if (a.effectiveFeePerVsize === b.effectiveFeePerVsize) {
-        // tie-break by lexicographic txid order for stability
-        return a.txid < b.txid ? -1 : 1;
-      } else {
-        return b.effectiveFeePerVsize - a.effectiveFeePerVsize;
-      }
-    });
+    memPoolArray.sort((a, b) => b.effectiveFeePerVsize - a.effectiveFeePerVsize);

    const end = new Date().getTime();
    const time = end - start;
    logger.debug('Mempool blocks calculated in ' + time / 1000 + ' seconds');

-    const blocks = this.calculateMempoolBlocks(memPoolArray);
+    const blocks = this.calculateMempoolBlocks(memPoolArray, this.mempoolBlocks);

    if (saveResults) {
      const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, blocks);
@@ -102,63 +85,26 @@ class MempoolBlocks {
    return blocks;
  }

-  private calculateMempoolBlocks(transactionsSorted: TransactionExtended[]): MempoolBlockWithTransactions[] {
+  private calculateMempoolBlocks(transactionsSorted: TransactionExtended[], prevBlocks: MempoolBlockWithTransactions[]): MempoolBlockWithTransactions[] {
    const mempoolBlocks: MempoolBlockWithTransactions[] = [];
-    let feeStatsCalculator: OnlineFeeStatsCalculator = new OnlineFeeStatsCalculator(config.MEMPOOL.BLOCK_WEIGHT_UNITS);
-    let onlineStats = false;
-    let blockSize = 0;
    let blockWeight = 0;
-    let blockVsize = 0;
-    let blockFees = 0;
-    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
-    let transactionIds: string[] = [];
+    let blockSize = 0;
    let transactions: TransactionExtended[] = [];
-    transactionsSorted.forEach((tx, index) => {
+    transactionsSorted.forEach((tx) => {
      if (blockWeight + tx.weight <= config.MEMPOOL.BLOCK_WEIGHT_UNITS
        || mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT - 1) {
-        tx.position = {
-          block: mempoolBlocks.length,
-          vsize: blockVsize + (tx.vsize / 2),
-        };
        blockWeight += tx.weight;
-        blockVsize += tx.vsize;
        blockSize += tx.size;
-        blockFees += tx.fee;
-        if (blockVsize <= sizeLimit) {
-          transactions.push(tx);
-        }
-        transactionIds.push(tx.txid);
-        if (onlineStats) {
-          feeStatsCalculator.processNext(tx);
-        }
+        transactions.push(tx);
      } else {
-        mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees));
-        blockVsize = 0;
-        tx.position = {
-          block: mempoolBlocks.length,
-          vsize: blockVsize + (tx.vsize / 2),
-        };
-
-        if (mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT - 1) {
-          const stackWeight = transactionsSorted.slice(index).reduce((total, tx) => total + (tx.weight || 0), 0);
-          if (stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS) {
-            onlineStats = true;
-            feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5);
-            feeStatsCalculator.processNext(tx);
-          }
-        }
-
-        blockVsize += tx.vsize;
+        mempoolBlocks.push(this.dataToMempoolBlocks(transactions, mempoolBlocks.length));
        blockWeight = tx.weight;
        blockSize = tx.size;
-        blockFees = tx.fee;
-        transactionIds = [tx.txid];
        transactions = [tx];
      }
    });
    if (transactions.length) {
-      const feeStats = onlineStats ? feeStatsCalculator.getRawFeeStats() : undefined;
-      mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees, feeStats));
+      mempoolBlocks.push(this.dataToMempoolBlocks(transactions, mempoolBlocks.length));
    }

    return mempoolBlocks;
@@ -169,7 +115,6 @@ class MempoolBlocks {
    for (let i = 0; i < Math.max(mempoolBlocks.length, prevBlocks.length); i++) {
      let added: TransactionStripped[] = [];
      let removed: string[] = [];
-      const changed: { txid: string, rate: number | undefined }[] = [];
      if (mempoolBlocks[i] && !prevBlocks[i]) {
        added = mempoolBlocks[i].transactions;
      } else if (!mempoolBlocks[i] && prevBlocks[i]) {
@@ -178,7 +123,7 @@ class MempoolBlocks {
        const prevIds = {};
        const newIds = {};
        prevBlocks[i].transactions.forEach(tx => {
-          prevIds[tx.txid] = tx;
+          prevIds[tx.txid] = true;
        });
        mempoolBlocks[i].transactions.forEach(tx => {
          newIds[tx.txid] = true;
@@ -191,43 +136,30 @@ class MempoolBlocks {
        mempoolBlocks[i].transactions.forEach(tx => {
          if (!prevIds[tx.txid]) {
            added.push(tx);
-          } else if (tx.rate !== prevIds[tx.txid].rate) {
-            changed.push({ txid: tx.txid, rate: tx.rate });
          }
        });
      }
      mempoolBlockDeltas.push({
        added,
-        removed,
-        changed,
+        removed
      });
    }
    return mempoolBlockDeltas;
  }

-  public async $makeBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, saveResults: boolean = false): Promise<MempoolBlockWithTransactions[]> {
-    const start = Date.now();
-
-    // reset mempool short ids
-    this.resetUids();
-    for (const tx of Object.values(newMempool)) {
-      this.setUid(tx);
-    }
-
+  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 strippedMempool: Map<number, CompactThreadTransaction> = new Map();
-    Object.values(newMempool).forEach(entry => {
-      if (entry.uid != null) {
-        strippedMempool.set(entry.uid, {
-          uid: entry.uid,
-          fee: entry.fee,
-          weight: entry.weight,
-          feePerVsize: entry.fee / (entry.weight / 4),
-          effectiveFeePerVsize: entry.effectiveFeePerVsize || (entry.fee / (entry.weight / 4)),
-          inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => uid != null) as number[],
-        });
-      }
+    const strippedMempool: { [txid: string]: ThreadTransaction } = {};
+    Object.values(newMempool).filter(tx => !tx.deleteAfter).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
@@ -246,7 +178,7 @@ class MempoolBlocks {
    // run the block construction algorithm in a separate thread, and wait for a result
    let threadErrorListener;
    try {
-      const workerResultPromise = new Promise<{ blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]> }>((resolve, reject) => {
+      const workerResultPromise = new Promise<{ blocks: ThreadTransaction[][], clusters: { [root: string]: string[] } }>((resolve, reject) => {
        threadErrorListener = reject;
        this.txSelectionWorker?.once('message', (result): void => {
          resolve(result);
@@ -254,167 +186,122 @@ class MempoolBlocks {
        this.txSelectionWorker?.once('error', reject);
      });
      this.txSelectionWorker.postMessage({ type: 'set', mempool: strippedMempool });
-      const { blocks, rates, clusters } = this.convertResultTxids(await workerResultPromise);
+      let { blocks, clusters } = await workerResultPromise;
+      // filter out stale transactions
+      const unfilteredCount = blocks.reduce((total, block) => { return total + block.length; }, 0);
+      blocks = blocks.map(block => block.filter(tx => (tx.txid && tx.txid in newMempool)));
+      const filteredCount = blocks.reduce((total, block) => { return total + block.length; }, 0);
+      if (filteredCount < unfilteredCount) {
+        logger.warn(`tx selection worker thread returned ${unfilteredCount - filteredCount} stale transactions from makeBlockTemplates`);
+      }

      // clean up thread error listener
      this.txSelectionWorker?.removeListener('error', threadErrorListener);

-      const processed = this.processBlockTemplates(newMempool, blocks, rates, clusters, saveResults);
-      logger.debug(`makeBlockTemplates completed in ${(Date.now() - start)/1000} seconds`);
-      return processed;
+      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: TransactionExtended[], saveResults: boolean = false): 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
-      await this.$makeBlockTemplates(newMempool, saveResults);
+      this.makeBlockTemplates(newMempool, saveResults);
      return;
    }
-
-    const start = Date.now();
-
-    for (const tx of Object.values(added)) {
-      this.setUid(tx);
-    }
-    const removedUids = removed.map(tx => this.getUid(tx)).filter(uid => uid != null) as number[];
    // 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 addedStripped: CompactThreadTransaction[] = added.filter(entry => entry.uid != null).map(entry => {
+    const addedStripped: ThreadTransaction[] = added.map(entry => {
      return {
-        uid: entry.uid || 0,
+        txid: entry.txid,
        fee: entry.fee,
        weight: entry.weight,
        feePerVsize: entry.fee / (entry.weight / 4),
-        effectiveFeePerVsize: entry.effectiveFeePerVsize || (entry.fee / (entry.weight / 4)),
-        inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => uid != null) as number[],
+        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;
    try {
-      const workerResultPromise = new Promise<{ blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]> }>((resolve, reject) => {
+      const workerResultPromise = new Promise<{ blocks: ThreadTransaction[][], clusters: { [root: string]: string[] } }>((resolve, reject) => {
        threadErrorListener = reject;
        this.txSelectionWorker?.once('message', (result): void => {
          resolve(result);
        });
        this.txSelectionWorker?.once('error', reject);
      });
-      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed: removedUids });
-      const { blocks, rates, clusters } = this.convertResultTxids(await workerResultPromise);
-
-      this.removeUids(removedUids);
+      this.txSelectionWorker.postMessage({ type: 'update', added: addedStripped, removed });
+      let { blocks, clusters } = await workerResultPromise;
+      // filter out stale transactions
+      const unfilteredCount = blocks.reduce((total, block) => { return total + block.length; }, 0);
+      blocks = blocks.map(block => block.filter(tx => (tx.txid && tx.txid in newMempool)));
+      const filteredCount = blocks.reduce((total, block) => { return total + block.length; }, 0);
+      if (filteredCount < unfilteredCount) {
+        logger.warn(`tx selection worker thread returned ${unfilteredCount - filteredCount} stale transactions from updateBlockTemplates`);
+      }

      // clean up thread error listener
      this.txSelectionWorker?.removeListener('error', threadErrorListener);

-      this.processBlockTemplates(newMempool, blocks, rates, clusters, saveResults);
-      logger.debug(`updateBlockTemplates completed in ${(Date.now() - start) / 1000} seconds`);
+      this.processBlockTemplates(newMempool, blocks, clusters, saveResults);
    } catch (e) {
      logger.err('updateBlockTemplates failed. ' + (e instanceof Error ? e.message : e));
    }
  }

-  private processBlockTemplates(mempool, blocks: string[][], rates: { [root: string]: number }, clusters: { [root: string]: string[] }, saveResults): MempoolBlockWithTransactions[] {
-    for (const txid of Object.keys(rates)) {
-      if (txid in mempool) {
-        mempool[txid].effectiveFeePerVsize = rates[txid];
-      }
-    }
-
-    let hasBlockStack = blocks.length >= 8;
-    let stackWeight;
-    let feeStatsCalculator: OnlineFeeStatsCalculator | void;
-    if (hasBlockStack) {
-      stackWeight = blocks[blocks.length - 1].reduce((total, tx) => total + (mempool[tx]?.weight || 0), 0);
-      hasBlockStack = stackWeight > config.MEMPOOL.BLOCK_WEIGHT_UNITS;
-      feeStatsCalculator = new OnlineFeeStatsCalculator(stackWeight, 0.5);
-    }
-
-    const readyBlocks: { transactionIds, transactions, totalSize, totalWeight, totalFees, feeStats }[] = [];
-    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
+  private processBlockTemplates(mempool, blocks, clusters, saveResults): MempoolBlockWithTransactions[] {
    // update this thread's mempool with the results
-    for (let blockIndex = 0; blockIndex < blocks.length; blockIndex++) {
-      const block: string[] = blocks[blockIndex];
-      let txid: string;
-      let mempoolTx: TransactionExtended;
-      let totalSize = 0;
-      let totalVsize = 0;
-      let totalWeight = 0;
-      let totalFees = 0;
-      const transactions: TransactionExtended[] = [];
-      for (let txIndex = 0; txIndex < block.length; txIndex++) {
-        txid = block[txIndex];
-        if (txid) {
-          mempoolTx = mempool[txid];
-          // save position in projected blocks
-          mempoolTx.position = {
-            block: blockIndex,
-            vsize: totalVsize + (mempoolTx.vsize / 2),
-          };
-          mempoolTx.cpfpChecked = true;
-
-          // online calculation of stack-of-blocks fee stats
-          if (hasBlockStack && blockIndex === blocks.length - 1 && feeStatsCalculator) {
-            feeStatsCalculator.processNext(mempoolTx);
+    blocks.forEach(block => {
+      block.forEach(tx => {
+        if (tx.txid && tx.txid in mempool) {
+          if (tx.effectiveFeePerVsize != null) {
+            mempool[tx.txid].effectiveFeePerVsize = tx.effectiveFeePerVsize;
          }
-
-          totalSize += mempoolTx.size;
-          totalVsize += mempoolTx.vsize;
-          totalWeight += mempoolTx.weight;
-          totalFees += mempoolTx.fee;
-
-          if (totalVsize <= sizeLimit) {
-            transactions.push(mempoolTx);
-          }
-        }
-      }
-      readyBlocks.push({
-        transactionIds: block,
-        transactions,
-        totalSize,
-        totalWeight,
-        totalFees,
-        feeStats: (hasBlockStack && blockIndex === blocks.length - 1 && feeStatsCalculator) ? feeStatsCalculator.getRawFeeStats() : undefined,
-      });
-    }
-
-    for (const cluster of Object.values(clusters)) {
-      for (const memberTxid of cluster) {
-        if (memberTxid in mempool) {
-          const mempoolTx = mempool[memberTxid];
-          const ancestors: Ancestor[] = [];
-          const descendants: Ancestor[] = [];
-          let matched = false;
-          cluster.forEach(txid => {
-            if (txid === memberTxid) {
-              matched = true;
-            } else {
-              const relative = {
-                txid: txid,
-                fee: mempool[txid].fee,
-                weight: mempool[txid].weight,
-              };
-              if (matched) {
-                descendants.push(relative);
-              } else {
-                ancestors.push(relative);
+          if (tx.cpfpRoot && tx.cpfpRoot in clusters) {
+            const ancestors: Ancestor[] = [];
+            const descendants: Ancestor[] = [];
+            const cluster = clusters[tx.cpfpRoot];
+            let matched = false;
+            cluster.forEach(txid => {
+              if (!txid || !mempool[txid]) {
+                logger.warn('projected transaction ancestor missing from mempool cache');
+                return;
              }
-            }
-          });
-          mempoolTx.ancestors = ancestors;
-          mempoolTx.descendants = descendants;
-          mempoolTx.bestDescendant = null;
+              if (txid === tx.txid) {
+                matched = true;
+              } else {
+                const relative = {
+                  txid: txid,
+                  fee: mempool[txid].fee,
+                  weight: mempool[txid].weight,
+                };
+                if (matched) {
+                  descendants.push(relative);
+                } else {
+                  ancestors.push(relative);
+                }
+              }
+            });
+            mempool[tx.txid].ancestors = ancestors;
+            mempool[tx.txid].descendants = descendants;
+            mempool[tx.txid].bestDescendant = null;
+          }
+          mempool[tx.txid].cpfpChecked = tx.cpfpChecked;
+        } else {
+          logger.warn('projected transaction missing from mempool cache');
        }
-      }
-    }
+      });
+    });

-    const mempoolBlocks = readyBlocks.map((b, index) => {
-      return this.dataToMempoolBlocks(b.transactionIds, b.transactions, b.totalSize, b.totalWeight, b.totalFees, b.feeStats);
+    // unpack the condensed blocks into proper mempool blocks
+    const mempoolBlocks = blocks.map((transactions, blockIndex) => {
+      return this.dataToMempoolBlocks(transactions.map(tx => {
+        return mempool[tx.txid] || null;
+      }).filter(tx => !!tx), blockIndex);
    });

    if (saveResults) {
@@ -426,71 +313,37 @@ class MempoolBlocks {
    return mempoolBlocks;
  }

-  private dataToMempoolBlocks(transactionIds: string[], transactions: TransactionExtended[], totalSize: number, totalWeight: number, totalFees: number, feeStats?: EffectiveFeeStats ): MempoolBlockWithTransactions {
-    if (!feeStats) {
-      feeStats = Common.calcEffectiveFeeStatistics(transactions);
+  private dataToMempoolBlocks(transactions: TransactionExtended[], blocksIndex: number): MempoolBlockWithTransactions {
+    let totalSize = 0;
+    let totalWeight = 0;
+    const fitTransactions: TransactionExtended[] = [];
+    transactions.forEach(tx => {
+      totalSize += tx.size;
+      totalWeight += tx.weight;
+      if ((totalWeight + tx.weight) <= config.MEMPOOL.BLOCK_WEIGHT_UNITS * 1.2) {
+        fitTransactions.push(tx);
+      }
+    });
+    let rangeLength = 4;
+    if (blocksIndex === 0) {
+      rangeLength = 8;
+    }
+    if (transactions.length > 4000) {
+      rangeLength = 6;
+    } else if (transactions.length > 10000) {
+      rangeLength = 8;
    }
    return {
      blockSize: totalSize,
-      blockVSize: (totalWeight / 4), // fractional vsize to avoid rounding errors
-      nTx: transactionIds.length,
-      totalFees: totalFees,
-      medianFee: feeStats.medianFee, // Common.percentile(transactions.map((tx) => tx.effectiveFeePerVsize), config.MEMPOOL.RECOMMENDED_FEE_PERCENTILE),
-      feeRange: feeStats.feeRange, //Common.getFeesInRange(transactions, rangeLength),
-      transactionIds: transactionIds,
-      transactions: transactions.map((tx) => Common.stripTransaction(tx)),
+      blockVSize: totalWeight / 4,
+      nTx: transactions.length,
+      totalFees: transactions.reduce((acc, cur) => acc + cur.fee, 0),
+      medianFee: Common.percentile(transactions.map((tx) => tx.effectiveFeePerVsize), config.MEMPOOL.RECOMMENDED_FEE_PERCENTILE),
+      feeRange: Common.getFeesInRange(transactions, rangeLength),
+      transactionIds: transactions.map((tx) => tx.txid),
+      transactions: fitTransactions.map((tx) => Common.stripTransaction(tx)),
    };
  }
-
-  private resetUids(): void {
-    this.uidMap.clear();
-    this.nextUid = 1;
-  }
-
-  private setUid(tx: TransactionExtended): number {
-    const uid = this.nextUid;
-    this.nextUid++;
-    this.uidMap.set(uid, tx.txid);
-    tx.uid = uid;
-    return uid;
-  }
-
-  private getUid(tx: TransactionExtended): number | void {
-    if (tx?.uid != null && this.uidMap.has(tx.uid)) {
-      return tx.uid;
-    }
-  }
-
-  private removeUids(uids: number[]): void {
-    for (const uid of uids) {
-      this.uidMap.delete(uid);
-    }
-  }
-
-  private convertResultTxids({ blocks, rates, clusters }: { blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]>})
-    : { blocks: string[][], rates: { [root: string]: number }, clusters: { [root: string]: string[] }} {
-    const convertedBlocks: string[][] = blocks.map(block => block.map(uid => {
-      return this.uidMap.get(uid) || '';
-    }));
-    const convertedRates = {};
-    for (const rateUid of rates.keys()) {
-      const rateTxid = this.uidMap.get(rateUid);
-      if (rateTxid) {
-        convertedRates[rateTxid] = rates.get(rateUid);
-      }
-    }
-    const convertedClusters = {};
-    for (const rootUid of clusters.keys()) {
-      const rootTxid = this.uidMap.get(rootUid);
-      if (rootTxid) {
-        const members = clusters.get(rootUid)?.map(uid => {
-          return this.uidMap.get(uid);
-        });
-        convertedClusters[rootTxid] = members;
-      }
-    }
-    return { blocks: convertedBlocks, rates: convertedRates, clusters: convertedClusters } as { blocks: string[][], rates: { [root: string]: number }, clusters: { [root: string]: string[] }};
-  }
 }

 export default new MempoolBlocks();
--- a/backend/src/api/mempool.ts
+++ b/backend/src/api/mempool.ts
@@ -11,6 +11,8 @@ import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';

 class Mempool {
+  private static WEBSOCKET_REFRESH_RATE_MS = 10000;
+  private static LAZY_DELETE_AFTER_SECONDS = 30;
  private inSync: boolean = false;
  private mempoolCacheDelta: number = -1;
  private mempoolCache: { [txId: string]: TransactionExtended } = {};
@@ -18,7 +20,7 @@ class Mempool {
                                                    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[],
+  private asyncMempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
    deletedTransactions: TransactionExtended[]) => Promise<void>) | undefined;

  private txPerSecondArray: number[] = [];
@@ -33,7 +35,6 @@ class Mempool {
  private SAMPLE_TIME = 10000; // In ms
  private timer = new Date().getTime();
  private missingTxCount = 0;
-  private mainLoopTimeout: number = 120000;

  constructor() {
    setInterval(this.updateTxPerSecond.bind(this), 1000);
@@ -70,20 +71,20 @@ class Mempool {

  public setAsyncMempoolChangedCallback(fn: (newMempool: { [txId: string]: TransactionExtended; },
    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]) => Promise<void>) {
-    this.$asyncMempoolChangedCallback = fn;
+    this.asyncMempoolChangedCallback = fn;
  }

  public getMempool(): { [txid: string]: TransactionExtended } {
    return this.mempoolCache;
  }

-  public async $setMempool(mempoolData: { [txId: string]: TransactionExtended }) {
+  public setMempool(mempoolData: { [txId: string]: TransactionExtended }) {
    this.mempoolCache = mempoolData;
    if (this.mempoolChangedCallback) {
      this.mempoolChangedCallback(this.mempoolCache, [], []);
    }
-    if (this.$asyncMempoolChangedCallback) {
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, [], []);
+    if (this.asyncMempoolChangedCallback) {
+      this.asyncMempoolChangedCallback(this.mempoolCache, [], []);
    }
  }

@@ -116,23 +117,19 @@ class Mempool {
    return txTimes;
  }

-  public async $updateMempool(transactions: string[]): Promise<void> {
+  public async $updateMempool(): Promise<void> {
    logger.debug(`Updating mempool...`);
-
-    // warn if this run stalls the main loop for more than 2 minutes
-    const timer = this.startTimer();
-
    const start = new Date().getTime();
    let hasChange: boolean = false;
    const currentMempoolSize = Object.keys(this.mempoolCache).length;
-    this.updateTimerProgress(timer, 'got raw mempool');
+    const transactions = await bitcoinApi.$getRawMempool();
    const diff = transactions.length - currentMempoolSize;
    const newTransactions: TransactionExtended[] = [];

    this.mempoolCacheDelta = Math.abs(diff);

    if (!this.inSync) {
-      loadingIndicators.setProgress('mempool', currentMempoolSize / transactions.length * 100);
+      loadingIndicators.setProgress('mempool', Object.keys(this.mempoolCache).length / transactions.length * 100);
    }

    // https://github.com/mempool/mempool/issues/3283
@@ -145,12 +142,10 @@ class Mempool {
      }
    };

-    let loggerTimer = new Date().getTime() / 1000;
    for (const txid of transactions) {
      if (!this.mempoolCache[txid]) {
        try {
          const transaction = await transactionUtils.$getTransactionExtended(txid);
-          this.updateTimerProgress(timer, 'fetched new transaction');
          this.mempoolCache[txid] = transaction;
          if (this.inSync) {
            this.txPerSecondArray.push(new Date().getTime());
@@ -168,12 +163,9 @@ class Mempool {
          logger.debug(`Error finding transaction '${txid}' in the mempool: ` + (e instanceof Error ? e.message : e));
        }
      }
-      const elapsedSeconds = Math.round((new Date().getTime() / 1000) - loggerTimer);
-      if (elapsedSeconds > 4) {
-        const progress = (currentMempoolSize + newTransactions.length) / transactions.length * 100;
-        logger.debug(`Mempool is synchronizing. Processed ${newTransactions.length}/${diff} txs (${Math.round(progress)}%)`);
-        loadingIndicators.setProgress('mempool', progress);
-        loggerTimer = new Date().getTime() / 1000;
+
+      if ((new Date().getTime()) - start > Mempool.WEBSOCKET_REFRESH_RATE_MS) {
+        break;
      }
    }

@@ -207,15 +199,13 @@ class Mempool {
      const transactionsObject = {};
      transactions.forEach((txId) => transactionsObject[txId] = true);

-      // Delete evicted transactions from mempool
+      // Flag transactions for lazy deletion
      for (const tx in this.mempoolCache) {
-        if (!transactionsObject[tx]) {
+        if (!transactionsObject[tx] && !this.mempoolCache[tx].deleteAfter) {
          deletedTransactions.push(this.mempoolCache[tx]);
+          this.mempoolCache[tx].deleteAfter = new Date().getTime() + Mempool.LAZY_DELETE_AFTER_SECONDS * 1000;
        }
      }
-      for (const tx of deletedTransactions) {
-        delete this.mempoolCache[tx.txid];
-      }
    }

    const newTransactionsStripped = newTransactions.map((tx) => Common.stripTransaction(tx));
@@ -232,46 +222,22 @@ class Mempool {
    if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
      this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
    }
-    if (this.$asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
-      this.updateTimerProgress(timer, 'running async mempool callback');
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
-      this.updateTimerProgress(timer, 'completed async mempool callback');
+    if (this.asyncMempoolChangedCallback && (hasChange || deletedTransactions.length)) {
+      await this.asyncMempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions);
    }

    const end = new Date().getTime();
    const time = end - start;
    logger.debug(`Mempool updated in ${time / 1000} seconds. New size: ${Object.keys(this.mempoolCache).length} (${diff > 0 ? '+' + diff : diff})`);
-
-    this.clearTimer(timer);
  }

-  private startTimer() {
-    const state: any = {
-      start: Date.now(),
-      progress: 'begin $updateMempool',
-      timer: null,
-    };
-    state.timer = setTimeout(() => {
-      logger.err(`$updateMempool stalled at "${state.progress}"`);
-    }, this.mainLoopTimeout);
-    return state;
-  }
-
-  private updateTimerProgress(state, msg) {
-    state.progress = msg;
-  }
-
-  private clearTimer(state) {
-    if (state.timer) {
-      clearTimeout(state.timer);
-    }
-  }
-
-  public handleRbfTransactions(rbfTransactions: { [txid: string]: TransactionExtended[]; }): void {
+  public handleRbfTransactions(rbfTransactions: { [txid: string]: TransactionExtended; }) {
    for (const rbfTransaction in rbfTransactions) {
-      if (this.mempoolCache[rbfTransaction] && rbfTransactions[rbfTransaction]?.length) {
+      if (this.mempoolCache[rbfTransaction]) {
        // Store replaced transactions
-        rbfCache.add(rbfTransactions[rbfTransaction], this.mempoolCache[rbfTransaction]);
+        rbfCache.add(this.mempoolCache[rbfTransaction], rbfTransactions[rbfTransaction].txid);
+        // Erase the replaced transactions from the local mempool
+        delete this.mempoolCache[rbfTransaction];
      }
    }
  }
@@ -289,6 +255,17 @@ class Mempool {
    }
  }

+  public deleteExpiredTransactions() {
+    const now = new Date().getTime();
+    for (const tx in this.mempoolCache) {
+      const lazyDeleteAt = this.mempoolCache[tx].deleteAfter;
+      if (lazyDeleteAt && lazyDeleteAt < now) {
+        delete this.mempoolCache[tx];
+        rbfCache.evict(tx);
+      }
+    }
+  }
+
  private $getMempoolInfo() {
    if (config.MEMPOOL.USE_SECOND_NODE_FOR_MINFEE) {
      return Promise.all([
--- a/backend/src/api/mining/mining-routes.ts
+++ b/backend/src/api/mining/mining-routes.ts
@@ -26,7 +26,7 @@ class MiningRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fee-rates/:interval', this.$getHistoricalBlockFeeRates)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/sizes-weights/:interval', this.$getHistoricalBlockSizeAndWeight)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty-adjustments/:interval', this.$getDifficultyAdjustments)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/predictions/:interval', this.$getHistoricalBlocksHealth)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/predictions/:interval', this.$getHistoricalBlockPrediction)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/scores', this.$getBlockAuditScores)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/scores/:height', this.$getBlockAuditScores)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/score/:hash', this.$getBlockAuditScore)
@@ -244,15 +244,15 @@ class MiningRoutes {
    }
  }

-  private async $getHistoricalBlocksHealth(req: Request, res: Response) {
+  private async $getHistoricalBlockPrediction(req: Request, res: Response) {
    try {
-      const blocksHealth = await mining.$getBlocksHealthHistory(req.params.interval);
-      const blockCount = await BlocksAuditsRepository.$getBlocksHealthCount();
+      const blockPredictions = await mining.$getBlockPredictionsHistory(req.params.interval);
+      const blockCount = await BlocksAuditsRepository.$getPredictionsCount();
      res.header('Pragma', 'public');
      res.header('Cache-control', 'public');
      res.header('X-total-count', blockCount.toString());
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(blocksHealth.map(health => [health.time, health.height, health.match_rate]));
+      res.json(blockPredictions.map(prediction => [prediction.time, prediction.height, prediction.match_rate]));
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
--- a/backend/src/api/mining/mining.ts
+++ b/backend/src/api/mining/mining.ts
@@ -13,6 +13,7 @@ import BlocksAuditsRepository from '../../repositories/BlocksAuditsRepository';
 import PricesRepository from '../../repositories/PricesRepository';
 import { bitcoinCoreApi } from '../bitcoin/bitcoin-api-factory';
 import { IEsploraApi } from '../bitcoin/esplora-api.interface';
+import database from '../../database';

 class Mining {
  private blocksPriceIndexingRunning = false;
@@ -20,10 +21,10 @@ class Mining {
  public lastWeeklyHashrateIndexingDate: number | null = null;

  /**
-   * Get historical blocks health
+   * Get historical block predictions match rate
   */
-   public async $getBlocksHealthHistory(interval: string | null = null): Promise<any> {
-    return await BlocksAuditsRepository.$getBlocksHealthHistory(
+   public async $getBlockPredictionsHistory(interval: string | null = null): Promise<any> {
+    return await BlocksAuditsRepository.$getBlockPredictionsHistory(
      this.getTimeRange(interval),
      Common.getSqlInterval(interval)
    );
@@ -451,7 +452,7 @@ class Mining {
      const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - timer));
      if (elapsedSeconds > 5) {
        const progress = Math.round(totalBlockChecked / blocks.length * 100);
-        logger.debug(`Indexing difficulty adjustment at block #${block.height} | Progress: ${progress}%`, logger.tags.mining);
+        logger.info(`Indexing difficulty adjustment at block #${block.height} | Progress: ${progress}%`, logger.tags.mining);
        timer = new Date().getTime() / 1000;
      }
    }
@@ -557,10 +558,8 @@ class Mining {
      currentBlockHeight -= 10000;
    }

-    if (totalIndexed > 0) {
-      logger.info(`Indexing missing coinstatsindex data completed. Indexed ${totalIndexed}`, logger.tags.mining);
-    } else {
-      logger.debug(`Indexing missing coinstatsindex data completed. Indexed 0.`, logger.tags.mining);
+    if (totalIndexed) {
+      logger.info(`Indexing missing coinstatsindex data completed`, logger.tags.mining);
    }
  }

--- a/backend/src/api/rbf-cache.ts
+++ b/backend/src/api/rbf-cache.ts
@@ -1,341 +1,65 @@
-import logger from "../logger";
-import { TransactionExtended, TransactionStripped } from "../mempool.interfaces";
-import bitcoinApi from './bitcoin/bitcoin-api-factory';
-import { Common } from "./common";
-
-interface RbfTransaction extends TransactionStripped {
-  rbf?: boolean;
-  mined?: boolean;
-}
-
-interface RbfTree {
-  tx: RbfTransaction;
-  time: number;
-  interval?: number;
-  mined?: boolean;
-  fullRbf: boolean;
-  replaces: RbfTree[];
-}
+import { TransactionExtended } from "../mempool.interfaces";

 class RbfCache {
-  private replacedBy: Map<string, string> = new Map();
-  private replaces: Map<string, string[]> = new Map();
-  private rbfTrees: Map<string, RbfTree> = new Map(); // sequences of consecutive replacements
-  private dirtyTrees: Set<string> = new Set();
-  private treeMap: Map<string, string> = new Map(); // map of txids to sequence ids
-  private txs: Map<string, TransactionExtended> = new Map();
-  private expiring: Map<string, number> = new Map();
+  private replacedBy: { [txid: string]: string; } = {};
+  private replaces: { [txid: string]: string[] } = {};
+  private txs: { [txid: string]: TransactionExtended } = {};
+  private expiring: { [txid: string]: Date } = {};

  constructor() {
-    setInterval(this.cleanup.bind(this), 1000 * 60 * 10);
+    setInterval(this.cleanup.bind(this), 1000 * 60 * 60);
  }

-  public add(replaced: TransactionExtended[], newTxExtended: TransactionExtended): void {
-    if (!newTxExtended || !replaced?.length) {
-      return;
+  public add(replacedTx: TransactionExtended, newTxId: string): void {
+    this.replacedBy[replacedTx.txid] = newTxId;
+    this.txs[replacedTx.txid] = replacedTx;
+    if (!this.replaces[newTxId]) {
+      this.replaces[newTxId] = [];
    }
-
-    const newTx = Common.stripTransaction(newTxExtended) as RbfTransaction;
-    const newTime = newTxExtended.firstSeen || (Date.now() / 1000);
-    newTx.rbf = newTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
-    this.txs.set(newTx.txid, newTxExtended);
-
-    // maintain rbf trees
-    let fullRbf = false;
-    const replacedTrees: RbfTree[] = [];
-    for (const replacedTxExtended of replaced) {
-      const replacedTx = Common.stripTransaction(replacedTxExtended) as RbfTransaction;
-      replacedTx.rbf = replacedTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
-      this.replacedBy.set(replacedTx.txid, newTx.txid);
-      if (this.treeMap.has(replacedTx.txid)) {
-        const treeId = this.treeMap.get(replacedTx.txid);
-        if (treeId) {
-          const tree = this.rbfTrees.get(treeId);
-          this.rbfTrees.delete(treeId);
-          if (tree) {
-            tree.interval = newTime - tree?.time;
-            replacedTrees.push(tree);
-            fullRbf = fullRbf || tree.fullRbf;
-          }
-        }
-      } else {
-        const replacedTime = replacedTxExtended.firstSeen || (Date.now() / 1000);
-        replacedTrees.push({
-          tx: replacedTx,
-          time: replacedTime,
-          interval: newTime - replacedTime,
-          fullRbf: !replacedTx.rbf,
-          replaces: [],
-        });
-        fullRbf = fullRbf || !replacedTx.rbf;
-        this.txs.set(replacedTx.txid, replacedTxExtended);
-      }
-    }
-    const treeId = replacedTrees[0].tx.txid;
-    const newTree = {
-      tx: newTx,
-      time: newTime,
-      fullRbf,
-      replaces: replacedTrees
-    };
-    this.rbfTrees.set(treeId, newTree);
-    this.updateTreeMap(treeId, newTree);
-    this.replaces.set(newTx.txid, replacedTrees.map(tree => tree.tx.txid));
-    this.dirtyTrees.add(treeId);
+    this.replaces[newTxId].push(replacedTx.txid);
  }

  public getReplacedBy(txId: string): string | undefined {
-    return this.replacedBy.get(txId);
+    return this.replacedBy[txId];
  }

  public getReplaces(txId: string): string[] | undefined {
-    return this.replaces.get(txId);
+    return this.replaces[txId];
  }

  public getTx(txId: string): TransactionExtended | undefined {
-    return this.txs.get(txId);
-  }
-
-  public getRbfTree(txId: string): RbfTree | void {
-    return this.rbfTrees.get(this.treeMap.get(txId) || '');
-  }
-
-  // get a paginated list of RbfTrees
-  // ordered by most recent replacement time
-  public getRbfTrees(onlyFullRbf: boolean, after?: string): RbfTree[] {
-    const limit = 25;
-    const trees: RbfTree[] = [];
-    const used = new Set<string>();
-    const replacements: string[][] = Array.from(this.replacedBy).reverse();
-    const afterTree = after ? this.treeMap.get(after) : null;
-    let ready = !afterTree;
-    for (let i = 0; i < replacements.length && trees.length <= limit - 1; i++) {
-      const txid = replacements[i][1];
-      const treeId = this.treeMap.get(txid) || '';
-      if (treeId === afterTree) {
-        ready = true;
-      } else if (ready) {
-        if (!used.has(treeId)) {
-          const tree = this.rbfTrees.get(treeId);
-          used.add(treeId);
-          if (tree && (!onlyFullRbf || tree.fullRbf)) {
-            trees.push(tree);
-          }
-        }
-      }
-    }
-    return trees;
-  }
-
-  // get map of rbf trees that have been updated since the last call
-  public getRbfChanges(): { trees: {[id: string]: RbfTree }, map: { [txid: string]: string }} {
-    const changes: { trees: {[id: string]: RbfTree }, map: { [txid: string]: string }} = {
-      trees: {},
-      map: {},
-    };
-    this.dirtyTrees.forEach(id => {
-      const tree = this.rbfTrees.get(id);
-      if (tree) {
-        changes.trees[id] = tree;
-        this.getTransactionsInTree(tree).forEach(tx => {
-          changes.map[tx.txid] = id;
-        });
-      }
-    });
-    this.dirtyTrees = new Set();
-    return changes;
-  }
-
-  public mined(txid): void {
-    if (!this.txs.has(txid)) {
-      return;
-    }
-    const treeId = this.treeMap.get(txid);
-    if (treeId && this.rbfTrees.has(treeId)) {
-      const tree = this.rbfTrees.get(treeId);
-      if (tree) {
-        this.setTreeMined(tree, txid);
-        tree.mined = true;
-        this.dirtyTrees.add(treeId);
-      }
-    }
-    this.evict(txid);
+    return this.txs[txId];
  }

  // flag a transaction as removed from the mempool
-  public evict(txid: string, fast: boolean = false): void {
-    if (this.txs.has(txid) && (fast || !this.expiring.has(txid))) {
-      this.expiring.set(txid, fast ? Date.now() + (1000 * 60 * 10) : Date.now() + (1000 * 86400)); // 24 hours
-    }
+  public evict(txid): void {
+    this.expiring[txid] = new Date(Date.now() + 1000 * 86400); // 24 hours
  }

  private cleanup(): void {
-    const now = Date.now();
-    for (const txid of this.expiring.keys()) {
-      if ((this.expiring.get(txid) || 0) < now) {
-        this.expiring.delete(txid);
+    const currentDate = new Date();
+    for (const txid in this.expiring) {
+      if (this.expiring[txid] < currentDate) {
+        delete this.expiring[txid];
        this.remove(txid);
      }
    }
-    logger.debug(`rbf cache contains ${this.txs.size} txs, ${this.expiring.size} due to expire`);
  }

  // remove a transaction & all previous versions from the cache
  private remove(txid): void {
-    // don't remove a transaction if a newer version remains in the mempool
-    if (!this.replacedBy.has(txid)) {
-      const replaces = this.replaces.get(txid);
-      this.replaces.delete(txid);
-      this.treeMap.delete(txid);
-      this.txs.delete(txid);
-      this.expiring.delete(txid);
-      for (const tx of (replaces || [])) {
+    // don't remove a transaction while a newer version remains in the mempool
+    if (this.replaces[txid] && !this.replacedBy[txid]) {
+      const replaces = this.replaces[txid];
+      delete this.replaces[txid];
+      for (const tx of replaces) {
        // recursively remove prior versions from the cache
-        this.replacedBy.delete(tx);
-        // if this is the id of a tree, remove that too
-        if (this.treeMap.get(tx) === tx) {
-          this.rbfTrees.delete(tx);
-        }
+        delete this.replacedBy[tx];
+        delete this.txs[tx];
        this.remove(tx);
      }
    }
  }
-
-  private updateTreeMap(newId: string, tree: RbfTree): void {
-    this.treeMap.set(tree.tx.txid, newId);
-    tree.replaces.forEach(subtree => {
-      this.updateTreeMap(newId, subtree);
-    });
-  }
-
-  private getTransactionsInTree(tree: RbfTree, txs: RbfTransaction[] = []): RbfTransaction[] {
-    txs.push(tree.tx);
-    tree.replaces.forEach(subtree => {
-      this.getTransactionsInTree(subtree, txs);
-    });
-    return txs;
-  }
-
-  private setTreeMined(tree: RbfTree, txid: string): void {
-    if (tree.tx.txid === txid) {
-      tree.tx.mined = true;
-    } else {
-      tree.replaces.forEach(subtree => {
-        this.setTreeMined(subtree, txid);
-      });
-    }
-  }
-
-  public dump(): any {
-    const trees = Array.from(this.rbfTrees.values()).map((tree: RbfTree) => { return this.exportTree(tree); });
-
-    return {
-      txs: Array.from(this.txs.entries()),
-      trees,
-      expiring: Array.from(this.expiring.entries()),
-    };
-  }
-
-  public async load({ txs, trees, expiring }): Promise<void> {
-    txs.forEach(txEntry => {
-      this.txs.set(txEntry[0], txEntry[1]);
-    });
-    for (const deflatedTree of trees) {
-      await this.importTree(deflatedTree.root, deflatedTree.root, deflatedTree, this.txs);
-    }
-    expiring.forEach(expiringEntry => {
-      if (this.txs.has(expiringEntry[0])) {
-        this.expiring.set(expiringEntry[0], new Date(expiringEntry[1]).getTime());
-      }
-    });
-    this.cleanup();
-  }
-
-  exportTree(tree: RbfTree, deflated: any = null) {
-    if (!deflated) {
-      deflated = {
-        root: tree.tx.txid,
-      };
-    }
-    deflated[tree.tx.txid] = {
-      tx: tree.tx.txid,
-      txMined: tree.tx.mined,
-      time: tree.time,
-      interval: tree.interval,
-      mined: tree.mined,
-      fullRbf: tree.fullRbf,
-      replaces: tree.replaces.map(child => child.tx.txid),
-    };
-    tree.replaces.forEach(child => {
-      this.exportTree(child, deflated);
-    });
-    return deflated;
-  }
-
-  async importTree(root, txid, deflated, txs: Map<string, TransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
-    const treeInfo = deflated[txid];
-    const replaces: RbfTree[] = [];
-
-    // check if any transactions in this tree have already been confirmed
-    mined = mined || treeInfo.mined;
-    let exists = mined;
-    if (!mined) {
-      try {
-        const apiTx = await bitcoinApi.$getRawTransaction(txid);
-        if (apiTx) {
-          exists = true;
-        }
-        if (apiTx?.status?.confirmed) {
-          mined = true;
-          treeInfo.txMined = true;
-          this.evict(txid, true);
-        }
-      } catch (e) {
-        // most transactions do not exist
-      }
-    }
-
-    // if the root tx is not in the mempool or the blockchain
-    // evict this tree as soon as possible
-    if (root === txid && !exists) {
-      this.evict(txid, true);
-    }
-
-    // recursively reconstruct child trees
-    for (const childId of treeInfo.replaces) {
-      const replaced = await this.importTree(root, childId, deflated, txs, mined);
-      if (replaced) {
-        this.replacedBy.set(replaced.tx.txid, txid);
-        replaces.push(replaced);
-        if (replaced.mined) {
-          mined = true;
-        }
-      }
-    }
-    this.replaces.set(txid, replaces.map(t => t.tx.txid));
-
-    const tx = txs.get(txid);
-    if (!tx) {
-      return;
-    }
-    const strippedTx = Common.stripTransaction(tx) as RbfTransaction;
-    strippedTx.rbf = tx.vin.some((v) => v.sequence < 0xfffffffe);
-    strippedTx.mined = treeInfo.txMined;
-    const tree = {
-      tx: strippedTx,
-      time: treeInfo.time,
-      interval: treeInfo.interval,
-      mined: mined,
-      fullRbf: treeInfo.fullRbf,
-      replaces,
-    };
-    this.treeMap.set(txid, root);
-    if (root === txid) {
-      this.rbfTrees.set(root, tree);
-      this.dirtyTrees.add(root);
-    }
-    return tree;
-  }
 }

 export default new RbfCache();
--- a/backend/src/api/tx-selection-worker.ts
+++ b/backend/src/api/tx-selection-worker.ts
@@ -1,10 +1,11 @@
 import config from '../config';
 import logger from '../logger';
-import { CompactThreadTransaction, AuditTransaction } from '../mempool.interfaces';
+import { ThreadTransaction, MempoolBlockWithTransactions, AuditTransaction } from '../mempool.interfaces';
 import { PairingHeap } from '../utils/pairing-heap';
+import { Common } from './common';
 import { parentPort } from 'worker_threads';

-let mempool: Map<number, CompactThreadTransaction> = new Map();
+let mempool: { [txid: string]: ThreadTransaction } = {};

 if (parentPort) {
  parentPort.on('message', (params) => {
@@ -12,18 +13,18 @@ if (parentPort) {
      mempool = params.mempool;
    } else if (params.type === 'update') {
      params.added.forEach(tx => {
-        mempool.set(tx.uid, tx);
+        mempool[tx.txid] = tx;
      });
-      params.removed.forEach(uid => {
-        mempool.delete(uid);
+      params.removed.forEach(txid => {
+        delete mempool[txid];
      });
    }
    
-    const { blocks, rates, clusters } = makeBlockTemplates(mempool);
+    const { blocks, clusters } = makeBlockTemplates(mempool);

    // return the result to main thread.
    if (parentPort) {
-      parentPort.postMessage({ blocks, rates, clusters });
+     parentPort.postMessage({ blocks, clusters });
    }
  });
 }
@@ -32,25 +33,26 @@ if (parentPort) {
 * Build projected mempool blocks using an approximation of the transaction selection algorithm from Bitcoin Core
 * (see BlockAssembler in https://github.com/bitcoin/bitcoin/blob/master/src/node/miner.cpp)
 */
-function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
-  : { blocks: number[][], rates: Map<number, number>, clusters: Map<number, number[]> } {
+function makeBlockTemplates(mempool: { [txid: string]: ThreadTransaction })
+  : { blocks: ThreadTransaction[][], clusters: { [root: string]: string[] } } {
  const start = Date.now();
-  const auditPool: Map<number, AuditTransaction> = new Map();
+  const auditPool: { [txid: string]: AuditTransaction } = {};
  const mempoolArray: AuditTransaction[] = [];
-  const cpfpClusters: Map<number, number[]> = new Map();
+  const restOfArray: ThreadTransaction[] = [];
+  const cpfpClusters: { [root: string]: string[] } = {};
  
-  mempool.forEach(tx => {
-    tx.dirty = false;
+  // grab the top feerate txs up to maxWeight
+  Object.values(mempool).sort((a, b) => b.feePerVsize - a.feePerVsize).forEach(tx => {
    // initializing everything up front helps V8 optimize property access later
-    auditPool.set(tx.uid, {
-      uid: tx.uid,
+    auditPool[tx.txid] = {
+      txid: tx.txid,
      fee: tx.fee,
      weight: tx.weight,
      feePerVsize: tx.feePerVsize,
      effectiveFeePerVsize: tx.feePerVsize,
-      inputs: tx.inputs || [],
+      vin: tx.vin,
      relativesSet: false,
-      ancestorMap: new Map<number, AuditTransaction>(),
+      ancestorMap: new Map<string, AuditTransaction>(),
      children: new Set<AuditTransaction>(),
      ancestorFee: 0,
      ancestorWeight: 0,
@@ -58,8 +60,8 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
      used: false,
      modified: false,
      modifiedNode: null,
-    });
-    mempoolArray.push(auditPool.get(tx.uid) as AuditTransaction);
+    };
+    mempoolArray.push(auditPool[tx.txid]);
  });

  // Build relatives graph & calculate ancestor scores
@@ -70,28 +72,15 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
  }

  // Sort by descending ancestor score
-  mempoolArray.sort((a, b) => {
-    if (b.score === a.score) {
-      // tie-break by uid for stability
-      return a.uid < b.uid ? -1 : 1;
-    } else {
-      return (b.score || 0) - (a.score || 0);
-    }
-  });
+  mempoolArray.sort((a, b) => (b.score || 0) - (a.score || 0));

  // Build blocks by greedily choosing the highest feerate package
  // (i.e. the package rooted in the transaction with the best ancestor score)
-  const blocks: number[][] = [];
+  const blocks: ThreadTransaction[][] = [];
  let blockWeight = 4000;
+  let blockSize = 0;
  let transactions: AuditTransaction[] = [];
-  const modified: PairingHeap<AuditTransaction> = new PairingHeap((a, b): boolean => {
-    if (a.score === b.score) {
-      // tie-break by uid for stability
-      return a.uid > b.uid;
-    } else {
-      return (a.score || 0) > (b.score || 0);
-    }
-  });
+  const modified: PairingHeap<AuditTransaction> = new PairingHeap((a, b): boolean => (a.score || 0) > (b.score || 0));
  let overflow: AuditTransaction[] = [];
  let failures = 0;
  let top = 0;
@@ -118,36 +107,30 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)

    if (nextTx && !nextTx?.used) {
      // Check if the package fits into this block
-      if (blocks.length >= 7 || (blockWeight + nextTx.ancestorWeight < config.MEMPOOL.BLOCK_WEIGHT_UNITS)) {
+      if (blockWeight + nextTx.ancestorWeight < config.MEMPOOL.BLOCK_WEIGHT_UNITS) {
        const ancestors: AuditTransaction[] = Array.from(nextTx.ancestorMap.values());
        // sort ancestors by dependency graph (equivalent to sorting by ascending ancestor count)
        const sortedTxSet = [...ancestors.sort((a, b) => { return (a.ancestorMap.size || 0) - (b.ancestorMap.size || 0); }), nextTx];
        let isCluster = false;
        if (sortedTxSet.length > 1) {
-          cpfpClusters.set(nextTx.uid, sortedTxSet.map(tx => tx.uid));
+          cpfpClusters[nextTx.txid] = sortedTxSet.map(tx => tx.txid);
          isCluster = true;
        }
        const effectiveFeeRate = nextTx.ancestorFee / (nextTx.ancestorWeight / 4);
        const used: AuditTransaction[] = [];
        while (sortedTxSet.length) {
          const ancestor = sortedTxSet.pop();
-          const mempoolTx = mempool.get(ancestor.uid);
-          if (!mempoolTx) {
-            continue;
-          }
+          const mempoolTx = mempool[ancestor.txid];
          ancestor.used = true;
-          ancestor.usedBy = nextTx.uid;
+          ancestor.usedBy = nextTx.txid;
          // update original copy of this tx with effective fee rate & relatives data
-          if (mempoolTx.effectiveFeePerVsize !== effectiveFeeRate) {
-            mempoolTx.effectiveFeePerVsize = effectiveFeeRate;
-            mempoolTx.dirty = true;
-          }
-          if (mempoolTx.cpfpRoot !== nextTx.uid) {
-            mempoolTx.cpfpRoot = isCluster ? nextTx.uid : null;
-            mempoolTx.dirty;
+          mempoolTx.effectiveFeePerVsize = effectiveFeeRate;
+          if (isCluster) {
+            mempoolTx.cpfpRoot = nextTx.txid;
          }
          mempoolTx.cpfpChecked = true;
          transactions.push(ancestor);
+          blockSize += ancestor.size;
          blockWeight += ancestor.weight;
          used.push(ancestor);
        }
@@ -173,10 +156,11 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
    if ((exceededPackageTries || queueEmpty) && blocks.length < 7) {
      // construct this block
      if (transactions.length) {
-        blocks.push(transactions.map(t => t.uid));
+        blocks.push(transactions.map(t => mempool[t.txid]));
      }
      // reset for the next block
      transactions = [];
+      blockSize = 0;
      blockWeight = 4000;

      // 'overflow' packages didn't fit in this block, but are valid candidates for the next
@@ -191,38 +175,50 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
      overflow = [];
    }
  }
-
-  if (overflow.length > 0) {
-    logger.warn('GBT overflow list unexpectedly non-empty after final block constructed');
-  }
-  // add the final unbounded block if it contains any transactions
-  if (transactions.length > 0) {
-    blocks.push(transactions.map(t => t.uid));
-  }
-
-  // get map of dirty transactions
-  const rates = new Map<number, number>();
-  for (const tx of mempool.values()) {
-    if (tx?.dirty) {
-      rates.set(tx.uid, tx.effectiveFeePerVsize || tx.feePerVsize);
+  // pack any leftover transactions into the last block
+  for (const tx of overflow) {
+    if (!tx || tx?.used) {
+      continue;
    }
+    blockWeight += tx.weight;
+    const mempoolTx = mempool[tx.txid];
+    // update original copy of this tx with effective fee rate & relatives data
+    mempoolTx.effectiveFeePerVsize = tx.score;
+    if (tx.ancestorMap.size > 0) {
+      cpfpClusters[tx.txid] = Array.from(tx.ancestorMap?.values()).map(a => a.txid);
+      mempoolTx.cpfpRoot = tx.txid;
+    }
+    mempoolTx.cpfpChecked = true;
+    transactions.push(tx);
+    tx.used = true;
  }
+  const blockTransactions = transactions.map(t => mempool[t.txid]);
+  restOfArray.forEach(tx => {
+    blockWeight += tx.weight;
+    tx.effectiveFeePerVsize = tx.feePerVsize;
+    tx.cpfpChecked = false;
+    blockTransactions.push(tx);
+  });
+  if (blockTransactions.length) {
+    blocks.push(blockTransactions);
+  }
+  transactions = [];

  const end = Date.now();
  const time = end - start;
  logger.debug('Mempool templates calculated in ' + time / 1000 + ' seconds');

-  return { blocks, rates, clusters: cpfpClusters };
+  return { blocks, clusters: cpfpClusters };
 }

 // traverse in-mempool ancestors
 // recursion unavoidable, but should be limited to depth < 25 by mempool policy
 function setRelatives(
  tx: AuditTransaction,
-  mempool: Map<number, AuditTransaction>,
+  mempool: { [txid: string]: AuditTransaction },
 ): void {
-  for (const parent of tx.inputs) {
-    const parentTx = mempool.get(parent);
+  for (const parent of tx.vin) {
+    const parentTx = mempool[parent];
    if (parentTx && !tx.ancestorMap?.has(parent)) {
      tx.ancestorMap.set(parent, parentTx);
      parentTx.children.add(tx);
@@ -231,7 +227,7 @@ function setRelatives(
        setRelatives(parentTx, mempool);
      }
      parentTx.ancestorMap.forEach((ancestor) => {
-        tx.ancestorMap.set(ancestor.uid, ancestor);
+        tx.ancestorMap.set(ancestor.txid, ancestor);
      });
    }
  };
@@ -249,7 +245,7 @@ function setRelatives(
 // avoids recursion to limit call stack depth
 function updateDescendants(
  rootTx: AuditTransaction,
-  mempool: Map<number, AuditTransaction>,
+  mempool: { [txid: string]: AuditTransaction },
  modified: PairingHeap<AuditTransaction>,
 ): void {
  const descendantSet: Set<AuditTransaction> = new Set();
@@ -265,9 +261,9 @@ function updateDescendants(
  });
  while (descendants.length) {
    descendantTx = descendants.pop();
-    if (descendantTx && descendantTx.ancestorMap && descendantTx.ancestorMap.has(rootTx.uid)) {
+    if (descendantTx && descendantTx.ancestorMap && descendantTx.ancestorMap.has(rootTx.txid)) {
      // remove tx as ancestor
-      descendantTx.ancestorMap.delete(rootTx.uid);
+      descendantTx.ancestorMap.delete(rootTx.txid);
      descendantTx.ancestorFee -= rootTx.fee;
      descendantTx.ancestorWeight -= rootTx.weight;
      tmpScore = descendantTx.score;
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -26,13 +26,6 @@ class WebsocketHandler {
  private wss: WebSocket.Server | undefined;
  private extraInitProperties = {};

-  private numClients = 0;
-  private numConnected = 0;
-  private numDisconnected = 0;
-
-  private initData: { [key: string]: string } = {};
-  private serializedInitData: string = '{}';
-
  constructor() { }

  setWebsocketServer(wss: WebSocket.Server) {
@@ -41,41 +34,6 @@ class WebsocketHandler {

  setExtraInitProperties(property: string, value: any) {
    this.extraInitProperties[property] = value;
-    this.setInitDataFields(this.extraInitProperties);
-  }
-
-  private setInitDataFields(data: { [property: string]: any }): void {
-    for (const property of Object.keys(data)) {
-      if (data[property] != null) {
-        this.initData[property] = JSON.stringify(data[property]);
-      } else {
-        delete this.initData[property];
-      }
-    }
-    this.serializedInitData = '{'
-      + Object.keys(this.initData).map(key => `"${key}": ${this.initData[key]}`).join(', ')
-      + '}';
-  }
-
-  private updateInitData(): void {
-    const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
-    const da = difficultyAdjustment.getDifficultyAdjustment();
-    this.setInitDataFields({
-      'mempoolInfo': memPool.getMempoolInfo(),
-      'vBytesPerSecond': memPool.getVBytesPerSecond(),
-      'blocks': _blocks,
-      'conversions': priceUpdater.getLatestPrices(),
-      'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
-      'transactions': memPool.getLatestTransactions(),
-      'backendInfo': backendInfo.getBackendInfo(),
-      'loadingIndicators': loadingIndicators.getLoadingIndicators(),
-      'da': da?.previousTime ? da : undefined,
-      'fees': feeApi.getRecommendedFee(),
-    });
-  }
-
-  public getSerializedInitData(): string {
-    return this.serializedInitData;
  }

  setupConnectionHandling() {
@@ -84,11 +42,7 @@ class WebsocketHandler {
    }

    this.wss.on('connection', (client: WebSocket) => {
-      this.numConnected++;
      client.on('error', logger.info);
-      client.on('close', () => {
-        this.numDisconnected++;
-      });
      client.on('message', async (message: string) => {
        try {
          const parsedMessage: WebsocketResponse = JSON.parse(message);
@@ -104,10 +58,9 @@ class WebsocketHandler {
          if (parsedMessage && parsedMessage['track-tx']) {
            if (/^[a-fA-F0-9]{64}$/.test(parsedMessage['track-tx'])) {
              client['track-tx'] = parsedMessage['track-tx'];
-              const trackTxid = client['track-tx'];
              // Client is telling the transaction wasn't found
              if (parsedMessage['watch-mempool']) {
-                const rbfCacheTxid = rbfCache.getReplacedBy(trackTxid);
+                const rbfCacheTxid = rbfCache.getReplacedBy(client['track-tx']);
                if (rbfCacheTxid) {
                  response['txReplaced'] = {
                    txid: rbfCacheTxid,
@@ -115,7 +68,7 @@ class WebsocketHandler {
                  client['track-tx'] = null;
                } else {
                  // It might have appeared before we had the time to start watching for it
-                  const tx = memPool.getMempool()[trackTxid];
+                  const tx = memPool.getMempool()[client['track-tx']];
                  if (tx) {
                    if (config.MEMPOOL.BACKEND === 'esplora') {
                      response['tx'] = tx;
@@ -139,13 +92,6 @@ class WebsocketHandler {
                  }
                }
              }
-              const tx = memPool.getMempool()[trackTxid];
-              if (tx && tx.position) {
-                response['txPosition'] = {
-                  txid: trackTxid,
-                  position: tx.position,
-                };
-              }
            } else {
              client['track-tx'] = null;
            }
@@ -186,22 +132,12 @@ class WebsocketHandler {
            }
          }

-          if (parsedMessage && parsedMessage['track-rbf'] !== undefined) {
-            if (['all', 'fullRbf'].includes(parsedMessage['track-rbf'])) {
-              client['track-rbf'] = parsedMessage['track-rbf'];
-            } else {
-              client['track-rbf'] = false;
-            }
-          }
-
          if (parsedMessage.action === 'init') {
-            if (!this.initData['blocks']?.length || !this.initData['da']) {
-              this.updateInitData();
-            }
-            if (!this.initData['blocks']?.length) {
+            const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
+            if (!_blocks) {
              return;
            }
-            client.send(this.serializedInitData);
+            client.send(JSON.stringify(this.getInitData(_blocks)));
          }

          if (parsedMessage.action === 'ping') {
@@ -250,14 +186,11 @@ class WebsocketHandler {
      throw new Error('WebSocket.Server is not set');
    }

-    this.setInitDataFields({ 'loadingIndicators': indicators });
-
-    const response = JSON.stringify({ loadingIndicators: indicators });
    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
-      client.send(response);
+      client.send(JSON.stringify({ loadingIndicators: indicators }));
    });
  }

@@ -266,28 +199,39 @@ class WebsocketHandler {
      throw new Error('WebSocket.Server is not set');
    }

-    this.setInitDataFields({ 'conversions': conversionRates });
-
-    const response = JSON.stringify({ conversions: conversionRates });
    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }
-      client.send(response);
+      client.send(JSON.stringify({ conversions: conversionRates }));
    });
  }

+  getInitData(_blocks?: BlockExtended[]) {
+    if (!_blocks) {
+      _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
+    }
+    const da = difficultyAdjustment.getDifficultyAdjustment();
+    return {
+      'mempoolInfo': memPool.getMempoolInfo(),
+      'vBytesPerSecond': memPool.getVBytesPerSecond(),
+      'blocks': _blocks,
+      'conversions': priceUpdater.getLatestPrices(),
+      'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
+      'transactions': memPool.getLatestTransactions(),
+      'backendInfo': backendInfo.getBackendInfo(),
+      'loadingIndicators': loadingIndicators.getLoadingIndicators(),
+      'da': da?.previousTime ? da : undefined,
+      'fees': feeApi.getRecommendedFee(),
+      ...this.extraInitProperties
+    };
+  }
+
  handleNewStatistic(stats: OptimizedStatistic) {
    if (!this.wss) {
      throw new Error('WebSocket.Server is not set');
    }

-    this.printLogs();
-
-    const response = JSON.stringify({
-      'live-2h-chart': stats
-    });
-
    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
@@ -297,20 +241,20 @@ class WebsocketHandler {
        return;
      }

-      client.send(response);
+      client.send(JSON.stringify({
+        'live-2h-chart': stats
+      }));
    });
  }

-  async $handleMempoolChange(newMempool: { [txid: string]: TransactionExtended },
+  async handleMempoolChange(newMempool: { [txid: string]: TransactionExtended },
    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]): Promise<void> {
    if (!this.wss) {
      throw new Error('WebSocket.Server is not set');
    }

-    this.printLogs();
-
    if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
-      await mempoolBlocks.$updateBlockTemplates(newMempool, newTransactions, deletedTransactions, true);
+      await mempoolBlocks.updateBlockTemplates(newMempool, newTransactions, deletedTransactions.map(tx => tx.txid), true);
    } else {
      mempoolBlocks.updateMempoolBlocks(newMempool, true);
    }
@@ -322,55 +266,8 @@ class WebsocketHandler {
    const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions);
    const da = difficultyAdjustment.getDifficultyAdjustment();
    memPool.handleRbfTransactions(rbfTransactions);
-    const rbfChanges = rbfCache.getRbfChanges();
-    let rbfReplacements;
-    let fullRbfReplacements;
-    if (Object.keys(rbfChanges.trees).length) {
-      rbfReplacements = rbfCache.getRbfTrees(false);
-      fullRbfReplacements = rbfCache.getRbfTrees(true);
-    }
-    for (const deletedTx of deletedTransactions) {
-      rbfCache.evict(deletedTx.txid);
-    }
    const recommendedFees = feeApi.getRecommendedFee();

-    // update init data
-    this.updateInitData();
-
-    // cache serialized objects to avoid stringify-ing the same thing for every client
-    const responseCache = { ...this.initData };
-    function getCachedResponse(key: string,  data): string {
-      if (!responseCache[key]) {
-        responseCache[key] = JSON.stringify(data);
-      }
-      return responseCache[key];
-    }
-
-    // pre-compute new tracked outspends
-    const outspendCache: { [txid: string]: { [vout: number]: { vin: number, txid: string } } } = {};
-    const trackedTxs = new Set<string>();
-    this.wss.clients.forEach((client) => {
-      if (client['track-tx']) {
-        trackedTxs.add(client['track-tx']);
-      }
-    });
-    if (trackedTxs.size > 0) {
-      for (const tx of newTransactions) {
-        for (let i = 0; i < tx.vin.length; i++) {
-          const vin = tx.vin[i];
-          if (trackedTxs.has(vin.txid)) {
-            if (!outspendCache[vin.txid]) {
-              outspendCache[vin.txid] = { [vin.vout]: { vin: i, txid: tx.txid }};
-            } else {
-              outspendCache[vin.txid][vin.vout] = { vin: i, txid: tx.txid };
-            }
-          }
-        }
-      }
-    }
-
-    const latestTransactions = newTransactions.slice(0, 6).map((tx) => Common.stripTransaction(tx));
-
    this.wss.clients.forEach(async (client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
@@ -379,17 +276,17 @@ class WebsocketHandler {
      const response = {};

      if (client['want-stats']) {
-        response['mempoolInfo'] = getCachedResponse('mempoolInfo', mempoolInfo);
-        response['vBytesPerSecond'] = getCachedResponse('vBytesPerSecond', vBytesPerSecond);
-        response['transactions'] = getCachedResponse('transactions', latestTransactions);
+        response['mempoolInfo'] = mempoolInfo;
+        response['vBytesPerSecond'] = vBytesPerSecond;
+        response['transactions'] = newTransactions.slice(0, 6).map((tx) => Common.stripTransaction(tx));
        if (da?.previousTime) {
-          response['da'] = getCachedResponse('da', da);
+          response['da'] = da;
        }
-        response['fees'] = getCachedResponse('fees', recommendedFees);
+        response['fees'] = recommendedFees;
      }

      if (client['want-mempool-blocks']) {
-        response['mempool-blocks'] = getCachedResponse('mempool-blocks', mBlocks);
+        response['mempool-blocks'] = mBlocks;
      }

      if (client['track-mempool-tx']) {
@@ -398,12 +295,12 @@ class WebsocketHandler {
          if (config.MEMPOOL.BACKEND !== 'esplora') {
            try {
              const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
-              response['tx'] = JSON.stringify(fullTx);
+              response['tx'] = fullTx;
            } catch (e) {
              logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
            }
          } else {
-            response['tx'] = JSON.stringify(tx);
+            response['tx'] = tx;
          }
          client['track-mempool-tx'] = null;
        }
@@ -443,7 +340,7 @@ class WebsocketHandler {
        }

        if (foundTransactions.length) {
-          response['address-transactions'] = JSON.stringify(foundTransactions);
+          response['address-transactions'] = foundTransactions;
        }
      }

@@ -472,60 +369,49 @@ class WebsocketHandler {
        });

        if (foundTransactions.length) {
-          response['address-transactions'] = JSON.stringify(foundTransactions);
+          response['address-transactions'] = foundTransactions;
        }
      }

      if (client['track-tx']) {
-        const trackTxid = client['track-tx'];
-        const outspends = outspendCache[trackTxid];
+        const outspends: object = {};
+        newTransactions.forEach((tx) => tx.vin.forEach((vin, i) => {
+          if (vin.txid === client['track-tx']) {
+            outspends[vin.vout] = {
+              vin: i,
+              txid: tx.txid,
+            };
+          }
+        }));

-        if (outspends && Object.keys(outspends).length) {
-          response['utxoSpent'] = JSON.stringify(outspends);
+        if (Object.keys(outspends).length) {
+          response['utxoSpent'] = outspends;
        }

-        const rbfReplacedBy = rbfCache.getReplacedBy(client['track-tx']);
-        if (rbfReplacedBy) {
-          response['rbfTransaction'] = JSON.stringify({
-            txid: rbfReplacedBy,
-          })
-        }
-
-        const rbfChange = rbfChanges.map[client['track-tx']];
-        if (rbfChange) {
-          response['rbfInfo'] = JSON.stringify(rbfChanges.trees[rbfChange]);
-        }
-
-        const mempoolTx = newMempool[trackTxid];
-        if (mempoolTx && mempoolTx.position) {
-          response['txPosition'] = JSON.stringify({
-            txid: trackTxid,
-            position: mempoolTx.position,
-          });
+        if (rbfTransactions[client['track-tx']]) {
+          for (const rbfTransaction in rbfTransactions) {
+            if (client['track-tx'] === rbfTransaction) {
+              response['rbfTransaction'] = {
+                txid: rbfTransactions[rbfTransaction].txid,
+              };
+              break;
+            }
+          }
        }
      }

      if (client['track-mempool-block'] >= 0) {
        const index = client['track-mempool-block'];
        if (mBlockDeltas[index]) {
-          response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, {
+          response['projected-block-transactions'] = {
            index: index,
            delta: mBlockDeltas[index],
-          });
+          };
        }
      }

-      if (client['track-rbf'] === 'all' && rbfReplacements) {
-        response['rbfLatest'] = getCachedResponse('rbfLatest', rbfReplacements);
-      } else if (client['track-rbf'] === 'fullRbf' && fullRbfReplacements) {
-        response['rbfLatest'] = getCachedResponse('fullrbfLatest', fullRbfReplacements);
-      }
-
      if (Object.keys(response).length) {
-        const serializedResponse = '{'
-          + Object.keys(response).map(key => `"${key}": ${response[key]}`).join(', ')
-          + '}';
-        client.send(serializedResponse);
+        client.send(JSON.stringify(response));
      }
    });
  }
@@ -535,29 +421,21 @@ class WebsocketHandler {
      throw new Error('WebSocket.Server is not set');
    }

-    this.printLogs();
-
    const _memPool = memPool.getMempool();

    if (config.MEMPOOL.AUDIT) {
      let projectedBlocks;
-      let auditMempool = _memPool;
      // template calculation functions have mempool side effects, so calculate audits using
      // a cloned copy of the mempool if we're running a different algorithm for mempool updates
-      const separateAudit = config.MEMPOOL.ADVANCED_GBT_AUDIT !== config.MEMPOOL.ADVANCED_GBT_MEMPOOL;
-      if (separateAudit) {
-        auditMempool = deepClone(_memPool);
-        if (config.MEMPOOL.ADVANCED_GBT_AUDIT) {
-          projectedBlocks = await mempoolBlocks.$makeBlockTemplates(auditMempool, false);
-        } else {
-          projectedBlocks = mempoolBlocks.updateMempoolBlocks(auditMempool, false);
-        }
+      const auditMempool = (config.MEMPOOL.ADVANCED_GBT_AUDIT === config.MEMPOOL.ADVANCED_GBT_MEMPOOL) ? _memPool : deepClone(_memPool);
+      if (config.MEMPOOL.ADVANCED_GBT_AUDIT) {
+        projectedBlocks = await mempoolBlocks.makeBlockTemplates(auditMempool, false);
      } else {
-        projectedBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
+        projectedBlocks = mempoolBlocks.updateMempoolBlocks(auditMempool, false);
      }

      if (Common.indexingEnabled() && memPool.isInSync()) {
-        const { censored, added, fresh, sigop, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool);
+        const { censored, added, fresh, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool);
        const matchRate = Math.round(score * 100 * 100) / 100;

        const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions.map((tx) => {
@@ -584,7 +462,6 @@ class WebsocketHandler {
          addedTxs: added,
          missingTxs: censored,
          freshTxs: fresh,
-          sigopTxs: sigop,
          matchRate: matchRate,
        });

@@ -600,14 +477,16 @@ class WebsocketHandler {
      }
    }

+    const removed: string[] = [];
    // Update mempool to remove transactions included in the new block
    for (const txId of txIds) {
      delete _memPool[txId];
-      rbfCache.mined(txId);
+      removed.push(txId);
+      rbfCache.evict(txId);
    }

    if (config.MEMPOOL.ADVANCED_GBT_MEMPOOL) {
-      await mempoolBlocks.$makeBlockTemplates(_memPool, true);
+      await mempoolBlocks.updateBlockTemplates(_memPool, [], removed, true);
    } else {
      mempoolBlocks.updateMempoolBlocks(_memPool, true);
    }
@@ -617,19 +496,6 @@ class WebsocketHandler {
    const da = difficultyAdjustment.getDifficultyAdjustment();
    const fees = feeApi.getRecommendedFee();

-    // update init data
-    this.updateInitData();
-
-    const responseCache = { ...this.initData };
-    function getCachedResponse(key, data): string {
-      if (!responseCache[key]) {
-        responseCache[key] = JSON.stringify(data);
-      }
-      return responseCache[key];
-    }
-
-    const mempoolInfo = memPool.getMempoolInfo();
-
    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
@@ -639,29 +505,19 @@ class WebsocketHandler {
        return;
      }

-      const response = {};
-      response['block'] = getCachedResponse('block', block);
-      response['mempoolInfo'] = getCachedResponse('mempoolInfo', mempoolInfo);
-      response['da'] = getCachedResponse('da', da?.previousTime ? da : undefined);
-      response['fees'] = getCachedResponse('fees', fees);
+      const response = {
+        'block': block,
+        'mempoolInfo': memPool.getMempoolInfo(),
+        'da': da?.previousTime ? da : undefined,
+        'fees': fees,
+      };

      if (mBlocks && client['want-mempool-blocks']) {
-        response['mempool-blocks'] = getCachedResponse('mempool-blocks', mBlocks);
+        response['mempool-blocks'] = mBlocks;
      }

-      if (client['track-tx']) {
-        const trackTxid = client['track-tx'];
-        if (txIds.indexOf(trackTxid) > -1) {
-          response['txConfirmed'] = 'true';
-        } else {
-          const mempoolTx = _memPool[trackTxid];
-          if (mempoolTx && mempoolTx.position) {
-            response['txPosition'] = JSON.stringify({
-              txid: trackTxid,
-              position: mempoolTx.position,
-            });
-          }
-        }
+      if (client['track-tx'] && txIds.indexOf(client['track-tx']) > -1) {
+        response['txConfirmed'] = true;
      }

      if (client['track-address']) {
@@ -687,7 +543,7 @@ class WebsocketHandler {
            };
          });

-          response['block-transactions'] = JSON.stringify(foundTransactions);
+          response['block-transactions'] = foundTransactions;
        }
      }

@@ -724,37 +580,23 @@ class WebsocketHandler {
            };
          });

-          response['block-transactions'] = JSON.stringify(foundTransactions);
+          response['block-transactions'] = foundTransactions;
        }
      }

      if (client['track-mempool-block'] >= 0) {
        const index = client['track-mempool-block'];
        if (mBlockDeltas && mBlockDeltas[index]) {
-          response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, {
+          response['projected-block-transactions'] = {
            index: index,
            delta: mBlockDeltas[index],
-          });
+          };
        }
      }

-      const serializedResponse = '{'
-        + Object.keys(response).map(key => `"${key}": ${response[key]}`).join(', ')
-        + '}';
-      client.send(serializedResponse);
+      client.send(JSON.stringify(response));
    });
  }
-
-  private printLogs(): void {
-    if (this.wss) {
-      const count = this.wss?.clients?.size || 0;
-      const diff = count - this.numClients;
-      this.numClients = count;
-      logger.debug(`${count} websocket clients | ${this.numConnected} connected | ${this.numDisconnected} disconnected | (${diff >= 0 ? '+' : ''}${diff})`);
-      this.numConnected = 0;
-      this.numDisconnected = 0;
-    }
-  }
 }

 export default new WebsocketHandler();
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -37,8 +37,6 @@ interface IConfig {
  };
  ESPLORA: {
    REST_API_URL: string;
-    UNIX_SOCKET_PATH: string | void | null;
-    RETRY_UNIX_SOCKET_AFTER: number;
  };
  LIGHTNING: {
    ENABLED: boolean;
@@ -86,7 +84,6 @@ interface IConfig {
    DATABASE: string;
    USERNAME: string;
    PASSWORD: string;
-    TIMEOUT: number;
  };
  SYSLOG: {
    ENABLED: boolean;
@@ -166,8 +163,6 @@ const defaults: IConfig = {
  },
  'ESPLORA': {
    'REST_API_URL': 'http://127.0.0.1:3000',
-    'UNIX_SOCKET_PATH': null,
-    'RETRY_UNIX_SOCKET_AFTER': 30000,
  },
  'ELECTRUM': {
    'HOST': '127.0.0.1',
@@ -195,8 +190,7 @@ const defaults: IConfig = {
    'PORT': 3306,
    'DATABASE': 'mempool',
    'USERNAME': 'mempool',
-    'PASSWORD': 'mempool',
-    'TIMEOUT': 180000,
+    'PASSWORD': 'mempool'
  },
  'SYSLOG': {
    'ENABLED': true,
--- a/backend/src/database.ts
+++ b/backend/src/database.ts
@@ -33,32 +33,8 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr
    OkPacket[] | ResultSetHeader>(query, params?): Promise<[T, FieldPacket[]]>
  {
    this.checkDBFlag();
-    let hardTimeout;
-    if (query?.timeout != null) {
-      hardTimeout = Math.floor(query.timeout * 1.1);
-    } else {
-      hardTimeout = config.DATABASE.TIMEOUT;
-    }
-    if (hardTimeout > 0) {
-      return new Promise((resolve, reject) => {
-        const timer = setTimeout(() => {
-          reject(new Error(`DB query failed to return, reject or time out within ${hardTimeout / 1000}s - ${query?.sql?.slice(0, 160) || (typeof(query) === 'string' || query instanceof String ? query?.slice(0, 160) : 'unknown query')}`));
-        }, hardTimeout);
-
-        this.getPool().then(pool => {
-          return pool.query(query, params) as Promise<[T, FieldPacket[]]>;
-        }).then(result => {
-          resolve(result);
-        }).catch(error => {
-          reject(error);
-        }).finally(() => {
-          clearTimeout(timer);
-        });
-      });
-    } else {
-      const pool = await this.getPool();
-      return pool.query(query, params);
-    }
+    const pool = await this.getPool();
+    return pool.query(query, params);
  }

  public async checkDbConnection() {
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -2,7 +2,6 @@ import express from 'express';
 import { Application, Request, Response, NextFunction } from 'express';
 import * as http from 'http';
 import * as WebSocket from 'ws';
-import bitcoinApi from './api/bitcoin/bitcoin-api-factory';
 import cluster from 'cluster';
 import DB from './database';
 import config from './config';
@@ -46,8 +45,7 @@ class Server {
  private wss: WebSocket.Server | undefined;
  private server: http.Server | undefined;
  private app: Application;
-  private currentBackendRetryInterval = 1;
-  private backendRetryCount = 0;
+  private currentBackendRetryInterval = 5;

  private maxHeapSize: number = 0;
  private heapLogInterval: number = 60;
@@ -122,7 +120,7 @@ class Server {
    await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
    await syncAssets.syncAssets$();
    if (config.MEMPOOL.ENABLED) {
-      await diskCache.$loadMempoolCache();
+      diskCache.loadMempoolCache();
    }

    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && cluster.isPrimary) {
@@ -180,26 +178,23 @@ class Server {
          logger.debug(msg);
        }
      }
-      const newMempool = await bitcoinApi.$getRawMempool();
-      const numHandledBlocks = await blocks.$updateBlocks();
-      if (numHandledBlocks === 0) {
-        await memPool.$updateMempool(newMempool);
-      }
+      memPool.deleteExpiredTransactions();
+      await blocks.$updateBlocks();
+      await memPool.$updateMempool();
      indexer.$run();

-      // rerun immediately if we skipped the mempool update, otherwise wait POLL_RATE_MS
-      setTimeout(this.runMainUpdateLoop.bind(this), numHandledBlocks > 0 ? 1 : config.MEMPOOL.POLL_RATE_MS);
-      this.backendRetryCount = 0;
+      setTimeout(this.runMainUpdateLoop.bind(this), config.MEMPOOL.POLL_RATE_MS);
+      this.currentBackendRetryInterval = 5;
    } catch (e: any) {
-      this.backendRetryCount++;
-      let loggerMsg = `Exception in runMainUpdateLoop() (count: ${this.backendRetryCount}). Retrying in ${this.currentBackendRetryInterval} sec.`;
+      let loggerMsg = `Exception in runMainUpdateLoop(). Retrying in ${this.currentBackendRetryInterval} sec.`;
      loggerMsg += ` Reason: ${(e instanceof Error ? e.message : e)}.`;
      if (e?.stack) {
        loggerMsg += ` Stack trace: ${e.stack}`;
      }
      // When we get a first Exception, only `logger.debug` it and retry after 5 seconds
      // From the second Exception, `logger.warn` the Exception and increase the retry delay
-      if (this.backendRetryCount >= 5) {
+      // Maximum retry delay is 60 seconds
+      if (this.currentBackendRetryInterval > 5) {
        logger.warn(loggerMsg);
        mempool.setOutOfSync();
      } else {
@@ -209,8 +204,8 @@ class Server {
        logger.debug(`AxiosError: ${e?.message}`);
      }
      setTimeout(this.runMainUpdateLoop.bind(this), 1000 * this.currentBackendRetryInterval);
-    } finally {
-      diskCache.unlock();
+      this.currentBackendRetryInterval *= 2;
+      this.currentBackendRetryInterval = Math.min(this.currentBackendRetryInterval, 60);
    }
  }

@@ -243,7 +238,7 @@ class Server {
    websocketHandler.setupConnectionHandling();
    if (config.MEMPOOL.ENABLED) {
      statistics.setNewStatisticsEntryCallback(websocketHandler.handleNewStatistic.bind(websocketHandler));
-      memPool.setAsyncMempoolChangedCallback(websocketHandler.$handleMempoolChange.bind(websocketHandler));
+      memPool.setAsyncMempoolChangedCallback(websocketHandler.handleMempoolChange.bind(websocketHandler));
      blocks.setNewAsyncBlockCallback(websocketHandler.handleNewBlock.bind(websocketHandler));
    }
    priceUpdater.setRatesChangedCallback(websocketHandler.handleNewConversionRates.bind(websocketHandler));
@@ -281,7 +276,7 @@ class Server {

    if (!this.warnedHeapCritical && this.maxHeapSize > warnThreshold) {
      this.warnedHeapCritical = true;
-      logger.warn(`Used ${(this.maxHeapSize / stats.heap_size_limit * 100).toFixed(2)}% of heap limit (${formatBytes(this.maxHeapSize, byteUnits, true)} / ${formatBytes(stats.heap_size_limit, byteUnits)})!`);
+      logger.warn(`Used ${(this.maxHeapSize / stats.heap_size_limit).toFixed(2)}% of heap limit (${formatBytes(this.maxHeapSize, byteUnits, true)} / ${formatBytes(stats.heap_size_limit, byteUnits)})!`);
    }
    if (this.lastHeapLogTime === null || (now - this.lastHeapLogTime) > (this.heapLogInterval * 1000)) {
      logger.debug(`Memory usage: ${formatBytes(this.maxHeapSize, byteUnits)} / ${formatBytes(stats.heap_size_limit, byteUnits)}`);
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -32,7 +32,6 @@ export interface BlockAudit {
  hash: string,
  missingTxs: string[],
  freshTxs: string[],
-  sigopTxs: string[],
  addedTxs: string[],
  matchRate: number,
 }
@@ -59,7 +58,6 @@ export interface MempoolBlockWithTransactions extends MempoolBlock {
 export interface MempoolBlockDelta {
  added: TransactionStripped[];
  removed: string[];
-  changed: { txid: string, rate: number | undefined }[];
 }

 interface VinStrippedToScriptsig {
@@ -81,22 +79,18 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
  descendants?: Ancestor[];
  bestDescendant?: BestDescendant | null;
  cpfpChecked?: boolean;
-  position?: {
-    block: number,
-    vsize: number,
-  };
-  uid?: number;
+  deleteAfter?: number;
 }

 export interface AuditTransaction {
-  uid: number;
+  txid: string;
  fee: number;
  weight: number;
  feePerVsize: number;
  effectiveFeePerVsize: number;
-  inputs: number[];
+  vin: string[];
  relativesSet: boolean;
-  ancestorMap: Map<number, AuditTransaction>;
+  ancestorMap: Map<string, AuditTransaction>;
  children: Set<AuditTransaction>;
  ancestorFee: number;
  ancestorWeight: number;
@@ -106,25 +100,13 @@ export interface AuditTransaction {
  modifiedNode: HeapNode<AuditTransaction>;
 }

-export interface CompactThreadTransaction {
-  uid: number;
-  fee: number;
-  weight: number;
-  feePerVsize: number;
-  effectiveFeePerVsize?: number;
-  inputs: number[];
-  cpfpRoot?: string;
-  cpfpChecked?: boolean;
-  dirty?: boolean;
-}
-
 export interface ThreadTransaction {
  txid: string;
  fee: number;
  weight: number;
  feePerVsize: number;
  effectiveFeePerVsize?: number;
-  inputs: number[];
+  vin: string[];
  cpfpRoot?: string;
  cpfpChecked?: boolean;
 }
@@ -163,7 +145,6 @@ export interface TransactionStripped {
  fee: number;
  vsize: number;
  value: number;
-  rate?: number; // effective fee rate
 }

 export interface BlockExtension {
@@ -233,21 +214,6 @@ export interface MempoolStats {
  tx_count: number;
 }

-export interface EffectiveFeeStats {
-  medianFee: number; // median effective fee rate
-  feeRange: number[]; // 2nd, 10th, 25th, 50th, 75th, 90th, 98th percentiles
-}
-
-export interface WorkingEffectiveFeeStats extends EffectiveFeeStats {
-  minFee: number;
-  maxFee: number;
-}
-
-export interface CpfpSummary {
-  transactions: TransactionExtended[];
-  clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[];
-}
-
 export interface Statistic {
  id?: number;
  added: string;
--- a/backend/src/repositories/BlocksAuditsRepository.ts
+++ b/backend/src/repositories/BlocksAuditsRepository.ts
@@ -6,9 +6,9 @@ import { BlockAudit, AuditScore } from '../mempool.interfaces';
 class BlocksAuditRepositories {
  public async $saveAudit(audit: BlockAudit): Promise<void> {
    try {
-      await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, fresh_txs, sigop_txs, match_rate)
-        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
-          JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), audit.matchRate]);
+      await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, fresh_txs, match_rate)
+        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
+          JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), audit.matchRate]);
    } catch (e: any) {
      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
        logger.debug(`Cannot save block audit for block ${audit.hash} because it has already been indexed, ignoring`);
@@ -19,7 +19,7 @@ class BlocksAuditRepositories {
    }
  }

-  public async $getBlocksHealthHistory(div: number, interval: string | null): Promise<any> {
+  public async $getBlockPredictionsHistory(div: number, interval: string | null): Promise<any> {
    try {
      let query = `SELECT UNIX_TIMESTAMP(time) as time, height, match_rate FROM blocks_audits`;

@@ -32,17 +32,17 @@ class BlocksAuditRepositories {
      const [rows] = await DB.query(query);
      return rows;
    } catch (e: any) {
-      logger.err(`Cannot fetch blocks health history. Reason: ` + (e instanceof Error ? e.message : e));
+      logger.err(`Cannot fetch block prediction history. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }

-  public async $getBlocksHealthCount(): Promise<number> {
+  public async $getPredictionsCount(): Promise<number> {
    try {
      const [rows] = await DB.query(`SELECT count(hash) as count FROM blocks_audits`);
      return rows[0].count;
    } catch (e: any) {
-      logger.err(`Cannot fetch blocks health count. Reason: ` + (e instanceof Error ? e.message : e));
+      logger.err(`Cannot fetch block prediction history. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -52,7 +52,7 @@ class BlocksAuditRepositories {
      const [rows]: any[] = await DB.query(
        `SELECT blocks.height, blocks.hash as id, UNIX_TIMESTAMP(blocks.blockTimestamp) as timestamp, blocks.size,
        blocks.weight, blocks.tx_count,
-        transactions, template, missing_txs as missingTxs, added_txs as addedTxs, fresh_txs as freshTxs, sigop_txs as sigopTxs, match_rate as matchRate
+        transactions, template, missing_txs as missingTxs, added_txs as addedTxs, fresh_txs as freshTxs, match_rate as matchRate
        FROM blocks_audits
        JOIN blocks ON blocks.hash = blocks_audits.hash
        JOIN blocks_summaries ON blocks_summaries.id = blocks_audits.hash
@@ -63,7 +63,6 @@ class BlocksAuditRepositories {
        rows[0].missingTxs = JSON.parse(rows[0].missingTxs);
        rows[0].addedTxs = JSON.parse(rows[0].addedTxs);
        rows[0].freshTxs = JSON.parse(rows[0].freshTxs);
-        rows[0].sigopTxs = JSON.parse(rows[0].sigopTxs);
        rows[0].transactions = JSON.parse(rows[0].transactions);
        rows[0].template = JSON.parse(rows[0].template);

--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -1,4 +1,4 @@
-import { BlockExtended, BlockExtension, BlockPrice, EffectiveFeeStats } from '../mempool.interfaces';
+import { BlockExtended, BlockExtension, BlockPrice } from '../mempool.interfaces';
 import DB from '../database';
 import logger from '../logger';
 import { Common } from '../api/common';
@@ -13,48 +13,6 @@ import chainTips from '../api/chain-tips';
 import blocks from '../api/blocks';
 import BlocksAuditsRepository from './BlocksAuditsRepository';

-interface DatabaseBlock {
-  id: string;
-  height: number;
-  version: number;
-  timestamp: number;
-  bits: number;
-  nonce: number;
-  difficulty: number;
-  merkle_root: string;
-  tx_count: number;
-  size: number;
-  weight: number;
-  previousblockhash: string;
-  mediantime: number;
-  totalFees: number;
-  medianFee: number;
-  feeRange: string;
-  reward: number;
-  poolId: number;
-  poolName: string;
-  poolSlug: string;
-  avgFee: number;
-  avgFeeRate: number;
-  coinbaseRaw: string;
-  coinbaseAddress: string;
-  coinbaseSignature: string;
-  coinbaseSignatureAscii: string;
-  avgTxSize: number;
-  totalInputs: number;
-  totalOutputs: number;
-  totalOutputAmt: number;
-  medianFeeAmt: number;
-  feePercentiles: string;
-  segwitTotalTxs: number;
-  segwitTotalSize: number;
-  segwitTotalWeight: number;
-  header: string;
-  utxoSetChange: number;
-  utxoSetSize: number;
-  totalInputAmt: number;
-}
-
 const BLOCK_DB_FIELDS = `
  blocks.hash AS id,
  blocks.height,
@@ -94,7 +52,7 @@ const BLOCK_DB_FIELDS = `
  blocks.header,
  blocks.utxoset_change AS utxoSetChange,
  blocks.utxoset_size AS utxoSetSize,
-  blocks.total_input_amt AS totalInputAmt
+  blocks.total_input_amt AS totalInputAmts
 `;

 class BlocksRepository {
@@ -213,32 +171,6 @@ class BlocksRepository {
    }
  }

-  /**
-   * Update missing fee amounts fields
-   *
-   * @param blockHash 
-   * @param feeAmtPercentiles 
-   * @param medianFeeAmt 
-   */
-  public async $updateFeeAmounts(blockHash: string, feeAmtPercentiles, medianFeeAmt) : Promise<void> {
-    try {
-      const query = `
-        UPDATE blocks
-        SET fee_percentiles = ?, median_fee_amt = ?
-        WHERE hash = ?
-      `;
-      const params: any[] = [
-        JSON.stringify(feeAmtPercentiles),
-        medianFeeAmt,
-        blockHash
-      ];
-      await DB.query(query, params);
-    } catch (e: any) {
-      logger.err(`Cannot update fee amounts for block ${blockHash}. Reason: ' + ${e instanceof Error ? e.message : e}`);
-      throw e;
-    }
-  }
-
  /**
   * Get all block height that have not been indexed between [startHeight, endHeight]
   */
@@ -500,7 +432,7 @@ class BlocksRepository {

      const blocks: BlockExtended[] = [];
      for (const block of rows) {
-        blocks.push(await this.formatDbBlockIntoExtendedBlock(block as DatabaseBlock));
+        blocks.push(await this.formatDbBlockIntoExtendedBlock(block));
      }

      return blocks;
@@ -527,13 +459,37 @@ class BlocksRepository {
        return null;
      }

-      return await this.formatDbBlockIntoExtendedBlock(rows[0] as DatabaseBlock);  
+      return await this.formatDbBlockIntoExtendedBlock(rows[0]);  
    } catch (e) {
      logger.err(`Cannot get indexed block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }

+  /**
+   * Get one block by hash
+   */
+  public async $getBlockByHash(hash: string): Promise<object | null> {
+    try {
+      const query = `
+        SELECT ${BLOCK_DB_FIELDS}
+        FROM blocks
+        JOIN pools ON blocks.pool_id = pools.id
+        WHERE hash = ?;
+      `;
+      const [rows]: any[] = await DB.query(query, [hash]);
+
+      if (rows.length <= 0) {
+        return null;
+      }
+ 
+      return await this.formatDbBlockIntoExtendedBlock(rows[0]);
+    } catch (e) {
+      logger.err(`Cannot get indexed block ${hash}. Reason: ` + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
  /**
   * Return blocks difficulty
   */
@@ -643,6 +599,7 @@ class BlocksRepository {
        if (blocks[idx].previous_block_hash !== blocks[idx - 1].hash) {
          logger.warn(`Chain divergence detected at block ${blocks[idx - 1].height}`);
          await this.$deleteBlocksFrom(blocks[idx - 1].height);
+          await BlocksSummariesRepository.$deleteBlocksFrom(blocks[idx - 1].height);
          await HashratesRepository.$deleteHashratesFromTimestamp(blocks[idx - 1].timestamp - 604800);
          await DifficultyAdjustmentsRepository.$deleteAdjustementsFromHeight(blocks[idx - 1].height);
          return false;
@@ -662,7 +619,7 @@ class BlocksRepository {
   * Delete blocks from the database from blockHeight
   */
  public async $deleteBlocksFrom(blockHeight: number) {
-    logger.info(`Delete newer blocks from height ${blockHeight} from the database`, logger.tags.mining);
+    logger.info(`Delete newer blocks from height ${blockHeight} from the database`);

    try {
      await DB.query(`DELETE FROM blocks where height >= ${blockHeight}`);
@@ -951,32 +908,13 @@ class BlocksRepository {
    }
  }

-  /**
-   * Save indexed effective fee statistics
-   * 
-   * @param id 
-   * @param feeStats 
-   */
-  public async $saveEffectiveFeeStats(id: string, feeStats: EffectiveFeeStats): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE blocks SET median_fee = ?, fee_span = ?
-        WHERE hash = ?`,
-        [feeStats.medianFee, JSON.stringify(feeStats.feeRange), id]
-      );
-    } catch (e) {
-      logger.err(`Cannot update block fee stats. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
  /**
   * Convert a mysql row block into a BlockExtended. Note that you
   * must provide the correct field into dbBlk object param
   * 
   * @param dbBlk 
   */
-  private async formatDbBlockIntoExtendedBlock(dbBlk: DatabaseBlock): Promise<BlockExtended> {
+  private async formatDbBlockIntoExtendedBlock(dbBlk: any): Promise<BlockExtended> {
    const blk: Partial<BlockExtended> = {};
    const extras: Partial<BlockExtension> = {};

@@ -1040,7 +978,6 @@ class BlocksRepository {
    }

    // If we're missing block summary related field, check if we can populate them on the fly now
-    // This is for example triggered upon re-org
    if (Common.blocksSummariesIndexingEnabled() &&
      (extras.medianFeeAmt === null || extras.feePercentiles === null))
    {
@@ -1048,12 +985,11 @@ class BlocksRepository {
      if (extras.feePercentiles === null) {
        const block = await bitcoinClient.getBlock(dbBlk.id, 2);
        const summary = blocks.summarizeBlock(block);
-        await BlocksSummariesRepository.$saveTransactions(dbBlk.height, dbBlk.id, summary.transactions);
+        await BlocksSummariesRepository.$saveSummary({ height: block.height, mined: summary });
        extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(dbBlk.id);
      }
      if (extras.feePercentiles !== null) {
        extras.medianFeeAmt = extras.feePercentiles[3];
-        await this.$updateFeeAmounts(dbBlk.id, extras.feePercentiles, extras.medianFeeAmt);
      }
    }

--- a/backend/src/repositories/BlocksSummariesRepository.ts
+++ b/backend/src/repositories/BlocksSummariesRepository.ts
@@ -1,6 +1,6 @@
 import DB from '../database';
 import logger from '../logger';
-import { BlockSummary, TransactionStripped } from '../mempool.interfaces';
+import { BlockSummary } from '../mempool.interfaces';

 class BlocksSummariesRepository {
  public async $getByBlockId(id: string): Promise<BlockSummary | undefined> {
@@ -17,17 +17,23 @@ class BlocksSummariesRepository {
    return undefined;
  }

-  public async $saveTransactions(blockHeight: number, blockId: string, transactions: TransactionStripped[]): Promise<void> {
+  public async $saveSummary(params: { height: number, mined?: BlockSummary}) {
+    const blockId = params.mined?.id;
    try {
-      const transactionsStr = JSON.stringify(transactions);
+      const transactions = JSON.stringify(params.mined?.transactions || []);
      await DB.query(`
-        INSERT INTO blocks_summaries
-        SET height = ?, transactions = ?, id = ?
-        ON DUPLICATE KEY UPDATE transactions = ?`,
-        [blockHeight, transactionsStr, blockId, transactionsStr]);
+        INSERT INTO blocks_summaries (height, id, transactions, template)
+        VALUE (?, ?, ?, ?)
+        ON DUPLICATE KEY UPDATE
+          transactions = ?
+      `, [params.height, blockId, transactions, '[]', transactions]);
    } catch (e: any) {
-      logger.debug(`Cannot save block summary transactions for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
-      throw e;
+      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
+        logger.debug(`Cannot save block summary for ${blockId} because it has already been indexed, ignoring`);
+      } else {
+        logger.debug(`Cannot save block summary for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
+        throw e;
+      }
    }
  }

@@ -62,6 +68,19 @@ class BlocksSummariesRepository {
    return [];
  }

+  /**
+   * Delete blocks from the database from blockHeight
+   */
+  public async $deleteBlocksFrom(blockHeight: number) {
+    logger.info(`Delete newer blocks summary from height ${blockHeight} from the database`);
+
+    try {
+      await DB.query(`DELETE FROM blocks_summaries where height >= ${blockHeight}`);
+    } catch (e) {
+      logger.err('Cannot delete indexed blocks summaries. Reason: ' + (e instanceof Error ? e.message : e));
+    }
+  }
+
  /**
   * Get the fee percentiles if the block has already been indexed, [] otherwise
   * 
--- a/backend/src/repositories/CpfpRepository.ts
+++ b/backend/src/repositories/CpfpRepository.ts
@@ -48,7 +48,7 @@ class CpfpRepository {
    }
  }

-  public async $batchSaveClusters(clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[]): Promise<boolean> {
+  public async $batchSaveClusters(clusters: { root: string, height: number, txs: any, effectiveFeePerVsize: number}[]): Promise<boolean> {
    try {
      const clusterValues: any[] = [];
      const txs: any[] = [];
--- a/backend/src/repositories/HashratesRepository.ts
+++ b/backend/src/repositories/HashratesRepository.ts
@@ -220,7 +220,7 @@ class HashratesRepository {
   * Delete hashrates from the database from timestamp
   */
  public async $deleteHashratesFromTimestamp(timestamp: number) {
-    logger.info(`Delete newer hashrates from timestamp ${new Date(timestamp * 1000).toUTCString()} from the database`, logger.tags.mining);
+    logger.info(`Delete newer hashrates from timestamp ${new Date(timestamp * 1000).toUTCString()} from the database`);

    try {
      await DB.query(`DELETE FROM hashrates WHERE hashrate_timestamp >= FROM_UNIXTIME(?)`, [timestamp]);
--- a/backend/src/repositories/PricesRepository.ts
+++ b/backend/src/repositories/PricesRepository.ts
@@ -160,7 +160,7 @@ class PricesRepository {

      // Compute fiat exchange rates
      let latestPrice = rates[0] as ApiPrice;
-      if (!latestPrice || latestPrice.USD === -1) {
+      if (latestPrice.USD === -1) {
        latestPrice = priceUpdater.getEmptyPricesObj();
      }

--- a/backend/src/tasks/lightning/forensics.service.ts
+++ b/backend/src/tasks/lightning/forensics.service.ts
@@ -27,7 +27,7 @@ class ForensicsService {

  private async $runTasks(): Promise<void> {
    try {
-      logger.debug(`Running forensics scans`);
+      logger.info(`Running forensics scans`);

      if (config.MEMPOOL.BACKEND === 'esplora') {
        await this.$runClosedChannelsForensics(false);
@@ -73,7 +73,7 @@ class ForensicsService {
    let progress = 0;

    try {
-      logger.debug(`Started running closed channel forensics...`);
+      logger.info(`Started running closed channel forensics...`);
      let channels;
      if (onlyNewChannels) {
        channels = await channelsApi.$getClosedChannelsWithoutReason();
@@ -152,11 +152,11 @@ class ForensicsService {
        ++progress;
        const elapsedSeconds = Math.round((new Date().getTime() / 1000) - this.loggerTimer);
        if (elapsedSeconds > 10) {
-          logger.debug(`Updating channel closed channel forensics ${progress}/${channels.length}`);
+          logger.info(`Updating channel closed channel forensics ${progress}/${channels.length}`);
          this.loggerTimer = new Date().getTime() / 1000;
        }
      }
-      logger.debug(`Closed channels forensics scan complete.`);
+      logger.info(`Closed channels forensics scan complete.`);
    } catch (e) {
      logger.err('$runClosedChannelsForensics() error: ' + (e instanceof Error ? e.message : e));
    }
@@ -217,7 +217,7 @@ class ForensicsService {
    let progress = 0;

    try {
-      logger.debug(`Started running open channel forensics...`);
+      logger.info(`Started running open channel forensics...`);
      const channels = await channelsApi.$getChannelsWithoutSourceChecked();

      for (const openChannel of channels) {
@@ -257,7 +257,7 @@ class ForensicsService {
        ++progress;
        const elapsedSeconds = Math.round((new Date().getTime() / 1000) - this.loggerTimer);
        if (elapsedSeconds > 10) {
-          logger.debug(`Updating opened channel forensics ${progress}/${channels?.length}`);
+          logger.info(`Updating opened channel forensics ${progress}/${channels?.length}`);
          this.loggerTimer = new Date().getTime() / 1000;
          this.truncateTempCache();
        }
@@ -266,7 +266,7 @@ class ForensicsService {
        }
      }

-      logger.debug(`Open channels forensics scan complete.`);
+      logger.info(`Open channels forensics scan complete.`);
    } catch (e) {
      logger.err('$runOpenedChannelsForensics() error: ' + (e instanceof Error ? e.message : e));
    } finally {
--- a/backend/src/tasks/lightning/network-sync.service.ts
+++ b/backend/src/tasks/lightning/network-sync.service.ts
@@ -283,7 +283,7 @@ class NetworkSyncService {
      } else {
        log += ` for the first time`;
      }
-      logger.debug(`${log}`, logger.tags.ln);
+      logger.info(`${log}`, logger.tags.ln);

      const channels = await channelsApi.$getChannelsByStatus([0, 1]);
      for (const channel of channels) {
@@ -300,7 +300,7 @@ class NetworkSyncService {
        ++progress;
        const elapsedSeconds = Math.round((new Date().getTime() / 1000) - this.loggerTimer);
        if (elapsedSeconds > config.LIGHTNING.LOGGER_UPDATE_INTERVAL) {
-          logger.debug(`Checking if channel has been closed ${progress}/${channels.length}`, logger.tags.ln);
+          logger.info(`Checking if channel has been closed ${progress}/${channels.length}`, logger.tags.ln);
          this.loggerTimer = new Date().getTime() / 1000;
        }
      }
--- a/backend/src/tasks/lightning/sync-tasks/stats-importer.ts
+++ b/backend/src/tasks/lightning/sync-tasks/stats-importer.ts
@@ -15,20 +15,16 @@ class LightningStatsImporter {
  topologiesFolder = config.LIGHTNING.TOPOLOGY_FOLDER;

  async $run(): Promise<void> {
-    try {
-      const [channels]: any[] = await DB.query('SELECT short_id from channels;');
-      logger.info(`Caching funding txs for currently existing channels`, logger.tags.ln);
-      await fundingTxFetcher.$fetchChannelsFundingTxs(channels.map(channel => channel.short_id));
+    const [channels]: any[] = await DB.query('SELECT short_id from channels;');
+    logger.info(`Caching funding txs for currently existing channels`, logger.tags.ln);
+    await fundingTxFetcher.$fetchChannelsFundingTxs(channels.map(channel => channel.short_id));

-      if (config.MEMPOOL.NETWORK !== 'mainnet' || config.DATABASE.ENABLED === false) {
-        return;
-      }
-
-      await this.$importHistoricalLightningStats();
-      await this.$cleanupIncorrectSnapshot();
-    } catch (e) {
-      logger.err(`Exception in LightningStatsImporter::$run(). ${e}`);
+    if (config.MEMPOOL.NETWORK !== 'mainnet' || config.DATABASE.ENABLED === false) {
+      return;
    }
+
+    await this.$importHistoricalLightningStats();
+    await this.$cleanupIncorrectSnapshot();
  }

  /**
--- a/backend/src/tasks/pools-updater.ts
+++ b/backend/src/tasks/pools-updater.ts
@@ -62,7 +62,7 @@ class PoolsUpdater {
      if (this.currentSha === null) {
        logger.info(`Downloading pools-v2.json for the first time from ${this.poolsUrl} over ${network}`, logger.tags.mining);
      } else {
-        logger.warn(`pools-v2.json is outdated, fetching latest from ${this.poolsUrl} over ${network}`, logger.tags.mining);
+        logger.warn(`pools-v2.json is outdated, fetch latest from ${this.poolsUrl} over ${network}`, logger.tags.mining);
      }
      const poolsJson = await this.query(this.poolsUrl);
      if (poolsJson === undefined) {
--- a/backend/src/tasks/price-updater.ts
+++ b/backend/src/tasks/price-updater.ts
@@ -222,7 +222,7 @@ class PriceUpdater {
  private async $insertMissingRecentPrices(type: 'hour' | 'day'): Promise<void> {
    const existingPriceTimes = await PricesRepository.$getPricesTimes();

-    logger.debug(`Fetching ${type === 'day' ? 'dai' : 'hour'}ly price history from exchanges and saving missing ones into the database`, logger.tags.mining);
+    logger.info(`Fetching ${type === 'day' ? 'dai' : 'hour'}ly price history from exchanges and saving missing ones into the database`, logger.tags.mining);

    const historicalPrices: PriceHistory[] = [];

--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -5,7 +5,6 @@
    "types": ["node", "jest"],
    "lib": ["es2019", "dom"],
    "strict": true,
-    "skipLibCheck": true,
    "noImplicitAny": false,
    "sourceMap": false,
    "outDir": "dist",
--- a/contributors/vostrnad.txt
+++ b/contributors/vostrnad.txt
@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
-
-Signed: vostrnad
--- a/docker/README.md
+++ b/docker/README.md
@@ -204,9 +204,7 @@ Corresponding `docker-compose.yml` overrides:
 `mempool-config.json`:
 ```json
  "ESPLORA": {
-    "REST_API_URL": "http://127.0.0.1:3000",
-    "UNIX_SOCKET_PATH": "/tmp/esplora-socket",
-    "RETRY_UNIX_SOCKET_AFTER": 30000
+    "REST_API_URL": "http://127.0.0.1:3000"
  },
 ```

@@ -215,8 +213,6 @@ Corresponding `docker-compose.yml` overrides:
  api:
    environment:
      ESPLORA_REST_API_URL: ""
-      ESPLORA_UNIX_SOCKET_PATH: ""
-      ESPLORA_RETRY_UNIX_SOCKET_AFTER: ""
      ...
 ```

@@ -269,7 +265,6 @@ Corresponding `docker-compose.yml` overrides:
      DATABASE_DATABASE: ""
      DATABASE_USERNAME: ""
      DATABASE_PASSWORD: ""
-      DATABASE_TIMEOUT: ""
      ...
 ```

--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -42,9 +42,7 @@
    "TLS_ENABLED": __ELECTRUM_TLS_ENABLED__
  },
  "ESPLORA": {
-    "REST_API_URL": "__ESPLORA_REST_API_URL__",
-    "UNIX_SOCKET_PATH": "__ESPLORA_UNIX_SOCKET_PATH__",
-    "RETRY_UNIX_SOCKET_AFTER": __ESPLORA_RETRY_UNIX_SOCKET_AFTER__
+    "REST_API_URL": "__ESPLORA_REST_API_URL__"
  },
  "SECOND_CORE_RPC": {
    "HOST": "__SECOND_CORE_RPC_HOST__",
@@ -60,8 +58,7 @@
    "PORT": __DATABASE_PORT__,
    "DATABASE": "__DATABASE_DATABASE__",
    "USERNAME": "__DATABASE_USERNAME__",
-    "PASSWORD": "__DATABASE_PASSWORD__",
-    "TIMEOUT": "__DATABASE_TIMEOUT__"
+    "PASSWORD": "__DATABASE_PASSWORD__"
  },
  "SYSLOG": {
    "ENABLED": __SYSLOG_ENABLED__,
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -46,8 +46,6 @@ __ELECTRUM_TLS_ENABLED__=${ELECTRUM_TLS_ENABLED:=false}

 # ESPLORA
 __ESPLORA_REST_API_URL__=${ESPLORA_REST_API_URL:=http://127.0.0.1:3000}
-__ESPLORA_UNIX_SOCKET_PATH__=${ESPLORA_UNIX_SOCKET_PATH:=null}
-__ESPLORA_RETRY_UNIX_SOCKET_AFTER__=${ESPLORA_RETRY_UNIX_SOCKET_AFTER:=30000}

 # SECOND_CORE_RPC
 __SECOND_CORE_RPC_HOST__=${SECOND_CORE_RPC_HOST:=127.0.0.1}
@@ -64,7 +62,6 @@ __DATABASE_PORT__=${DATABASE_PORT:=3306}
 __DATABASE_DATABASE__=${DATABASE_DATABASE:=mempool}
 __DATABASE_USERNAME__=${DATABASE_USERNAME:=mempool}
 __DATABASE_PASSWORD__=${DATABASE_PASSWORD:=mempool}
-__DATABASE_TIMEOUT__=${DATABASE_TIMEOUT:=180000}

 # SYSLOG
 __SYSLOG_ENABLED__=${SYSLOG_ENABLED:=false}
@@ -169,8 +166,6 @@ sed -i "s/__ELECTRUM_PORT__/${__ELECTRUM_PORT__}/g" mempool-config.json
 sed -i "s/__ELECTRUM_TLS_ENABLED__/${__ELECTRUM_TLS_ENABLED__}/g" mempool-config.json

 sed -i "s!__ESPLORA_REST_API_URL__!${__ESPLORA_REST_API_URL__}!g" mempool-config.json
-sed -i "s!__ESPLORA_UNIX_SOCKET_PATH__!${__ESPLORA_UNIX_SOCKET_PATH__}!g" mempool-config.json
-sed -i "s!__ESPLORA_RETRY_UNIX_SOCKET_AFTER__!${__ESPLORA_RETRY_UNIX_SOCKET_AFTER__}!g" mempool-config.json

 sed -i "s/__SECOND_CORE_RPC_HOST__/${__SECOND_CORE_RPC_HOST__}/g" mempool-config.json
 sed -i "s/__SECOND_CORE_RPC_PORT__/${__SECOND_CORE_RPC_PORT__}/g" mempool-config.json
--- a/docker/frontend/entrypoint.sh
+++ b/docker/frontend/entrypoint.sh
@@ -39,7 +39,6 @@ __AUDIT__=${AUDIT:=false}
 __MAINNET_BLOCK_AUDIT_START_HEIGHT__=${MAINNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __TESTNET_BLOCK_AUDIT_START_HEIGHT__=${TESTNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __SIGNET_BLOCK_AUDIT_START_HEIGHT__=${SIGNET_BLOCK_AUDIT_START_HEIGHT:=0}
-__FULL_RBF_ENABLED__=${FULL_RBF_ENABLED:=false}
 __HISTORICAL_PRICE__=${HISTORICAL_PRICE:=true}

 # Export as environment variables to be used by envsubst
@@ -66,7 +65,6 @@ export __AUDIT__
 export __MAINNET_BLOCK_AUDIT_START_HEIGHT__
 export __TESTNET_BLOCK_AUDIT_START_HEIGHT__
 export __SIGNET_BLOCK_AUDIT_START_HEIGHT__
-export __FULL_RBF_ENABLED__
 export __HISTORICAL_PRICE__

 folder=$(find /var/www/mempool -name "config.js" | xargs dirname)
--- a/frontend/cypress/e2e/mainnet/mainnet.spec.ts
+++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts
@@ -127,7 +127,7 @@ describe('Mainnet', () => {

        cy.get('.search-box-container > .form-control').type('S').then(() => {
          cy.wait('@search-1wizS');
-          cy.get('app-search-results button.dropdown-item').should('have.length', 6);
+          cy.get('app-search-results button.dropdown-item').should('have.length', 5);
        });

        cy.get('.search-box-container > .form-control').type('A').then(() => {
@@ -504,17 +504,9 @@ describe('Mainnet', () => {

    describe('RBF transactions', () => {
      it('shows RBF transactions properly (mobile)', () => {
-        cy.intercept('/api/v1/tx/21518a98d1aa9df524865d2f88c578499f524eb1d0c4d3e70312ab863508692f/cached', {
-          fixture: 'mainnet_tx_cached.json'
-        }).as('cached_tx');
-
-        cy.intercept('/api/v1/tx/f81a08699b62b2070ad8fe0f2a076f8bea0386a2fdcd8124caee42cbc564a0d5/rbf', {
-          fixture: 'mainnet_rbf_new.json'
-        }).as('rbf');
-
        cy.viewport('iphone-xr');
        cy.mockMempoolSocket();
-        cy.visit('/tx/21518a98d1aa9df524865d2f88c578499f524eb1d0c4d3e70312ab863508692f');
+        cy.visit('/tx/f81a08699b62b2070ad8fe0f2a076f8bea0386a2fdcd8124caee42cbc564a0d5');

        cy.waitForSkeletonGone();

@@ -532,30 +524,22 @@ describe('Mainnet', () => {
          }
        });

-        cy.get('.alert').should('be.visible');
-        cy.get('.alert').invoke('css', 'width').then((alertWidth) => {
+        cy.get('.alert-mempool').should('be.visible');
+        cy.get('.alert-mempool').invoke('css', 'width').then((alertWidth) => {
          cy.get('.container-xl > :nth-child(3)').invoke('css', 'width').should('equal', alertWidth);
        });

-        cy.get('.btn-danger').then(getRectangle).then((rectA) => {
-          cy.get('.alert').then(getRectangle).then((rectB) => {
+        cy.get('.btn-success').then(getRectangle).then((rectA) => {
+          cy.get('.alert-mempool').then(getRectangle).then((rectB) => {
            expect(areOverlapping(rectA, rectB), 'Confirmations box and RBF alert are overlapping').to.be.false;
          });
        });
      });

      it('shows RBF transactions properly (desktop)', () => {
-        cy.intercept('/api/v1/tx/21518a98d1aa9df524865d2f88c578499f524eb1d0c4d3e70312ab863508692f/cached', {
-          fixture: 'mainnet_tx_cached.json'
-        }).as('cached_tx');
-
-        cy.intercept('/api/v1/tx/f81a08699b62b2070ad8fe0f2a076f8bea0386a2fdcd8124caee42cbc564a0d5/rbf', {
-          fixture: 'mainnet_rbf_new.json'
-        }).as('rbf');
-
        cy.viewport('macbook-16');
        cy.mockMempoolSocket();
-        cy.visit('/tx/21518a98d1aa9df524865d2f88c578499f524eb1d0c4d3e70312ab863508692f');
+        cy.visit('/tx/f81a08699b62b2070ad8fe0f2a076f8bea0386a2fdcd8124caee42cbc564a0d5');

        cy.waitForSkeletonGone();

@@ -573,17 +557,17 @@ describe('Mainnet', () => {
          }
        });

-        cy.get('.alert').should('be.visible');
+        cy.get('.alert-mempool').should('be.visible');

-        const alertLocator = '.alert';
+        const alertLocator = '.alert-mempool';
        const tableLocator = '.container-xl > :nth-child(3)';

        cy.get(tableLocator).invoke('css', 'width').then((firstWidth) => {
          cy.get(alertLocator).invoke('css', 'width').should('equal', firstWidth);
        });

-        cy.get('.btn-danger').then(getRectangle).then((rectA) => {
-          cy.get('.alert').then(getRectangle).then((rectB) => {
+        cy.get('.btn-success').then(getRectangle).then((rectA) => {
+          cy.get('.alert-mempool').then(getRectangle).then((rectB) => {
            expect(areOverlapping(rectA, rectB), 'Confirmations box and RBF alert are overlapping').to.be.false;
          });
        });
--- a/frontend/cypress/fixtures/mainnet_rbf.json
+++ b/frontend/cypress/fixtures/mainnet_rbf.json
@@ -1,4 +1,52 @@
 {
-"txReplaced": {
-  "txid": "8913ec7ba0ede285dbd120e46f6d61a28f2903c10814a6f6c4f97d0edf3e1f46"
-}}
+  "rbfTransaction": {
+    "txid": "8913ec7ba0ede285dbd120e46f6d61a28f2903c10814a6f6c4f97d0edf3e1f46",
+    "version": 2,
+    "locktime": 632699,
+    "vin": [
+      {
+        "txid": "02238126a63ea2669c5f378012180ef8b54402a949316f9b2f1352c51730a086",
+        "vout": 0,
+        "prevout": {
+          "scriptpubkey": "a914f8e495456956c833e5e8c69b9a9dc041aa14c72f87",
+          "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 f8e495456956c833e5e8c69b9a9dc041aa14c72f OP_EQUAL",
+          "scriptpubkey_type": "p2sh",
+          "scriptpubkey_address": "3QP3LMD8veT5GtWV83Nosif2Bhr73857VB",
+          "value": 25000000
+        },
+        "scriptsig": "22002043288fbbc0fc5efa86c229dbb7d88ab78d57957c65b5d5ceaece70838976ad1b",
+        "scriptsig_asm": "OP_PUSHBYTES_34 002043288fbbc0fc5efa86c229dbb7d88ab78d57957c65b5d5ceaece70838976ad1b",
+        "witness": [
+          "",
+          "3044022009e2d3a8e645f65bc89c8492cd9c08e6fb02609fd402214884a754a1970145340220575bb325429def59f3a3f1e22d9740a3feecbe97438ff3bb5796b2c46b3c477f01",
+          "3044022039c34372882da8fc1c1243bd72b5e7e5e6870301ef56bdebb87bc647fb50f9b5022071a704ee77d742f78b10e45be675d4c45a5f31e884139e75c975144fde70e41701",
+          "522102346eb7133f11e0dc279bc592d5ac948a91676372a6144c9ae2085625d7fbf70421021b9508a458f9d59be4eb8cc87ad582c3b494106fb1d4ec22801569be0700eb7b52ae"
+        ],
+        "is_coinbase": false,
+        "sequence": 4294967293,
+        "inner_redeemscript_asm": "OP_0 OP_PUSHBYTES_32 43288fbbc0fc5efa86c229dbb7d88ab78d57957c65b5d5ceaece70838976ad1b",
+        "inner_witnessscript_asm": "OP_PUSHNUM_2 OP_PUSHBYTES_33 02346eb7133f11e0dc279bc592d5ac948a91676372a6144c9ae2085625d7fbf704 OP_PUSHBYTES_33 021b9508a458f9d59be4eb8cc87ad582c3b494106fb1d4ec22801569be0700eb7b OP_PUSHNUM_2 OP_CHECKMULTISIG"
+      }
+    ],
+    "vout": [
+      {
+        "scriptpubkey": "a914fd4e5e59dd5cf2dc48eaedf1a2a1650ca1ce9d7f87",
+        "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 fd4e5e59dd5cf2dc48eaedf1a2a1650ca1ce9d7f OP_EQUAL",
+        "scriptpubkey_type": "p2sh",
+        "scriptpubkey_address": "3QnNmDhZS7toHA7bhhbTPBdtpLJoeecq5c",
+        "value": 13986350
+      },
+      {
+        "scriptpubkey": "76a914edc93d0446deec1c2d514f3a490f050096e74e0e88ac",
+        "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 edc93d0446deec1c2d514f3a490f050096e74e0e OP_EQUALVERIFY OP_CHECKSIG",
+        "scriptpubkey_type": "p2pkh",
+        "scriptpubkey_address": "1NgJDkTUqJxxCAAZrrsC87kWag5kphrRtM",
+        "value": 11000000
+      }
+    ],
+    "size": 372,
+    "weight": 828,
+    "fee": 1.5,
+    "status": { "confirmed": false }
+  }
+}
--- a/frontend/cypress/fixtures/mainnet_rbf_new.json
+++ b/frontend/cypress/fixtures/mainnet_rbf_new.json
@@ -1,31 +0,0 @@
-{
-  "replacements": {
-    "tx": {
-      "txid": "f22735aaa8eb84bcae3e7705f78609c6f5f0cd7dfc34ae03094e61f2dab0cc64",
-      "fee": 13843,
-      "vsize": 109.25,
-      "value": 253003805,
-      "rate": 36.04666732302845,
-      "rbf": true
-    },
-    "time": 1683865345,
-    "fullRbf": false,
-    "replaces": [
-      {
-        "tx": {
-          "txid": "21518a98d1aa9df524865d2f88c578499f524eb1d0c4d3e70312ab863508692f",
-          "fee": 8794,
-          "vsize": 109.25,
-          "value": 253008854,
-          "rate": 35.05247612484001,
-          "rbf": true
-        },
-        "time": 1683864993,
-        "interval": 352,
-        "fullRbf": false,
-        "replaces": []
-      }
-    ]
-  },
-  "replaces": null
-}
--- a/frontend/cypress/fixtures/mainnet_tx_cached.json
+++ b/frontend/cypress/fixtures/mainnet_tx_cached.json
@@ -1,60 +0,0 @@
-{
-  "vsize": 109,
-  "feePerVsize": 80.49427917620137,
-  "effectiveFeePerVsize": 35.05247612484001,
-  "txid": "21518a98d1aa9df524865d2f88c578499f524eb1d0c4d3e70312ab863508692f",
-  "version": 2,
-  "locktime": 0,
-  "vin": [
-    {
-      "txid": "1e3bd5c634781a6ba8bb3d3385b14739bf38cad5332d5fbc5c0ab775e54b9aef",
-      "vout": 144,
-      "prevout": {
-        "scriptpubkey": "0014d98654186b90d95da7e31a30929f5b5b6a0af250",
-        "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 d98654186b90d95da7e31a30929f5b5b6a0af250",
-        "scriptpubkey_type": "v0_p2wpkh",
-        "scriptpubkey_address": "bc1qmxr9gxrtjrv4mflrrgcf986mtd4q4ujss432tk",
-        "value": 253017648
-      },
-      "scriptsig": "",
-      "scriptsig_asm": "",
-      "witness": [
-        "30440220448e8f58fcdea87c1969d58438b49da5b43712380bc4c68b02d22cf6b164907302207b2ed660f1a5b3b74f712961ffb3f3a7d1ac6e48b269ea6ff15df985042211f301",
-        "02e39a1f3583e382cec1a1fab6a3f5950b6403c953fada58d809127a497f502ebe"
-      ],
-      "is_coinbase": false,
-      "sequence": 4294967293
-    }
-  ],
-  "vout": [
-    {
-      "scriptpubkey": "0014edb5167da7e97c73d7931eb2130ac3e34e6845a9",
-      "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 edb5167da7e97c73d7931eb2130ac3e34e6845a9",
-      "scriptpubkey_type": "v0_p2wpkh",
-      "scriptpubkey_address": "bc1qak63vld8a97884unr6epxzkrud8xs3dfdqswy2",
-      "value": 253008854
-    }
-  ],
-  "size": 191,
-  "weight": 437,
-  "fee": 8794,
-  "status": {
-    "confirmed": false
-  },
-  "firstSeen": 1683864993,
-  "uid": 298353,
-  "position": {
-    "block": 0,
-    "vsize": 886207.5
-  },
-  "cpfpChecked": true,
-  "ancestors": [
-    {
-      "txid": "1e3bd5c634781a6ba8bb3d3385b14739bf38cad5332d5fbc5c0ab775e54b9aef",
-      "fee": 169220,
-      "weight": 19877
-    }
-  ],
-  "descendants": [],
-  "bestDescendant": null
-}
--- a/frontend/mempool-frontend-config.sample.json
+++ b/frontend/mempool-frontend-config.sample.json
@@ -22,6 +22,5 @@
  "TESTNET_BLOCK_AUDIT_START_HEIGHT": 0,
  "SIGNET_BLOCK_AUDIT_START_HEIGHT": 0,
  "LIGHTNING": false,
-  "FULL_RBF_ENABLED": false,
  "HISTORICAL_PRICE": true
 }
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "mempool-frontend",
-  "version": "2.6.0-dev",
+  "version": "2.5.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "mempool-frontend",
-      "version": "2.6.0-dev",
+      "version": "2.5.1",
      "license": "GNU Affero General Public License v3.0",
      "dependencies": {
        "@angular-devkit/build-angular": "^14.2.10",
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mempool-frontend",
-  "version": "2.6.0-dev",
+  "version": "2.5.1",
  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
  "license": "GNU Affero General Public License v3.0",
  "homepage": "https://mempool.space",
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -4,12 +4,9 @@ import { AppPreloadingStrategy } from './app.preloading-strategy'
 import { StartComponent } from './components/start/start.component';
 import { TransactionComponent } from './components/transaction/transaction.component';
 import { BlockComponent } from './components/block/block.component';
-import { ClockMinedComponent as ClockMinedComponent } from './components/clock/clock-mined.component';
-import { ClockMempoolComponent as ClockMempoolComponent } from './components/clock/clock-mempool.component';
 import { AddressComponent } from './components/address/address.component';
 import { MasterPageComponent } from './components/master-page/master-page.component';
 import { AboutComponent } from './components/about/about.component';
-import { AcceleratorLandingComponent } from './components/accelerator-landing/accelerator-landing.component';
 import { StatusViewComponent } from './components/status-view/status-view.component';
 import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component';
 import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
@@ -17,7 +14,6 @@ import { TrademarkPolicyComponent } from './components/trademark-policy/trademar
 import { BisqMasterPageComponent } from './components/bisq-master-page/bisq-master-page.component';
 import { PushTransactionComponent } from './components/push-transaction/push-transaction.component';
 import { BlocksList } from './components/blocks-list/blocks-list.component';
-import { RbfList } from './components/rbf-list/rbf-list.component';
 import { LiquidMasterPageComponent } from './components/liquid-master-page/liquid-master-page.component';
 import { AssetGroupComponent } from './components/assets/asset-group/asset-group.component';
 import { AssetsFeaturedComponent } from './components/assets/assets-featured/assets-featured.component';
@@ -60,10 +56,6 @@ let routes: Routes = [
            path: 'blocks',
            component: BlocksList,
          },
-          {
-            path: 'rbf',
-            component: RbfList,
-          },
          {
            path: 'terms-of-service',
            component: TermsOfServiceComponent
@@ -170,10 +162,6 @@ let routes: Routes = [
            path: 'blocks',
            component: BlocksList,
          },
-          {
-            path: 'rbf',
-            component: RbfList,
-          },
          {
            path: 'terms-of-service',
            component: TermsOfServiceComponent
@@ -272,18 +260,10 @@ let routes: Routes = [
        path: 'about',
        component: AboutComponent,
      },
-      {
-        path: 'accelerator',
-        component: AcceleratorLandingComponent,
-      },
      {
        path: 'blocks',
        component: BlocksList,
      },
-      {
-        path: 'rbf',
-        component: RbfList,
-      },
      {
        path: 'terms-of-service',
        component: TermsOfServiceComponent
@@ -362,14 +342,6 @@ let routes: Routes = [
      },
    ],
  },
-  {
-    path: 'clock-mined',
-    component: ClockMinedComponent,
-  },
-  {
-    path: 'clock-mempool',
-    component: ClockMempoolComponent,
-  },
  {
    path: 'status',
    data: { networks: ['bitcoin', 'liquid'] },
--- a/frontend/src/app/app.constants.ts
+++ b/frontend/src/app/app.constants.ts
@@ -29,14 +29,6 @@ export const mempoolFeeColors = [
  'ba3243',
  'b92b48',
  'b9254b',
-  'b8214d',
-  'b71d4f',
-  'b61951',
-  'b41453',
-  'b30e55',
-  'b10857',
-  'b00259',
-  'ae005b',
 ];

 export const chartColors = [
@@ -77,7 +69,6 @@ export const chartColors = [
  "#3E2723",
  "#212121",
  "#263238",
-  "#801313",
 ];

 export const poolsColor = {
--- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss
+++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.scss
@@ -1,6 +1,11 @@
 .pagination-container {
  float: none;
+  margin-bottom: 200px;
  @media(min-width: 400px){
    float: right;
  }
 }
+
+.container-xl {
+    padding-bottom: 110px;
+}
--- a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html
+++ b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html
@@ -36,7 +36,7 @@
          <h5 class="card-title">US Dollar - BTC/USD</h5>
          <div class="chart-container">
            <ng-container *ngIf="hlocData$ | async as hlocData; else loadingSpinner">
-              <app-lightweight-charts [height]="300" [data]="hlocData.hloc" [volumeData]="hlocData.volume" [precision]="2"></app-lightweight-charts>
+              <app-lightweight-charts [height]="300" [data]="hlocData.hloc" [volumeData]="hlocData.volume" [precision]="2"></app-lightweight-charts>      
            </ng-container>
          </div>
        </div>
@@ -84,7 +84,7 @@
                    </ng-template>
                  </td>
                  <td>{{ ticker.volume?.num_trades ? ticker.volume?.num_trades : 0 }}</td>
-                </tr>
+                </tr> 
              </tbody>
            </table>
          </div>
@@ -105,6 +105,14 @@
  </ng-container>
  </div>

+  <app-language-selector></app-language-selector>
+
+  <div class="text-small text-center mt-3">
+    <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
+    |
+    <a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
+  </div>
+
 </div>

 <ng-template #loadingTmpl>
@@ -121,4 +129,4 @@

 <ng-template #loading>
  <div class="skeleton-loader shorter"></div>
-</ng-template>
+</ng-template>
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -107,7 +107,22 @@
        <span>Blockstream</span>
      </a>
      <a href="https://unchained.com/" target="_blank" title="Unchained">
-        <svg id="Layer_1" width="78" height="78" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 156.68 156.68"><defs><style>.cls-unchained-1{fill:#fff;}</style></defs><path class="cls-unchained-1" d="m78.34,0C35.07,0,0,35.07,0,78.34s35.07,78.34,78.34,78.34,78.34-35.07,78.34-78.34S121.6,0,78.34,0ZM20.23,109.5c-4.99-9.28-7.81-19.89-7.81-31.16C12.42,41.93,41.93,12.42,78.34,12.42c33.15,0,60.58,24.46,65.23,56.32h-37.48c-45.29,0-71.19,20.05-85.85,40.76Zm58.11,34.76c-12.42,0-24.04-3.44-33.96-9.41,3.94-8.85,9.11-18.7,15.84-28.9,20.99-31.8,52.2-31.19,76.49-31.19h7.45c.06,1.18.1,2.38.1,3.58,0,36.41-29.51,65.92-65.92,65.92Z"/><path class="cls-unchained-1" d="m91.98,42.4l-3.62-1.18c-3.94-1.29-7.03-4.38-8.32-8.32l-1.18-3.63c-.13-.39-.68-.39-.81,0l-1.18,3.63c-1.29,3.94-4.38,7.03-8.32,8.32l-3.62,1.18c-.39.13-.39.68,0,.81l3.62,1.18c3.94,1.29,7.03,4.38,8.32,8.32l1.18,3.63c.13.39.68.39.81,0l1.18-3.63c1.29-3.94,4.38-7.03,8.32-8.32l3.62-1.18c.39-.13.39-.68,0-.81Z"/></svg>
+        <svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" viewBox="0 0 216 216" class="image" style="enable-background:new 0 0 216 216;">
+        <style type="text/css">
+          .ucst0{fill:#002248;}
+          .ucst1{opacity:0.5;fill:#FFFFFF;}
+          .ucst2{fill:#FFFFFF;}
+          .ucst3{opacity:0.75;fill:#FFFFFF;}
+        </style>
+        <rect class="ucst0" width="216" height="216"/>
+        <g>
+          <g>
+            <path class="ucst1" d="M108,39.5V108l59.3,34.2V73.8L108,39.5z M126.9,95.4c0,2,1.1,3.8,2.8,4.8l27.9,16l0,10.8L125,108.2c-4.6-2.6-7.4-7.5-7.4-12.8l-0.1-22.7c0-1.9,0.5-3.7,1.4-5.3c0.9-1.5,2.2-2.9,3.8-3.8c3.3-1.9,7.2-1.9,10.5,0l24.5,14.2l-0.2,10.7l-29-16.8c-0.5-0.3-0.9-0.2-1.2,0c-0.3,0.2-0.6,0.5-0.6,1L126.9,95.4z"/>
+            <path class="ucst2" d="M108,39.5L48.7,73.8v68.5L108,108V39.5z M99.7,93.1c0,5.3-2.8,10.2-7.4,12.8l-19.6,11.4c-1.7,1-3.5,1.4-5.3,1.5c-1.8,0-3.6-0.5-5.2-1.4c-3.3-1.9-5.3-5.3-5.3-9.1V80l9.4-5.2l-0.1,33.5c0,0.6,0.3,0.9,0.6,1c0.3,0.2,0.7,0.3,1.2,0l19.6-11.4c1.7-1,2.8-2.8,2.8-4.8L90.3,61l9.4-5.4L99.7,93.1z"/>
+            <path class="ucst3" d="M108,108l-59.3,34.2l59.3,34.2l59.3-34.2L108,108z M133.8,152l-24.5,14.2l-9.2-5.5l29.1-16.7c0.5-0.3,0.6-0.7,0.6-1c0-0.3-0.1-0.7-0.6-1l-19.7-11.2c-1.7-1-3.8-1-5.5,0l-27.8,16.1l-9.4-5.4l32.6-18.7c4.6-2.6,10.2-2.6,14.8,0l19.7,11.2c1.7,0.9,3,2.3,3.9,3.9c0.9,1.5,1.4,3.3,1.4,5.2C139.1,146.7,137.1,150.1,133.8,152z"/>
+          </g>
+        </g>
+        </svg>
        <span>Unchained</span>
      </a>
      <a href="https://gemini.com/" target="_blank" title="Gemini">
@@ -189,9 +204,9 @@
        <img class="image" src="/resources/profile/raspiblitz.svg" />
        <span>RaspiBlitz</span>
      </a>
-      <a href="https://github.com/mynodebtc/mynode" target="_blank" title="myNode">
-        <img class="image" src="/resources/profile/mynodebtc.png" />
-        <span>myNode</span>
+      <a href="https://github.com/mynodebtc/mynode" target="_blank" title="MyNode">
+        <img class="image" src="/resources/profile/mynodebtc.jpg" />
+        <span>MyNode</span>
      </a>
      <a href="https://github.com/RoninDojo/RoninDojo" target="_blank" title="RoninDojo">
        <img class="image" src="/resources/profile/ronindojo.png" />
@@ -238,7 +253,7 @@
        <span>Sparrow</span>
      </a>
      <a href="https://github.com/ACINQ/phoenix" target="_blank" title="Phoenix Wallet by ACINQ">
-        <img class="image not-rounded" src="/resources/profile/phoenix.svg" />
+        <img class="image" src="/resources/profile/phoenix.jpg" />
        <span>Phoenix</span>
      </a>
      <a href="https://github.com/lnbits/lnbits-legend" target="_blank" title="LNbits">
@@ -393,14 +408,33 @@

  <div class="footer-links">
    <a href="/3rdpartylicenses.txt">Third-party Licenses</a>
+    <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
+    <div class="social-icons">
+      <a target="_blank" href="https://github.com/mempool/mempool">
+        <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="currentColor" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>
+      </a>
+      <a target="_blank" href="https://twitter.com/mempool">
+        <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="twitter" class="svg-inline--fa fa-twitter fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"></path></svg>
+      </a>
+      <a target="_blank" href="https://matrix.to/#/#mempool:bitcoin.kyoto">
+        <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="matrix" class="svg-inline--fa fa-matrix fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1536 1792"><path fill="currentColor" d="M40.467 163.152v1465.696H145.92V1664H0V128h145.92v35.152zm450.757 464.64v74.14h2.069c19.79-28.356 43.717-50.215 71.483-65.575 27.765-15.656 59.963-23.336 96-23.336 34.56 0 66.165 6.795 94.818 20.086 28.652 13.293 50.216 37.22 65.28 70.893 16.246-23.926 38.4-45.194 66.166-63.507 27.766-18.314 60.848-27.472 98.954-27.472 28.948 0 55.828 3.545 80.64 10.635 24.812 7.088 45.785 18.314 63.508 33.968 17.722 15.656 31.31 35.742 41.354 60.85 9.747 25.107 14.768 55.236 14.768 90.683v366.573h-150.35V865.28c0-18.314-.59-35.741-2.068-51.987-1.476-16.247-5.316-30.426-11.52-42.24-6.499-12.112-15.656-21.563-28.062-28.653-12.405-7.088-29.242-10.634-50.214-10.634-21.268 0-38.4 4.135-51.397 12.112-12.997 8.27-23.336 18.608-30.72 31.901-7.386 12.997-12.407 27.765-14.77 44.602-2.363 16.542-3.84 33.379-3.84 50.216v305.133H692.971v-307.2c0-16.247-.294-32.197-1.18-48.149-.591-15.95-3.84-30.424-9.157-44.011-5.317-13.293-14.178-24.223-26.585-32.197-12.406-7.976-30.425-12.112-54.646-12.112-7.088 0-16.542 1.478-28.062 4.726-11.52 3.25-23.04 9.157-33.968 18.02-10.93 8.86-20.383 21.563-28.063 38.103-7.68 16.543-11.52 38.4-11.52 65.28v317.834H349.44V627.792zm1004.309 1001.056V163.152H1390.08V128H1536v1536h-145.92v-35.152z"/></svg>
+      </a>
+      <a target="_blank" href="https://youtube.com/@mempool">
+        <svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="youtube" class="svg-inline--fa fa-youtube fa-w-16 fa-2x" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z"/></svg>
+      </a>
+      <a target="_blank" href="https://bitcointv.com/c/mempool/videos" class="bitcointv">
+        <svg xmlns="http://www.w3.org/2000/svg" focusable="false" viewBox="0 0 440 440"><path d="M225.57,2.08l-.69-.45a4.22,4.22,0,0,0-5.72,1.23L182.33,46.09a4,4,0,0,0,.88,5.81l9.38,6.38L173.48,97.49a4.22,4.22,0,0,0,2.45,4.19s3.55.7,4.53-1l41.92-40.56a3.62,3.62,0,0,0-1.51-5.1l-10.55-6.12L227.44,6.79A4.26,4.26,0,0,0,225.57,2.08Z" fill="currentColor"></path><path d="M118.52,401.83c-62.51,0-113.37-51-113.37-113.67V214.68C5.15,152,56,101,118.52,101H342.08a24.82,24.82,0,0,1,24.76,24.83V377a24.81,24.81,0,0,1-24.76,24.82Z"></path><path d="M342.08,105.18a20.65,20.65,0,0,1,20.61,20.66V377a20.66,20.66,0,0,1-20.61,20.66H118.52C58.3,397.67,9.31,348.55,9.31,288.16V214.68c0-60.38,49-109.5,109.21-109.5H342.08m0-8.34H118.52C53.62,96.84,1,149.6,1,214.68v73.48C1,353.24,53.62,406,118.52,406H342.08A29,29,0,0,0,371,377V125.84a29,29,0,0,0-28.92-29Z" fill="currentColor"></path><path fill="currentColor" d="M344.69,346.23A25.84,25.84,0,1,0,335,369.87l-10.22-10.2a11.69,11.69,0,1,1,4.77-5.12l10.31,10.28A25.84,25.84,0,0,0,344.69,346.23Z"></path><path fill="currentColor" d="M315.82,257.61a25.67,25.67,0,0,0-12.53,5.22L315,274.49a9.58,9.58,0,0,1,2.11-.73A9.72,9.72,0,1,1,309.4,283a9.4,9.4,0,0,1,.75-3.41L298.4,267.84a25.77,25.77,0,1,0,17.42-10.23Z"></path><path fill="currentColor" d="M313,214a7.76,7.76,0,1,1,1.41,10.91,7.62,7.62,0,0,1-2.19-2.69l-18.67-.14a25.94,25.94,0,1,0,.05-7l18.64.14A7.4,7.4,0,0,1,313,214Z"></path><path fill="currentColor" d="M341.2,144.08h-6.32c-1.67,0-3.61,1.87-3.61,4.29s1.94,4.29,3.61,4.29h6.32c1.67,0,3.61-1.87,3.61-4.29S342.87,144.08,341.2,144.08Z"></path><path fill="currentColor" d="M301.75,144.08h-6.44c-1.67,0-3.61,1.87-3.61,4.29s1.94,4.29,3.61,4.29h6.44c1.67,0,3.61-1.87,3.61-4.29S303.42,144.08,301.75,144.08Z"></path><path fill="currentColor" d="M321.77,144.08h-7c-1.67,0-3.62,1.87-3.62,4.29s1.95,4.29,3.62,4.29h7c1.67,0,3.62-1.87,3.62-4.29S323.44,144.08,321.77,144.08Z"></path><ellipse fill="currentColor" cx="295.97" cy="127.61" rx="4.27" ry="4.29"></ellipse><path fill="currentColor" d="M340.54,131.9a4.29,4.29,0,1,0-4.27-4.29A4.28,4.28,0,0,0,340.54,131.9Z"></path><path fill="currentColor" d="M318.26,131.9a4.29,4.29,0,1,0-4.27-4.29A4.29,4.29,0,0,0,318.26,131.9Z"></path><ellipse fill="currentColor" cx="295.97" cy="169.13" rx="4.27" ry="4.29"></ellipse><path fill="currentColor" d="M340.54,164.84a4.3,4.3,0,1,0,4.27,4.29A4.29,4.29,0,0,0,340.54,164.84Z"></path><path fill="currentColor" d="M318.26,164.84a4.3,4.3,0,1,0,4.28,4.29A4.29,4.29,0,0,0,318.26,164.84Z"></path><path d="M108.62,256.87c8.36-1,7.68-7.76,3.14-17-3.64-7.4-9.74-16.39-15.75-25.36-14.23-21.23-27.69-42.23-5.35-41.07,19.55,1,42.9,18.63,68.22,36.74,31.1,22.24,65.16,45.21,98.81,39.11a151.19,151.19,0,0,1,20-2.37V221a92,92,0,0,0-91.91-92.16H124.33A92,92,0,0,0,32.42,221v17.59c17.71,3.81,31,9.94,43.8,14.15C86.6,256.16,96.69,258.31,108.62,256.87Z"></path><path d="M273.37,310.79c-35-15.26-76.67-32.1-104-23.59-3.15,1-5,2.3-6,3.85-3.35,5.31,4.67,13.57,14.89,22.17,7.17,6,15.36,12.21,21.44,17.64,11.47,10.26,15.35,17.84-9.89,16.62-29.75-1.44-49.18-13.75-71.18-24l-.29-.14a165.84,165.84,0,0,0-22.93-8.91c-15.74-4.67-34.22-6.79-58.51-3.28A91.93,91.93,0,0,0,124.33,375h61.45A92,92,0,0,0,273.37,310.79Z"></path><path fill="currentColor" d="M257.69,249.31C224,255.41,190,232.44,158.88,210.2c-25.32-18.11-48.67-35.72-68.22-36.74C68.32,172.3,81.78,193.3,96,214.53c6,9,12.11,18,15.75,25.36,4.54,9.22,5.22,16-3.14,17-11.93,1.44-22-.71-32.4-4.13-12.8-4.21-26.09-10.34-43.8-14.15v44.26c0,1.26.14,2.48.19,3.72a91.8,91.8,0,0,0,2.9,19.62c.43,1.67.84,3.34,1.37,5,24.29-3.51,42.77-1.39,58.51,3.28a165.84,165.84,0,0,1,22.93,8.91c.39-.12.76-.26,1.14-.39l-.85.53c22,10.25,41.43,22.56,71.18,24,25.24,1.22,21.36-6.36,9.89-16.62-6.08-5.43-14.27-11.61-21.44-17.64-10.22-8.6-18.24-16.86-14.89-22.17,1-1.55,2.87-2.87,6-3.85,27.33-8.51,69,8.33,104,23.59.32-1,.56-2.05.84-3.07a92.33,92.33,0,0,0,3.48-24.87V246.94A151.19,151.19,0,0,0,257.69,249.31Z"></path><path fill="currentColor" d="M192,137a78,78,0,0,1,77.78,78v73.91a78,78,0,0,1-77.78,78H118.51a78,78,0,0,1-77.78-78V215a78,78,0,0,1,77.78-78H192m0-8.33H118.51A86.21,86.21,0,0,0,32.42,215v73.91a86.21,86.21,0,0,0,86.09,86.33H192a86.21,86.21,0,0,0,86.09-86.33V215A86.21,86.21,0,0,0,192,128.64Z"></path></svg>
+      </a>
+    </div>
  </div>

-  <br>
-</div>
+  <div class="footer-version" *ngIf="officialMempoolSpace">
+    {{ (backendInfo$ | async)?.hostname }} (v{{ (backendInfo$ | async )?.version }}) [<a href="https://github.com/mempool/mempool/commit/{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}">{{ (backendInfo$ | async )?.gitCommit | slice:0:8 }}</a>]
+  </div>

+</div>

 <ng-template #loadingSponsors>
  <br>
  <div class="spinner-border text-light"></div>
 </ng-template>
-
--- a/frontend/src/app/components/accelerator-landing/accelerator-landing.component.html
+++ b/frontend/src/app/components/accelerator-landing/accelerator-landing.component.html
@@ -1,49 +0,0 @@
-<div id="hero">
-  <div class="bg-effect top" style="background-image: url(/resources/accelerator-landing/wind.svg);"></div>
-  <h2>Stuck Bitcoin transaction?<br>Get it confirmed quickly with Mempool Accelerator™</h2>
-  <!--<p>Simple & reliable process with provably fair pricing.</p>-->
-  <p>Get your transaction confirmed quicker through mempool.space's network of mining pool partners—fairly, reliably, and transparently.</p>
-  <video src="/resources/accelerator-landing/pre.mp4" poster="" controls loop playsinline [autoplay]="true" [muted]="true"></video>
-</div>
-
-<div class="cta panel">
-    <a href="/signup" class="btn" style="background-color: rgba(152, 88, 255, 0.75); box-shadow: 0px 0px 50px 5px rgba(152, 88, 255, 0.75)">Join the Waitlist</a>
-</div>
-
-<div class="explainer panel">
-  <div class="point">
-    <svg width="72" height="72" viewBox="0 0 390.677 504" fill="#7647c7" xmlns="http://www.w3.org/2000/svg"><path d="M268.162 44.289c.906-4.664 2.062-14.18 5.98-16.25 6.77-3.64 25.328 3.246 11.762-3.668-16.52-8.176-5.925-15.012-4.66-24.371-11.262 8.973-12.23 14.621-24 4.344-12.746-12.273 5.102 9.851-.707 14.758-3.707 4.87-14.508 8.808-11.848 9.351 24.266-4.093 16.891 3.454 23.473 15.836zm45.062 219.2c-1.813-6.324 10.074-22.637 1.164-13.512-3.445 2.812-6.937 7.117-11.473 7.062-5.047.336-16.824-14.027-13.613-7.609 6.106 12.801 7 15.574-1.809 21.258-2.636 2.156-5.582 2.8-6.957 4.625 3.938.824 12.57-2.781 17.406.617 4.016 3.602 4.68 11.711 5.72 15.512 1.16 1.223.964-1.922 1.292-2.773 3.125-22.16 12.125-11.691 21.992-14.617-4.133-2.254-12.832-6.328-13.723-10.562zm-191.4-163.89c.21.297.605.371.656-.402.805-3.168.93-9.118 4.395-11.355 6.754-2.575 18.324 2.933 6.758-3.446-9.07-4.316-3.332-11.219-1.614-16.152-9.129 5.434-8.21 11.16-19.05 1.301-5.77-5.683 5.433 9.79.726 12.453-2.43 2.91-9.867 5.809-8.113 6.235 14.422-2.508 13.71.625 16.242 11.367zm70.609-37.258c11.598-3.254 7.906 8.445 9.715 6.094 1.16-9.051 4.097-6.227 9.25-6.52-1.047-1.28-4.676-1.976-5.66-4.34-.621-2.199 1.253-4.984 1.843-6.68-6.343 4.688-5.761 5.333-11.715.013 3.383 9.246 1.942 6.546-3.433 11.434zm-74.285 106.19c2.742-9.61 2.488-6.313 9.57-7.145-11.633-4.078-.726-12.867-4.648-10.375-6.758 8.5-10.91-2.812-10.871.157.766 2.023 3.27 5.312 1.07 7.5-12.145 8.625 4.477-4.047 4.88 9.863zm204.16-107.66c11.598-3.254 7.906 8.445 9.715 6.094 1.16-9.051 4.097-6.227 9.25-6.52-1.047-1.28-4.672-1.976-5.66-4.34-.621-2.199 1.253-4.984 1.843-6.68-6.343 4.688-5.761 5.333-11.715.013 3.383 9.25 1.95 6.55-3.433 11.434zm64.059 133.48c-8.379 10.652-14.203-8.176-9.465 4.66 1.602 3.488-3.77 5.012-5.297 6.57 7.801-.593 7.875-.722 9.418 6.204.555 2.39 1.086-5.997 2.801-6.215 1.965-1.418 7.04.492 6.848-.508-11.398-4.238-1.434-11.512-4.305-10.711zm-28.039-69.969c-1.836-3.633 6.223-15.484 1.758-11.031-12.18 14.789-18.512-4.047-19.266.125 1.21 3.121 4.906 8.2 3.023 12.137-2.535 3.898-8.86 5.562-9.004 7.004 13.961-1.434 13.641-1.172 16.441 11.055.801 3.336 2.067-10.465 4.328-10.824 3.5-3.05 13.625.531 12.441-1.25-2.425-1.48-8.043-3.61-9.722-7.215zm-59.516-39.199c.59-1.379 2.367-3.488.129-4.91-2.488-.758-3.2 1.98-4.602 2.855-61.734 59.137-63.812 54.7-124.71 1.618-11.234-8.813.453 10.812 1.977 14.449 6.242 13.113 19.168 43.133 17.887 53.445-.711 13.625-9.012 20.926-18.312 27.91-14.992 11.608-32.258 21.706-43.418 27.854-5.824 7.051 14.19.84 16.87 1.262 13.923-1.875 43.794-4.312 53.923-.762L1.586 490.194c-2.777 3.97-1.813 9.442 2.156 12.22 3.969 2.777 9.442 1.812 12.22-2.157l197.02-281.37c12.101 18.777 17.253 48.938 20.82 65.387 6.835 19.691 7.163-63.8 32.02-74.312 13.155-8.14 49.061-3.629 59.077-3.18 3.863-.257 23.031 4.7 17.06-1.882-76.54-41.184-76.36-42.855-43.146-119.72z"/></svg>
-    <p class="point-lead">Easy</p>
-    <p class="point-body">Simply tell us which transaction you need accelerated, set the maximum rate you're willing to pay, and we'll take care of the rest.</p>
-  </div>
-  <div class="point">
-    <svg width="72" height="72" viewBox="0 0 466.09 445.916" fill="#7647c7" xmlns="http://www.w3.org/2000/svg"><path d="m434.87 159.649-40.781-84.11c7.023 1.204 13.37 2.461 18.77 3.774l4.262-11.844c-31.81-15.418-94.176-26.777-166.73-28.305 3.769-4.164 6.128-9.633 6.128-15.691C256.52 10.508 246.011 0 233.046 0s-23.473 10.508-23.473 23.473c0 6.059 2.36 11.527 6.13 15.691-72.56 1.527-134.93 12.887-166.73 28.305l4.261 11.844c5.398-1.313 11.746-2.57 18.77-3.773l-40.781 84.109H0c15.688 28.992 46.363 48.684 81.641 48.684 35.278 0 65.953-19.691 81.641-48.684h-31.219L89.965 72.825c34.863-4.653 82.227-7.86 134.67-8.118v52.02h-10.68v261.15H195.6c-38.832 0-70.941 30.051-74.328 68.04h223.55c-3.387-37.989-35.5-68.04-74.328-68.04h-18.359l-.004-261.15h-10.68v-52.02c52.445.258 99.809 3.465 134.67 8.118l-42.098 86.824h-31.215c15.688 28.992 46.363 48.684 81.641 48.684 35.278 0 65.953-19.691 81.641-48.684zm-311.61 0H40.01l41.52-85.637c.066-.012.129-.02.191-.028zm219.56 0 41.535-85.664c.062.008.125.02.191.027l41.52 85.637z"/></svg>
-    <p class="point-lead">Fair</p>
-    <p class="point-body">Our service is based on feerates and block templates you can verify by running The Mempool Open Source Project™ yourself.</p>
-  </div>
-  <div class="point">
-    <svg width="72" height="72" viewBox="0 0 700.261 296.22" fill="#7647c7" xmlns="http://www.w3.org/2000/svg"><path d="M512.791 44.48C519.815 2.339 585.365 2.339 618.141 0c0 0 63.211 53.848 81.941 166.22 4.684 30.434-84.28 39.801-84.28 39.801-2.34-58.527-32.778-117.06-63.212-170.9-16.387 2.34-25.754 4.684-39.8 9.363zm-351.17 4.684C147.574 9.363 82.023 14.047 49.241 18.73c0 0-51.504 63.21-49.164 177.93 0 30.434 86.621 16.387 86.621 16.387-9.363-63.211 11.707-128.76 32.777-173.25 16.387 2.34 28.094 7.023 42.141 9.363zm32.777 189.63c-2.34-7.024 2.34-14.047 4.684-21.07-7.023-2.34-9.363-7.024-21.07-14.047-25.754 16.387-7.023 53.848 16.387 35.117zm58.527-7.024c-11.707-39.8-60.87-9.363-51.504 7.024 4.684 9.363 18.73 14.047 28.094 14.047 14.047-2.34 14.047-16.387 23.41-21.07zm42.141 25.754c2.34-18.73-28.094-25.754-39.8-18.73-14.048 11.707-16.388 23.41-9.364 30.434 11.707 9.364 44.48-4.683 49.164-11.707zm-16.387 30.434c11.707 11.707 44.48-4.683 39.801-18.73-7.023-11.707-30.434-2.34-37.457 2.34-2.34 2.34-7.023 9.363-2.34 16.387zM93.73 191.97c49.164 0 63.211-9.363 110.04 21.07 21.07-11.707 46.824-9.363 56.188 16.387 18.73 0 42.141 4.684 42.141 28.094 28.094 0 30.434 18.73 14.047 32.777 14.047 4.684 56.188 9.364 70.234 2.34 4.684-2.34 14.047-7.023 4.684-9.363s-28.094-2.34-32.777-4.684c-9.363 0-7.023-4.683 0-4.683 14.047 2.34 49.164 4.683 63.211 2.34 11.707-2.34 25.754-9.364 9.363-18.73-21.07-7.024-53.848-16.388-58.527-23.41 2.34-9.364 46.824 14.046 65.551 23.41 9.364 2.34 23.41 4.683 32.777 0 14.047-4.684 4.684-11.708-2.34-16.388-16.387-14.047-51.504-44.48-65.55-58.527-9.364-11.707-2.34-11.707 7.023-4.683 11.707 11.707 37.457 37.457 74.918 67.895 14.047 7.023 35.117-7.024 25.754-25.754 0-2.34-4.684-9.364-11.707-18.73-35.117-58.527-114.71-107.69-170.9-86.621-18.73 7.023-23.41 30.434-44.48 51.504-21.07 18.73-37.457 16.387-58.527 4.683 23.41-28.094 28.094-44.48 37.457-77.258 9.363-21.07 16.387-21.07 32.777-32.777 42.14-28.094 30.434-21.07 11.707-21.07-79.598-2.34-79.598 18.73-100.67 21.07-28.094 0-65.551-11.707-81.941-14.047-21.07 42.141-32.777 98.328-30.434 145.15zm358.2-124.08c-44.48 9.364-86.62-35.117-107.69-30.434-7.023 4.684-63.21 39.801-70.234 49.164-16.387 30.434 0 25.754-37.457 84.281 44.48 21.07 58.527-53.848 86.621-63.21 74.918-25.755 152.18 44.48 182.61 91.304 39.801-18.73 67.895-16.387 98.328-23.41-9.363-46.824-37.457-100.67-56.188-133.45-28.094 4.684-74.918 21.07-95.988 25.754z" fill-rule="evenodd"/></svg>
-    <p class="point-lead">Reliable</p>
-    <p class="point-body">Mempool's best-in-class fee estimation—combined with its mining pool relationships—means you can expect your transaction to be confirmed fast.</p>
-  </div>
-</div>
-
-<div class="panel faq">
-  <div class="endpoint-container">
-    <a id="faq-1" class="section-header"><table><tr><td>What makes Mempool Accelerator™ different from other accelerators?</td></tr></table></a>
-    <p>Mempool Accelerator™ strives to be fair, reliable, and transparent. The fee you pay to accelerate, for example, is based on the fair market price for blockspace—which you can verify from your own node running The Mempool Open Source Project™.</p>
-  </div>
-  <div class="endpoint-container">
-    <a id="faq-1" class="section-header"><table><tr><td>My transaction has been stuck for days. How quickly can Mempool Accelerator™ get it confirmed?</td></tr></table></a>
-    <p>Mempool Accelerator™ prioritizes your transaction directly with mining pools based on the feerate ceiling you determine.</p><p>While it is not possible to provide a precise timeframe, your transaction will go from being "stuck" in the mempool to being in the top portion of pending transactions likely to be confirmed soon.</p>
-  </div>
-  <div class="endpoint-container">
-    <a id="faq-1" class="section-header"><table><tr><td>When will Mempool Accelerator™ be available?</td></tr></table></a>
-    <p>Soon™. Join the waitlist to be notified when it's ready.</p>
-  </div>
-</div>
-
-<div class="cta panel bottom" style="margin-bottom: 30px;">
-  <a href="/signup" class="btn" style="background-color: rgba(152, 88, 255, 0.75); box-shadow: 0px 0px 50px 5px rgba(152, 88, 255, 0.75)">Join the Waitlist</a>
-</div>
-
--- a/frontend/src/app/components/accelerator-landing/accelerator-landing.component.scss
+++ b/frontend/src/app/components/accelerator-landing/accelerator-landing.component.scss
@@ -1,145 +0,0 @@
-p {
-  margin-top: 1rem;
-}
-
-tr {
-  white-space: normal;
-}
-
-#hero {
-  text-align: center;
-  margin: 60px auto;
-  width: 100%;
-  max-width: 2000px;
-  padding: 0 20px;
-}
-
-#hero p {
-  color: rgba(255, 255, 255, 0.568627451);
-}
-
-#hero video {
-  height: auto;
-  width: 50%;
-  max-width: 675px;
-  margin-top: 40px;
-}
-
-h2 {
-  margin: 30px auto;
-  font-size: 2.35rem;
-}
-
-.panel {
-  padding: 30px 40px 30px 40px;
-}
-
-.panel-lead {
-  text-transform: uppercase;
-  letter-spacing: 2px;
-  font-size: 14px;
-}
-
-.partner.panel {
-  background-color: #1d1f31; //#1d1f31
-  text-align: center;
-}
-
-.partner.panel svg {
-  width: 150px;
-  height: auto;
-}
-
-.cta.panel {
-  text-align: center;
-}
-
-.cta.bottom.panel {
-  position: relative;
-}
-
-.explainer.panel {
-  text-align: center;
-  width: 100%;
-  max-width: 2000px;
-  margin: 0 auto;
-  margin-bottom: 75px;
-}
-
-.explainer.panel .point {
-  text-align: center;
-  width: 460px;
-  height: 300px;
-  padding: 30px;
-  display: inline-block;
-}
-
-.explainer.panel .point .point-lead {
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 1px;
-  margin-top: 26px;
-  font-size: 22px;
-}
-
-.explainer.panel .point svg {
-  height: auto;
-  width: 115px;
-  border-radius: 50%;
-  padding: 25px;
-}
-
-.panel.faq {
-  width: 100%;
-  max-width: 1200px;
-  margin: 0 auto;
-  padding-top: 0;
-}
-
-.endpoint-container {
-  margin-bottom: 25px;
-}
-
-.endpoint-container .section-header {
-  display: block;
-  background-color: #2d3348;
-  color: #1bd8f4;
-  padding: 1rem 1.3rem;
-  font-weight: 700;
-  border-radius: .25rem;
-  font-size: 18px;
-  font-weight: 700;
-  cursor: pointer;
-}
-
-.endpoint-container .section-header:hover {
-  text-decoration: none;
-}
-
-.bg-effect {
-  position: absolute;
-  z-index: -100 !important;
-  height: 90vh;
-  opacity: 0.3;
-  background-repeat: no-repeat;
-  max-width: calc(100% - 50px);
-  animation: 2s ease forwards .5s bg-scale;
-}
-
-.bg-effect.top {
-  background-position: top left;
-  top: 20px;
-  width: 1000px;
-}
-
-@media (max-width: 992px) {
-
-  #hero img {
-    width: 80%;
-  }
-
-  .explainer.panel .point {
-    width: 100%;
-  }
-
-}
--- a/frontend/src/app/components/accelerator-landing/accelerator-landing.component.ts
+++ b/frontend/src/app/components/accelerator-landing/accelerator-landing.component.ts
@@ -1,19 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { SeoService } from '../../services/seo.service';
-import { StateService } from '../../services/state.service';
-
-@Component({
-  selector: 'app-accelerator-landing',
-  templateUrl: './accelerator-landing.component.html',
-  styleUrls: ['./accelerator-landing.component.scss'],
-})
-export class AcceleratorLandingComponent implements OnInit {
-
-  constructor(
-  ) { }
-
-  ngOnInit() {
-
-  }
-
-}
--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html
@@ -82,10 +82,6 @@

 <br />

-<main>
-  <router-outlet></router-outlet>
-</main>
-
-<app-global-footer *ngIf="footerVisible"></app-global-footer>
+<router-outlet></router-outlet>

 <br>
--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss
@@ -17,12 +17,6 @@ li.nav-item {
  padding-right: 10px;
 }

-@media (max-width: 992px) {
-  footer > .container-fluid {
-    padding-bottom: 35px;
-  }
-}
-
@media (min-width: 992px) {
  .navbar {
    padding: 0rem 2rem;
--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts
@@ -17,7 +17,6 @@ export class BisqMasterPageComponent implements OnInit {
  isMobile = window.innerWidth <= 767.98;
  urlLanguage: string;
  networkPaths: { [network: string]: string };
-  footerVisible = true;

  constructor(
    private stateService: StateService,
@@ -32,11 +31,6 @@ export class BisqMasterPageComponent implements OnInit {
    this.urlLanguage = this.languageService.getLanguageForUrl();
    this.navigationService.subnetPaths.subscribe((paths) => {
      this.networkPaths = paths;
-      if (paths.mainnet.indexOf('docs') > -1) {
-        this.footerVisible = false;
-      } else {
-        this.footerVisible = true;
-      }
    });
  }

--- a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.scss
+++ b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.scss
@@ -4,9 +4,6 @@
  @media (min-width: 465px) {
    font-size: 20px;
  }
-  @media (min-width: 992px) {
-    height: 40px;
-  }
 }

 .main-title {
@@ -21,19 +18,17 @@
 }

 .full-container {
-  display: flex;
-  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 250px);
-  @media (min-width: 992px) {
-    height: calc(100vh - 150px);
-  }
+  min-height: 500px;
+  height: calc(100% - 150px);
+  @media (max-width: 992px) {
+    padding-bottom: 100px;
+  };
 }

 .chart {
-  display: flex;
-  flex: 1;
+  width: 100%;
  height: 100%;
  padding-bottom: 20px;
  padding-right: 10px;
--- a/frontend/src/app/components/block-fees-graph/block-fees-graph.component.scss
+++ b/frontend/src/app/components/block-fees-graph/block-fees-graph.component.scss
@@ -4,9 +4,6 @@
  @media (min-width: 465px) {
    font-size: 20px;
  }
-  @media (min-width: 992px) {
-    height: 40px;
-  }
 }

 .main-title {
@@ -21,20 +18,18 @@
 }

 .full-container {
-  display: flex;
-  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 250px);
-  @media (min-width: 992px) {
-    height: calc(100vh - 150px);
-  }
+  min-height: 500px;
+  height: calc(100% - 150px);
+  @media (max-width: 992px) {
+    padding-bottom: 100px;
+  };
 }

 .chart {
-  display: flex;
-  flex: 1;
  width: 100%;
+  height: 100%;
  padding-bottom: 20px;
  padding-right: 10px;
  @media (max-width: 992px) {
--- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
+++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
@@ -23,8 +23,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
  @Input() unavailable: boolean = false;
  @Input() auditHighlighting: boolean = false;
  @Input() blockConversion: Price;
-  @Input() pixelAlign: boolean = false;
-  @Output() txClickEvent = new EventEmitter<{ tx: TransactionStripped, keyModifier: boolean}>();
+  @Output() txClickEvent = new EventEmitter<TransactionStripped>();
  @Output() txHoverEvent = new EventEmitter<string>();
  @Output() readyEvent = new EventEmitter();

@@ -133,9 +132,9 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
    }
  }

-  update(add: TransactionStripped[], remove: string[], change: { txid: string, rate: number | undefined }[], direction: string = 'left', resetLayout: boolean = false): void {
+  update(add: TransactionStripped[], remove: string[], direction: string = 'left', resetLayout: boolean = false): void {
    if (this.scene) {
-      this.scene.update(add, remove, change, direction, resetLayout);
+      this.scene.update(add, remove, direction, resetLayout);
      this.start();
    }
  }
@@ -202,8 +201,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
      this.start();
    } else {
      this.scene = new BlockScene({ width: this.displayWidth, height: this.displayHeight, resolution: this.resolution,
-        blockLimit: this.blockLimit, orientation: this.orientation, flip: this.flip, vertexArray: this.vertexArray,
-        highlighting: this.auditHighlighting, pixelAlign: this.pixelAlign });
+        blockLimit: this.blockLimit, orientation: this.orientation, flip: this.flip, vertexArray: this.vertexArray, highlighting: this.auditHighlighting });
      this.start();
    }
  }
@@ -328,9 +326,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
    if (event.target === this.canvas.nativeElement && event.pointerType === 'touch') {
      this.setPreviewTx(event.offsetX, event.offsetY, true);
    } else if (event.target === this.canvas.nativeElement) {
-      const keyMod = event.shiftKey || event.ctrlKey || event.metaKey;
-      const middleClick = event.which === 2 || event.button === 1;
-      this.onTxClick(event.offsetX, event.offsetY, keyMod || middleClick);
+      this.onTxClick(event.offsetX, event.offsetY);
    }
  }

@@ -413,12 +409,12 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy, On
    }
  }

-  onTxClick(cssX: number, cssY: number, keyModifier: boolean = false) {
+  onTxClick(cssX: number, cssY: number) {
    const x = cssX * window.devicePixelRatio;
    const y = cssY * window.devicePixelRatio;
    const selected = this.scene.getTxAt({ x, y });
    if (selected && selected.txid) {
-      this.txClickEvent.emit({ tx: selected, keyModifier });
+      this.txClickEvent.emit(selected);
    }
  }

--- a/frontend/src/app/components/block-overview-graph/block-scene.ts
+++ b/frontend/src/app/components/block-overview-graph/block-scene.ts
@@ -15,7 +15,6 @@ export default class BlockScene {
  gridWidth: number;
  gridHeight: number;
  gridSize: number;
-  pixelAlign: boolean;
  vbytesPerUnit: number;
  unitPadding: number;
  unitWidth: number;
@@ -24,24 +23,19 @@ export default class BlockScene {
  animateUntil = 0;
  dirty: boolean;

-  constructor({ width, height, resolution, blockLimit, orientation, flip, vertexArray, highlighting, pixelAlign }:
+  constructor({ width, height, resolution, blockLimit, orientation, flip, vertexArray, highlighting }:
      { width: number, height: number, resolution: number, blockLimit: number,
-        orientation: string, flip: boolean, vertexArray: FastVertexArray, highlighting: boolean, pixelAlign: boolean }
+        orientation: string, flip: boolean, vertexArray: FastVertexArray, highlighting: boolean }
  ) {
-    this.init({ width, height, resolution, blockLimit, orientation, flip, vertexArray, highlighting, pixelAlign });
+    this.init({ width, height, resolution, blockLimit, orientation, flip, vertexArray, highlighting });
  }

  resize({ width = this.width, height = this.height, animate = true }: { width?: number, height?: number, animate: boolean }): void {
    this.width = width;
    this.height = height;
    this.gridSize = this.width / this.gridWidth;
-    if (this.pixelAlign) {
-      this.unitPadding =  Math.max(1, Math.floor(this.gridSize / 2.5));
-      this.unitWidth = this.gridSize - (this.unitPadding);
-    } else {
-      this.unitPadding =  width / 500;
-      this.unitWidth = this.gridSize - (this.unitPadding * 2);
-    }
+    this.unitPadding =  width / 500;
+    this.unitWidth = this.gridSize - (this.unitPadding * 2);

    this.dirty = true;
    if (this.initialised && this.scene) {
@@ -156,7 +150,7 @@ export default class BlockScene {
    this.updateAll(startTime, 200, direction);
  }

-  update(add: TransactionStripped[], remove: string[], change: { txid: string, rate: number | undefined }[], direction: string = 'left', resetLayout: boolean = false): void {
+  update(add: TransactionStripped[], remove: string[], direction: string = 'left', resetLayout: boolean = false): void {
    const startTime = performance.now();
    const removed = this.removeBatch(remove, startTime, direction);

@@ -178,15 +172,6 @@ export default class BlockScene {
        this.place(tx);
      });
    } else {
-      // update effective rates
-      change.forEach(tx => {
-        if (this.txs[tx.txid]) {
-          this.txs[tx.txid].feerate = tx.rate || (this.txs[tx.txid].fee / this.txs[tx.txid].vsize);
-          this.txs[tx.txid].rate = tx.rate;
-          this.txs[tx.txid].dirty = true;
-        }
-      });
-
      // try to insert new txs directly
      const remaining = [];
      add.map(tx => new TxView(tx, this)).sort(feeRateDescending).forEach(tx => {
@@ -215,15 +200,14 @@ export default class BlockScene {
    this.animateUntil = Math.max(this.animateUntil, tx.setHover(value));
  }

-  private init({ width, height, resolution, blockLimit, orientation, flip, vertexArray, highlighting, pixelAlign }:
+  private init({ width, height, resolution, blockLimit, orientation, flip, vertexArray, highlighting }:
      { width: number, height: number, resolution: number, blockLimit: number,
-        orientation: string, flip: boolean, vertexArray: FastVertexArray, highlighting: boolean, pixelAlign: boolean }
+        orientation: string, flip: boolean, vertexArray: FastVertexArray, highlighting: boolean }
  ): void {
    this.orientation = orientation;
    this.flip = flip;
    this.vertexArray = vertexArray;
    this.highlightingEnabled = highlighting;
-    this.pixelAlign = pixelAlign;

    this.scene = {
      count: 0,
@@ -349,12 +333,7 @@ export default class BlockScene {
  private gridToScreen(position: Square | void): Square {
    if (position) {
      const slotSize = (position.s * this.gridSize);
-      let squareSize;
-      if (this.pixelAlign) {
-        squareSize = slotSize - (this.unitPadding);
-      } else {
-        squareSize = slotSize - (this.unitPadding * 2);
-      }
+      const squareSize = slotSize - (this.unitPadding * 2);

      // The grid is laid out notionally left-to-right, bottom-to-top,
      // so we rotate and/or flip the y axis to match the target configuration.
--- a/frontend/src/app/components/block-overview-graph/tx-view.ts
+++ b/frontend/src/app/components/block-overview-graph/tx-view.ts
@@ -36,8 +36,7 @@ export default class TxView implements TransactionStripped {
  vsize: number;
  value: number;
  feerate: number;
-  rate?: number;
-  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'added' | 'censored' | 'selected';
+  status?: 'found' | 'missing' | 'fresh' | 'added' | 'censored' | 'selected';
  context?: 'projected' | 'actual';
  scene?: BlockScene;

@@ -59,8 +58,7 @@ export default class TxView implements TransactionStripped {
    this.fee = tx.fee;
    this.vsize = tx.vsize;
    this.value = tx.value;
-    this.feerate = tx.rate || (tx.fee / tx.vsize); // sort by effective fee rate where available
-    this.rate = tx.rate;
+    this.feerate = tx.fee / tx.vsize;
    this.status = tx.status;
    this.initialised = false;
    this.vertexArray = scene.vertexArray;
@@ -159,8 +157,7 @@ export default class TxView implements TransactionStripped {
  }

  getColor(): Color {
-    const rate = this.fee / this.vsize; // color by simple single-tx fee rate
-    const feeLevelIndex = feeLevels.findIndex((feeLvl) => Math.max(1, rate) < feeLvl) - 1;
+    const feeLevelIndex = feeLevels.findIndex((feeLvl) => Math.max(1, this.feerate) < feeLvl) - 1;
    const feeLevelColor = feeColors[feeLevelIndex] || feeColors[mempoolFeeColors.length - 1];
    // Normal mode
    if (!this.scene?.highlightingEnabled) {
@@ -171,7 +168,6 @@ export default class TxView implements TransactionStripped {
      case 'censored':
        return auditColors.censored;
      case 'missing':
-      case 'sigop':
        return marginalFeeColors[feeLevelIndex] || marginalFeeColors[mempoolFeeColors.length - 1];
      case 'fresh':
        return auditColors.missing;
--- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
+++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
@@ -28,12 +28,6 @@
          {{ feeRate | feeRounding }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
        </td>
      </tr>
-      <tr *ngIf="effectiveRate && effectiveRate !== feeRate">
-        <td class="td-width" i18n="transaction.effective-fee-rate|Effective transaction fee rate">Effective fee rate</td>
-        <td>
-          {{ effectiveRate | feeRounding }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span>
-        </td>
-      </tr>
      <tr>
        <td class="td-width" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
        <td [innerHTML]="'&lrm;' + (vsize | vbytes: 2)"></td>
@@ -44,7 +38,6 @@
          <td *ngSwitchCase="'found'"><span class="badge badge-success" i18n="transaction.audit.match">Match</span></td>
          <td *ngSwitchCase="'censored'"><span class="badge badge-danger" i18n="transaction.audit.removed">Removed</span></td>
          <td *ngSwitchCase="'missing'"><span class="badge badge-warning" i18n="transaction.audit.marginal">Marginal fee rate</span></td>
-          <td *ngSwitchCase="'sigop'"><span class="badge badge-warning" i18n="transaction.audit.sigop">High sigop count</span></td>
          <td *ngSwitchCase="'fresh'"><span class="badge badge-warning" i18n="transaction.audit.recently-broadcasted">Recently broadcasted</span></td>
          <td *ngSwitchCase="'added'"><span class="badge badge-warning" i18n="transaction.audit.added">Added</span></td>
          <td *ngSwitchCase="'selected'"><span class="badge badge-warning" i18n="transaction.audit.marginal">Marginal fee rate</span></td>
--- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.ts
+++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.ts
@@ -20,7 +20,6 @@ export class BlockOverviewTooltipComponent implements OnChanges {
  value = 0;
  vsize = 1;
  feeRate = 0;
-  effectiveRate;

  tooltipPosition: Position = { x: 0, y: 0 };

@@ -52,7 +51,6 @@ export class BlockOverviewTooltipComponent implements OnChanges {
      this.value = tx.value || 0;
      this.vsize = tx.vsize || 1;
      this.feeRate = this.fee / this.vsize;
-      this.effectiveRate = tx.rate;
    }
  }
 }
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.html
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.html
@@ -3,7 +3,7 @@
 <div class="full-container">
  <div class="card-header mb-0 mb-md-4">
    <div class="d-flex d-md-block align-items-baseline">
-      <span i18n="mining.blocks-health">Block Health</span>
+      <span i18n="mining.block-prediction-accuracy">Block Prediction Accuracy</span>
      <button class="btn p-0 pl-2" style="margin: 0 0 4px 0px" (click)="onSaveChart()">
        <fa-icon [icon]="['fas', 'download']" [fixedWidth]="true"></fa-icon>
      </button>
@@ -12,34 +12,34 @@
    <form [formGroup]="radioGroupForm" class="formRadioGroup" *ngIf="(statsObservable$ | async) as stats">
      <div class="btn-group btn-group-toggle" name="radioBasic" [class]="{'disabled': isLoading}">
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 144" [class.active]="radioGroupForm.get('dateSpan').value === '24h'">
-          <input type="radio" [value]="'24h'" fragment="24h" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 24h
+          <input type="radio" [value]="'24h'" fragment="24h" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 24h
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 432" [class.active]="radioGroupForm.get('dateSpan').value === '3d'">
-          <input type="radio" [value]="'3d'" fragment="3d" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 3D
+          <input type="radio" [value]="'3d'" fragment="3d" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 3D
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 1008" [class.active]="radioGroupForm.get('dateSpan').value === '1w'">
-          <input type="radio" [value]="'1w'" fragment="1w" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 1W
+          <input type="radio" [value]="'1w'" fragment="1w" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 1W
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 4320" [class.active]="radioGroupForm.get('dateSpan').value === '1m'">
-          <input type="radio" [value]="'1m'" fragment="1m" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 1M
+          <input type="radio" [value]="'1m'" fragment="1m" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 1M
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 12960" [class.active]="radioGroupForm.get('dateSpan').value === '3m'">
-          <input type="radio" [value]="'3m'" fragment="3m" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 3M
+          <input type="radio" [value]="'3m'" fragment="3m" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 3M
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 25920" [class.active]="radioGroupForm.get('dateSpan').value === '6m'">
-          <input type="radio" [value]="'6m'" fragment="6m" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 6M
+          <input type="radio" [value]="'6m'" fragment="6m" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 6M
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 52560" [class.active]="radioGroupForm.get('dateSpan').value === '1y'">
-          <input type="radio" [value]="'1y'" fragment="1y" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 1Y
+          <input type="radio" [value]="'1y'" fragment="1y" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 1Y
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 105120" [class.active]="radioGroupForm.get('dateSpan').value === '2y'">
-          <input type="radio" [value]="'2y'" fragment="2y" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 2Y
+          <input type="radio" [value]="'2y'" fragment="2y" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 2Y
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 157680" [class.active]="radioGroupForm.get('dateSpan').value === '3y'">
-          <input type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 3Y
+          <input type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 3Y
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount > 157680" [class.active]="radioGroupForm.get('dateSpan').value === 'all'">
-          <input type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> ALL
+          <input type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> ALL
        </label>
      </div>
    </form>
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.scss
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.scss
@@ -4,9 +4,6 @@
  @media (min-width: 465px) {
    font-size: 20px;
  }
-  @media (min-width: 992px) {
-    height: 40px;
-  }
 }

 .main-title {
@@ -21,19 +18,17 @@
 }

 .full-container {
-  display: flex;
-  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 250px);
-  @media (min-width: 992px) {
-    height: calc(100vh - 150px);
-  }
+  min-height: 500px;
+  height: calc(100% - 150px);
+  @media (max-width: 992px) {
+    padding-bottom: 100px;
+  };
 }

 .chart {
-  display: flex;
-  flex: 1;
+  width: 100%;
  height: 100%;
  padding-bottom: 20px;
  padding-right: 10px;
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.ts
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.ts
@@ -13,9 +13,9 @@ import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pi
 import { StateService } from '../../services/state.service';

@Component({
-  selector: 'app-block-health-graph',
-  templateUrl: './block-health-graph.component.html',
-  styleUrls: ['./block-health-graph.component.scss'],
+  selector: 'app-block-prediction-graph',
+  templateUrl: './block-prediction-graph.component.html',
+  styleUrls: ['./block-prediction-graph.component.scss'],
  styles: [`
    .loadingGraphs {
      position: absolute;
@@ -26,7 +26,7 @@ import { StateService } from '../../services/state.service';
  `],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class BlockHealthGraphComponent implements OnInit {
+export class BlockPredictionGraphComponent implements OnInit {
  @Input() right: number | string = 45;
  @Input() left: number | string = 75;

@@ -60,7 +60,7 @@ export class BlockHealthGraphComponent implements OnInit {
  }

  ngOnInit(): void {
-    this.seoService.setTitle($localize`:@@d7d5fcf50179ad70c938491c517efb82de2c8146:Block Health`);
+    this.seoService.setTitle($localize`:@@d7d5fcf50179ad70c938491c517efb82de2c8146:Block Prediction Accuracy`);
    this.miningWindowPreference = '24h';//this.miningService.getDefaultTimespan('24h');
    this.radioGroupForm = this.formBuilder.group({ dateSpan: this.miningWindowPreference });
    this.radioGroupForm.controls.dateSpan.setValue(this.miningWindowPreference);
@@ -80,7 +80,7 @@ export class BlockHealthGraphComponent implements OnInit {
          this.storageService.setValue('miningWindowPreference', timespan);
          this.timespan = timespan;
          this.isLoading = true;
-          return this.apiService.getHistoricalBlocksHealth$(timespan)
+          return this.apiService.getHistoricalBlockPrediction$(timespan)
            .pipe(
              tap((response) => {
                this.prepareChartOptions(response.body);
@@ -163,7 +163,7 @@ export class BlockHealthGraphComponent implements OnInit {
          hideOverlap: true,
          padding: [0, 5],
        },
-        data: data.map(health => health[0])
+        data: data.map(prediction => prediction[0])
      },
      yAxis: data.length === 0 ? undefined : [
        {
@@ -186,12 +186,12 @@ export class BlockHealthGraphComponent implements OnInit {
      series: data.length === 0 ? undefined : [
        {
          zlevel: 0,
-          name: $localize`Health`,
-          data: data.map(health => ({
-            value: health[2],
-            block: health[1],
+          name: $localize`Match rate`,
+          data: data.map(prediction => ({
+            value: prediction[2],
+            block: prediction[1],
            itemStyle: {
-              color: this.getHealthColor(health[2])
+              color: this.getPredictionColor(prediction[2])
            }
          })),
          type: 'bar',
@@ -257,7 +257,7 @@ export class BlockHealthGraphComponent implements OnInit {
    return 'rgb(' + gradient.red + ',' + gradient.green + ',' + gradient.blue + ')';
  }

-  getHealthColor(matchRate) {
+  getPredictionColor(matchRate) {
    return this.colorGradient(
      Math.pow((100 - matchRate) / 100, 0.5),
      {red: 67, green: 171, blue: 71},
@@ -294,7 +294,7 @@ export class BlockHealthGraphComponent implements OnInit {
    download(this.chartInstance.getDataURL({
      pixelRatio: 2,
      excludeComponents: ['dataZoom'],
-    }), `block-health-${this.timespan}-${Math.round(now.getTime() / 1000)}.svg`);
+    }), `block-fees-${this.timespan}-${Math.round(now.getTime() / 1000)}.svg`);
    // @ts-ignore
    this.chartOptions.grid.bottom = prevBottom;
    this.chartOptions.backgroundColor = 'none';
--- a/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.scss
+++ b/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.scss
@@ -4,9 +4,6 @@
  @media (min-width: 465px) {
    font-size: 20px;
  }
-  @media (min-width: 992px) {
-    height: 40px;
-  }
 }

 .main-title {
@@ -21,19 +18,17 @@
 }

 .full-container {
-  display: flex;
-  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 250px);
-  @media (min-width: 992px) {
-    height: calc(100vh - 150px);
-  }
+  min-height: 500px;
+  height: calc(100% - 150px);
+  @media (max-width: 992px) {
+    padding-bottom: 100px;
+  };
 }

 .chart {
-  display: flex;
-  flex: 1;
+  width: 100%;
  height: 100%;
  padding-bottom: 20px;
  padding-right: 10px;
--- a/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.scss
+++ b/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.scss
@@ -4,9 +4,6 @@
  @media (min-width: 465px) {
    font-size: 20px;
  }
-  @media (min-width: 992px) {
-    height: 40px;
-  }
 }

 .main-title {
@@ -21,19 +18,17 @@
 }

 .full-container {
-  display: flex;
-  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 250px);
-  @media (min-width: 992px) {
-    height: calc(100vh - 150px);
-  }
+  min-height: 500px;
+  height: calc(100% - 150px);
+  @media (max-width: 992px) {
+    padding-bottom: 100px;
+  };
 }

 .chart {
-  display: flex;
-  flex: 1;
+  width: 100%;
  height: 100%;
  padding-bottom: 20px;
  padding-right: 10px;
--- a/frontend/src/app/components/block/block.component.ts
+++ b/frontend/src/app/components/block/block.component.ts
@@ -335,7 +335,6 @@ export class BlockComponent implements OnInit, OnDestroy {
          const isMissing = {};
          const isSelected = {};
          const isFresh = {};
-          const isSigop = {};
          this.numMissing = 0;
          this.numUnexpected = 0;

@@ -355,9 +354,6 @@ export class BlockComponent implements OnInit, OnDestroy {
            for (const txid of blockAudit.freshTxs || []) {
              isFresh[txid] = true;
            }
-            for (const txid of blockAudit.sigopTxs || []) {
-              isSigop[txid] = true;
-            }
            // set transaction statuses
            for (const tx of blockAudit.template) {
              tx.context = 'projected';
@@ -366,7 +362,7 @@ export class BlockComponent implements OnInit, OnDestroy {
              } else if (inBlock[tx.txid]) {
                tx.status = 'found';
              } else {
-                tx.status = isFresh[tx.txid] ? 'fresh' : (isSigop[tx.txid] ? 'sigop' : 'missing');
+                tx.status = isFresh[tx.txid] ? 'fresh' : 'missing';
                isMissing[tx.txid] = true;
                this.numMissing++;
              }
@@ -616,13 +612,9 @@ export class BlockComponent implements OnInit, OnDestroy {
    });
  }

-  onTxClick(event: { tx: TransactionStripped, keyModifier: boolean }): void {
-    const url = new RelativeUrlPipe(this.stateService).transform(`/tx/${event.tx.txid}`);
-    if (!event.keyModifier) {
-      this.router.navigate([url]);
-    } else {
-      window.open(url, '_blank');
-    }
+  onTxClick(event: TransactionStripped): void {
+    const url = new RelativeUrlPipe(this.stateService).transform(`/tx/${event.txid}`);
+    this.router.navigate([url]);
  }

  onTxHover(txid: string): void {
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
@@ -1,61 +1,53 @@
-<div class="blocks-container blockchain-blocks-container" [class.time-ltr]="timeLtr" [class.minimal]="minimal"
-  [style.left]="static ? (offset || 0) + 'px' : null" [style.--block-size]="blockWidth+'px'"
+<div class="blocks-container blockchain-blocks-container" [class.time-ltr]="timeLtr"
+  [style.left]="static ? (offset || 0) + 'px' : null"
  *ngIf="static || (loadingBlocks$ | async) === false; else loadingBlocksTemplate">
  <div *ngFor="let block of blocks; let i = index; trackBy: trackByBlocksFn">
    <ng-container *ngIf="connected && block && !block.loading && !block.placeholder; else placeholderBlock">
-      <div
-        *ngIf="minimal && spotlight < 0 && chainTip + spotlight + 1 === block.height"
-        class="spotlight-bottom"
-        [style.left]="blockStyles[i].left"
-      ></div>
      <div [attr.data-cy]="'bitcoin-block-offset-' + offset + '-index-' + i"
        class="text-center bitcoin-block mined-block blockchain-blocks-offset-{{ offset }}-index-{{ i }}"
-        [class.offscreen]="!static && count && i >= count"
        id="bitcoin-block-{{ block.height }}" [ngStyle]="blockStyles[i]"
        [class.blink-bg]="isSpecial(block.height)">
        <a draggable="false" [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }"
          class="blockLink" [ngClass]="{'disabled': (this.stateService.blockScrolling$ | async)}">&nbsp;</a>
-        <div *ngIf="!minimal" [attr.data-cy]="'bitcoin-block-' + i + '-height'" class="block-height">
+        <div [attr.data-cy]="'bitcoin-block-' + i + '-height'" class="block-height">
          <a [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }">{{ block.height
            }}</a>
        </div>
        <div class="block-body">
-          <ng-container *ngIf="!minimal">
-            <div *ngIf="block?.extras; else emptyfees" [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fees">
-              ~{{ block?.extras?.medianFee | number:feeRounding }} <ng-container
-                i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
+          <div *ngIf="block?.extras; else emptyfees" [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fees">
+            ~{{ block?.extras?.medianFee | number:feeRounding }} <ng-container
+              i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
+          </div>
+          <ng-template #emptyfees>
+            <div [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fees">
+              &nbsp;
            </div>
-            <ng-template #emptyfees>
-              <div [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fees">
-                &nbsp;
-              </div>
-            </ng-template>
-            <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-fee-span'" class="fee-span"
-              *ngIf="block?.extras?.feeRange; else emptyfeespan">
-              {{ block?.extras?.feeRange?.[0] | number:feeRounding }} - {{
-              block?.extras?.feeRange[block?.extras?.feeRange?.length - 1] | number:feeRounding }} <ng-container
-                i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
+          </ng-template>
+          <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-fee-span'" class="fee-span"
+            *ngIf="block?.extras?.feeRange; else emptyfeespan">
+            {{ block?.extras?.feeRange?.[1] | number:feeRounding }} - {{
+            block?.extras?.feeRange[block?.extras?.feeRange?.length - 1] | number:feeRounding }} <ng-container
+              i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
+          </div>
+          <ng-template #emptyfeespan>
+            <div [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fee-span">
+              &nbsp;
            </div>
-            <ng-template #emptyfeespan>
-              <div [attr.data-cy]="'bitcoin-block-offset=' + offset + '-index-' + i + '-fees'" class="fee-span">
-                &nbsp;
-              </div>
-            </ng-template>
-            <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-total-fees'" *ngIf="showMiningInfo"
-              class="block-size">
-              <app-amount [satoshis]="block.extras?.totalFees ?? 0" digitsInfo="1.2-3" [noFiat]="true"></app-amount>
-            </div>
-            <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + 'block-size'" *ngIf="!showMiningInfo"
-              class="block-size" [innerHTML]="'&lrm;' + (block.size | bytes: 2)"></div>
-            <div [attr.data-cy]="'bitcoin-block-' + i + '-transactions'" class="transaction-count">
-              <ng-container
-                *ngTemplateOutlet="block.tx_count === 1 ? transactionsSingular : transactionsPlural; context: {$implicit: block.tx_count | number}"></ng-container>
-              <ng-template #transactionsSingular let-i i18n="shared.transaction-count.singular">{{ i }} transaction</ng-template>
-              <ng-template #transactionsPlural let-i i18n="shared.transaction-count.plural">{{ i }} transactions</ng-template>
-            </div>
-            <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-time'" class="time-difference">
-              <app-time kind="since" [time]="block.timestamp" [fastRender]="true"></app-time></div>
-          </ng-container>
+          </ng-template>
+          <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-total-fees'" *ngIf="showMiningInfo"
+            class="block-size">
+            <app-amount [satoshis]="block.extras?.totalFees ?? 0" digitsInfo="1.2-3" [noFiat]="true"></app-amount>
+          </div>
+          <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + 'block-size'" *ngIf="!showMiningInfo"
+            class="block-size" [innerHTML]="'&lrm;' + (block.size | bytes: 2)"></div>
+          <div [attr.data-cy]="'bitcoin-block-' + i + '-transactions'" class="transaction-count">
+            <ng-container
+              *ngTemplateOutlet="block.tx_count === 1 ? transactionsSingular : transactionsPlural; context: {$implicit: block.tx_count | number}"></ng-container>
+            <ng-template #transactionsSingular let-i i18n="shared.transaction-count.singular">{{ i }} transaction</ng-template>
+            <ng-template #transactionsPlural let-i i18n="shared.transaction-count.plural">{{ i }} transactions</ng-template>
+          </div>
+          <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-time'" class="time-difference">
+            <app-time kind="since" [time]="block.timestamp" [fastRender]="true"></app-time></div>
        </div>
        <div class="animated" [class]="showMiningInfo ? 'show' : 'hide'" *ngIf="block.extras?.pool != undefined">
          <a [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-pool'" class="badge badge-primary"
@@ -87,11 +79,11 @@
 </div>

 <ng-template #loadingBlocksTemplate>
-  <div class="blocks-container" [class.time-ltr]="timeLtr" [style.--block-size]="blockWidth+'px'">
+  <div class="blocks-container" [class.time-ltr]="timeLtr">
    <div class="flashing">
      <div *ngFor="let block of emptyBlocks; let i = index; trackBy: trackByBlocksFn">
        <div class="text-center bitcoin-block mined-block" id="bitcoin-block-{{ block.height }}"
-          [ngStyle]="emptyBlockStyles[i]" [class.offscreen]="!static && count && i >= count"></div>
+          [ngStyle]="emptyBlockStyles[i]"></div>
      </div>
    </div>
  </div>
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.scss
@@ -1,6 +1,6 @@
 .bitcoin-block {
-  width: var(--block-size);
-  height: var(--block-size);
+  width: 125px;
+  height: 125px;
 }

 .blockLink {
@@ -22,11 +22,7 @@
 .mined-block {
  position: absolute;
  top: 0px;
-  transition: background 2s, left 2s, transform 1s, opacity 1s;
-}
-
-.mined-block.offscreen {
-  opacity: 0;
+  transition: background 2s, left 2s, transform 1s;
 }

 .mined-block.placeholder-block {
@@ -39,11 +35,9 @@
 }

 .blocks-container {
-  --block-size: 125px;
-  --block-offset: calc(0.32 * var(--block-size));
  position: absolute;
  top: 0px;
-  left: var(--block-offset);
+  left: 40px;
 }

 .block-body {
@@ -83,11 +77,11 @@

 .bitcoin-block::after {
  content: '';
-  width: var(--block-size);
-  height: calc(0.192 * var(--block-size));
+  width: 125px;
+  height: 24px;
  position:absolute;
-  top: calc(-0.192 * var(--block-size));
-  left: calc(-0.16 * var(--block-size));
+  top: -24px;
+  left: -20px;
  background-color: #232838;
  transform:skew(40deg);
  transform-origin:top;
@@ -95,11 +89,11 @@

 .bitcoin-block::before {
  content: '';
-  width: calc(0.16 * var(--block-size));
-  height: var(--block-size);
+  width: 20px;
+  height: 125px;
  position: absolute;
-  top: calc(-0.096 * var(--block-size));
-  left: calc(-0.16 * var(--block-size));
+  top: -12px;
+  left: -20px;
  background-color: #191c27;

  transform: skewY(50deg);
@@ -174,16 +168,4 @@
  .bitcoin-block {
    transform: scaleX(-1);
  }
-}
-
-.spotlight-bottom {
-  position: absolute;
-  width: calc(0.6 * var(--block-size));
-  height: calc(0.25 * var(--block-size));
-  border-left: solid calc(0.3 * var(--block-size)) transparent;
-  border-bottom: solid calc(0.3 * var(--block-size)) white;
-  border-right: solid calc(0.3 * var(--block-size)) transparent;
-  transform: translate(calc(0.2 * var(--block-size)), calc(1.1 * var(--block-size)));
-  border-radius: 2px;
-  z-index: -1;
 }
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
@@ -24,9 +24,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
  @Input() count: number = 8; // number of blocks in this chunk (dynamic blocks only)
  @Input() loadingTip: boolean = false;
  @Input() connected: boolean = true;
-  @Input() minimal: boolean = false;
-  @Input() blockWidth: number = 125;
-  @Input() spotlight: number = 0;
  
  specialBlocks = specialBlocks;
  network = '';
@@ -54,10 +51,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
  timeLtrSubscription: Subscription;
  timeLtr: boolean;

-  blockOffset: number = 155;
-  dividerBlockOffset: number = 205;
-  blockPadding: number = 30;
-
  gradientColors = {
    '': ['#9339f4', '#105fb0'],
    bisq: ['#9339f4', '#105fb0'],
@@ -125,7 +118,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {

          this.blockStyles = [];
          if (this.blocksFilled && block.height > this.chainTip) {
-            this.blocks.forEach((b, i) => this.blockStyles.push(this.getStyleForBlock(b, i, i ? -this.blockOffset : -this.dividerBlockOffset)));
+            this.blocks.forEach((b, i) => this.blockStyles.push(this.getStyleForBlock(b, i, i ? -155 : -205)));
            setTimeout(() => {
              this.blockStyles = [];
              this.blocks.forEach((b, i) => this.blockStyles.push(this.getStyleForBlock(b, i)));
@@ -166,13 +159,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
  }

  ngOnChanges(changes: SimpleChanges): void {
-    if (changes.blockWidth && this.blockWidth) {
-      this.blockPadding = 0.24 * this.blockWidth;
-      this.blockOffset = this.blockWidth + this.blockPadding;
-      this.dividerBlockOffset = this.blockOffset + (0.4 * this.blockWidth);
-      this.blockStyles = [];
-      this.blocks.forEach((b, i) => this.blockStyles.push(this.getStyleForBlock(b, i)));
-    }
    if (this.static) {
      const animateSlide = changes.height && (changes.height.currentValue === changes.height.previousValue + 1);
      this.updateStaticBlocks(animateSlide);
@@ -205,14 +191,14 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
      }
      this.arrowVisible = true;
      if (newBlockFromLeft) {
-        this.arrowLeftPx = blockindex * this.blockOffset + this.blockPadding - this.dividerBlockOffset;
+        this.arrowLeftPx = blockindex * 155 + 30 - 205;
        setTimeout(() => {
          this.arrowTransition = '2s';
-          this.arrowLeftPx = blockindex * this.blockOffset + this.blockPadding;
+          this.arrowLeftPx = blockindex * 155 + 30;
          this.cd.markForCheck();
        }, 50);
      } else {
-        this.arrowLeftPx = blockindex * this.blockOffset + this.blockPadding;
+        this.arrowLeftPx = blockindex * 155 + 30;
        if (!animate) {
          setTimeout(() => {
            this.arrowTransition = '2s';
@@ -259,7 +245,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
    }
    this.blocks = this.blocks.slice(0, this.count);
    this.blockStyles = [];
-    this.blocks.forEach((b, i) => this.blockStyles.push(this.getStyleForBlock(b, i, animateSlide ? -this.blockOffset : 0)));
+    this.blocks.forEach((b, i) => this.blockStyles.push(this.getStyleForBlock(b, i, animateSlide ? -155 : 0)));
    this.cd.markForCheck();
    if (animateSlide) {
      // animate blocks slide right
@@ -301,7 +287,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
    }

    return {
-      left: addLeft + this.blockOffset * index + 'px',
+      left: addLeft + 155 * index + 'px',
      background: `repeating-linear-gradient(
        #2d3348,
        #2d3348 ${greenBackgroundHeight}%,
@@ -323,7 +309,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
    const addLeft = animateEnterFrom || 0;

    return {
-      left: addLeft + (this.blockOffset * index) + 'px',
+      left: addLeft + (155 * index) + 'px',
      background: "#2d3348",
    };
  }
@@ -331,7 +317,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
  getStyleForPlaceholderBlock(index: number, animateEnterFrom: number = 0) {
    const addLeft = animateEnterFrom || 0;
    return {
-      left: addLeft + (this.blockOffset * index) + 'px',
+      left: addLeft + (155 * index) + 'px',
    };
  }

@@ -339,7 +325,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
    const addLeft = animateEnterFrom || 0;

    return {
-      left: addLeft + this.blockOffset * this.emptyBlocks.indexOf(block) + 'px',
+      left: addLeft + 155 * this.emptyBlocks.indexOf(block) + 'px',
      background: "#2d3348",
    };
  }
--- a/frontend/src/app/components/clock-face/clock-face.component.html
+++ b/frontend/src/app/components/clock-face/clock-face.component.html
@@ -1,42 +0,0 @@
-<div class="clock-face" [style]="faceStyle">
-  <ng-content></ng-content>
-  <svg
-    class="cut-out"
-    width="384"
-    height="384"
-    viewBox="0 0 384 384"
-  >
-    <g>
-      <path
-        class="face"
-        d="M 0,0 V 384 H 384 V 0 Z M 192,15 A 177,177 0 0 1 369,192 177,177 0 0 1 192,369 177,177 0 0 1 15,192 177,177 0 0 1 192,15 Z"
-      />
-    </g>
-  </svg>
-
-  <svg
-    class="demo-dial"
-    width="384"
-    height="384"
-    viewBox="0 0 384 384"
-  >
-    <defs>
-      <pattern id="dial-gradient" patternUnits="userSpaceOnUse" width="384" height="384">
-        <image class="dial-gradient-img" href="/resources/clock/gradient.png" x="0" y="0" width="384" height="384" [style.transform]="'rotate(' + (minutes * 6) + 'deg)'" />
-      </pattern>
-    </defs>
-
-    <path *ngFor="let angle of minorTicks" class="tick minor" d="M 192,27 v 10" [style.transform]="'rotate(' + angle + 'deg)'"/>
-    <path *ngFor="let angle of majorTicks" class="tick major" d="M 192,27 v 18" [style.transform]="'rotate(' + angle + 'deg)'"/>
-
-    <ng-container *ngFor="let segment of segments; trackBy: trackBySegment">
-      <path class="block-segment" [attr.d]="segment.path" />
-      <!-- <circle class="segment-mark start" [attr.cx]="segment.start.x" [attr.cy]="segment.start.y" r="2" style="fill:green;stroke:white;stroke-width:1px;" />
-      <circle class="segment-mark end" [attr.cx]="segment.end.x" [attr.cy]="segment.end.y" r="2" style="fill:red;stroke:white;stroke-width:1px;" /> -->
-    </ng-container>
-    <!-- <polyline points="468.750,82.031 468.750,35 " id="polyline322" style="fill:none;stroke:#ffffff;stroke-width:4.84839;stroke-dasharray:none;stroke-opacity:1" transform="matrix(0.41250847,0,0,0.93092534,-1.3627708,-32.692008)" /> -->
-    <path class="tick very major" d="M 192,0 v 45" />
-    <path id="hour" class="gnomon hour" d="M 178,3 206,3 192,40 Z" [style.transform]="'rotate(' + (hours * 30) + 'deg)'" />
-    <path id="minute" class="gnomon minute" d="M 180,4 204,4 192,38 Z" [style.transform]="'rotate(' + (minutes * 6) + 'deg)'" />
-  </svg>
-</div>
--- a/frontend/src/app/components/clock-face/clock-face.component.scss
+++ b/frontend/src/app/components/clock-face/clock-face.component.scss
@@ -1,69 +0,0 @@
-.clock-face {
-  position: relative;
-  height: 84.375%;
-  margin: auto;
-  overflow: hidden;
-
-  .cut-out, .demo-dial {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    width: 100%;
-    height: 100%;
-
-    .face {
-      fill: #11131f;
-    }
-  }
-
-  .gnomon {
-    transform-origin: center;
-    stroke-linejoin: round;
-
-    &.minute {
-      fill:#80C2E1;
-      stroke:#80C2E1;
-      stroke-width: 2px;
-    }
-
-    &.hour {
-      fill: #105fb0;
-      stroke: #105fb0;
-      stroke-width: 6px;
-    }
-  }
-
-  .tick {
-    transform-origin: center;
-    fill: none;
-    stroke: white;
-    stroke-width: 2px;
-    stroke-linecap: butt;
-
-    &.minor {
-      stroke-opacity: 0.5;
-    }
-
-    &.very.major {
-      stroke-width: 4px;
-    }
-  }
-
-  .block-segment {
-    fill: none;
-    stroke: url(#dial-gradient);
-    stroke-width: 18px;
-  }
-
-  .dial-segment {
-    fill: none;
-    stroke: white;
-    stroke-width: 2px;
-  }
-
-  .dial-gradient-img {
-    transform-origin: center;
-  }
-}
--- a/frontend/src/app/components/clock-face/clock-face.component.ts
+++ b/frontend/src/app/components/clock-face/clock-face.component.ts
@@ -1,147 +0,0 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
-import { Subscription, tap, timer } from 'rxjs';
-import { WebsocketService } from '../../services/websocket.service';
-import { StateService } from '../../services/state.service';
-
-@Component({
-  selector: 'app-clock-face',
-  templateUrl: './clock-face.component.html',
-  styleUrls: ['./clock-face.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ClockFaceComponent implements OnInit, OnChanges, OnDestroy {
-  @Input() size: number = 300;
-
-  blocksSubscription: Subscription;
-  timeSubscription: Subscription;
-
-  faceStyle;
-  dialPath;
-  blockTimes = [];
-  segments = [];
-  hours: number = 0;
-  minutes: number = 0;
-  minorTicks: number[] = [];
-  majorTicks: number[] = [];
-
-  constructor(
-    public stateService: StateService,
-    private cd: ChangeDetectorRef
-  ) {
-    this.updateTime();
-    this.makeTicks();
-  }
-
-  ngOnInit(): void {
-    this.timeSubscription = timer(0, 250).pipe(
-      tap(() => {
-        this.updateTime();
-      })
-    ).subscribe();
-    this.blocksSubscription = this.stateService.blocks$
-      .subscribe(([block]) => {
-        if (block) {
-          this.blockTimes.push([block.height, new Date(block.timestamp * 1000)]);
-          // using block-reported times, so ensure they are sorted chronologically
-          this.blockTimes = this.blockTimes.sort((a, b) => a[1].getTime() - b[1].getTime());
-          this.updateSegments();
-        }
-      });
-  }
-
-  ngOnChanges(): void {
-    this.faceStyle = {
-      width: `${this.size}px`,
-      height: `${this.size}px`,
-    };
-  }
-
-  ngOnDestroy(): void {
-    this.timeSubscription.unsubscribe();
-  }
-
-  updateTime(): void {
-    const now = new Date();
-    const seconds = now.getSeconds() + (now.getMilliseconds() / 1000);
-    this.minutes = (now.getMinutes() + (seconds / 60)) % 60;
-    this.hours = now.getHours() + (this.minutes / 60);
-    this.updateSegments();
-  }
-
-  updateSegments(): void {
-    const now = new Date();
-    this.blockTimes = this.blockTimes.filter(time => (now.getTime() - time[1].getTime()) <= 3600000);
-    const tail = new Date(now.getTime() - 3600000);
-    const hourStart = new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours());
-
-    const times = [
-      ['start', tail],
-      ...this.blockTimes,
-      ['end', now],
-    ];
-    const minuteTimes = times.map(time => {
-      return [time[0], (time[1].getTime() - hourStart.getTime()) / 60000];
-    });
-    this.segments = [];
-    const r = 174;
-    const cx = 192;
-    const cy = cx;
-    for (let i = 1; i < minuteTimes.length; i++) {
-      const arc = this.getArc(minuteTimes[i-1][1], minuteTimes[i][1], r, cx, cy);
-      if (arc) {
-        arc.id = minuteTimes[i][0];
-        this.segments.push(arc);
-      }
-    }
-    const arc = this.getArc(minuteTimes[0][1], minuteTimes[1][1], r, cx, cy);
-    if (arc) {
-      this.dialPath = arc.path;
-    }
-
-    this.cd.markForCheck();
-  }
-
-  getArc(startTime, endTime, r, cx, cy): any {
-    const startDegrees = (startTime + 0.2) * 6;
-      const endDegrees = (endTime - 0.2) * 6;
-      const start = this.getPointOnCircle(startDegrees, r, cx, cy);
-      const end = this.getPointOnCircle(endDegrees, r, cx, cy);
-      const arcLength = endDegrees - startDegrees;
-      // merge gaps and omit lines shorter than 1 degree
-      if (arcLength >= 1) {
-        const path = `M ${start.x} ${start.y} A ${r} ${r} 0 ${arcLength > 180 ? 1 : 0} 1 ${end.x} ${end.y}`;
-        return {
-          path,
-          start,
-          end
-        };
-      } else {
-        return null;
-      }
-  }
-
-  getPointOnCircle(deg, r, cx, cy) {
-    const modDeg = ((deg % 360) + 360) % 360;
-    const rad = (modDeg * Math.PI) / 180;
-    return {
-      x: cx + (r * Math.sin(rad)),
-      y: cy - (r * Math.cos(rad)),
-    };
-  }
-
-  makeTicks() {
-    this.minorTicks = [];
-    this.majorTicks = [];
-    for (let i = 1; i < 60; i++) {
-      if (i % 5 === 0) {
-        this.majorTicks.push(i * 6);
-      } else {
-        this.minorTicks.push(i * 6);
-      }
-    }
-  }
-
-  trackBySegment(index: number, segment) {
-    return segment.id;
-  }
-}
--- a/frontend/src/app/components/clock/clock-mempool.component.html
+++ b/frontend/src/app/components/clock/clock-mempool.component.html
@@ -1 +0,0 @@
-<app-clock mode="mempool"></app-clock>
--- a/frontend/src/app/components/clock/clock-mempool.component.ts
+++ b/frontend/src/app/components/clock/clock-mempool.component.ts
@@ -1,7 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-clock-mempool',
-  templateUrl: './clock-mempool.component.html',
-})
-export class ClockMempoolComponent {}
--- a/frontend/src/app/components/clock/clock-mined.component.html
+++ b/frontend/src/app/components/clock/clock-mined.component.html
@@ -1 +0,0 @@
-<app-clock mode="block"></app-clock>
--- a/frontend/src/app/components/clock/clock-mined.component.ts
+++ b/frontend/src/app/components/clock/clock-mined.component.ts
@@ -1,7 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-clock-mined',
-  templateUrl: './clock-mined.component.html',
-})
-export class ClockMinedComponent {}
--- a/frontend/src/app/components/clock/clock.component.html
+++ b/frontend/src/app/components/clock/clock.component.html
@@ -1,67 +0,0 @@
-<div class="clock-wrapper" [style]="wrapperStyle">
-  <div class="clockchain-bar" [style.height]="chainHeight + 'px'">
-    <div class="clockchain">
-      <app-clockchain [width]="chainWidth" [height]="chainHeight" [mode]="mode"></app-clockchain>
-    </div>
-  </div>
-  <div class="clock-face">
-    <app-clock-face [size]="clockSize">
-      <div class="block-wrapper">
-        <ng-container *ngIf="block && block.height >= 0">
-          <ng-container *ngIf="mode === 'block'; else mempoolMode;">
-            <div class="block-cube">
-              <div class="side top"></div>
-              <div class="side bottom"></div>
-              <div class="side right" [style]="blockStyle"></div>
-              <div class="side left" [style]="blockStyle"></div>
-              <div class="side front" [style]="blockStyle"></div>
-              <div class="side back" [style]="blockStyle"></div>
-            </div>
-          </ng-container>
-          <ng-template #mempoolMode>
-            <div class="block-sizer" [style]="blockSizerStyle">
-              <app-mempool-block-overview [index]="0" [pixelAlign]="true"></app-mempool-block-overview>
-            </div>
-          </ng-template>
-          <div class="fader"></div>
-          <div class="title-wrapper">
-            <h1 class="block-height">{{ block.height }}</h1>
-          </div>
-        </ng-container>
-      </div>
-    </app-clock-face>
-  </div>
-  <ng-container *ngIf="!hideStats">
-    <div class="stats top left">
-      <p class="label" i18n="clock.fiat-price">fiat price</p>
-      <p>
-        <app-fiat [value]="100000000" digitsInfo="1.2-2" colorClass="white-color"></app-fiat>
-      </p>
-    </div>
-    <div class="stats top right">
-      <p class="label" i18n="clock.priority-rate|priority fee rate">priority rate</p>
-      <p *ngIf="recommendedFees$ | async as recommendedFees;" i18n="shared.sat-vbyte|sat/vB">{{ recommendedFees.fastestFee }} sat/vB</p>
-    </div>
-    <div *ngIf="mode !== 'mempool' && block" class="stats bottom left">
-      <p [innerHTML]="block.size | bytes: 2"></p>
-      <p class="label" i18n="clock.block-size">block size</p>
-    </div>
-    <div *ngIf="mode !== 'mempool' && block" class="stats bottom right">
-      <p class="force-wrap">
-        <ng-container *ngTemplateOutlet="block.tx_count === 1 ? transactionsSingular : transactionsPlural; context: {$implicit: block.tx_count | number}"></ng-container>
-        <ng-template #transactionsSingular let-i i18n="shared.transaction-count.singular">{{ i }} <span class="label">transaction</span></ng-template>
-        <ng-template #transactionsPlural let-i i18n="shared.transaction-count.plural">{{ i }} <span class="label">transactions</span></ng-template>
-      </p>
-    </div>
-    <ng-container *ngIf="mempoolInfo$ | async as mempoolInfo;">
-      <div *ngIf="mode === 'mempool'" class="stats bottom left">
-        <p [innerHTML]="mempoolInfo.usage | bytes: 0"></p>
-        <p class="label" i18n="dashboard.memory-usage|Memory usage">memory usage</p>
-      </div>
-      <div *ngIf="mode === 'mempool'" class="stats bottom right">
-        <p>{{ mempoolInfo.size | number }}</p>
-        <p class="label" i18n="dashboard.unconfirmed|Unconfirmed count">unconfirmed</p>
-      </div>
-    </ng-container>
-  </ng-container>
-</div>
--- a/frontend/src/app/components/clock/clock.component.scss
+++ b/frontend/src/app/components/clock/clock.component.scss
@@ -1,190 +0,0 @@
-.clock-wrapper {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-
-  --chain-height: 60px;
-  --clock-width: 300px;
-
-  .clockchain-bar, .clock-face {
-    flex-shrink: 0;
-    flex-grow: 0;
-  }
-
-  .clockchain-bar {
-    position: relative;
-    width: 100%;
-    height: 15.625%;
-    z-index: 2;
-    // overflow: hidden;
-    // background: #1d1f31;
-    // box-shadow: 0 0 15px #000;
-  }
-
-  .clock-face {
-    position: relative;
-    height: 84.375%;
-    margin: auto;
-    overflow: hidden;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    z-index: 1;
-  }
-
-  .stats {
-    position: absolute;
-    z-index: 3;
-
-    p {
-      margin: 0;
-      font-size: calc(0.055 * var(--clock-width));
-      line-height: calc(0.05 * var(--clock-width));
-      opacity: 0.8;
-
-      &.force-wrap {
-        word-spacing: 10000px;
-      }
-
-      ::ng-deep .symbol {
-        font-size: inherit;
-        color: white;
-      }
-    }
-
-    .label {
-      font-size: calc(0.04 * var(--clock-width));
-      line-height: calc(0.05 * var(--clock-width));
-    }
-
-    &.top {
-      top: calc(var(--chain-height) + 2%);
-    }
-    &.bottom {
-      bottom: 2%;
-    }
-    &.left {
-      left: 5%;
-    }
-    &.right {
-      right: 5%;
-      text-align: end;
-      text-align: right;
-    }
-  }
-}
-
-.title-wrapper {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-
-  .block-height {
-    font-size: calc(0.2 * var(--clock-width));
-    padding: 0;
-    margin: 0;
-    background: radial-gradient(rgba(0,0,0,0.5), transparent 67%);
-    padding: calc(0.05 * var(--clock-width)) calc(0.15 * var(--clock-width));
-  }
-}
-
-.block-wrapper {
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  width: 100%;
-  height: 100%;
-
-  .block-sizer {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-  }
-
-  .fader {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    background: radial-gradient(transparent 0%, transparent 44%, #11131f 58%, #11131f 100%);
-  }
-
-  .block-cube {
-    --side-width: calc(0.4 * var(--clock-width));
-    --half-side: calc(0.2 * var(--clock-width));
-    --neg-half-side: calc(-0.2 * var(--clock-width));
-    transform-style: preserve-3d;
-    animation: block-spin 60s infinite linear;
-    position: absolute;
-    z-index: -1;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: var(--side-width);
-    height: var(--side-width);
-
-    .side {
-      width: var(--side-width);
-      height: var(--side-width);
-      line-height: 100px;
-      text-align: center;
-      background: #232838;
-      display: block;
-      position: absolute;
-    }
-
-    .side.top {
-      transform: rotateX(90deg); 
-      margin-top: var(--neg-half-side);
-    }
-
-    .side.bottom {
-      background: #105fb0;
-      transform: rotateX(-90deg); 
-      margin-top: var(--half-side);
-    }
-
-    .side.right {
-      transform: rotateY(90deg); 
-      margin-left: var(--half-side);
-    }
-
-    .side.left {
-      transform: rotateY(-90deg); 
-      margin-left: var(--neg-half-side);
-    }
-
-    .side.front {
-      transform: translateZ(var(--half-side));
-    }
-
-    .side.back {
-      transform: translateZ(var(--neg-half-side));
-    }
-  }
-}
-
-@keyframes block-spin {
-  0% {transform: translate(-50%, -50%) rotateX(-20deg) rotateY(0deg);}
-  100% {transform: translate(-50%, -50%) rotateX(-20deg) rotateY(-360deg);}
-}
--- a/frontend/src/app/components/clock/clock.component.ts
+++ b/frontend/src/app/components/clock/clock.component.ts
@@ -1,105 +0,0 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, Input, OnInit } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
-import { StateService } from '../../services/state.service';
-import { BlockExtended } from '../../interfaces/node-api.interface';
-import { WebsocketService } from '../../services/websocket.service';
-import { MempoolInfo, Recommendedfees } from '../../interfaces/websocket.interface';
-import { ActivatedRoute } from '@angular/router';
-
-@Component({
-  selector: 'app-clock',
-  templateUrl: './clock.component.html',
-  styleUrls: ['./clock.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ClockComponent implements OnInit {
-  @Input() mode: 'block' | 'mempool' = 'block';
-  hideStats: boolean = false;
-  blocksSubscription: Subscription;
-  recommendedFees$: Observable<Recommendedfees>;
-  mempoolInfo$: Observable<MempoolInfo>;
-  block: BlockExtended;
-  clockSize: number = 300;
-  chainWidth: number = 384;
-  chainHeight: number = 60;
-  blockStyle;
-  blockSizerStyle;
-  wrapperStyle;
-  limitWidth: number;
-  limitHeight: number;
-
-  gradientColors = {
-    '': ['#9339f4', '#105fb0'],
-    bisq: ['#9339f4', '#105fb0'],
-    liquid: ['#116761', '#183550'],
-    'liquidtestnet': ['#494a4a', '#272e46'],
-    testnet: ['#1d486f', '#183550'],
-    signet: ['#6f1d5d', '#471850'],
-  };
-
-  constructor(
-    public stateService: StateService,
-    private websocketService: WebsocketService,
-    private route: ActivatedRoute,
-    private cd: ChangeDetectorRef,
-  ) {
-    this.route.queryParams.subscribe((params) => {
-      this.hideStats = params && params.stats === 'false';
-      this.limitWidth = Number.parseInt(params.width) || null;
-      this.limitHeight = Number.parseInt(params.height) || null;
-    });
-  }
-
-  ngOnInit(): void {
-    this.resizeCanvas();
-    this.websocketService.want(['blocks', 'stats', 'mempool-blocks']);
-
-    this.blocksSubscription = this.stateService.blocks$
-      .subscribe(([block]) => {
-        if (block) {
-          this.block = block;
-          this.blockStyle = this.getStyleForBlock(this.block);
-          this.cd.markForCheck();
-        }
-      });
-
-    this.recommendedFees$ = this.stateService.recommendedFees$;
-    this.mempoolInfo$ = this.stateService.mempoolInfo$;
-  }
-
-  getStyleForBlock(block: BlockExtended) {
-    const greenBackgroundHeight = 100 - (block.weight / this.stateService.env.BLOCK_WEIGHT_UNITS) * 100;
-
-    return {
-      background: `repeating-linear-gradient(
-        #2d3348,
-        #2d3348 ${greenBackgroundHeight}%,
-        ${this.gradientColors[''][0]} ${Math.max(greenBackgroundHeight, 0)}%,
-        ${this.gradientColors[''][1]} 100%
-      )`,
-    };
-  }
-  
-  @HostListener('window:resize', ['$event'])
-  resizeCanvas(): void {
-    const windowWidth = this.limitWidth || window.innerWidth;
-    const windowHeight = this.limitHeight || window.innerHeight;
-    this.chainWidth = windowWidth;
-    this.chainHeight = Math.max(60, windowHeight / 8);
-    this.clockSize = Math.min(800, windowWidth, windowHeight - (1.4 * this.chainHeight));
-    const size = Math.ceil(this.clockSize / 75) * 75;
-    const margin = (this.clockSize - size) / 2;
-    this.blockSizerStyle = {
-      transform: `translate(${margin}px, ${margin}px)`,
-      width: `${size}px`,
-      height: `${size}px`,
-    };
-    this.wrapperStyle = {
-      '--clock-width': `${this.clockSize}px`,
-      '--chain-height': `${this.chainHeight}px`,
-      'width': this.limitWidth ? `${this.limitWidth}px` : undefined,
-      'height': this.limitHeight ? `${this.limitHeight}px` : undefined,
-    };
-    this.cd.markForCheck();
-  }
-}
--- a/frontend/src/app/components/clockchain/clockchain.component.html
+++ b/frontend/src/app/components/clockchain/clockchain.component.html
@@ -1,28 +0,0 @@
-<div
-  class="text-center" class="blockchain-wrapper" [class.time-ltr]="timeLtr" #container
-  [class.ltr-transition]="ltrTransitionEnabled" [style.width]="width + 'px'" [style.height]="height + 'px'"
->
-  <div class="position-container" [ngClass]="network ? network : ''" [style.top]="(height / 3) + 'px'">
-    <span>
-      <div class="blocks-wrapper">
-        <app-mempool-blocks [minimal]="true" [count]="mempoolBlocks" [blockWidth]="blockWidth" [spotlight]="mode === 'mempool' ? 1 : 0"></app-mempool-blocks>
-        <app-blockchain-blocks [minimal]="true" [count]="blockchainBlocks" [blockWidth]="blockWidth" [spotlight]="mode === 'block' ? -1 : 0"></app-blockchain-blocks>
-      </div>
-      <div class="divider" [style.top]="-(height / 6) + 'px'">
-        <svg
-          viewBox="0 0 2 175"
-          [style.width]="'2px'"
-          [style.height]="(5 * height / 6) + 'px'"
-        >
-          <line
-            class="divider-line"
-            x0="0"
-            x1="0"
-            y0="0"
-            y1="175px"
-          ></line>
-        </svg>
-      </div>
-    </span>
-  </div>
-</div>
--- a/frontend/src/app/components/clockchain/clockchain.component.scss
+++ b/frontend/src/app/components/clockchain/clockchain.component.scss
@@ -1,94 +0,0 @@
-.divider {
-  position: absolute;
-  left: -0.5px;
-  top: 0;
-  .divider-line {
-    stroke: white;
-    stroke-width: 4px;
-    stroke-linecap: butt;
-    stroke-dasharray: 25px 25px;
-  }
-}
-
-.blockchain-wrapper {
-  height: 100%;
-
-  -webkit-user-select: none; /* Safari */
-  -moz-user-select: none; /* Firefox */
-  -ms-user-select: none; /* IE10+/Edge */
-  user-select: none; /* Standard */
-}
-
-.position-container {
-  position: absolute;
-  left: 50%;
-  top: 0;
-}
-
-.black-background {
-  background-color: #11131f;
-  z-index: 100;
-  position: relative;
-}
-
-.scroll-spacer {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 1px;
-  height: 1px;
-  pointer-events: none;
-}
-
-.loading-block {
-  position: absolute;
-  text-align: center;
-  margin: auto;
-  width: 300px;
-  left: -150px;
-  top: 0px;
-}
-
-.time-toggle {
-  color: white;
-  font-size: 0.8rem;
-  position: absolute;
-  bottom: -1.8em;
-  left: 1px;
-  transform: translateX(-50%);
-  background: none;
-  border: none;
-  outline: none;
-  margin: 0;
-  padding: 0;
-}
-
-.blockchain-wrapper.ltr-transition .blocks-wrapper,
-.blockchain-wrapper.ltr-transition .position-container,
-.blockchain-wrapper.ltr-transition .time-toggle {
-  transition: transform 1s;
-}
-
-.blockchain-wrapper.time-ltr {
-  .blocks-wrapper {
-    transform: scaleX(-1);
-  }
-
-  .time-toggle {
-    transform: translateX(-50%) scaleX(-1);
-  }
-}
-
-:host-context(.ltr-layout) {
-  .blockchain-wrapper.time-ltr .blocks-wrapper,
-  .blockchain-wrapper .blocks-wrapper {
-    direction: ltr;
-  }
-}
-
-:host-context(.rtl-layout) {
-  .blockchain-wrapper.time-ltr .blocks-wrapper,
-  .blockchain-wrapper .blocks-wrapper {
-    direction: rtl;
-  }
-}
--- a/frontend/src/app/components/clockchain/clockchain.component.ts
+++ b/frontend/src/app/components/clockchain/clockchain.component.ts
@@ -1,73 +0,0 @@
-import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, OnChanges, ChangeDetectorRef } from '@angular/core';
-import { firstValueFrom, Subscription } from 'rxjs';
-import { StateService } from '../../services/state.service';
-
-@Component({
-  selector: 'app-clockchain',
-  templateUrl: './clockchain.component.html',
-  styleUrls: ['./clockchain.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ClockchainComponent implements OnInit, OnChanges, OnDestroy {
-  @Input() width: number = 300;
-  @Input() height: number = 60;
-  @Input() mode: 'mempool' | 'block';
-
-  mempoolBlocks: number = 3;
-  blockchainBlocks: number = 6;
-  blockWidth: number = 50;
-  dividerStyle;
-
-  network: string;
-  timeLtrSubscription: Subscription;
-  timeLtr: boolean = this.stateService.timeLtr.value;
-  ltrTransitionEnabled = false;
-  connectionStateSubscription: Subscription;
-  loadingTip: boolean = true;
-  connected: boolean = true;
-
-  constructor(
-    public stateService: StateService,
-    private cd: ChangeDetectorRef,
-  ) {}
-
-  ngOnInit() {
-    this.ngOnChanges();
-
-    this.network = this.stateService.network;
-    this.timeLtrSubscription = this.stateService.timeLtr.subscribe((ltr) => {
-      this.timeLtr = !!ltr;
-    });
-    this.connectionStateSubscription = this.stateService.connectionState$.subscribe(state => {
-      this.connected = (state === 2);
-    });
-    firstValueFrom(this.stateService.chainTip$).then(() => {
-      this.loadingTip = false;
-    });
-  }
-
-  ngOnChanges() {
-    this.blockWidth = Math.floor(7 * this.height / 12);
-    this.mempoolBlocks = Math.floor(((this.width / 2) - (this.blockWidth * 0.32)) / (1.24 * this.blockWidth));
-    this.blockchainBlocks = this.mempoolBlocks;
-    this.dividerStyle = {
-      width: '2px',
-      height: `${this.height}px`,
-    };
-    this.cd.markForCheck();
-  }
-
-  ngOnDestroy() {
-    this.timeLtrSubscription.unsubscribe();
-    this.connectionStateSubscription.unsubscribe();
-  }
-
-  trackByPageFn(index: number, item: { index: number }) {
-    return item.index;
-  }
-
-  toggleTimeDirection() {
-    this.ltrTransitionEnabled = true;
-    this.stateService.timeLtr.next(!this.timeLtr);
-  }
-}
--- a/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html
+++ b/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.component.html
@@ -14,7 +14,7 @@
          <a [routerLink]="['/block' | relativeUrl, diffChange.height]">{{ diffChange.height }}</a>
        </td>
        <td class="date text-left">
-          <app-time kind="since" [time]="diffChange.timestamp" [fastRender]="true" [precision]="1"></app-time>
+          <app-time kind="since" [time]="diffChange.timestamp" [fastRender]="true"></app-time>
        </td>
        <td class="text-right">{{ diffChange.difficultyShorten }}</td>
        <td class="text-right" [style]="diffChange.change >= 0 ? 'color: #42B747' : 'color: #B74242'">
--- a/frontend/src/app/components/difficulty-mining/difficulty-mining.component.html
+++ b/frontend/src/app/components/difficulty-mining/difficulty-mining.component.html
@@ -10,7 +10,7 @@
            <ng-template #blocksPlural let-i i18n="shared.blocks">{{ i }} <span class="shared-block">blocks</span></ng-template>
            <ng-template #blocksSingular let-i i18n="shared.block">{{ i }} <span class="shared-block">block</span></ng-template>
          </div>
-          <div class="symbol"><app-time kind="until" [time]="epochData.estimatedRetargetDate" [fastRender]="true" [precision]="1"></app-time></div>
+          <div class="symbol"><app-time kind="until" [time]="epochData.estimatedRetargetDate" [fastRender]="true"></app-time></div>
        </div>
        <div class="item">
          <h5 class="card-title" i18n="difficulty-box.estimate">Estimate</h5>
@@ -54,7 +54,7 @@
            <ng-template #blocksPlural let-i i18n="shared.blocks">{{ i }} <span class="shared-block">blocks</span></ng-template>
            <ng-template #blocksSingular let-i i18n="shared.block">{{ i }} <span class="shared-block">block</span></ng-template>
          </div>
-          <div class="symbol"><app-time kind="until" [time]="epochData.timeUntilHalving" [fastRender]="true" [precision]="1"></app-time></div>
+          <div class="symbol"><app-time kind="until" [time]="epochData.timeUntilHalving" [fastRender]="true"></app-time></div>
        </div>
      </div>
    </div>
--- a/frontend/src/app/components/difficulty/difficulty.component.html
+++ b/frontend/src/app/components/difficulty/difficulty.component.html
@@ -37,7 +37,7 @@
        <div class="difficulty-stats">
          <div class="item">
            <div class="card-text">
-              ~<app-time [time]="epochData.timeAvg / 1000" [fractionDigits]="1"></app-time>
+              ~<app-time [time]="epochData.timeAvg / 1000" [forceFloorOnTimeIntervals]="['minute']" [fractionDigits]="1"></app-time>
            </div>
            <div class="symbol" i18n="difficulty-box.average-block-time">Average block time</div>
          </div>
@@ -68,7 +68,7 @@
            </div>
          </div>
          <div class="item">
-            <div class="card-text"><app-time kind="until" [time]="epochData.estimatedRetargetDate" [fastRender]="true" [precision]="1"></app-time></div>
+            <div class="card-text"><app-time kind="until" [time]="epochData.estimatedRetargetDate" [fastRender]="true"></app-time></div>
            <div class="symbol">
              {{ epochData.retargetDateString }}
            </div>
--- a/frontend/src/app/components/fees-box/fees-box.component.html
+++ b/frontend/src/app/components/fees-box/fees-box.component.html
@@ -1,4 +1,4 @@
-<div class="fee-estimation-wrapper" *ngIf="(isLoading$ | async) === false && (recommendedFees$ | async) as recommendedFees; else loadingFees">
+<div class="fee-estimation-wrapper" *ngIf="(isLoadingWebSocket$ | async) === false && (recommendedFees$ | async) as recommendedFees; else loadingFees">
  <div class="d-flex">
    <div class="fee-progress-bar" [style.background]="noPriority">
      <span class="fee-label" i18n="fees-box.no-priority" i18n-ngbTooltip="Transaction feerate tooltip (economy)" ngbTooltip="Either 2x the minimum, or the Low Priority rate (whichever is lower)" placement="top">No Priority</span>
--- a/frontend/src/app/components/fees-box/fees-box.component.ts
+++ b/frontend/src/app/components/fees-box/fees-box.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
 import { StateService } from '../../services/state.service';
-import { Observable, combineLatest } from 'rxjs';
+import { Observable } from 'rxjs';
 import { Recommendedfees } from '../../interfaces/websocket.interface';
 import { feeLevels, mempoolFeeColors } from '../../app.constants';
-import { map, startWith, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';

@Component({
  selector: 'app-fees-box',
@@ -12,7 +12,7 @@ import { map, startWith, tap } from 'rxjs/operators';
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FeesBoxComponent implements OnInit {
-  isLoading$: Observable<boolean>;
+  isLoadingWebSocket$: Observable<boolean>;
  recommendedFees$: Observable<Recommendedfees>;
  gradient = 'linear-gradient(to right, #2e324e, #2e324e)';
  noPriority = '#2e324e';
@@ -22,12 +22,7 @@ export class FeesBoxComponent implements OnInit {
  ) { }

  ngOnInit(): void {
-    this.isLoading$ = combineLatest(
-      this.stateService.isLoadingWebSocket$.pipe(startWith(false)),
-      this.stateService.loadingIndicators$.pipe(startWith({ mempool: 0 })),
-    ).pipe(map(([socket, indicators]) => {
-      return socket || (indicators.mempool != null && indicators.mempool !== 100);
-    }));
+    this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$;
    this.recommendedFees$ = this.stateService.recommendedFees$
      .pipe(
        tap((fees) => {
--- a/frontend/src/app/components/graphs/graphs.component.html
+++ b/frontend/src/app/components/graphs/graphs.component.html
@@ -22,7 +22,7 @@
      <a class="dropdown-item" routerLinkActive="active"
        [routerLink]="['/graphs/mining/block-sizes-weights' | relativeUrl]" i18n="mining.block-sizes-weights">Block Sizes and Weights</a>
      <a *ngIf="stateService.env.AUDIT" class="dropdown-item" routerLinkActive="active"
-        [routerLink]="['/graphs/mining/block-health' | relativeUrl]" i18n="mining.block-health">Block Health</a>
+        [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" i18n="mining.block-prediction-accuracy">Block Prediction Accuracy</a>
    </div>
  </div>

--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss
@@ -4,9 +4,6 @@
  @media (min-width: 465px) {
    font-size: 20px;
  }
-  @media (min-width: 992px) {
-    height: 40px;
-  }
 }

 .main-title {
@@ -21,19 +18,16 @@
 }

 .full-container {
-  display: flex;
-  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 250px);
-  @media (min-width: 992px) {
-    height: calc(100vh - 150px);
-  }
+  min-height: 500px;
+  height: calc(100% - 150px);
+  @media (max-width: 992px) {
+    padding-bottom: 100px;
+  };
 }

 .chart {
-  display: flex;
-  flex: 1;
  width: 100%;
  height: 100%;
  padding-bottom: 20px;
--- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss
+++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss
@@ -4,9 +4,6 @@
  @media (min-width: 465px) {
    font-size: 20px;
  }
-  @media (min-width: 992px) {
-    height: 40px;
-  }
 }

 .main-title {
@@ -21,20 +18,18 @@
 }

 .full-container {
-  display: flex;
-  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 250px);
-  @media (min-width: 992px) {
-    height: calc(100vh - 150px);
-  }
+  min-height: 500px;
+  height: calc(100% - 150px);
+  @media (max-width: 992px) {
+    padding-bottom: 100px;
+  };
 }

 .chart {
-  display: flex;
-  flex: 1;
  width: 100%;
+  height: 100%;
  padding-bottom: 20px;
  padding-right: 10px;
  @media (max-width: 992px) {
--- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html
+++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html
@@ -44,7 +44,7 @@
    </ng-container>
  </a>

-  <div ngbDropdown (window:resize)="onResize()" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
+  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
    <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split" aria-haspopup="true">
      <app-svg-images [name]="network.val === '' ? 'liquid' : network.val" width="22" height="22" viewBox="0 0 125 125" style="width: 30px; height: 30px; margin-right: 5px;"></app-svg-images>
    </button>
@@ -90,12 +90,9 @@
 </nav>
 </header>

-<app-testnet-alert *ngIf="network.val === 'liquidtestnet'"></app-testnet-alert>
+<br />

-<main>
-  <router-outlet></router-outlet>
-</main>
-
-<app-global-footer *ngIf="footerVisible"></app-global-footer>
+<router-outlet></router-outlet>

+<br>
 </ng-container>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wiz	249b015299	Release v2.5.1 Contains CLN related hotfixes for StartOS	2024-03-01 11:24:47 +09:00
wiz	4950ac9df4	Merge pull request #4679 from mempool/knorrium/v2.5.1 Patch v2.5.0 to v2.5.1 with hot fixes to CLN	2024-03-01 11:21:15 +09:00
wiz	19670dd79d	Another hotfix for CLN crash	2024-02-11 13:17:21 -08:00
wiz	8cd69deb1b	Hotfix for CLN crash	2024-02-11 13:17:11 -08:00