Add i18n for lightning footer link

2023-03-07 02:06:52 -05:00
349 changed files with 19843 additions and 37629 deletions
--- a/.github/workflows/get_image_digest.yml
+++ b/.github/workflows/get_image_digest.yml
@@ -1,26 +0,0 @@
-name: 'Print images digest'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Image Version'
-        required: false
-        default: 'latest'
-        type: string 
-jobs:
-  print-images-sha:
-    runs-on: 'ubuntu-latest'
-    name: Print digest for images
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          path: digest
-
-      - name: Run script
-        working-directory: digest
-        run: |
-          sh ./docker/scripts/get_image_digest.sh $VERSION
-        env: 
-          VERSION: ${{ github.event.inputs.version }}
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 # The Mempool Open Source Project™ [![mempool](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/ry4br7/master&style=flat-square)](https://dashboard.cypress.io/projects/ry4br7/runs)

-https://user-images.githubusercontent.com/93150691/226236121-375ea64f-b4a1-4cc0-8fad-a6fb33226840.mp4
-
-<br>
+https://user-images.githubusercontent.com/232186/222445818-234aa6c9-c233-4c52-b3f0-e32b8232893b.mp4

 Mempool is the fully-featured mempool visualizer, explorer, and API service running at [mempool.space](https://mempool.space/). 

 It is an open-source project developed and operated for the benefit of the Bitcoin community, with a focus on the emerging transaction fee market that is evolving Bitcoin into a multi-layer ecosystem.

+![mempool](https://mempool.space/resources/screenshots/v2.4.0-dashboard.png)
+
 # Installation Methods

 Mempool can be self-hosted on a wide variety of your own hardware, ranging from a simple one-click installation on a Raspberry Pi full-node distro all the way to a robust production instance on a powerful FreeBSD server. 
--- a/backend/README.md
+++ b/backend/README.md
@@ -171,58 +171,52 @@ Helpful link: https://gist.github.com/System-Glitch/cb4e87bf1ae3fec9925725bb3ebe

 Run bitcoind on regtest:
   ```
-   bitcoind -regtest
+   bitcoind -regtest -rpcport=8332
   ```

 Create a new wallet, if needed:
   ```
-   bitcoin-cli -regtest createwallet test
+   bitcoin-cli -regtest -rpcport=8332 createwallet test
   ```

 Load wallet (this command may take a while if you have lot of UTXOs):
   ```
-   bitcoin-cli -regtest loadwallet test
+   bitcoin-cli -regtest -rpcport=8332 loadwallet test
   ```

 Get a new address:
   ```
-   address=$(bitcoin-cli -regtest getnewaddress)
+   address=$(./src/bitcoin-cli -regtest -rpcport=8332 getnewaddress)
   ```

 Mine blocks to the previously generated address. You need at least 101 blocks before you can spend. This will take some time to execute (~1 min):
   ```
-   bitcoin-cli -regtest generatetoaddress 101 $address
+   bitcoin-cli -regtest -rpcport=8332 generatetoaddress 101 $address
   ```

 Send 0.1 BTC at 5 sat/vB to another address:
   ```
-   bitcoin-cli -named -regtest sendtoaddress address=$(bitcoin-cli -regtest getnewaddress) amount=0.1 fee_rate=5
+   ./src/bitcoin-cli -named -regtest -rpcport=8332 sendtoaddress address=$(./src/bitcoin-cli -regtest -rpcport=8332 getnewaddress) amount=0.1 fee_rate=5
   ```

 See more example of `sendtoaddress`:
   ```
-   bitcoin-cli sendtoaddress # will print the help
+   ./src/bitcoin-cli sendtoaddress # will print the help
   ```

-Mini script to generate random network activity (random TX count with random tx fee-rate). It's slow so don't expect to use this to test mempool spam, except if you let it run for a long time, or maybe with multiple regtest nodes connected to each other.
+Mini script to generate transactions with random TX fee-rate (between 1 to 100 sat/vB). It's slow so don't expect to use this to test mempool spam, except if you let it run for a long time, or maybe with multiple regtest nodes connected to each other.
   ```
   #!/bin/bash
-   address=$(bitcoin-cli -regtest getnewaddress)
-   bitcoin-cli -regtest generatetoaddress 101 $address
+   address=$(./src/bitcoin-cli -regtest -rpcport=8332 getnewaddress)
   for i in {1..1000000}
   do
-      for y in $(seq 1 "$(jot -r 1 1 1000)")
-      do
-         bitcoin-cli -regtest -named sendtoaddress address=$address amount=0.01 fee_rate=$(jot -r 1 1 100)
-      done
-      bitcoin-cli -regtest generatetoaddress 1 $address
-      sleep 5
+     ./src/bitcoin-cli -regtest -rpcport=8332 -named sendtoaddress address=$address amount=0.01 fee_rate=$(jot -r 1  1 100)
   done
   ```

 Generate block at regular interval (every 10 seconds in this example):
   ```
-   watch -n 10 "bitcoin-cli -regtest generatetoaddress 1 $address"
+   watch -n 10 "./src/bitcoin-cli -regtest -rpcport=8332 generatetoaddress 1 $address"
   ```

 ### Mining pools update
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -27,15 +27,13 @@
    "AUDIT": false,
    "ADVANCED_GBT_AUDIT": false,
    "ADVANCED_GBT_MEMPOOL": false,
-    "CPFP_INDEXING": false,
-    "DISK_CACHE_BLOCK_INTERVAL": 6
+    "CPFP_INDEXING": false
  },
  "CORE_RPC": {
    "HOST": "127.0.0.1",
    "PORT": 8332,
    "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 60000
+    "PASSWORD": "mempool"
  },
  "ELECTRUM": {
    "HOST": "127.0.0.1",
@@ -43,16 +41,13 @@
    "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",
    "PORT": 8332,
    "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 60000
+    "PASSWORD": "mempool"
  },
  "DATABASE": {
    "ENABLED": true,
@@ -61,8 +56,7 @@
    "SOCKET": "/var/run/mysql/mysql.sock",
    "DATABASE": "mempool",
    "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 180000
+    "PASSWORD": "mempool"
  },
  "SYSLOG": {
    "ENABLED": true,
@@ -97,8 +91,7 @@
  "LND": {
    "TLS_CERT_PATH": "tls.cert",
    "MACAROON_PATH": "readonly.macaroon",
-    "REST_API_URL": "https://localhost:8080",
-    "TIMEOUT": 10000
+    "REST_API_URL": "https://localhost:8080"
  },
  "CLIGHTNING": {
    "SOCKET": "lightning-rpc"
@@ -122,9 +115,5 @@
    "LIQUID_ONION": "http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1",
    "BISQ_URL": "https://bisq.markets/api",
    "BISQ_ONION": "http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api"
-  },
-  "MEMPOOL_SERVICES": {
-    "API": "https://mempool.space/api",
-    "ACCELERATIONS": false
  }
 }
--- 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.0-dev",
  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
  "license": "GNU Affero General Public License v3.0",
  "homepage": "https://mempool.space",
@@ -28,43 +28,41 @@
    "package-rm-build-deps": "(cd package/node_modules; rm -r typescript @typescript-eslint)",
    "start": "node --max-old-space-size=2048 dist/index.js",
    "start-production": "node --max-old-space-size=16384 dist/index.js",
-    "reindex-updated-pools": "npm run start-production --update-pools",
-    "reindex-all-blocks": "npm run start-production --update-pools --reindex-blocks",
    "test": "./node_modules/.bin/jest --coverage",
    "lint": "./node_modules/.bin/eslint . --ext .ts",
    "lint:fix": "./node_modules/.bin/eslint . --ext .ts --fix",
    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
  },
  "dependencies": {
-    "@babel/core": "^7.21.3",
-    "@mempool/electrum-client": "1.1.9",
-    "@types/node": "^18.15.3",
+    "@babel/core": "^7.20.12",
+    "@mempool/electrum-client": "^1.1.7",
+    "@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
@@ -16,7 +16,7 @@
    "INITIAL_BLOCKS_AMOUNT": 7,
    "MEMPOOL_BLOCKS_AMOUNT": 8,
    "USE_SECOND_NODE_FOR_MINFEE": 10,
-    "EXTERNAL_ASSETS": [],
+    "EXTERNAL_ASSETS": 11,
    "EXTERNAL_MAX_RETRY": 12,
    "EXTERNAL_RETRY_INTERVAL": 13,
    "USER_AGENT": "__MEMPOOL_USER_AGENT__",
@@ -24,19 +24,17 @@
    "INDEXING_BLOCKS_AMOUNT": 14,
    "POOLS_JSON_TREE_URL": "__POOLS_JSON_TREE_URL__",
    "POOLS_JSON_URL": "__POOLS_JSON_URL__",
-    "AUDIT": true,
-    "ADVANCED_GBT_AUDIT": true,
-    "ADVANCED_GBT_MEMPOOL": true,
-    "CPFP_INDEXING": true,
-    "MAX_BLOCKS_BULK_QUERY": 999,
-    "DISK_CACHE_BLOCK_INTERVAL": 999
+    "AUDIT": "__MEMPOOL_AUDIT__",
+    "ADVANCED_GBT_AUDIT": "__MEMPOOL_ADVANCED_GBT_AUDIT__",
+    "ADVANCED_GBT_MEMPOOL": "__MEMPOOL_ADVANCED_GBT_MEMPOOL__",
+    "CPFP_INDEXING": "__MEMPOOL_CPFP_INDEXING__",
+    "MAX_BLOCKS_BULK_QUERY": "__MEMPOOL_MAX_BLOCKS_BULK_QUERY__"
  },
  "CORE_RPC": {
    "HOST": "__CORE_RPC_HOST__",
    "PORT": 15,
    "USERNAME": "__CORE_RPC_USERNAME__",
-    "PASSWORD": "__CORE_RPC_PASSWORD__",
-    "TIMEOUT": 1000
+    "PASSWORD": "__CORE_RPC_PASSWORD__"
  },
  "ELECTRUM": {
    "HOST": "__ELECTRUM_HOST__",
@@ -44,16 +42,13 @@
    "TLS_ENABLED": true
  },
  "ESPLORA": {
-    "REST_API_URL": "__ESPLORA_REST_API_URL__",
-    "UNIX_SOCKET_PATH": "__ESPLORA_UNIX_SOCKET_PATH__",
-    "RETRY_UNIX_SOCKET_AFTER": 888
+    "REST_API_URL": "__ESPLORA_REST_API_URL__"
  },
  "SECOND_CORE_RPC": {
    "HOST": "__SECOND_CORE_RPC_HOST__",
    "PORT": 17,
    "USERNAME": "__SECOND_CORE_RPC_USERNAME__",
-    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__",
-    "TIMEOUT": 2000
+    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__"
  },
  "DATABASE": {
    "ENABLED": false,
@@ -62,8 +57,7 @@
    "PORT": 18,
    "DATABASE": "__DATABASE_DATABASE__",
    "USERNAME": "__DATABASE_USERNAME__",
-    "PASSWORD": "__DATABASE_PASSWORD__",
-    "TIMEOUT": 3000
+    "PASSWORD": "__DATABASE_PASSWORD__"
  },
  "SYSLOG": {
    "ENABLED": false,
@@ -101,26 +95,21 @@
    "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
  },
  "LIGHTNING": {
-    "ENABLED": true,
+    "ENABLED": "__LIGHTNING_ENABLED__",
    "BACKEND": "__LIGHTNING_BACKEND__",
    "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__",
    "STATS_REFRESH_INTERVAL": 600,
    "GRAPH_REFRESH_INTERVAL": 600,
    "LOGGER_UPDATE_INTERVAL": 30,
    "FORENSICS_INTERVAL": 43200,
-    "FORENSICS_RATE_LIMIT": 1234
+    "FORENSICS_RATE_LIMIT": "__FORENSICS_RATE_LIMIT__"
  },
  "LND": {
    "TLS_CERT_PATH": "",
    "MACAROON_PATH": "",
-    "REST_API_URL": "https://localhost:8080",
-    "TIMEOUT": 10000
+    "REST_API_URL": "https://localhost:8080"
  },
  "CLIGHTNING": {
    "SOCKET": "__CLIGHTNING_SOCKET__"
-  },
-  "MEMPOOl_SERVICES": {
-    "API": "__MEMPOOL_SERVICES_API__",
-    "ACCELERATIONS": "__MEMPOOL_SERVICES_ACCELERATIONS__"
  }
-}
+}
--- a/backend/src/tests/api/difficulty-adjustment.test.ts
+++ b/backend/src/tests/api/difficulty-adjustment.test.ts
@@ -14,20 +14,18 @@ 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,
          previousRetarget: 0.6280047707459726,
-          previousTime: 1660820820,
          nextRetargetHeight: 751968,
          timeAvg: 533038,
          timeOffset: 0,
-          expectedBlocks: 161.68833333333333,
        },
      ],
      [ // Vector 2 (testnet)
@@ -41,40 +39,15 @@ 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,
-          previousTime: 1660820820,
          previousRetarget: 0.6280047707459726,
          nextRetargetHeight: 751968,
          timeAvg: 533038,
          timeOffset: -667000, // 11 min 7 seconds since last block (testnet only)
          // If we add time avg to abs(timeOffset) it makes exactly 1200000 ms, or 20 minutes
-          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][];
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -42,27 +42,24 @@ describe('Mempool Backend Config', () => {
        ADVANCED_GBT_MEMPOOL: false,
        CPFP_INDEXING: false,
        MAX_BLOCKS_BULK_QUERY: 0,
-        DISK_CACHE_BLOCK_INTERVAL: 6,
      });

      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',
        PORT: 8332,
        USERNAME: 'mempool',
-        PASSWORD: 'mempool',
-        TIMEOUT: 60000
+        PASSWORD: 'mempool'
      });

      expect(config.SECOND_CORE_RPC).toStrictEqual({
        HOST: '127.0.0.1',
        PORT: 8332,
        USERNAME: 'mempool',
-        PASSWORD: 'mempool',
-        TIMEOUT: 60000
+        PASSWORD: 'mempool'
      });

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

      expect(config.SYSLOG).toStrictEqual({
@@ -110,18 +106,6 @@ describe('Mempool Backend Config', () => {
        BISQ_URL: 'https://bisq.markets/api',
        BISQ_ONION: 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api'
      });
-
-      expect(config.MAXMIND).toStrictEqual({
-        ENABLED: false,
-        GEOLITE2_CITY: '/usr/local/share/GeoIP/GeoLite2-City.mmdb',
-        GEOLITE2_ASN: '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb',
-        GEOIP2_ISP: '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb'
-      });
-
-      expect(config.MEMPOOL_SERVICES).toStrictEqual({
-        API: "",
-        ACCELERATIONS: false,
-      });
    });
  });

@@ -155,98 +139,6 @@ describe('Mempool Backend Config', () => {
      expect(config.PRICE_DATA_SERVER).toStrictEqual(fixture.PRICE_DATA_SERVER);

      expect(config.EXTERNAL_DATA_SERVER).toStrictEqual(fixture.EXTERNAL_DATA_SERVER);
-
-      expect(config.MEMPOOL_SERVICES).toStrictEqual(fixture.MEMPOOL_SERVICES);
    });
  });
-
-  test('should ensure the docker start.sh script has default values', () => {
-    jest.isolateModules(() => {
-      const startSh = fs.readFileSync(`${__dirname}/../../../docker/backend/start.sh`, 'utf-8');
-      const fixture = JSON.parse(fs.readFileSync(`${__dirname}/../__fixtures__/mempool-config.template.json`, 'utf8'));
-
-      function parseJson(jsonObj, root?) {
-        for (const [key, value] of Object.entries(jsonObj)) {
-          // We have a few cases where we can't follow the pattern
-          if (root === 'MEMPOOL' && key === 'HTTP_PORT') {
-            console.log('skipping check for MEMPOOL_HTTP_PORT');
-            return;
-          }
-          switch (typeof value) {
-            case 'object': {
-              if (Array.isArray(value)) {
-                return;
-              } else {
-                parseJson(value, key);
-              }
-              break;
-            }
-            default: {
-              //The flattened string, i.e, __MEMPOOL_ENABLED__
-              const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-
-              //The string used as the environment variable, i.e, MEMPOOL_ENABLED
-              const envVarStr = `${root ? root : ''}_${key}`;
-
-              //The string used as the default value, to be checked as a regex, i.e, __MEMPOOL_ENABLED__=${MEMPOOL_ENABLED:=(.*)}
-              const defaultEntry = replaceStr + '=' + '\\${' + envVarStr + ':=(.*)' + '}';
-
-              console.log(`looking for ${defaultEntry} in the start.sh script`);
-              const re = new RegExp(defaultEntry);
-              expect(startSh).toMatch(re);
-
-              //The string that actually replaces the values in the config file
-              const sedStr = 'sed -i "s!' + replaceStr + '!${' + replaceStr + '}!g" mempool-config.json';
-              console.log(`looking for ${sedStr} in the start.sh script`);
-              expect(startSh).toContain(sedStr);
-              break;
-            }
-          }
-        }
-      }
-      parseJson(fixture);
-    });
-  });
-
-  test('should ensure that the mempool-config.json Docker template has all the keys', () => {
-    jest.isolateModules(() => {
-      const fixture = JSON.parse(fs.readFileSync(`${__dirname}/../__fixtures__/mempool-config.template.json`, 'utf8'));
-      const dockerJson = fs.readFileSync(`${__dirname}/../../../docker/backend/mempool-config.json`, 'utf-8');
-
-      function parseJson(jsonObj, root?) {
-        for (const [key, value] of Object.entries(jsonObj)) {
-          switch (typeof value) {
-            case 'object': {
-              if (Array.isArray(value)) {
-                // numbers, arrays and booleans won't be enclosed by quotes
-                const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-                expect(dockerJson).toContain(`"${key}": ${replaceStr}`);
-                break;
-              } else {
-                //Check for top level config keys
-                expect(dockerJson).toContain(`"${key}"`);
-                parseJson(value, key);
-                break;
-              }
-            }
-            case 'string': {
-              // strings should be enclosed by quotes
-              const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-              expect(dockerJson).toContain(`"${key}": "${replaceStr}"`);
-              break;
-            }
-            default: {
-              // numbers, arrays and booleans won't be enclosed by quotes
-              const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
-              expect(dockerJson).toContain(`"${key}": ${replaceStr}`);
-              break;
-            }
-          }
-        };
-      }
-      parseJson(fixture);
-    });
-  });
-
-
 });
--- a/backend/src/api/audit.ts
+++ b/backend/src/api/audit.ts
@@ -1,25 +1,21 @@
 import config from '../config';
-import logger from '../logger';
 import { TransactionExtended, MempoolBlockWithTransactions } from '../mempool.interfaces';

 const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first seen after which it is assumed to have propagated to all miners

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

    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 accelerated: string[] = []; // prioritized by the mempool accelerator
    const isCensored = {}; // missing, without excuse
    const isDisplaced = {};
    let displacedWeight = 0;
-    let matchedWeight = 0;
-    let projectedWeight = 0;

    const inBlock = {};
    const inTemplate = {};
@@ -27,9 +23,6 @@ class Audit {
    const now = Math.round((Date.now() / 1000));
    for (const tx of transactions) {
      inBlock[tx.txid] = tx;
-      if (mempool[tx.txid] && mempool[tx.txid].acceleration) {
-        accelerated.push(tx.txid);
-      }
    }
    // coinbase is always expected
    if (transactions[0]) {
@@ -44,19 +37,12 @@ class Audit {
        } else {
          isCensored[txid] = true;
        }
-        displacedWeight += mempool[txid]?.weight || 0;
-      } else {
-        matchedWeight += mempool[txid]?.weight || 0;
+        displacedWeight += mempool[txid].weight;
      }
-      projectedWeight += mempool[txid]?.weight || 0;
      inTemplate[txid] = true;
    }

-    if (transactions[0]) {
-      displacedWeight += (4000 - transactions[0].weight);
-      projectedWeight += transactions[0].weight;
-      matchedWeight += transactions[0].weight;
-    }
+    displacedWeight += (4000 - transactions[0].weight);

    // we can expect an honest miner to include 'displaced' transactions in place of recent arrivals and censored txs
    // these displaced transactions should occupy the first N weight units of the next projected block
@@ -66,24 +52,19 @@ class Audit {
    let failures = 0;
    while (projectedBlocks[1] && index < projectedBlocks[1].transactionIds.length && failures < 500) {
      const txid = projectedBlocks[1].transactionIds[index];
-      const tx = mempool[txid];
-      if (tx) {
-        const fits = (tx.weight - displacedWeightRemaining) < 4000;
-        const feeMatches = tx.effectiveFeePerVsize >= lastFeeRate;
-        if (fits || feeMatches) {
-          isDisplaced[txid] = true;
-          if (fits) {
-            lastFeeRate = Math.min(lastFeeRate, tx.effectiveFeePerVsize);
-          }
-          if (tx.firstSeen == null || (now - (tx?.firstSeen || 0)) > PROPAGATION_MARGIN) {
-            displacedWeightRemaining -= tx.weight;
-          }
-          failures = 0;
-        } else {
-          failures++;
+      const fits = (mempool[txid].weight - displacedWeightRemaining) < 4000;
+      const feeMatches = mempool[txid].effectiveFeePerVsize >= lastFeeRate;
+      if (fits || feeMatches) {
+        isDisplaced[txid] = true;
+        if (fits) {
+          lastFeeRate = Math.min(lastFeeRate, mempool[txid].effectiveFeePerVsize);
        }
+        if (mempool[txid].firstSeen == null || (now - (mempool[txid]?.firstSeen || 0)) > PROPAGATION_MARGIN) {
+          displacedWeightRemaining -= mempool[txid].weight;
+        }
+        failures = 0;
      } else {
-        logger.warn('projected transaction missing from mempool cache');
+        failures++;
      }
      index++;
    }
@@ -97,7 +78,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;
@@ -110,41 +101,32 @@ class Audit {
    index = projectedBlocks[0].transactionIds.length - 1;
    while (index >= 0) {
      const txid = projectedBlocks[0].transactionIds[index];
-      const tx = mempool[txid];
-      if (tx) {
-        if (overflowWeightRemaining > 0) {
-          if (isCensored[txid]) {
-            delete isCensored[txid];
-          }
-          if (tx.effectiveFeePerVsize > maxOverflowRate) {
-            maxOverflowRate = tx.effectiveFeePerVsize;
-            rateThreshold = (Math.ceil(maxOverflowRate * 100) / 100) + 0.005;
-          }
-        } else if (tx.effectiveFeePerVsize <= rateThreshold) { // tolerance of 0.01 sat/vb + rounding
-          if (isCensored[txid]) {
-            delete isCensored[txid];
-          }
+      if (overflowWeightRemaining > 0) {
+        if (isCensored[txid]) {
+          delete isCensored[txid];
+        }
+        if (mempool[txid].effectiveFeePerVsize > maxOverflowRate) {
+          maxOverflowRate = mempool[txid].effectiveFeePerVsize;
+          rateThreshold = (Math.ceil(maxOverflowRate * 100) / 100) + 0.005;
+        }
+      } else if (mempool[txid].effectiveFeePerVsize <= rateThreshold) { // tolerance of 0.01 sat/vb + rounding
+        if (isCensored[txid]) {
+          delete isCensored[txid];
        }
-        overflowWeightRemaining -= (mempool[txid]?.weight || 0);
-      } else {
-        logger.warn('projected transaction missing from mempool cache');
      }
+      overflowWeightRemaining -= (mempool[txid]?.weight || 0);
      index--;
    }

    const numCensored = Object.keys(isCensored).length;
    const numMatches = matches.length - 1; // adjust for coinbase tx
    const score = numMatches > 0 ? (numMatches / (numMatches + numCensored)) : 0;
-    const similarity = projectedWeight ? matchedWeight / projectedWeight : 1;

    return {
      censored: Object.keys(isCensored),
      added,
      fresh,
-      sigop: [],
-      accelerated,
-      score,
-      similarity,
+      score
    };
  }
 }
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -415,38 +415,12 @@ class BitcoinApi implements AbstractBitcoinApi {
      vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
    }

-    if (vin.prevout.scriptpubkey_type === 'v1_p2tr' && vin.witness) {
-      const witnessScript = this.witnessToP2TRScript(vin.witness);
-      if (witnessScript !== null) {
-        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
-      }
+    if (vin.prevout.scriptpubkey_type === 'v1_p2tr' && vin.witness && vin.witness.length > 1) {
+      const witnessScript = vin.witness[vin.witness.length - 2];
+      vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
    }
  }

-  /**
-   * This function must only be called when we know the witness we are parsing
-   * is a taproot witness.
-   * @param witness An array of hex strings that represents the witness stack of
-   *                the input.
-   * @returns null if the witness is not a script spend, and the hex string of
-   *          the script item if it is a script spend.
-   */
-  private witnessToP2TRScript(witness: string[]): string | null {
-    if (witness.length < 2) return null;
-    // Note: see BIP341 for parsing details of witness stack
-
-    // If there are at least two witness elements, and the first byte of the
-    // last element is 0x50, this last element is called annex a and
-    // is removed from the witness stack.
-    const hasAnnex = witness[witness.length - 1].substring(0, 2) === '50';
-    // If there are at least two witness elements left, script path spending is used.
-    // Call the second-to-last stack element s, the script.
-    // (Note: this phrasing from BIP341 assumes we've *removed* the annex from the stack)
-    if (hasAnnex && witness.length < 3) return null;
-    const positionOfScript = hasAnnex ? witness.length - 3 : witness.length - 2;
-    return witness[positionOfScript];
-  }
-
 }

 export default BitcoinApi;
--- a/backend/src/api/bitcoin/bitcoin-client.ts
+++ b/backend/src/api/bitcoin/bitcoin-client.ts
@@ -7,7 +7,7 @@ const nodeRpcCredentials: BitcoinRpcCredentials = {
  port: config.CORE_RPC.PORT,
  user: config.CORE_RPC.USERNAME,
  pass: config.CORE_RPC.PASSWORD,
-  timeout: config.CORE_RPC.TIMEOUT,
+  timeout: 60000,
 };

 export default new bitcoin.Client(nodeRpcCredentials);
--- a/backend/src/api/bitcoin/bitcoin-second-client.ts
+++ b/backend/src/api/bitcoin/bitcoin-second-client.ts
@@ -7,7 +7,7 @@ const nodeRpcCredentials: BitcoinRpcCredentials = {
  port: config.SECOND_CORE_RPC.PORT,
  user: config.SECOND_CORE_RPC.USERNAME,
  pass: config.SECOND_CORE_RPC.PASSWORD,
-  timeout: config.SECOND_CORE_RPC.TIMEOUT,
+  timeout: 60000,
 };

 export default new bitcoin.Client(nodeRpcCredentials);
--- 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);
    }
@@ -211,9 +208,6 @@ class BitcoinRoutes {
          bestDescendant: tx.bestDescendant || null,
          descendants: tx.descendants || null,
          effectiveFeePerVsize: tx.effectiveFeePerVsize || null,
-          sigops: tx.sigops,
-          adjustedVsize: tx.adjustedVsize,
-          acceleration: tx.acceleration
        });
        return;
      }
@@ -226,17 +220,18 @@ class BitcoinRoutes {
      let cpfpInfo;
      if (config.DATABASE.ENABLED) {
        cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
-      }
-      if (cpfpInfo) {
-        res.json(cpfpInfo);
-        return;
      } else {
        res.json({
          ancestors: []
        });
        return;
      }
+      if (cpfpInfo) {
+        res.json(cpfpInfo);
+        return;
+      }
    }
+    res.status(404).send(`Transaction has no CPFP info available.`);
  }

  private getBackendInfo(req: Request, res: Response) {
@@ -595,14 +590,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);
    }
@@ -648,30 +639,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);
    }
@@ -683,7 +652,7 @@ class BitcoinRoutes {
      if (result) {
        res.json(result);
      } else {
-        res.status(204).send();
+        res.status(404).send('not found');
      }
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
--- a/backend/src/api/bitcoin/electrum-api.ts
+++ b/backend/src/api/bitcoin/electrum-api.ts
@@ -16,7 +16,7 @@ class BitcoindElectrsApi extends BitcoinApi implements AbstractBitcoinApi {
    super(bitcoinClient);

    const electrumConfig = { client: 'mempool-v2', version: '1.4' };
-    const electrumPersistencePolicy = { retryPeriod: 1000, maxRetry: Number.MAX_SAFE_INTEGER, callback: null };
+    const electrumPersistencePolicy = { retryPeriod: 10000, maxRetry: 1000, callback: null };

    const electrumCallbacks = {
      onConnect: (client, versionInfo) => { logger.info(`Connected to Electrum Server at ${config.ELECTRUM.HOST}:${config.ELECTRUM.PORT} (${JSON.stringify(versionInfo)})`); },
--- 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, MempoolTransactionExtended } 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[] {
@@ -76,7 +74,6 @@ class Blocks {
    blockHeight: number,
    onlyCoinbase: boolean,
    quiet: boolean = false,
-    addMempoolData: boolean = false,
  ): Promise<TransactionExtended[]> {
    const transactions: TransactionExtended[] = [];
    const txIds: string[] = await bitcoinApi.$getTxIdsForBlock(blockHash);
@@ -97,14 +94,14 @@ class Blocks {
          logger.debug(`Indexing tx ${i + 1} of ${txIds.length} in block #${blockHeight}`);
        }
        try {
-          const tx = await transactionUtils.$getTransactionExtended(txIds[i], false, false, false, addMempoolData);
+          const tx = await transactionUtils.$getTransactionExtended(txIds[i]);
          transactions.push(tx);
          transactionsFetched++;
        } catch (e) {
          try {
            if (config.MEMPOOL.BACKEND === 'esplora') {
              // Try again with core
-              const tx = await transactionUtils.$getTransactionExtended(txIds[i], false, false, true, addMempoolData);
+              const tx = await transactionUtils.$getTransactionExtended(txIds[i], false, false, true);
              transactions.push(tx);
              transactionsFetched++;
            } else {
@@ -127,13 +124,11 @@ class Blocks {
      }
    }

-    if (addMempoolData) {
-      transactions.forEach((tx) => {
-        if (!tx.cpfpChecked) {
-          Common.setRelativesAndGetCpfpInfo(tx as MempoolTransactionExtended, mempool); // Child Pay For Parent
-        }
-      });
-    }
+    transactions.forEach((tx) => {
+      if (!tx.cpfpChecked) {
+        Common.setRelativesAndGetCpfpInfo(tx, mempool); // Child Pay For Parent
+      }
+    });

    if (!quiet) {
      logger.debug(`${transactionsFound} of ${txIds.length} found in mempool. ${transactionsFetched} fetched through backend service.`);
@@ -148,10 +143,7 @@ class Blocks {
   * @returns BlockSummary
   */
  public summarizeBlock(block: IBitcoinApi.VerboseBlock): BlockSummary {
-    if (Common.isLiquid()) {
-      block = this.convertLiquidFees(block);
-    }
-    const stripped = block.tx.map((tx: IBitcoinApi.VerboseTransaction) => {
+    const stripped = block.tx.map((tx) => {
      return {
        txid: tx.txid,
        vsize: tx.weight / 4,
@@ -166,13 +158,6 @@ class Blocks {
    };
  }

-  private convertLiquidFees(block: IBitcoinApi.VerboseBlock): IBitcoinApi.VerboseBlock {
-    block.tx.forEach(tx => {
-      tx.fee = Object.values(tx.fee || {}).reduce((total, output) => total + output, 0);
-    });
-    return block;
-  }
-
  /**
   * Return a block with additional data (reward, coinbase, fees...)
   * @param block
@@ -205,15 +190,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;
@@ -309,7 +287,7 @@ class Blocks {
    }

    const asciiScriptSig = transactionUtils.hex2ascii(txMinerInfo.vin[0].scriptsig);
-    const addresses = txMinerInfo.vout.map((vout) => vout.scriptpubkey_address).filter((address) => address);
+    const address = txMinerInfo.vout[0].scriptpubkey_address;

    let pools: PoolTag[] = [];
    if (config.DATABASE.ENABLED === true) {
@@ -319,13 +297,11 @@ class Blocks {
    }

    for (let i = 0; i < pools.length; ++i) {
-      if (addresses.length) {
-        const poolAddresses: string[] = typeof pools[i].addresses === 'string' ?
+      if (address !== undefined) {
+        const addresses: string[] = typeof pools[i].addresses === 'string' ?
          JSON.parse(pools[i].addresses) : pools[i].addresses;
-        for (let y = 0; y < poolAddresses.length; y++) {
-          if (addresses.indexOf(poolAddresses[y]) !== -1) {
-            return pools[i];
-          }
+        if (addresses.indexOf(address) !== -1) {
+          return pools[i];
        }
      }

@@ -417,13 +393,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;
@@ -534,16 +509,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);
@@ -561,21 +529,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,79 +548,57 @@ class Blocks {
    }

    while (this.currentBlockHeight < blockHeightTip) {
-      if (this.currentBlockHeight === 0) {
+      if (this.currentBlockHeight < blockHeightTip - config.MEMPOOL.INITIAL_BLOCKS_AMOUNT) {
        this.currentBlockHeight = blockHeightTip;
      } 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, false, true);
-      if (config.MEMPOOL.BACKEND !== 'esplora') {
-        // fill in missing transaction fee data from verboseBlock
-        for (let i = 0; i < transactions.length; i++) {
-          if (!transactions[i].fee && transactions[i].txid === verboseBlock.tx[i].txid) {
-            transactions[i].fee = verboseBlock.tx[i].fee * 100_000_000;
-          }
-        }
-      }
-      const cpfpSummary: CpfpSummary = Common.calculateCpfp(block.height, transactions);
-      const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions);
+      const transactions = await this.$getTransactionsExtended(blockHash, block.height, false);
+      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);
@@ -666,11 +607,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);
          }
        }
      }
@@ -683,7 +622,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;
@@ -703,44 +641,12 @@ class Blocks {
      if (this.newBlockCallbacks.length) {
        this.newBlockCallbacks.forEach((cb) => cb(blockExtended, txIds, transactions));
      }
-      if (!memPool.hasPriority() && (block.height % config.MEMPOOL.DISK_CACHE_BLOCK_INTERVAL === 0)) {
+      if (!memPool.hasPriority()) {
        diskCache.$saveCacheToDisk();
      }

      // 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);
    }
  }

@@ -812,7 +718,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;
@@ -928,12 +834,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);
        }
      }

@@ -998,20 +903,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, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats } from '../mempool.interfaces';
+import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
 import config from '../config';
 import { NodeSocket } from '../repositories/NodesSocketsRepository';
 import { isIP } from 'net';
@@ -57,52 +57,32 @@ export class Common {
    return arr;
  }

-  static findRbfTransactions(added: MempoolTransactionExtended[], deleted: MempoolTransactionExtended[]): { [txid: string]: MempoolTransactionExtended[] } {
-    const matches: { [txid: string]: MempoolTransactionExtended[] } = {};
-    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.
-            && addedTx.adjustedFeePerVsize > deletedTx.adjustedFeePerVsize
+            && addedTx.feePerVsize > deletedTx.feePerVsize
            // Spends one or more of the same inputs
            && 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;
  }

-  static findMinedRbfTransactions(minedTransactions: TransactionExtended[], spendMap: Map<string, MempoolTransactionExtended>): { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} {
-    const matches: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }} = {};
-    for (const tx of minedTransactions) {
-      const replaced: Set<MempoolTransactionExtended> = new Set();
-      for (let i = 0; i < tx.vin.length; i++) {
-        const vin = tx.vin[i];
-        const match = spendMap.get(`${vin.txid}:${vin.vout}`);
-        if (match && match.txid !== tx.txid) {
-          replaced.add(match);
-        }
-      }
-      if (replaced.size) {
-        matches[tx.txid] = { replaced: Array.from(replaced), replacedBy: tx };
-      }
-    }
-    return matches;
-  }
-
  static stripTransaction(tx: TransactionExtended): TransactionStripped {
    return {
      txid: tx.txid,
      fee: tx.fee,
      vsize: tx.weight / 4,
      value: tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0),
-      acc: tx.acceleration || undefined,
-      rate: tx.effectiveFeePerVsize,
    };
  }

@@ -121,18 +101,18 @@ export class Common {
    }
  }

-  static setRelativesAndGetCpfpInfo(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
+  static setRelativesAndGetCpfpInfo(tx: TransactionExtended, memPool: { [txid: string]: TransactionExtended }): CpfpInfo {
    const parents = this.findAllParents(tx, memPool);
-    const lowerFeeParents = parents.filter((parent) => parent.adjustedFeePerVsize < tx.effectiveFeePerVsize);
+    const lowerFeeParents = parents.filter((parent) => parent.feePerVsize < tx.effectiveFeePerVsize);

-    let totalWeight = (tx.adjustedVsize * 4) + lowerFeeParents.reduce((prev, val) => prev + (val.adjustedVsize * 4), 0);
+    let totalWeight = tx.weight + lowerFeeParents.reduce((prev, val) => prev + val.weight, 0);
    let totalFees = tx.fee + lowerFeeParents.reduce((prev, val) => prev + val.fee, 0);

    tx.ancestors = parents
      .map((t) => {
        return {
          txid: t.txid,
-          weight: (t.adjustedVsize * 4),
+          weight: t.weight,
          fee: t.fee,
        };
      });
@@ -153,8 +133,8 @@ export class Common {
  }


-  private static findAllParents(tx: MempoolTransactionExtended, memPool: { [txid: string]: MempoolTransactionExtended }): MempoolTransactionExtended[] {
-    let parents: MempoolTransactionExtended[] = [];
+  private static findAllParents(tx: TransactionExtended, memPool: { [txid: string]: TransactionExtended }): TransactionExtended[] {
+    let parents: TransactionExtended[] = [];
    tx.vin.forEach((parent) => {
      if (parents.find((p) => p.txid === parent.txid)) {
        return;
@@ -162,17 +142,17 @@ export class Common {

      const parentTx = memPool[parent.txid];
      if (parentTx) {
-        if (tx.bestDescendant && tx.bestDescendant.fee / (tx.bestDescendant.weight / 4) > parentTx.adjustedFeePerVsize) {
+        if (tx.bestDescendant && tx.bestDescendant.fee / (tx.bestDescendant.weight / 4) > parentTx.feePerVsize) {
          if (parentTx.bestDescendant && parentTx.bestDescendant.fee < tx.fee + tx.bestDescendant.fee) {
            parentTx.bestDescendant = {
-              weight: (tx.adjustedVsize * 4) + tx.bestDescendant.weight,
+              weight: tx.weight + tx.bestDescendant.weight,
              fee: tx.fee + tx.bestDescendant.fee,
              txid: tx.txid,
            };
          }
-        } else if (tx.adjustedFeePerVsize > parentTx.adjustedFeePerVsize) {
+        } else if (tx.feePerVsize > parentTx.feePerVsize) {
          parentTx.bestDescendant = {
-            weight: (tx.adjustedVsize * 4),
+            weight: tx.weight,
            fee: tx.fee,
            txid: tx.txid
          };
@@ -184,30 +164,6 @@ export class Common {
    return parents;
  }

-  // calculates the ratio of matched transactions to projected transactions by weight
-  static getSimilarity(projectedBlock: MempoolBlockWithTransactions, transactions: TransactionExtended[]): number {
-    let matchedWeight = 0;
-    let projectedWeight = 0;
-    const inBlock = {};
-
-    for (const tx of transactions) {
-      inBlock[tx.txid] = tx;
-    }
-
-    // look for transactions that were expected in the template, but missing from the mined block
-    for (const tx of projectedBlock.transactions) {
-      if (inBlock[tx.txid]) {
-        matchedWeight += tx.vsize * 4;
-      }
-      projectedWeight += tx.vsize * 4;
-    }
-
-    projectedWeight += transactions[0].weight;
-    matchedWeight += transactions[0].weight;
-
-    return projectedWeight ? matchedWeight / projectedWeight : 1;
-  }
-
  static getSqlInterval(interval: string | null): string | null {
    switch (interval) {
      case '24h': return '1 DAY';
@@ -219,7 +175,6 @@ export class Common {
      case '1y': return '1 YEAR';
      case '2y': return '2 YEAR';
      case '3y': return '3 YEAR';
-      case '4y': return '4 YEAR';
      default: return null;
    }
  }
@@ -365,215 +320,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 = 62;
+  private static currentVersion = 58;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -497,7 +497,6 @@ class DatabaseMigration {
      this.uniqueLog(logger.notice, this.blocksTruncatedMessage);
      await this.$executeQuery('DELETE FROM `pools`');
      await this.$executeQuery('ALTER TABLE pools AUTO_INCREMENT = 1');
-      await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
      this.uniqueLog(logger.notice, '`pools` table has been truncated`');
      await this.updateToSchemaVersion(56);
    }
@@ -511,32 +510,6 @@ class DatabaseMigration {
      // We only run some migration queries for this version
      await this.updateToSchemaVersion(58);
    }
-
-    if (databaseSchemaVersion < 59 && (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'testnet')) {
-      // 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);
-    }
-
-    if (databaseSchemaVersion < 61 && isBitcoin === true) {
-      // Break block templates into their own table
-      if (! await this.$checkIfTableExists('blocks_templates')) {
-        await this.$executeQuery('CREATE TABLE blocks_templates AS SELECT id, template FROM blocks_summaries WHERE template != "[]"');
-      }
-      await this.$executeQuery('ALTER TABLE blocks_templates MODIFY template JSON DEFAULT "[]"');
-      await this.$executeQuery('ALTER TABLE blocks_templates ADD PRIMARY KEY (id)');
-      await this.$executeQuery('ALTER TABLE blocks_summaries DROP COLUMN template');
-      await this.updateToSchemaVersion(61);
-    }
-
-    if (databaseSchemaVersion < 62 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD accelerated_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(61);
-    }
  }

  /**
@@ -1064,7 +1037,7 @@ class DatabaseMigration {
    await this.$executeQuery('DELETE FROM `pools`');
    await this.$executeQuery('ALTER TABLE pools AUTO_INCREMENT = 1');
    await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
-  }
+}

  private async $convertCompactCpfpTables(): Promise<void> {
    try {
--- a/backend/src/api/difficulty-adjustment.ts
+++ b/backend/src/api/difficulty-adjustment.ts
@@ -9,11 +9,9 @@ export interface DifficultyAdjustment {
  remainingBlocks: number;       // Block count
  remainingTime: number;         // Duration of time in ms
  previousRetarget: number;      // Percent: -75 to 300
-  previousTime: number;          // Unix time in ms
  nextRetargetHeight: number;    // Block Height
  timeAvg: number;               // Duration of time in ms
  timeOffset: number;            // (Testnet) Time since last block (cap @ 20min) in ms
-  expectedBlocks: number;         // Block count
 }

 export function calcDifficultyAdjustment(
@@ -24,29 +22,31 @@ export function calcDifficultyAdjustment(
  network: string,
  latestBlockTimestamp: number,
 ): DifficultyAdjustment {
+  const ESTIMATE_LAG_BLOCKS = 146; // For first 7.2% of epoch, don't estimate.
  const EPOCH_BLOCK_LENGTH = 2016; // Bitcoin mainnet
  const BLOCK_SECONDS_TARGET = 600; // Bitcoin mainnet
  const TESTNET_MAX_BLOCK_SECONDS = 1200; // Bitcoin testnet

-  const diffSeconds = Math.max(0, nowSeconds - DATime);
+  const diffSeconds = nowSeconds - DATime;
  const blocksInEpoch = (blockHeight >= 0) ? blockHeight % EPOCH_BLOCK_LENGTH : 0;
  const progressPercent = (blockHeight >= 0) ? blocksInEpoch / EPOCH_BLOCK_LENGTH * 100 : 100;
  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;
-  // Max increase is x4 (+300%)
-  if (difficultyChange > 300) {
-    difficultyChange = 300;
-  }
-  // Max decrease is /4 (-75%)
-  if (difficultyChange < -75) {
-    difficultyChange = -75;
+  let timeAvgSecs = BLOCK_SECONDS_TARGET;
+  // Only calculate the estimate once we have 7.2% of blocks in current epoch
+  if (blocksInEpoch >= ESTIMATE_LAG_BLOCKS) {
+    timeAvgSecs = diffSeconds / blocksInEpoch;
+    difficultyChange = (BLOCK_SECONDS_TARGET / timeAvgSecs - 1) * 100;
+    // Max increase is x4 (+300%)
+    if (difficultyChange > 300) {
+      difficultyChange = 300;
+    }
+    // Max decrease is /4 (-75%)
+    if (difficultyChange < -75) {
+      difficultyChange = -75;
+    }
  }

  // Testnet difficulty is set to 1 after 20 minutes of no blocks,
@@ -74,11 +74,9 @@ export function calcDifficultyAdjustment(
    remainingBlocks,
    remainingTime,
    previousRetarget,
-    previousTime: DATime,
    nextRetargetHeight,
    timeAvg,
    timeOffset,
-    expectedBlocks,
  };
 }

--- a/backend/src/api/disk-cache.ts
+++ b/backend/src/api/disk-cache.ts
@@ -7,141 +7,62 @@ 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 ignoreBlocksCache = false;

-  private semaphore: { resume: (() => void)[], locks: number } = {
-    resume: [],
-    locks: 0,
-  };
+  constructor() { }

-  constructor() {
-    if (!cluster.isPrimary) {
-      return;
-    }
-    process.on('SIGINT', (e) => {
-      this.$saveCacheToDisk(true);
-      process.exit(0);
-    });
-  }
-
-  async $saveCacheToDisk(sync: boolean = false): Promise<void> {
+  async $saveCacheToDisk(): Promise<void> {
    if (!cluster.isPrimary) {
      return;
    }
    if (this.isWritingCache) {
-      logger.debug('Saving cache already in progress. Skipping.');
+      logger.debug('Saving cache already in progress. Skipping.')
      return;
    }
    try {
-      logger.debug(`Writing mempool and blocks data to disk cache (${ sync ? 'sync' : 'async' })...`);
+      logger.debug('Writing mempool and blocks data to disk cache (async)...');
      this.isWritingCache = true;

      const mempool = memPool.getMempool();
      const mempoolArray: TransactionExtended[] = [];
      for (const tx in mempool) {
-        if (mempool[tx]) {
-          mempoolArray.push(mempool[tx]);
-        }
+        mempoolArray.push(mempool[tx]);
      }

      Common.shuffleArray(mempoolArray);

      const chunkSize = Math.floor(mempoolArray.length / DiskCache.CHUNK_FILES);

-      if (sync) {
-        fs.writeFileSync(DiskCache.TMP_FILE_NAME, JSON.stringify({
-          network: config.MEMPOOL.NETWORK,
-          cacheSchemaVersion: this.cacheSchemaVersion,
-          blocks: blocks.getBlocks(),
-          blockSummaries: blocks.getBlockSummaries(),
+      await fsPromises.writeFile(DiskCache.FILE_NAME, JSON.stringify({
+        cacheSchemaVersion: this.cacheSchemaVersion,
+        blocks: blocks.getBlocks(),
+        blockSummaries: blocks.getBlockSummaries(),
+        mempool: {},
+        mempoolArray: mempoolArray.splice(0, chunkSize),
+      }), { flag: 'w' });
+      for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
+        await fsPromises.writeFile(DiskCache.FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
          mempool: {},
          mempoolArray: mempoolArray.splice(0, chunkSize),
        }), { flag: 'w' });
-        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          fs.writeFileSync(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), JSON.stringify({
-            mempool: {},
-            mempoolArray: mempoolArray.splice(0, chunkSize),
-          }), { flag: 'w' });
-        }
-
-        fs.renameSync(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME);
-        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          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,
-          blocks: blocks.getBlocks(),
-          blockSummaries: blocks.getBlockSummaries(),
-          mempool: {},
-          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),
-          }), { flag: 'w' });
-        }
-
-        await fsPromises.rename(DiskCache.TMP_FILE_NAME, DiskCache.FILE_NAME);
-        for (let i = 1; i < DiskCache.CHUNK_FILES; i++) {
-          await fsPromises.rename(DiskCache.TMP_FILE_NAMES.replace('{number}', i.toString()), DiskCache.FILE_NAMES.replace('{number}', i.toString()));
-        }
      }
-
      logger.debug('Mempool and blocks data saved to disk cache');
      this.isWritingCache = false;
    } catch (e) {
      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 {
-    logger.notice(`Wiping nodejs backend cache/cache*.json files`);
+  wipeCache() {
+    logger.notice(`Wipping nodejs backend cache/cache*.json files`);
    try {
      fs.unlinkSync(DiskCache.FILE_NAME);
    } catch (e: any) {
@@ -162,19 +83,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() {
    if (!fs.existsSync(DiskCache.FILE_NAME)) {
      return;
    }
@@ -188,10 +97,6 @@ class DiskCache {
          logger.notice('Disk cache contains an outdated schema version. Clearing it and skipping the cache loading.');
          return this.wipeCache();
        }
-        if (data.network && data.network !== config.MEMPOOL.NETWORK) {
-          logger.notice('Disk cache contains data from a different network. Clearing it and skipping the cache loading.');
-          return this.wipeCache();
-        }

        if (data.mempoolArray) {
          for (const tx of data.mempoolArray) {
@@ -214,74 +119,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);
-      if (!this.ignoreBlocksCache) {
-        blocks.setBlocks(data.blocks);
-        blocks.setBlockSummaries(data.blockSummaries || []);
-      } else {
-        logger.info('Re-saving cache with empty recent blocks data');
-        await this.$saveCacheToDisk(true);
-      }
+      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();
-      }
-    }
-  }
-
-  public setIgnoreBlocksCache(): void {
-    this.ignoreBlocksCache = true;
  }
 }

--- a/backend/src/api/explorer/nodes.api.ts
+++ b/backend/src/api/explorer/nodes.api.ts
@@ -417,24 +417,24 @@ class NodesApi {

        if (!ispList[isp1]) {
          ispList[isp1] = {
-            ids: [channel.isp1ID],
+            id: channel.isp1ID.toString(),
            capacity: 0,
            channels: 0,
            nodes: {},
          };
-        } else if (ispList[isp1].ids.includes(channel.isp1ID) === false) {
-          ispList[isp1].ids.push(channel.isp1ID);
+        } else if (ispList[isp1].id.indexOf(channel.isp1ID) === -1) {
+          ispList[isp1].id += ',' + channel.isp1ID.toString();
        }

        if (!ispList[isp2]) {
          ispList[isp2] = {
-            ids: [channel.isp2ID],
+            id: channel.isp2ID.toString(),
            capacity: 0,
            channels: 0,
            nodes: {},
          };
-        } else if (ispList[isp2].ids.includes(channel.isp2ID) === false) {
-          ispList[isp2].ids.push(channel.isp2ID);
+        } else if (ispList[isp2].id.indexOf(channel.isp2ID) === -1) {
+          ispList[isp2].id += ',' + channel.isp2ID.toString();
        }
        
        ispList[isp1].capacity += channel.capacity;
@@ -444,11 +444,11 @@ class NodesApi {
        ispList[isp2].channels += 1;
        ispList[isp2].nodes[channel.node2PublicKey] = true;
      }
-      
+
      const ispRanking: any[] = [];
      for (const isp of Object.keys(ispList)) {
        ispRanking.push([
-          ispList[isp].ids.sort((a, b) => a - b).join(','),
+          ispList[isp].id,
          isp,
          ispList[isp].capacity,
          ispList[isp].channels,
--- a/backend/src/api/lightning/lnd/lnd-api.ts
+++ b/backend/src/api/lightning/lnd/lnd-api.ts
@@ -4,29 +4,21 @@ import * as fs from 'fs';
 import { AbstractLightningApi } from '../lightning-api-abstract-factory';
 import { ILightningApi } from '../lightning-api.interface';
 import config from '../../../config';
-import logger from '../../../logger';

 class LndApi implements AbstractLightningApi {
  axiosConfig: AxiosRequestConfig = {};

  constructor() {
-    if (!config.LIGHTNING.ENABLED) {
-      return;
-    }
-    try {
+    if (config.LIGHTNING.ENABLED) {
      this.axiosConfig = {
        headers: {
-          'Grpc-Metadata-macaroon': fs.readFileSync(config.LND.MACAROON_PATH).toString('hex'),
+          'Grpc-Metadata-macaroon': fs.readFileSync(config.LND.MACAROON_PATH).toString('hex')
        },
        httpsAgent: new Agent({
          ca: fs.readFileSync(config.LND.TLS_CERT_PATH)
        }),
-        timeout: config.LND.TIMEOUT
+        timeout: 10000
      };
-    } catch (e) {
-      config.LIGHTNING.ENABLED = false;
-      logger.updateNetwork();
-      logger.err(`Could not initialize LND Macaroon/TLS Cert. Disabling LIGHTNING. ` + (e instanceof Error ? e.message : e));
    }
  }

--- 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,19 +1,15 @@
 import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, 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';
-import mempool from './mempool';

 class MempoolBlocks {
  private mempoolBlocks: MempoolBlockWithTransactions[] = [];
  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[] {
@@ -37,9 +33,9 @@ class MempoolBlocks {
    return this.mempoolBlockDeltas;
  }

-  public updateMempoolBlocks(memPool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false): MempoolBlockWithTransactions[] {
+  public updateMempoolBlocks(memPool: { [txid: string]: TransactionExtended }, saveResults: boolean = false): MempoolBlockWithTransactions[] {
    const latestMempool = memPool;
-    const memPoolArray: MempoolTransactionExtended[] = [];
+    const memPoolArray: TransactionExtended[] = [];
    for (const i in latestMempool) {
      if (latestMempool.hasOwnProperty(i)) {
        memPoolArray.push(latestMempool[i]);
@@ -53,24 +49,17 @@ class MempoolBlocks {
      tx.ancestors = [];
      tx.cpfpChecked = false;
      if (!tx.effectiveFeePerVsize) {
-        tx.effectiveFeePerVsize = tx.adjustedFeePerVsize;
+        tx.effectiveFeePerVsize = tx.feePerVsize;
      }
    });

    // First sort
-    memPoolArray.sort((a, b) => {
-      if (a.adjustedFeePerVsize === b.adjustedFeePerVsize) {
-        // tie-break by lexicographic txid order for stability
-        return a.txid < b.txid ? -1 : 1;
-      } else {
-        return b.adjustedFeePerVsize - a.adjustedFeePerVsize;
-      }
-    });
+    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;
@@ -79,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);
@@ -103,63 +85,26 @@ class MempoolBlocks {
    return blocks;
  }

-  private calculateMempoolBlocks(transactionsSorted: MempoolTransactionExtended[]): 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 transactions: MempoolTransactionExtended[] = [];
-    transactionsSorted.forEach((tx, index) => {
+    let blockSize = 0;
+    let transactions: TransactionExtended[] = [];
+    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;
@@ -170,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, acc: number | undefined }[] = [];
      if (mempoolBlocks[i] && !prevBlocks[i]) {
        added = mempoolBlocks[i].transactions;
      } else if (!mempoolBlocks[i] && prevBlocks[i]) {
@@ -179,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;
@@ -192,46 +136,30 @@ class MempoolBlocks {
        mempoolBlocks[i].transactions.forEach(tx => {
          if (!prevIds[tx.txid]) {
            added.push(tx);
-          } else if (tx.rate !== prevIds[tx.txid].rate || tx.acc !== prevIds[tx.txid].acc) {
-            changed.push({ txid: tx.txid, rate: tx.rate, acc: tx.acc });
          }
        });
      }
      mempoolBlockDeltas.push({
        added,
-        removed,
-        changed,
+        removed
      });
    }
    return mempoolBlockDeltas;
  }

-  public async $makeBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false, useAccelerations: boolean = false): Promise<MempoolBlockWithTransactions[]> {
-    const start = Date.now();
-
-    // reset mempool short ids
-    this.resetUids();
-    for (const tx of Object.values(newMempool)) {
-      this.setUid(tx, true);
-    }
-
-    const accelerations = useAccelerations ? mempool.getAccelerations() : {};
-
+  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();
+    const strippedMempool: { [txid: string]: ThreadTransaction } = {};
    Object.values(newMempool).forEach(entry => {
-      if (entry.uid != null) {
-        strippedMempool.set(entry.uid, {
-          uid: entry.uid,
-          fee: entry.fee + (useAccelerations ? (accelerations[entry.txid] || 0) : 0),
-          weight: (entry.adjustedVsize * 4),
-          sigops: entry.sigops,
-          feePerVsize: entry.adjustedFeePerVsize || entry.feePerVsize,
-          effectiveFeePerVsize: entry.effectiveFeePerVsize || entry.adjustedFeePerVsize || entry.feePerVsize,
-          inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => uid != null) as number[],
-        });
-      }
+      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
@@ -250,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);
@@ -258,174 +186,102 @@ class MempoolBlocks {
        this.txSelectionWorker?.once('error', reject);
      });
      this.txSelectionWorker.postMessage({ type: 'set', mempool: strippedMempool });
-      const { blocks, rates, clusters } = this.convertResultTxids(await workerResultPromise);
+      const { blocks, clusters } = await workerResultPromise;

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

-      const processed = this.processBlockTemplates(newMempool, blocks, rates, clusters, accelerations, 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]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], accelerationDelta: string[] = [], saveResults: boolean = false, useAccelerations: 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, useAccelerations);
+      this.makeBlockTemplates(newMempool, saveResults);
      return;
    }
-
-    const start = Date.now();
-
-    const accelerations = useAccelerations ? mempool.getAccelerations() : {};
-    const addedAndChanged: MempoolTransactionExtended[] = useAccelerations ? accelerationDelta.map(txid => newMempool[txid]).filter(tx => tx != null).concat(added) : added;
-
-    for (const tx of addedAndChanged) {
-      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[] = addedAndChanged.filter(entry => entry.uid != null).map(entry => {
+    const addedStripped: ThreadTransaction[] = added.map(entry => {
      return {
-        uid: entry.uid || 0,
-        fee: entry.fee + (useAccelerations ? (accelerations[entry.txid] || 0) : 0),
-        weight: (entry.adjustedVsize * 4),
-        sigops: entry.sigops,
-        feePerVsize: entry.adjustedFeePerVsize || entry.feePerVsize,
-        effectiveFeePerVsize: entry.effectiveFeePerVsize || entry.adjustedFeePerVsize || entry.feePerVsize,
-        inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => uid != null) as number[],
+        txid: entry.txid,
+        fee: entry.fee,
+        weight: entry.weight,
+        feePerVsize: entry.fee / (entry.weight / 4),
+        effectiveFeePerVsize: entry.fee / (entry.weight / 4),
+        vin: entry.vin.map(v => v.txid),
      };
    });

    // run the block construction algorithm in a separate thread, and wait for a result
    let threadErrorListener;
    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 });
+      const { blocks, clusters } = await workerResultPromise;

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

-      this.processBlockTemplates(newMempool, blocks, rates, clusters, accelerations, 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[] }, accelerations, 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: MempoolTransactionExtended;
-      let totalSize = 0;
-      let totalVsize = 0;
-      let totalWeight = 0;
-      let totalFees = 0;
-      const transactions: MempoolTransactionExtended[] = [];
-      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;
-
-          mempoolTx.acceleration = accelerations[txid];
-
-          // 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 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].adjustedVsize * 4),
-              };
-              if (matched) {
-                descendants.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 === tx.txid) {
+                matched = true;
              } else {
-                ancestors.push(relative);
+                const relative = {
+                  txid: txid,
+                  fee: mempool[txid].fee,
+                  weight: mempool[txid].weight,
+                };
+                if (matched) {
+                  descendants.push(relative);
+                } else {
+                  ancestors.push(relative);
+                }
              }
-            }
-          });
-          mempoolTx.ancestors = ancestors;
-          mempoolTx.descendants = descendants;
-          mempoolTx.bestDescendant = null;
+            });
+            mempool[tx.txid].ancestors = ancestors;
+            mempool[tx.txid].descendants = descendants;
+            mempool[tx.txid].bestDescendant = null;
+          }
+          mempool[tx.txid].cpfpChecked = tx.cpfpChecked;
        }
-      }
-    }
+      });
+    });

-    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) {
@@ -437,77 +293,37 @@ class MempoolBlocks {
    return mempoolBlocks;
  }

-  private dataToMempoolBlocks(transactionIds: string[], transactions: MempoolTransactionExtended[], 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;
-  }
-
-  // use reset=true to overwrite existing uids held by tx objects (required after resetUids)
-  private setUid(tx: MempoolTransactionExtended, reset = false): number {
-    let uid = reset ? null : this.getUid(tx);
-    if (uid == null) {
-      uid = this.nextUid;
-      this.nextUid++;
-      this.uidMap.set(uid, tx.txid);
-      tx.uid = uid;
-      return uid;
-    } else {
-      return uid;
-    }
-  }
-
-  private getUid(tx: MempoolTransactionExtended): 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
@@ -1,6 +1,6 @@
 import config from '../config';
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
-import { MempoolTransactionExtended, TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
+import { TransactionExtended, VbytesPerSecond } from '../mempool.interfaces';
 import logger from '../logger';
 import { Common } from './common';
 import transactionUtils from './transaction-utils';
@@ -9,21 +9,19 @@ import loadingIndicators from './loading-indicators';
 import bitcoinClient from './bitcoin/bitcoin-client';
 import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';
-import accelerationApi, { Acceleration } from './services/acceleration';

 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]: MempoolTransactionExtended } = {};
-  private spendMap = new Map<string, MempoolTransactionExtended>();
+  private mempoolCache: { [txId: string]: TransactionExtended } = {};
  private mempoolInfo: IBitcoinApi.MempoolInfo = { loaded: false, size: 0, bytes: 0, usage: 0, total_fee: 0,
                                                    maxmempool: 300000000, mempoolminfee: 0.00001000, minrelaytxfee: 0.00001000 };
-  private mempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, newTransactions: MempoolTransactionExtended[],
-    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => void) | undefined;
-  private $asyncMempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, newTransactions: MempoolTransactionExtended[],
-    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => Promise<void>) | undefined;
-
-  private accelerations: { [txId: string]: number } = {};
+  private mempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
+    deletedTransactions: TransactionExtended[]) => void) | undefined;
+  private asyncMempoolChangedCallback: ((newMempool: {[txId: string]: TransactionExtended; }, newTransactions: TransactionExtended[],
+    deletedTransactions: TransactionExtended[]) => Promise<void>) | undefined;

  private txPerSecondArray: number[] = [];
  private txPerSecond: number = 0;
@@ -33,14 +31,9 @@ class Mempool {
  private mempoolProtection = 0;
  private latestTransactions: any[] = [];

-  private ESPLORA_MISSING_TX_WARNING_THRESHOLD = 100; 
-  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);
+    setInterval(this.deleteExpiredTransactions.bind(this), 20000);
  }

  /**
@@ -67,38 +60,28 @@ class Mempool {
    return this.latestTransactions;
  }

-  public setMempoolChangedCallback(fn: (newMempool: { [txId: string]: MempoolTransactionExtended; },
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]) => void): void {
+  public setMempoolChangedCallback(fn: (newMempool: { [txId: string]: TransactionExtended; },
+    newTransactions: TransactionExtended[], deletedTransactions: TransactionExtended[]) => void) {
    this.mempoolChangedCallback = fn;
  }

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

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

-  public getSpendMap(): Map<string, MempoolTransactionExtended> {
-    return this.spendMap;
-  }
-
-  public async $setMempool(mempoolData: { [txId: string]: MempoolTransactionExtended }) {
+  public setMempool(mempoolData: { [txId: string]: TransactionExtended }) {
    this.mempoolCache = mempoolData;
-    for (const txid of Object.keys(this.mempoolCache)) {
-      if (this.mempoolCache[txid].sigops == null || this.mempoolCache[txid].effectiveFeePerVsize == null) {
-        this.mempoolCache[txid] = transactionUtils.extendMempoolTransaction(this.mempoolCache[txid]);
-      }
-    }
    if (this.mempoolChangedCallback) {
-      this.mempoolChangedCallback(this.mempoolCache, [], [], []);
+      this.mempoolChangedCallback(this.mempoolCache, [], []);
    }
-    if (this.$asyncMempoolChangedCallback) {
-      await this.$asyncMempoolChangedCallback(this.mempoolCache, [], [], []);
+    if (this.asyncMempoolChangedCallback) {
+      this.asyncMempoolChangedCallback(this.mempoolCache, [], []);
    }
-    this.addToSpendMap(Object.values(this.mempoolCache));
  }

  public async $updateMemPoolInfo() {
@@ -130,41 +113,25 @@ 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: MempoolTransactionExtended[] = [];
+    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
-    const logEsplora404 = (missingTxCount, threshold, time) => {
-      const log = `In the past ${time / 1000} seconds, esplora tx API replied ${missingTxCount} times with a 404 error code while updating nodejs backend mempool`;
-      if (missingTxCount >= threshold) {
-        logger.warn(log);
-      } else if (missingTxCount > 0) {
-        logger.debug(log);
-      }
-    };
-
-    let loggerTimer = new Date().getTime() / 1000;
    for (const txid of transactions) {
      if (!this.mempoolCache[txid]) {
        try {
-          const transaction = await transactionUtils.$getMempoolTransactionExtended(txid, false, false, false);
-          this.updateTimerProgress(timer, 'fetched new transaction');
+          const transaction = await transactionUtils.$getTransactionExtended(txid);
          this.mempoolCache[txid] = transaction;
          if (this.inSync) {
            this.txPerSecondArray.push(new Date().getTime());
@@ -175,28 +142,14 @@ class Mempool {
          }
          hasChange = true;
          newTransactions.push(transaction);
-        } catch (e: any) {
-          if (config.MEMPOOL.BACKEND === 'esplora' && e.response?.status === 404) {
-            this.missingTxCount++;
-          }
+        } catch (e) {
          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;
-      }
-    }

-    // Reset esplora 404 counter and log a warning if needed
-    const elapsedTime = new Date().getTime() - this.timer;
-    if (elapsedTime > this.SAMPLE_TIME) {
-      logEsplora404(this.missingTxCount, this.ESPLORA_MISSING_TX_WARNING_THRESHOLD, elapsedTime);
-      this.timer = new Date().getTime();
-      this.missingTxCount = 0;
+      if ((new Date().getTime()) - start > Mempool.WEBSOCKET_REFRESH_RATE_MS) {
+        break;
+      }
    }

    // Prevent mempool from clear on bitcoind restart by delaying the deletion
@@ -213,7 +166,7 @@ class Mempool {
      }, 1000 * 60 * config.MEMPOOL.CLEAR_PROTECTION_MINUTES);
    }

-    const deletedTransactions: MempoolTransactionExtended[] = [];
+    const deletedTransactions: TransactionExtended[] = [];

    if (this.mempoolProtection !== 1) {
      this.mempoolProtection = 0;
@@ -221,20 +174,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 accelerationDelta = await this.$updateAccelerations();
-    if (accelerationDelta.length) {
-      hasChange = true;
    }

    const newTransactionsStripped = newTransactions.map((tx) => Common.stripTransaction(tx));
@@ -249,118 +195,24 @@ class Mempool {
    this.mempoolCacheDelta = Math.abs(transactions.length - Object.keys(this.mempoolCache).length);

    if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
-      this.mempoolChangedCallback(this.mempoolCache, newTransactions, deletedTransactions, accelerationDelta);
+      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, accelerationDelta);
-      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);
  }

-  public getAccelerations(): { [txid: string]: number } {
-    return this.accelerations;
-  }
-
-  public async $updateAccelerations(): Promise<string[]> {
-    if (!config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      return [];
-    }
-
-    try {
-      const newAccelerations = await accelerationApi.$fetchAccelerations();
-
-      const changed: string[] = [];
-
-      const newAccelerationMap: { [txid: string]: number } = {};
-      for (const acceleration of newAccelerations) {
-        newAccelerationMap[acceleration.txid] = acceleration.feeDelta;
-        if (this.accelerations[acceleration.txid] == null) {
-          // new acceleration
-          changed.push(acceleration.txid);
-        } else if (this.accelerations[acceleration.txid] !== acceleration.feeDelta) {
-          // feeDelta changed
-          changed.push(acceleration.txid);
-        }
-      }
-
-      for (const oldTxid of Object.keys(this.accelerations)) {
-        if (!newAccelerationMap[oldTxid]) {
-          // removed
-          changed.push(oldTxid);
-        }
-      }
-
-      this.accelerations = newAccelerationMap;
-
-      return changed;
-    } catch (e: any) {
-      logger.debug(`Failed to update accelerations: ` + (e instanceof Error ? e.message : e));
-      return [];
-    }
-  }
-
-  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]: MempoolTransactionExtended[]; }): 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]);
-      }
-    }
-  }
-
-  public handleMinedRbfTransactions(rbfTransactions: { [txid: string]: { replaced: MempoolTransactionExtended[], replacedBy: TransactionExtended }}): void {
-    for (const rbfTransaction in rbfTransactions) {
-      if (rbfTransactions[rbfTransaction].replacedBy && rbfTransactions[rbfTransaction]?.replaced?.length) {
-        // Store replaced transactions
-        rbfCache.add(rbfTransactions[rbfTransaction].replaced, transactionUtils.extendMempoolTransaction(rbfTransactions[rbfTransaction].replacedBy));
-      }
-    }
-  }
-
-  public addToSpendMap(transactions: MempoolTransactionExtended[]): void {
-    for (const tx of transactions) {
-      for (const vin of tx.vin) {
-        this.spendMap.set(`${vin.txid}:${vin.vout}`, tx);
-      }
-    }
-  }
-
-  public removeFromSpendMap(transactions: TransactionExtended[]): void {
-    for (const tx of transactions) {
-      for (const vin of tx.vin) {
-        const key = `${vin.txid}:${vin.vout}`;
-        if (this.spendMap.get(key)?.txid === tx.txid) {
-          this.spendMap.delete(key);
-        }
+        rbfCache.add(this.mempoolCache[rbfTransaction], rbfTransactions[rbfTransaction].txid);
+        // Erase the replaced transactions from the local mempool
+        delete this.mempoolCache[rbfTransaction];
      }
    }
  }
@@ -378,6 +230,17 @@ class Mempool {
    }
  }

+  private 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);
    }
@@ -263,7 +263,7 @@ class MiningRoutes {
      const audit = await BlocksAuditsRepository.$getBlockAudit(req.params.hash);

      if (!audit) {
-        res.status(204).send(`This block has not been audited.`);
+        res.status(404).send(`This block has not been audited.`);
        return;
      }

--- a/backend/src/api/mining/mining.ts
+++ b/backend/src/api/mining/mining.ts
@@ -20,10 +20,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)
    );
@@ -117,7 +117,7 @@ class Mining {
      poolsStatistics['lastEstimatedHashrate'] = await bitcoinClient.getNetworkHashPs(totalBlock24h);
    } catch (e) {
      poolsStatistics['lastEstimatedHashrate'] = 0;
-      logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate', logger.tags.mining);
+      logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate');
    }

    return poolsStatistics;
@@ -141,14 +141,11 @@ class Mining {
    const blockCount1w: number = await BlocksRepository.$blockCount(pool.id, '1w');
    const totalBlock1w: number = await BlocksRepository.$blockCount(null, '1w');

-    const avgHealth = await BlocksRepository.$getAvgBlockHealthPerPoolId(pool.id);    
-    const totalReward = await BlocksRepository.$getTotalRewardForPoolId(pool.id);    
-
    let currentEstimatedHashrate = 0;
    try {
      currentEstimatedHashrate = await bitcoinClient.getNetworkHashPs(totalBlock24h);
    } catch (e) {
-      logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate', logger.tags.mining);
+      logger.debug('Bitcoin Core is not available, using zeroed value for current hashrate');
    }

    return {
@@ -165,8 +162,6 @@ class Mining {
      },
      estimatedHashrate: currentEstimatedHashrate * (blockCount24h / totalBlock24h),
      reportedHashrate: null,
-      avgBlockHealth: avgHealth,
-      totalReward: totalReward,
    };
  }

@@ -213,7 +208,7 @@ class Mining {
      const startedAt = new Date().getTime() / 1000;
      let timer = new Date().getTime() / 1000;

-      logger.debug(`Indexing weekly mining pool hashrate`, logger.tags.mining);
+      logger.debug(`Indexing weekly mining pool hashrate`);
      loadingIndicators.setProgress('weekly-hashrate-indexing', 0);

      while (toTimestamp > genesisTimestamp && toTimestamp > oldestConsecutiveBlockTimestamp) {
@@ -250,7 +245,7 @@ class Mining {
            });
          }

-          newlyIndexed += hashrates.length / Math.max(1, pools.length);
+          newlyIndexed += hashrates.length;
          await HashratesRepository.$saveHashrates(hashrates);
          hashrates.length = 0;
        }
@@ -261,7 +256,7 @@ class Mining {
          const weeksPerSeconds = Math.max(1, Math.round(indexedThisRun / elapsedSeconds));
          const progress = Math.round(totalIndexed / totalWeekIndexed * 10000) / 100;
          const formattedDate = new Date(fromTimestamp).toUTCString();
-          logger.debug(`Getting weekly pool hashrate for ${formattedDate} | ~${weeksPerSeconds.toFixed(2)} weeks/sec | total: ~${totalIndexed}/${Math.round(totalWeekIndexed)} (${progress}%) | elapsed: ${runningFor} seconds`, logger.tags.mining);
+          logger.debug(`Getting weekly pool hashrate for ${formattedDate} | ~${weeksPerSeconds.toFixed(2)} weeks/sec | total: ~${totalIndexed}/${Math.round(totalWeekIndexed)} (${progress}%) | elapsed: ${runningFor} seconds`);
          timer = new Date().getTime() / 1000;
          indexedThisRun = 0;
          loadingIndicators.setProgress('weekly-hashrate-indexing', progress, false);
@@ -273,14 +268,14 @@ class Mining {
      }
      this.lastWeeklyHashrateIndexingDate = new Date().getUTCDate();
      if (newlyIndexed > 0) {
-        logger.info(`Weekly mining pools hashrates indexing completed: indexed ${newlyIndexed} weeks`, logger.tags.mining);
+        logger.notice(`Weekly mining pools hashrates indexing completed: indexed ${newlyIndexed}`, logger.tags.mining);
      } else {
-        logger.debug(`Weekly mining pools hashrates indexing completed: indexed ${newlyIndexed} weeks`, logger.tags.mining);
+        logger.debug(`Weekly mining pools hashrates indexing completed: indexed ${newlyIndexed}`, logger.tags.mining);
      }
      loadingIndicators.setProgress('weekly-hashrate-indexing', 100);
    } catch (e) {
      loadingIndicators.setProgress('weekly-hashrate-indexing', 100);
-      logger.err(`Weekly mining pools hashrates indexing failed. Trying again in 10 seconds. Reason: ${(e instanceof Error ? e.message : e)}`, logger.tags.mining);
+      logger.err(`Weekly mining pools hashrates indexing failed. Trying again in 10 seconds. Reason: ${(e instanceof Error ? e.message : e)}`);
      throw e;
    }
  }
@@ -313,7 +308,7 @@ class Mining {
      const startedAt = new Date().getTime() / 1000;
      let timer = new Date().getTime() / 1000;

-      logger.debug(`Indexing daily network hashrate`, logger.tags.mining);
+      logger.debug(`Indexing daily network hashrate`);
      loadingIndicators.setProgress('daily-hashrate-indexing', 0);

      while (toTimestamp > genesisTimestamp && toTimestamp > oldestConsecutiveBlockTimestamp) {
@@ -351,7 +346,7 @@ class Mining {
          const daysPerSeconds = Math.max(1, Math.round(indexedThisRun / elapsedSeconds));
          const progress = Math.round(totalIndexed / totalDayIndexed * 10000) / 100;
          const formattedDate = new Date(fromTimestamp).toUTCString();
-          logger.debug(`Getting network daily hashrate for ${formattedDate} | ~${daysPerSeconds.toFixed(2)} days/sec | total: ~${totalIndexed}/${Math.round(totalDayIndexed)} (${progress}%) | elapsed: ${runningFor} seconds`, logger.tags.mining);
+          logger.debug(`Getting network daily hashrate for ${formattedDate} | ~${daysPerSeconds.toFixed(2)} days/sec | total: ~${totalIndexed}/${Math.round(totalDayIndexed)} (${progress}%) | elapsed: ${runningFor} seconds`);
          timer = new Date().getTime() / 1000;
          indexedThisRun = 0;
          loadingIndicators.setProgress('daily-hashrate-indexing', progress);
@@ -378,14 +373,14 @@ class Mining {

      this.lastHashrateIndexingDate = new Date().getUTCDate();
      if (newlyIndexed > 0) {
-        logger.info(`Daily network hashrate indexing completed: indexed ${newlyIndexed} days`, logger.tags.mining);
+        logger.notice(`Daily network hashrate indexing completed: indexed ${newlyIndexed} days`, logger.tags.mining);
      } else {
        logger.debug(`Daily network hashrate indexing completed: indexed ${newlyIndexed} days`, logger.tags.mining);
      }
      loadingIndicators.setProgress('daily-hashrate-indexing', 100);
    } catch (e) {
      loadingIndicators.setProgress('daily-hashrate-indexing', 100);
-      logger.err(`Daily network hashrate indexing failed. Trying again later. Reason: ${(e instanceof Error ? e.message : e)}`, logger.tags.mining);
+      logger.err(`Daily network hashrate indexing failed. Trying again in 10 seconds. Reason: ${(e instanceof Error ? e.message : e)}`, logger.tags.mining);
      throw e;
    }
  }
@@ -451,13 +446,13 @@ 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}%`);
        timer = new Date().getTime() / 1000;
      }
    }

    if (totalIndexed > 0) {
-      logger.info(`Indexed ${totalIndexed} difficulty adjustments`, logger.tags.mining);
+      logger.notice(`Indexed ${totalIndexed} difficulty adjustments`, logger.tags.mining);
    } else {
      logger.debug(`Indexed ${totalIndexed} difficulty adjustments`, logger.tags.mining);
    }
@@ -504,7 +499,7 @@ class Mining {
          if (blocksWithoutPrices.length > 200000) {
            logStr += ` | Progress ${Math.round(totalInserted / blocksWithoutPrices.length * 100)}%`;
          }
-          logger.debug(logStr, logger.tags.mining);
+          logger.debug(logStr);
          await BlocksRepository.$saveBlockPrices(blocksPrices);
          blocksPrices.length = 0;
        }
@@ -516,7 +511,7 @@ class Mining {
        if (blocksWithoutPrices.length > 200000) {
          logStr += ` | Progress ${Math.round(totalInserted / blocksWithoutPrices.length * 100)}%`;
        }
-        logger.debug(logStr, logger.tags.mining);
+        logger.debug(logStr);
        await BlocksRepository.$saveBlockPrices(blocksPrices);
      }
    } catch (e) {
@@ -557,10 +552,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);
    }
  }

@@ -575,7 +568,6 @@ class Mining {

  private getTimeRange(interval: string | null, scale = 1): number {
    switch (interval) {
-      case '4y': return 43200 * scale; // 12h
      case '3y': return 43200 * scale; // 12h
      case '2y': return 28800 * scale; // 8h
      case '1y': return 28800 * scale; // 8h
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -41,7 +41,7 @@ class PoolsParser {
  public async migratePoolsJson(): Promise<void> {
    // We also need to wipe the backend cache to make sure we don't serve blocks with
    // the wrong mining pool (usually happen with unknown blocks)
-    diskCache.setIgnoreBlocksCache();
+    diskCache.wipeCache();

    await this.$insertUnknownPool();

@@ -118,6 +118,10 @@ class PoolsParser {
   * @param pool 
   */
  private async $deleteBlocksForPool(pool: PoolTag): Promise<void> {
+    if (config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING === false) {
+      return;
+    }
+
    // Get oldest blocks mined by the pool and assume pools-v2.json updates only concern most recent years
    // Ignore early days of Bitcoin as there were no mining pool yet
    const [oldestPoolBlock]: any[] = await DB.query(`
--- a/backend/src/api/rbf-cache.ts
+++ b/backend/src/api/rbf-cache.ts
@@ -1,341 +1,65 @@
-import logger from "../logger";
-import { MempoolTransactionExtended, 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, MempoolTransactionExtended> = 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: MempoolTransactionExtended[], newTxExtended: MempoolTransactionExtended): void {
-    if (!newTxExtended || !replaced?.length || this.txs.has(newTxExtended.txid)) {
-      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): MempoolTransactionExtended | 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);
+  public getTx(txId: string): TransactionExtended | undefined {
+    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, MempoolTransactionExtended>, 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/services/acceleration.ts
+++ b/backend/src/api/services/acceleration.ts
@@ -1,38 +0,0 @@
-import { query } from '../../utils/axios-query';
-import config from '../../config';
-import { BlockExtended, PoolTag } from '../../mempool.interfaces';
-
-export interface Acceleration {
-  txid: string,
-  feeDelta: number,
-}
-
-class AccelerationApi {
-  public async $fetchAccelerations(): Promise<Acceleration[]> {
-    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      const response = await query(`${config.MEMPOOL_SERVICES.API}/accelerations`);
-      return (response as Acceleration[]) || [];
-    } else {
-      return [];
-    }
-  }
-
-  public async $fetchPools(): Promise<PoolTag[]> {
-    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
-      const response = await query(`${config.MEMPOOL_SERVICES.API}/partners`);
-      return (response as PoolTag[]) || [];
-    } else {
-      return [];
-    }
-  }
-
-  public async $isAcceleratedBlock(block: BlockExtended): Promise<boolean> {
-    const pools = await this.$fetchPools();
-    if (block?.extras?.pool?.id == null) {
-      return false;
-    }
-    return pools.reduce((match, tag) => match || tag.uniqueId === block.extras.pool.id, false);
-  }
-}
-
-export default new AccelerationApi();
--- a/backend/src/api/statistics/statistics-api.ts
+++ b/backend/src/api/statistics/statistics-api.ts
@@ -375,17 +375,6 @@ class StatisticsApi {
    }
  }

-  public async $list4Y(): Promise<OptimizedStatistic[]> {
-    try {
-      const query = this.getQueryForDays(43200, '4 YEAR'); // 12h interval
-      const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout });
-      return this.mapStatisticToOptimizedStatistic(rows as Statistic[]);
-    } catch (e) {
-      logger.err('$list4Y() error' + (e instanceof Error ? e.message : e));
-      return [];
-    }
-  }
-
  private mapStatisticToOptimizedStatistic(statistic: Statistic[]): OptimizedStatistic[] {
    return statistic.map((s) => {
      return {
--- a/backend/src/api/statistics/statistics.routes.ts
+++ b/backend/src/api/statistics/statistics.routes.ts
@@ -14,11 +14,10 @@ class StatisticsRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/1y', this.$getStatisticsByTime.bind(this, '1y'))
      .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/2y', this.$getStatisticsByTime.bind(this, '2y'))
      .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/3y', this.$getStatisticsByTime.bind(this, '3y'))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/4y', this.$getStatisticsByTime.bind(this, '4y'))
    ;
  }

-  private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y' | '4y', req: Request, res: Response) {
+  private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y', req: Request, res: Response) {
    res.header('Pragma', 'public');
    res.header('Cache-control', 'public');
    res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
@@ -55,9 +54,6 @@ class StatisticsRoutes {
        case '3y':
          result = await statisticsApi.$list3Y();
          break;
-        case '4y':
-          result = await statisticsApi.$list4Y();
-          break;
        default:
          result = await statisticsApi.$list2H();
      }
--- a/backend/src/api/transaction-utils.ts
+++ b/backend/src/api/transaction-utils.ts
@@ -1,8 +1,7 @@
-import { TransactionExtended, MempoolTransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
+import { TransactionExtended, TransactionMinerInfo } from '../mempool.interfaces';
 import { IEsploraApi } from './bitcoin/esplora-api.interface';
 import { Common } from './common';
 import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory';
-import * as bitcoinjs from 'bitcoinjs-lib';

 class TransactionUtils {
  constructor() { }
@@ -23,27 +22,19 @@ class TransactionUtils {
  }

  /**
-   * @param txId
-   * @param addPrevouts
-   * @param lazyPrevouts
+   * @param txId 
+   * @param addPrevouts 
+   * @param lazyPrevouts 
   * @param forceCore - See https://github.com/mempool/mempool/issues/2904
   */
-  public async $getTransactionExtended(txId: string, addPrevouts = false, lazyPrevouts = false, forceCore = false, addMempoolData = false): Promise<TransactionExtended> {
+  public async $getTransactionExtended(txId: string, addPrevouts = false, lazyPrevouts = false, forceCore = false): Promise<TransactionExtended> {
    let transaction: IEsploraApi.Transaction;
    if (forceCore === true) {
      transaction  = await bitcoinCoreApi.$getRawTransaction(txId, true);
    } else {
      transaction  = await bitcoinApi.$getRawTransaction(txId, false, addPrevouts, lazyPrevouts);
    }
-    if (addMempoolData || !transaction?.status?.confirmed) {
-      return this.extendMempoolTransaction(transaction);
-    } else {
-      return this.extendTransaction(transaction);
-    }
-  }
-
-  public async $getMempoolTransactionExtended(txId: string, addPrevouts = false, lazyPrevouts = false, forceCore = false): Promise<MempoolTransactionExtended> {
-    return (await this.$getTransactionExtended(txId, addPrevouts, lazyPrevouts, forceCore, true)) as MempoolTransactionExtended;
+    return this.extendTransaction(transaction);
  }

  private extendTransaction(transaction: IEsploraApi.Transaction): TransactionExtended {
@@ -59,32 +50,8 @@ class TransactionUtils {
      feePerVsize: feePerVbytes,
      effectiveFeePerVsize: feePerVbytes,
    }, transaction);
-    if (!transaction?.status?.confirmed && !transactionExtended.firstSeen) {
-      transactionExtended.firstSeen = Math.round((Date.now() / 1000));
-    }
-    return transactionExtended;
-  }
-
-  public extendMempoolTransaction(transaction: IEsploraApi.Transaction): MempoolTransactionExtended {
-    const vsize = Math.ceil(transaction.weight / 4);
-    const fractionalVsize = (transaction.weight / 4);
-    const sigops = this.countSigops(transaction);
-    // https://github.com/bitcoin/bitcoin/blob/e9262ea32a6e1d364fb7974844fadc36f931f8c6/src/policy/policy.cpp#L295-L298
-    const adjustedVsize = Math.max(fractionalVsize, sigops *  5); // adjusted vsize = Max(weight, sigops * bytes_per_sigop) / witness_scale_factor
-    const feePerVbytes = Math.max(Common.isLiquid() ? 0.1 : 1,
-      (transaction.fee || 0) / fractionalVsize);
-    const adjustedFeePerVsize = Math.max(Common.isLiquid() ? 0.1 : 1,
-      (transaction.fee || 0) / adjustedVsize);
-    const transactionExtended: MempoolTransactionExtended = Object.assign(transaction, {
-      vsize: Math.round(transaction.weight / 4),
-      adjustedVsize,
-      sigops,
-      feePerVsize: feePerVbytes,
-      adjustedFeePerVsize: adjustedFeePerVsize,
-      effectiveFeePerVsize: adjustedFeePerVsize,
-    });
-    if (!transactionExtended?.status?.confirmed && !transactionExtended.firstSeen) {
-      transactionExtended.firstSeen = Math.round((Date.now() / 1000));
+    if (!transaction.status.confirmed) {
+      transactionExtended.firstSeen = Math.round((new Date().getTime() / 1000));
    }
    return transactionExtended;
  }
@@ -96,64 +63,6 @@ class TransactionUtils {
    }
    return str;
  }
-
-  public countScriptSigops(script: string, isRawScript: boolean = false, witness: boolean = false): number {
-    let sigops = 0;
-    // count OP_CHECKSIG and OP_CHECKSIGVERIFY
-    sigops += (script.match(/OP_CHECKSIG/g)?.length || 0);
-
-    // count OP_CHECKMULTISIG and OP_CHECKMULTISIGVERIFY
-    if (isRawScript) {
-      // in scriptPubKey or scriptSig, always worth 20
-      sigops += 20 * (script.match(/OP_CHECKMULTISIG/g)?.length || 0);
-    } else {
-      // in redeem scripts and witnesses, worth N if preceded by OP_N, 20 otherwise
-      const matches = script.matchAll(/(?:OP_(\d+))? OP_CHECKMULTISIG/g);
-      for (const match of matches) {
-        const n = parseInt(match[1]);
-        if (Number.isInteger(n)) {
-          sigops += n;
-        } else {
-          sigops += 20;
-        }
-      }
-    }
-
-    return witness ? sigops : (sigops * 4);
-  }
-
-  public countSigops(transaction: IEsploraApi.Transaction): number {
-    let sigops = 0;
-
-    for (const input of transaction.vin) {
-      if (input.scriptsig_asm) {
-        sigops += this.countScriptSigops(input.scriptsig_asm, true);
-      }
-      if (input.prevout) {
-        switch (true) {
-          case input.prevout.scriptpubkey_type === 'p2sh' && input.witness?.length === 2 && input.scriptsig && input.scriptsig.startsWith('160014'):
-          case input.prevout.scriptpubkey_type === 'v0_p2wpkh':
-            sigops += 1;
-            break;
-
-          case input.prevout?.scriptpubkey_type === 'p2sh' && input.witness?.length && input.scriptsig && input.scriptsig.startsWith('220020'):
-          case input.prevout.scriptpubkey_type === 'v0_p2wsh':
-            if (input.witness?.length) {
-              sigops += this.countScriptSigops(bitcoinjs.script.toASM(Buffer.from(input.witness[input.witness.length - 1], 'hex')), false, true);
-            }
-            break;
-        }
-      }
-    }
-
-    for (const output of transaction.vout) {
-      if (output.scriptpubkey_asm) {
-        sigops += this.countScriptSigops(output.scriptpubkey_asm, true);
-      }
-    }
-
-    return sigops;
-  }
 }

 export default new TransactionUtils();
--- 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,36 +33,35 @@ 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,
-      sigops: tx.sigops,
-      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,
-      ancestorSigops: 0,
      score: 0,
      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
@@ -72,29 +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 blockSigops = 0;
+  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;
@@ -121,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) && (blockSigops + nextTx.ancestorSigops <= 80000))) {
+      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 = Math.min(nextTx.dependencyRate || Infinity, nextTx.ancestorFee / (nextTx.ancestorWeight / 4));
+        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);
        }
@@ -158,7 +138,7 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
        // remove these as valid package ancestors for any descendants remaining in the mempool
        if (used.length) {
          used.forEach(tx => {
-            updateDescendants(tx, auditPool, modified, effectiveFeeRate);
+            updateDescendants(tx, auditPool, modified);
          });
        }

@@ -176,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
@@ -194,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);
@@ -234,17 +227,15 @@ function setRelatives(
        setRelatives(parentTx, mempool);
      }
      parentTx.ancestorMap.forEach((ancestor) => {
-        tx.ancestorMap.set(ancestor.uid, ancestor);
+        tx.ancestorMap.set(ancestor.txid, ancestor);
      });
    }
  };
  tx.ancestorFee = tx.fee || 0;
  tx.ancestorWeight = tx.weight || 0;
-  tx.ancestorSigops = tx.sigops || 0;
  tx.ancestorMap.forEach((ancestor) => {
    tx.ancestorFee += ancestor.fee;
    tx.ancestorWeight += ancestor.weight;
-    tx.ancestorSigops += ancestor.sigops;
  });
  tx.score = tx.ancestorFee / ((tx.ancestorWeight / 4) || 1);
  tx.relativesSet = true;
@@ -254,9 +245,8 @@ function setRelatives(
 // avoids recursion to limit call stack depth
 function updateDescendants(
  rootTx: AuditTransaction,
-  mempool: Map<number, AuditTransaction>,
+  mempool: { [txid: string]: AuditTransaction },
  modified: PairingHeap<AuditTransaction>,
-  clusterRate: number,
 ): void {
  const descendantSet: Set<AuditTransaction> = new Set();
  // stack of nodes left to visit
@@ -271,15 +261,13 @@ 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;
-      descendantTx.ancestorSigops -= rootTx.sigops;
      tmpScore = descendantTx.score;
      descendantTx.score = descendantTx.ancestorFee / (descendantTx.ancestorWeight / 4);
-      descendantTx.dependencyRate = descendantTx.dependencyRate ? Math.min(descendantTx.dependencyRate, clusterRate) : clusterRate;

      if (!descendantTx.modifiedNode) {
        descendantTx.modified = true;
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -1,8 +1,8 @@
 import logger from '../logger';
 import * as WebSocket from 'ws';
 import {
-  BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse,
-  OptimizedStatistic, ILoadingIndicators
+  BlockExtended, TransactionExtended, WebsocketResponse, MempoolBlock, MempoolBlockDelta,
+  OptimizedStatistic, ILoadingIndicators, IConversionRates
 } from '../mempool.interfaces';
 import blocks from './blocks';
 import memPool from './mempool';
@@ -20,20 +20,11 @@ import BlocksSummariesRepository from '../repositories/BlocksSummariesRepository
 import Audit from './audit';
 import { deepClone } from '../utils/clone';
 import priceUpdater from '../tasks/price-updater';
-import { ApiPrice } from '../repositories/PricesRepository';
-import accelerationApi from './services/acceleration';

 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) {
@@ -42,41 +33,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() {
@@ -85,11 +41,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);
@@ -105,10 +57,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,
@@ -116,14 +67,14 @@ 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;
                    } else {
                      // tx.prevout is missing from transactions when in bitcoind mode
                      try {
-                        const fullTx = await transactionUtils.$getMempoolTransactionExtended(tx.txid, true);
+                        const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
                        response['tx'] = fullTx;
                      } catch (e) {
                        logger.debug('Error finding transaction: ' + (e instanceof Error ? e.message : e));
@@ -131,7 +82,7 @@ class WebsocketHandler {
                    }
                  } else {
                    try {
-                      const fullTx = await transactionUtils.$getMempoolTransactionExtended(client['track-tx'], true);
+                      const fullTx = await transactionUtils.$getTransactionExtended(client['track-tx'], true);
                      response['tx'] = fullTx;
                    } catch (e) {
                      logger.debug('Error finding transaction. ' + (e instanceof Error ? e.message : e));
@@ -140,14 +91,6 @@ class WebsocketHandler {
                  }
                }
              }
-              const tx = memPool.getMempool()[trackTxid];
-              if (tx && tx.position) {
-                response['txPosition'] = {
-                  txid: trackTxid,
-                  position: tx.position,
-                  accelerated: tx.acceleration || undefined,
-                };
-              }
            } else {
              client['track-tx'] = null;
            }
@@ -188,22 +131,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') {
@@ -252,44 +185,51 @@ 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 }));
    });
  }

-  handleNewConversionRates(conversionRates: ApiPrice) {
+  handleNewConversionRates(conversionRates: IConversionRates) {
    if (!this.wss) {
      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);
+    }
+    return {
+      'mempoolInfo': memPool.getMempoolInfo(),
+      'vBytesPerSecond': memPool.getVBytesPerSecond(),
+      'blocks': _blocks,
+      'conversions': priceUpdater.latestPrices,
+      'mempool-blocks': mempoolBlocks.getMempoolBlocks(),
+      'transactions': memPool.getLatestTransactions(),
+      'backendInfo': backendInfo.getBackendInfo(),
+      'loadingIndicators': loadingIndicators.getLoadingIndicators(),
+      'da': difficultyAdjustment.getDifficultyAdjustment(),
+      '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;
@@ -299,20 +239,20 @@ class WebsocketHandler {
        return;
      }

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

-  async $handleMempoolChange(newMempool: { [txid: string]: MempoolTransactionExtended },
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[]): Promise<void> {
+  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, accelerationDelta, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      await mempoolBlocks.updateBlockTemplates(newMempool, newTransactions, deletedTransactions.map(tx => tx.txid), true);
    } else {
      mempoolBlocks.updateMempoolBlocks(newMempool, true);
    }
@@ -324,57 +264,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);
-    }
-    memPool.removeFromSpendMap(deletedTransactions);
-    memPool.addToSpendMap(newTransactions);
    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;
@@ -383,17 +274,15 @@ class WebsocketHandler {
      const response = {};

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

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

      if (client['track-mempool-tx']) {
@@ -401,13 +290,13 @@ class WebsocketHandler {
        if (tx) {
          if (config.MEMPOOL.BACKEND !== 'esplora') {
            try {
-              const fullTx = await transactionUtils.$getMempoolTransactionExtended(tx.txid, true);
-              response['tx'] = JSON.stringify(fullTx);
+              const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
+              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;
        }
@@ -421,7 +310,7 @@ class WebsocketHandler {
          if (someVin) {
            if (config.MEMPOOL.BACKEND !== 'esplora') {
              try {
-                const fullTx = await transactionUtils.$getMempoolTransactionExtended(tx.txid, true);
+                const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
                foundTransactions.push(fullTx);
              } catch (e) {
                logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
@@ -435,7 +324,7 @@ class WebsocketHandler {
          if (someVout) {
            if (config.MEMPOOL.BACKEND !== 'esplora') {
              try {
-                const fullTx = await transactionUtils.$getMempoolTransactionExtended(tx.txid, true);
+                const fullTx = await transactionUtils.$getTransactionExtended(tx.txid, true);
                foundTransactions.push(fullTx);
              } catch (e) {
                logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
@@ -447,7 +336,7 @@ class WebsocketHandler {
        }

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

@@ -476,60 +365,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));
      }
    });
  }
@@ -539,34 +417,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;
-      const isAccelerated = config.MEMPOOL_SERVICES.ACCELERATIONS && await accelerationApi.$isAcceleratedBlock(block);
      // 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, isAccelerated);
-        } 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 {
-        if ((config.MEMPOOL_SERVICES.ACCELERATIONS && !isAccelerated)) {
-          projectedBlocks = await mempoolBlocks.$makeBlockTemplates(auditMempool, false, isAccelerated);
-        } else {
-          projectedBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
-        }
+        projectedBlocks = mempoolBlocks.updateMempoolBlocks(auditMempool, false);
      }

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

        const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions.map((tx) => {
@@ -593,35 +458,25 @@ class WebsocketHandler {
          addedTxs: added,
          missingTxs: censored,
          freshTxs: fresh,
-          sigopTxs: sigop,
-          acceleratedTxs: accelerated,
          matchRate: matchRate,
        });

        if (block.extras) {
          block.extras.matchRate = matchRate;
-          block.extras.similarity = similarity;
        }
      }
-    } else if (block.extras) {
-      const mBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
-      if (mBlocks?.length && mBlocks[0].transactions) {
-        block.extras.similarity = Common.getSimilarity(mBlocks[0], transactions);
-      }
    }

-    const rbfTransactions = Common.findMinedRbfTransactions(transactions, memPool.getSpendMap());
-    memPool.handleMinedRbfTransactions(rbfTransactions);
-    memPool.removeFromSpendMap(transactions);
-
+    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, config.MEMPOOL_SERVICES.ACCELERATIONS);
+      await mempoolBlocks.updateBlockTemplates(_memPool, [], removed, true);
    } else {
      mempoolBlocks.updateMempoolBlocks(_memPool, true);
    }
@@ -631,19 +486,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;
@@ -653,29 +495,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,
+        '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 (trackTxid && txIds.indexOf(trackTxid) > -1) {
-          response['txConfirmed'] = JSON.stringify(trackTxid);
-        } 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']) {
@@ -701,7 +533,7 @@ class WebsocketHandler {
            };
          });

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

@@ -738,37 +570,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
@@ -33,12 +33,9 @@ interface IConfig {
    ADVANCED_GBT_MEMPOOL: boolean;
    CPFP_INDEXING: boolean;
    MAX_BLOCKS_BULK_QUERY: number;
-    DISK_CACHE_BLOCK_INTERVAL: number;
  };
  ESPLORA: {
    REST_API_URL: string;
-    UNIX_SOCKET_PATH: string | void | null;
-    RETRY_UNIX_SOCKET_AFTER: number;
  };
  LIGHTNING: {
    ENABLED: boolean;
@@ -54,7 +51,6 @@ interface IConfig {
    TLS_CERT_PATH: string;
    MACAROON_PATH: string;
    REST_API_URL: string;
-    TIMEOUT: number;
  };
  CLIGHTNING: {
    SOCKET: string;
@@ -69,14 +65,12 @@ interface IConfig {
    PORT: number;
    USERNAME: string;
    PASSWORD: string;
-    TIMEOUT: number;
  };
  SECOND_CORE_RPC: {
    HOST: string;
    PORT: number;
    USERNAME: string;
    PASSWORD: string;
-    TIMEOUT: number;
  };
  DATABASE: {
    ENABLED: boolean;
@@ -86,7 +80,6 @@ interface IConfig {
    DATABASE: string;
    USERNAME: string;
    PASSWORD: string;
-    TIMEOUT: number;
  };
  SYSLOG: {
    ENABLED: boolean;
@@ -129,10 +122,6 @@ interface IConfig {
    GEOLITE2_ASN: string;
    GEOIP2_ISP: string;
  },
-  MEMPOOL_SERVICES: {
-    API: string;
-    ACCELERATIONS: boolean;
-  },
 }

 const defaults: IConfig = {
@@ -166,12 +155,9 @@ const defaults: IConfig = {
    'ADVANCED_GBT_MEMPOOL': false,
    'CPFP_INDEXING': false,
    'MAX_BLOCKS_BULK_QUERY': 0,
-    'DISK_CACHE_BLOCK_INTERVAL': 6,
  },
  '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',
@@ -182,15 +168,13 @@ const defaults: IConfig = {
    'HOST': '127.0.0.1',
    'PORT': 8332,
    'USERNAME': 'mempool',
-    'PASSWORD': 'mempool',
-    'TIMEOUT': 60000,
+    'PASSWORD': 'mempool'
  },
  'SECOND_CORE_RPC': {
    'HOST': '127.0.0.1',
    'PORT': 8332,
    'USERNAME': 'mempool',
-    'PASSWORD': 'mempool',
-    'TIMEOUT': 60000,
+    'PASSWORD': 'mempool'
  },
  'DATABASE': {
    'ENABLED': true,
@@ -199,8 +183,7 @@ const defaults: IConfig = {
    'PORT': 3306,
    'DATABASE': 'mempool',
    'USERNAME': 'mempool',
-    'PASSWORD': 'mempool',
-    'TIMEOUT': 180000,
+    'PASSWORD': 'mempool'
  },
  'SYSLOG': {
    'ENABLED': true,
@@ -231,7 +214,6 @@ const defaults: IConfig = {
    'TLS_CERT_PATH': '',
    'MACAROON_PATH': '',
    'REST_API_URL': 'https://localhost:8080',
-    'TIMEOUT': 10000,
  },
  'CLIGHTNING': {
    'SOCKET': '',
@@ -262,10 +244,6 @@ const defaults: IConfig = {
    'GEOLITE2_ASN': '/usr/local/share/GeoIP/GeoLite2-ASN.mmdb',
    'GEOIP2_ISP': '/usr/local/share/GeoIP/GeoIP2-ISP.mmdb'
  },
-  'MEMPOOL_SERVICES': {
-    'API': '',
-    'ACCELERATIONS': false,
-  }
 };

 class Config implements IConfig {
@@ -285,7 +263,6 @@ class Config implements IConfig {
  PRICE_DATA_SERVER: IConfig['PRICE_DATA_SERVER'];
  EXTERNAL_DATA_SERVER: IConfig['EXTERNAL_DATA_SERVER'];
  MAXMIND: IConfig['MAXMIND'];
-  MEMPOOL_SERVICES: IConfig['MEMPOOL_SERVICES'];

  constructor() {
    const configs = this.merge(configFromFile, defaults);
@@ -305,7 +282,6 @@ class Config implements IConfig {
    this.PRICE_DATA_SERVER = configs.PRICE_DATA_SERVER;
    this.EXTERNAL_DATA_SERVER = configs.EXTERNAL_DATA_SERVER;
    this.MAXMIND = configs.MAXMIND;
-    this.MEMPOOL_SERVICES = configs.MEMPOOL_SERVICES;
  }

  merge = (...objects: object[]): IConfig => {
--- 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';
@@ -39,20 +38,12 @@ import forensicsService from './tasks/lightning/forensics.service';
 import priceUpdater from './tasks/price-updater';
 import chainTips from './api/chain-tips';
 import { AxiosError } from 'axios';
-import v8 from 'v8';
-import { formatBytes, getBytesUnit } from './utils/format';

 class Server {
  private wss: WebSocket.Server | undefined;
  private server: http.Server | undefined;
  private app: Application;
-  private currentBackendRetryInterval = 1;
-  private backendRetryCount = 0;
-
-  private maxHeapSize: number = 0;
-  private heapLogInterval: number = 60;
-  private warnedHeapCritical: boolean = false;
-  private lastHeapLogTime: number | null = null;
+  private currentBackendRetryInterval = 5;

  constructor() {
    this.app = express();
@@ -122,7 +113,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) {
@@ -146,8 +137,6 @@ class Server {
      this.runMainUpdateLoop();
    }

-    setInterval(() => { this.healthCheck(); }, 2500);
-
    if (config.BISQ.ENABLED) {
      bisq.startBisqService();
      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitProperties('bsq-price', price));
@@ -180,26 +169,22 @@ class Server {
          logger.debug(msg);
        }
      }
-      const newMempool = await bitcoinApi.$getRawMempool();
-      const numHandledBlocks = await blocks.$updateBlocks();
-      if (numHandledBlocks === 0) {
-        await memPool.$updateMempool(newMempool);
-      }
+      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 +194,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);
    }
  }

@@ -221,11 +206,11 @@ class Server {
      await lightningStatsUpdater.$startService();
      await forensicsService.$startService();
    } catch(e) {
-      logger.err(`Exception in $runLightningBackend. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
+      logger.err(`Nodejs lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
      await Common.sleep$(1000 * 60);
      this.$runLightningBackend();
    };
-  }
+}

  setUpWebsocketHandling(): void {
    if (this.wss) {
@@ -243,7 +228,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));
@@ -270,26 +255,6 @@ class Server {
      channelsRoutes.initRoutes(this.app);
    }
  }
-
-  healthCheck(): void {
-    const now = Date.now();
-    const stats = v8.getHeapStatistics();
-    this.maxHeapSize = Math.max(stats.used_heap_size, this.maxHeapSize);
-    const warnThreshold = 0.8 * stats.heap_size_limit;
-
-    const byteUnits = getBytesUnit(Math.max(this.maxHeapSize, stats.heap_size_limit));
-
-    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)})!`);
-    }
-    if (this.lastHeapLogTime === null || (now - this.lastHeapLogTime) > (this.heapLogInterval * 1000)) {
-      logger.debug(`Memory usage: ${formatBytes(this.maxHeapSize, byteUnits)} / ${formatBytes(stats.heap_size_limit, byteUnits)}`);
-      this.warnedHeapCritical = false;
-      this.maxHeapSize = 0;
-      this.lastHeapLogTime = now;
-    }
-  }
 }

 ((): Server => new Server())();
--- a/backend/src/indexer.ts
+++ b/backend/src/indexer.ts
@@ -76,13 +76,13 @@ class Indexer {
      this.tasksRunning.push(task);
      const lastestPriceId = await PricesRepository.$getLatestPriceId();
      if (priceUpdater.historyInserted === false || lastestPriceId === null) {
-        logger.debug(`Blocks prices indexer is waiting for the price updater to complete`, logger.tags.mining);
+        logger.debug(`Blocks prices indexer is waiting for the price updater to complete`);
        setTimeout(() => {
          this.tasksRunning = this.tasksRunning.filter(runningTask => runningTask !== task);
          this.runSingleTask('blocksPrices');
        }, 10000);
      } else {
-        logger.debug(`Blocks prices indexer will run now`, logger.tags.mining);
+        logger.debug(`Blocks prices indexer will run now`);
        await mining.$indexBlockPrices();
        this.tasksRunning = this.tasksRunning.filter(runningTask => runningTask !== task);
      }
@@ -112,7 +112,7 @@ class Indexer {
    this.runIndexer = false;
    this.indexerRunning = true;

-    logger.debug(`Running mining indexer`);
+    logger.info(`Running mining indexer`);

    await this.checkAvailableCoreIndexes();

@@ -122,7 +122,7 @@ class Indexer {
      const chainValid = await blocks.$generateBlockDatabase();
      if (chainValid === false) {
        // Chain of block hash was invalid, so we need to reindex. Stop here and continue at the next iteration
-        logger.warn(`The chain of block hash is invalid, re-indexing invalid data in 10 seconds.`, logger.tags.mining);
+        logger.warn(`The chain of block hash is invalid, re-indexing invalid data in 10 seconds.`);
        setTimeout(() => this.reindex(), 10000);
        this.indexerRunning = false;
        return;
--- a/backend/src/logger.ts
+++ b/backend/src/logger.ts
@@ -69,10 +69,6 @@ class Logger {
    this.network = this.getNetwork();
  }

-  public updateNetwork(): void {
-    this.network = this.getNetwork();
-  }
-
  private addprio(prio): void {
    this[prio] = (function(_this) {
      return function(msg, tag?: string) {
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -32,9 +32,7 @@ export interface BlockAudit {
  hash: string,
  missingTxs: string[],
  freshTxs: string[],
-  sigopTxs: string[],
  addedTxs: string[],
-  acceleratedTxs: string[],
  matchRate: number,
 }

@@ -60,7 +58,6 @@ export interface MempoolBlockWithTransactions extends MempoolBlock {
 export interface MempoolBlockDelta {
  added: TransactionStripped[];
  removed: string[];
-  changed: { txid: string, rate: number | undefined }[];
 }

 interface VinStrippedToScriptsig {
@@ -82,52 +79,25 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
  descendants?: Ancestor[];
  bestDescendant?: BestDescendant | null;
  cpfpChecked?: boolean;
-  position?: {
-    block: number,
-    vsize: number,
-  };
-  acceleration?: number;
-  uid?: number;
-}
-
-export interface MempoolTransactionExtended extends TransactionExtended {
-  sigops: number;
-  adjustedVsize: number;
-  adjustedFeePerVsize: number;
+  deleteAfter?: number;
 }

 export interface AuditTransaction {
-  uid: number;
+  txid: string;
  fee: number;
  weight: number;
  feePerVsize: number;
  effectiveFeePerVsize: number;
-  sigops: number;
-  inputs: number[];
+  vin: string[];
  relativesSet: boolean;
-  ancestorMap: Map<number, AuditTransaction>;
+  ancestorMap: Map<string, AuditTransaction>;
  children: Set<AuditTransaction>;
  ancestorFee: number;
  ancestorWeight: number;
-  ancestorSigops: number;
  score: number;
  used: boolean;
  modified: boolean;
  modifiedNode: HeapNode<AuditTransaction>;
-  dependencyRate?: number;
-}
-
-export interface CompactThreadTransaction {
-  uid: number;
-  fee: number;
-  weight: number;
-  sigops: number;
-  feePerVsize: number;
-  effectiveFeePerVsize?: number;
-  inputs: number[];
-  cpfpRoot?: string;
-  cpfpChecked?: boolean;
-  dirty?: boolean;
 }

 export interface ThreadTransaction {
@@ -136,7 +106,7 @@ export interface ThreadTransaction {
  weight: number;
  feePerVsize: number;
  effectiveFeePerVsize?: number;
-  inputs: number[];
+  vin: string[];
  cpfpRoot?: string;
  cpfpChecked?: boolean;
 }
@@ -175,8 +145,6 @@ export interface TransactionStripped {
  fee: number;
  vsize: number;
  value: number;
-  acc?: number;
-  rate?: number; // effective fee rate
 }

 export interface BlockExtension {
@@ -185,7 +153,6 @@ export interface BlockExtension {
  feeRange: number[]; // fee rate percentiles
  reward: number;
  matchRate: number | null;
-  similarity?: number;
  pool: {
    id: number; // Note - This is the `unique_id`, not to mix with the auto increment `id`
    name: string;
@@ -246,21 +213,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;
@@ -341,6 +293,7 @@ interface RequiredParams {
 }

 export interface ILoadingIndicators { [name: string]: number; }
+export interface IConversionRates { [currency: string]: number; }

 export interface IBackendInfo {
  hostname: string;
@@ -356,11 +309,9 @@ export interface IDifficultyAdjustment {
  remainingBlocks: number;
  remainingTime: number;
  previousRetarget: number;
-  previousTime: number;
  nextRetargetHeight: number;
  timeAvg: number;
  timeOffset: number;
-  expectedBlocks: number;
 }

 export interface IndexedDifficultyAdjustment {
--- a/backend/src/repositories/BlocksAuditsRepository.ts
+++ b/backend/src/repositories/BlocksAuditsRepository.ts
@@ -6,19 +6,20 @@ 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, accelerated_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), JSON.stringify(audit.acceleratedTxs), 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`);
      } else {
        logger.err(`Cannot save block audit into db. Reason: ` + (e instanceof Error ? e.message : e));
+        throw e;
      }
    }
  }

-  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`;

@@ -31,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;
    }
  }
@@ -51,10 +52,9 @@ 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, accelerated_txs as acceleratedTxs, 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_templates ON blocks_templates.id = blocks_audits.hash
        JOIN blocks_summaries ON blocks_summaries.id = blocks_audits.hash
        WHERE blocks_audits.hash = "${hash}"
      `);
@@ -63,8 +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].acceleratedTxs = JSON.parse(rows[0].acceleratedTxs);
        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]
   */
@@ -398,55 +330,6 @@ class BlocksRepository {
    }
  }

-  /**
-   * Get average block health for all blocks for a single pool
-   */
-  public async $getAvgBlockHealthPerPoolId(poolId: number): Promise<number> {
-    const params: any[] = [];
-    const query = `
-      SELECT AVG(blocks_audits.match_rate) AS avg_match_rate
-      FROM blocks
-      JOIN blocks_audits ON blocks.height = blocks_audits.height
-      WHERE blocks.pool_id = ?
-    `;
-    params.push(poolId);
-
-    try {
-      const [rows] = await DB.query(query, params);
-      if (!rows[0] || !rows[0].avg_match_rate) {
-        return 0;
-      }
-      return Math.round(rows[0].avg_match_rate * 100) / 100;
-    } catch (e) {
-      logger.err(`Cannot get average block health for pool id ${poolId}. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  /**
-   * Get average block health for all blocks for a single pool
-   */
-  public async $getTotalRewardForPoolId(poolId: number): Promise<number> {
-    const params: any[] = [];
-    const query = `
-      SELECT sum(reward) as total_reward
-      FROM blocks
-      WHERE blocks.pool_id = ?
-    `;
-    params.push(poolId);
-
-    try {
-      const [rows] = await DB.query(query, params);
-      if (!rows[0] || !rows[0].total_reward) {
-        return 0;
-      }
-      return rows[0].total_reward;
-    } catch (e) {
-      logger.err(`Cannot get total reward for pool id ${poolId}. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
  /**
   * Get the oldest indexed block
   */
@@ -500,7 +383,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 +410,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 +550,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 +570,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}`);
@@ -840,7 +748,6 @@ class BlocksRepository {
        SELECT height
        FROM compact_cpfp_clusters
        WHERE height <= ? AND height >= ?
-        GROUP BY height
        ORDER BY height DESC;
      `, [currentBlockHeight, minHeight]);

@@ -951,32 +858,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 +928,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 +935,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;
+      }
    }
  }

@@ -36,16 +42,17 @@ class BlocksSummariesRepository {
    try {
      const transactions = JSON.stringify(params.template?.transactions || []);
      await DB.query(`
-        INSERT INTO blocks_templates (id, template)
-        VALUE (?, ?)
+        INSERT INTO blocks_summaries (height, id, transactions, template)
+        VALUE (?, ?, ?, ?)
        ON DUPLICATE KEY UPDATE
          template = ?
-      `, [blockId, transactions, transactions]);
+      `, [params.height, blockId, '[]', transactions, transactions]);
    } catch (e: any) {
      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
        logger.debug(`Cannot save block template for ${blockId} because it has already been indexed, ignoring`);
      } else {
-        logger.warn(`Cannot save block template for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
+        logger.debug(`Cannot save block template for ${blockId}. Reason: ${e instanceof Error ? e.message : e}`);
+        throw e;
      }
    }
  }
@@ -61,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/DifficultyAdjustmentsRepository.ts
+++ b/backend/src/repositories/DifficultyAdjustmentsRepository.ts
@@ -20,9 +20,9 @@ class DifficultyAdjustmentsRepository {
      await DB.query(query, params);
    } catch (e: any) {
      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
-        logger.debug(`Cannot save difficulty adjustment at block ${adjustment.height}, already indexed, ignoring`, logger.tags.mining);
+        logger.debug(`Cannot save difficulty adjustment at block ${adjustment.height}, already indexed, ignoring`);
      } else {
-        logger.err(`Cannot save difficulty adjustment at block ${adjustment.height}. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining);
+        logger.err(`Cannot save difficulty adjustment at block ${adjustment.height}. Reason: ${e instanceof Error ? e.message : e}`);
        throw e;
      }
    }
@@ -54,7 +54,7 @@ class DifficultyAdjustmentsRepository {
      const [rows] = await DB.query(query);
      return rows as IndexedDifficultyAdjustment[];
    } catch (e) {
-      logger.err(`Cannot get difficulty adjustments from the database. Reason: ` + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err(`Cannot get difficulty adjustments from the database. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -83,7 +83,7 @@ class DifficultyAdjustmentsRepository {
      const [rows] = await DB.query(query);
      return rows as IndexedDifficultyAdjustment[];
    } catch (e) {
-      logger.err(`Cannot get difficulty adjustments from the database. Reason: ` + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err(`Cannot get difficulty adjustments from the database. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -93,27 +93,27 @@ class DifficultyAdjustmentsRepository {
      const [rows]: any[] = await DB.query(`SELECT height FROM difficulty_adjustments`);
      return rows.map(block => block.height);
    } catch (e: any) {
-      logger.err(`Cannot get difficulty adjustment block heights. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining);
+      logger.err(`Cannot get difficulty adjustment block heights. Reason: ${e instanceof Error ? e.message : e}`);
      throw e;
    }
  }

  public async $deleteAdjustementsFromHeight(height: number): Promise<void> {
    try {
-      logger.info(`Delete newer difficulty adjustments from height ${height} from the database`, logger.tags.mining);
+      logger.info(`Delete newer difficulty adjustments from height ${height} from the database`);
      await DB.query(`DELETE FROM difficulty_adjustments WHERE height >= ?`, [height]);
    } catch (e: any) {
-      logger.err(`Cannot delete difficulty adjustments from the database. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining);
+      logger.err(`Cannot delete difficulty adjustments from the database. Reason: ${e instanceof Error ? e.message : e}`);
      throw e;
    }
  }

  public async $deleteLastAdjustment(): Promise<void> {
    try {
-      logger.info(`Delete last difficulty adjustment from the database`, logger.tags.mining);
+      logger.info(`Delete last difficulty adjustment from the database`);
      await DB.query(`DELETE FROM difficulty_adjustments ORDER BY time LIMIT 1`);
    } catch (e: any) {
-      logger.err(`Cannot delete last difficulty adjustment from the database. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining);
+      logger.err(`Cannot delete last difficulty adjustment from the database. Reason: ${e instanceof Error ? e.message : e}`);
      throw e;
    }
  }
--- a/backend/src/repositories/HashratesRepository.ts
+++ b/backend/src/repositories/HashratesRepository.ts
@@ -25,7 +25,7 @@ class HashratesRepository {
    try {
      await DB.query(query);
    } catch (e: any) {
-      logger.err('Cannot save indexed hashrate into db. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot save indexed hashrate into db. Reason: ' + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -51,7 +51,7 @@ class HashratesRepository {
      const [rows]: any[] = await DB.query(query);
      return rows;
    } catch (e) {
-      logger.err('Cannot fetch network hashrate history. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot fetch network hashrate history. Reason: ' + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -78,7 +78,7 @@ class HashratesRepository {
      const [rows]: any[] = await DB.query(query);
      return rows;
    } catch (e) {
-      logger.err('Cannot fetch network hashrate history. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot fetch network hashrate history. Reason: ' + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -93,7 +93,7 @@ class HashratesRepository {
      const [rows]: any[] = await DB.query(query);
      return rows.map(row => row.timestamp);
    } catch (e) {
-      logger.err('Cannot retreive indexed weekly hashrate timestamps. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot retreive indexed weekly hashrate timestamps. Reason: ' + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -128,7 +128,7 @@ class HashratesRepository {
      const [rows]: any[] = await DB.query(query);
      return rows;
    } catch (e) {
-      logger.err('Cannot fetch weekly pools hashrate history. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot fetch weekly pools hashrate history. Reason: ' + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -158,7 +158,7 @@ class HashratesRepository {
      const [rows]: any[] = await DB.query(query, [pool.id]);
      boundaries = rows[0];
    } catch (e) {
-      logger.err('Cannot fetch hashrate start/end timestamps for this pool. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot fetch hashrate start/end timestamps for this pool. Reason: ' + (e instanceof Error ? e.message : e));
    }

    // Get hashrates entries between boundaries
@@ -173,7 +173,7 @@ class HashratesRepository {
      const [rows]: any[] = await DB.query(query, [boundaries.firstTimestamp, boundaries.lastTimestamp, pool.id]);
      return rows;
    } catch (e) {
-      logger.err('Cannot fetch pool hashrate history for this pool. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot fetch pool hashrate history for this pool. Reason: ' + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -192,7 +192,7 @@ class HashratesRepository {
      }
      return rows[0]['number'];
    } catch (e) {
-      logger.err(`Cannot retrieve last indexing run for ${key}. Reason: ` + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err(`Cannot retrieve last indexing run for ${key}. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }
@@ -201,7 +201,7 @@ class HashratesRepository {
   * Delete most recent data points for re-indexing
   */
  public async $deleteLastEntries() {
-    logger.info(`Delete latest hashrates data points from the database`, logger.tags.mining);
+    logger.info(`Delete latest hashrates data points from the database`);

    try {
      const [rows]: any[] = await DB.query(`SELECT MAX(hashrate_timestamp) as timestamp FROM hashrates GROUP BY type`);
@@ -212,7 +212,7 @@ class HashratesRepository {
      mining.lastHashrateIndexingDate = null;
      mining.lastWeeklyHashrateIndexingDate = null;
    } catch (e) {
-      logger.err('Cannot delete latest hashrates data points. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot delete latest hashrates data points. Reason: ' + (e instanceof Error ? e.message : e));
    }
  }
  
@@ -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]);
@@ -228,7 +228,7 @@ class HashratesRepository {
      mining.lastHashrateIndexingDate = null;
      mining.lastWeeklyHashrateIndexingDate = null;
    } catch (e) {
-      logger.err('Cannot delete latest hashrates data points. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
+      logger.err('Cannot delete latest hashrates data points. Reason: ' + (e instanceof Error ? e.message : e));
    }
  }
 }
--- a/backend/src/repositories/PricesRepository.ts
+++ b/backend/src/repositories/PricesRepository.ts
@@ -1,5 +1,6 @@
 import DB from '../database';
 import logger from '../logger';
+import { IConversionRates } from '../mempool.interfaces';
 import priceUpdater from '../tasks/price-updater';

 export interface ApiPrice {
@@ -12,16 +13,6 @@ export interface ApiPrice {
  AUD: number,
  JPY: number,
 }
-const ApiPriceFields = `
-  UNIX_TIMESTAMP(time) as time,
-  USD,
-  EUR,
-  GBP,
-  CAD,
-  CHF,
-  AUD,
-  JPY
-`;

 export interface ExchangeRates {
  USDEUR: number,
@@ -48,7 +39,7 @@ export const MAX_PRICES = {
 };

 class PricesRepository {
-  public async $savePrices(time: number, prices: ApiPrice): Promise<void> {
+  public async $savePrices(time: number, prices: IConversionRates): Promise<void> {
    if (prices.USD === -1) {
      // Some historical price entries have no USD prices, so we just ignore them to avoid future UX issues
      // As of today there are only 4 (on 2013-09-05, 2013-0909, 2013-09-12 and 2013-09-26) so that's fine
@@ -69,115 +60,77 @@ class PricesRepository {
        VALUE             (FROM_UNIXTIME(?), ?,   ?,   ?,   ?,   ?,   ?,   ?  )`,
        [time, prices.USD, prices.EUR, prices.GBP, prices.CAD, prices.CHF, prices.AUD, prices.JPY]
      );
-    } catch (e) {
+    } catch (e: any) {
      logger.err(`Cannot save exchange rate into db. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
    }
  }

  public async $getOldestPriceTime(): Promise<number> {
-    const [oldestRow] = await DB.query(`
-      SELECT UNIX_TIMESTAMP(time) AS time
-      FROM prices
-      ORDER BY time
-      LIMIT 1
-    `);
+    const [oldestRow] = await DB.query(`SELECT UNIX_TIMESTAMP(time) as time from prices WHERE USD != 0 ORDER BY time LIMIT 1`);
    return oldestRow[0] ? oldestRow[0].time : 0;
  }

  public async $getLatestPriceId(): Promise<number | null> {
-    const [oldestRow] = await DB.query(`
-      SELECT id
-      FROM prices
-      ORDER BY time DESC
-      LIMIT 1`
-    );
+    const [oldestRow] = await DB.query(`SELECT id from prices WHERE USD != 0 ORDER BY time DESC LIMIT 1`);
    return oldestRow[0] ? oldestRow[0].id : null;
  }

  public async $getLatestPriceTime(): Promise<number> {
-    const [oldestRow] = await DB.query(`
-      SELECT UNIX_TIMESTAMP(time) AS time
-      FROM prices
-      ORDER BY time DESC
-      LIMIT 1`
-    );
+    const [oldestRow] = await DB.query(`SELECT UNIX_TIMESTAMP(time) as time from prices WHERE USD != 0 ORDER BY time DESC LIMIT 1`);
    return oldestRow[0] ? oldestRow[0].time : 0;
  }

  public async $getPricesTimes(): Promise<number[]> {
-    const [times] = await DB.query(`
-      SELECT UNIX_TIMESTAMP(time) AS time
-      FROM prices
-      WHERE USD != -1
-      ORDER BY time
-    `);
-    if (!Array.isArray(times)) {
-      return [];
-    }
+    const [times]: any[] = await DB.query(`SELECT UNIX_TIMESTAMP(time) as time from prices WHERE USD != 0 ORDER BY time`);
    return times.map(time => time.time);
  }

-  public async $getPricesTimesAndId(): Promise<{time: number, id: number, USD: number}[]> {
-    const [times] = await DB.query(`
-      SELECT
-        UNIX_TIMESTAMP(time) AS time,
-        id,
-        USD
-      FROM prices
-      ORDER BY time
-    `);
-    return times as {time: number, id: number, USD: number}[];
+  public async $getPricesTimesAndId(): Promise<number[]> {
+    const [times]: any[] = await DB.query(`SELECT UNIX_TIMESTAMP(time) as time, id, USD from prices ORDER BY time`);
+    return times;
  }

-  public async $getLatestConversionRates(): Promise<ApiPrice> {
-    const [rates] = await DB.query(`
-      SELECT ${ApiPriceFields}
+  public async $getLatestConversionRates(): Promise<any> {
+    const [rates]: any[] = await DB.query(`
+      SELECT USD, EUR, GBP, CAD, CHF, AUD, JPY
      FROM prices
      ORDER BY time DESC
      LIMIT 1`
    );
-
-    if (!Array.isArray(rates) || rates.length === 0) {
+    if (!rates || rates.length === 0) {
      return priceUpdater.getEmptyPricesObj();
    }
-    return rates[0] as ApiPrice;
+    return rates[0];
  }

  public async $getNearestHistoricalPrice(timestamp: number | undefined): Promise<Conversion | null> {
    try {
-      const [rates] = await DB.query(`
-        SELECT ${ApiPriceFields}
+      const [rates]: any[] = await DB.query(`
+        SELECT *, UNIX_TIMESTAMP(time) AS time
        FROM prices
        WHERE UNIX_TIMESTAMP(time) < ?
        ORDER BY time DESC
        LIMIT 1`,
        [timestamp]
      );
-      if (!Array.isArray(rates)) {
+      if (!rates) {
        throw Error(`Cannot get single historical price from the database`);
      }

      // Compute fiat exchange rates
-      let latestPrice = rates[0] as ApiPrice;
-      if (!latestPrice || latestPrice.USD === -1) {
-        latestPrice = priceUpdater.getEmptyPricesObj();
-      }
-
-      const computeFx = (usd: number, other: number): number =>
-        Math.round(Math.max(other, 0) / Math.max(usd, 1) * 100) / 100;
-      
+      const latestPrice = await this.$getLatestConversionRates();
      const exchangeRates: ExchangeRates = {
-        USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-        USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-        USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-        USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-        USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-        USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
+        USDEUR: Math.round(latestPrice.EUR / latestPrice.USD * 100) / 100,
+        USDGBP: Math.round(latestPrice.GBP / latestPrice.USD * 100) / 100,
+        USDCAD: Math.round(latestPrice.CAD / latestPrice.USD * 100) / 100,
+        USDCHF: Math.round(latestPrice.CHF / latestPrice.USD * 100) / 100,
+        USDAUD: Math.round(latestPrice.AUD / latestPrice.USD * 100) / 100,
+        USDJPY: Math.round(latestPrice.JPY / latestPrice.USD * 100) / 100,
      };

      return {
-        prices: rates as ApiPrice[],
+        prices: rates,
        exchangeRates: exchangeRates
      };
    } catch (e) {
@@ -188,35 +141,28 @@ class PricesRepository {

  public async $getHistoricalPrices(): Promise<Conversion | null> {
    try {
-      const [rates] = await DB.query(`
-        SELECT ${ApiPriceFields}
+      const [rates]: any[] = await DB.query(`
+        SELECT *, UNIX_TIMESTAMP(time) AS time
        FROM prices
        ORDER BY time DESC
      `);
-      if (!Array.isArray(rates)) {
+      if (!rates) {
        throw Error(`Cannot get average historical price from the database`);
      }

      // Compute fiat exchange rates
-      let latestPrice = rates[0] as ApiPrice;
-      if (latestPrice.USD === -1) {
-        latestPrice = priceUpdater.getEmptyPricesObj();
-      }
-
-      const computeFx = (usd: number, other: number): number =>
-        Math.round(Math.max(other, 0) / Math.max(usd, 1) * 100) / 100;
-      
+      const latestPrice: ApiPrice = rates[0];
      const exchangeRates: ExchangeRates = {
-        USDEUR: computeFx(latestPrice.USD, latestPrice.EUR),
-        USDGBP: computeFx(latestPrice.USD, latestPrice.GBP),
-        USDCAD: computeFx(latestPrice.USD, latestPrice.CAD),
-        USDCHF: computeFx(latestPrice.USD, latestPrice.CHF),
-        USDAUD: computeFx(latestPrice.USD, latestPrice.AUD),
-        USDJPY: computeFx(latestPrice.USD, latestPrice.JPY),
+        USDEUR: Math.round(latestPrice.EUR / latestPrice.USD * 100) / 100,
+        USDGBP: Math.round(latestPrice.GBP / latestPrice.USD * 100) / 100,
+        USDCAD: Math.round(latestPrice.CAD / latestPrice.USD * 100) / 100,
+        USDCHF: Math.round(latestPrice.CHF / latestPrice.USD * 100) / 100,
+        USDAUD: Math.round(latestPrice.AUD / latestPrice.USD * 100) / 100,
+        USDJPY: Math.round(latestPrice.JPY / latestPrice.USD * 100) / 100,
      };

      return {
-        prices: rates as ApiPrice[],
+        prices: rates,
        exchangeRates: exchangeRates
      };
    } catch (e) {
--- 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/stats-updater.service.ts
+++ b/backend/src/tasks/lightning/stats-updater.service.ts
@@ -22,15 +22,12 @@ class LightningStatsUpdater {
   * Update the latest entry for each node every config.LIGHTNING.STATS_REFRESH_INTERVAL seconds
   */
  private async $logStatsDaily(): Promise<void> {
-    try {
-      const date = new Date();
-      Common.setDateMidnight(date);
-      const networkGraph = await lightningApi.$getNetworkGraph();
-      await LightningStatsImporter.computeNetworkStats(date.getTime() / 1000, networkGraph);
-      logger.debug(`Updated latest network stats`, logger.tags.ln);
-    } catch (e) {
-      logger.err(`Exception in $logStatsDaily. Reason: ${(e instanceof Error ? e.message : e)}`);
-    }
+    const date = new Date();
+    Common.setDateMidnight(date);
+    const networkGraph = await lightningApi.$getNetworkGraph();
+    await LightningStatsImporter.computeNetworkStats(date.getTime() / 1000, networkGraph);
+    
+    logger.debug(`Updated latest network stats`, logger.tags.ln);
  }
 }

--- 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();
  }

  /**
@@ -415,7 +411,7 @@ class LightningStatsImporter {
      }

      if (totalProcessed > 0) {
-        logger.info(`Lightning network stats historical import completed`, logger.tags.ln);
+        logger.notice(`Lightning network stats historical import completed`, logger.tags.ln);
      }
    } catch (e) {
      logger.err(`Lightning network stats historical failed. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.ln);
--- a/backend/src/tasks/pools-updater.ts
+++ b/backend/src/tasks/pools-updater.ts
@@ -12,14 +12,12 @@ import * as https from 'https';
 */
 class PoolsUpdater {
  lastRun: number = 0;
-  currentSha: string | null = null;
+  currentSha: string | undefined = undefined;
  poolsUrl: string = config.MEMPOOL.POOLS_JSON_URL;
  treeUrl: string = config.MEMPOOL.POOLS_JSON_TREE_URL;

  public async updatePoolsJson(): Promise<void> {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false ||
-      config.MEMPOOL.ENABLED === false
-    ) {
+    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
      return;
    }

@@ -35,7 +33,7 @@ class PoolsUpdater {

    try {
      const githubSha = await this.fetchPoolsSha(); // Fetch pools-v2.json sha from github
-      if (githubSha === null) {
+      if (githubSha === undefined) {
        return;
      }

@@ -44,12 +42,12 @@ class PoolsUpdater {
      }

      logger.debug(`pools-v2.json sha | Current: ${this.currentSha} | Github: ${githubSha}`);
-      if (this.currentSha !== null && this.currentSha === githubSha) {
+      if (this.currentSha !== undefined && this.currentSha === githubSha) {
        return;
      }

      // See backend README for more details about the mining pools update process
-      if (this.currentSha !== null && // If we don't have any mining pool, download it at least once
+      if (this.currentSha !== undefined && // If we don't have any mining pool, download it at least once
        config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING !== true && // Automatic pools update is disabled
        !process.env.npm_config_update_pools // We're not manually updating mining pool
      ) {
@@ -59,10 +57,10 @@ class PoolsUpdater {
      }

      const network = config.SOCKS5PROXY.ENABLED ? 'tor' : 'clearnet';
-      if (this.currentSha === null) {
+      if (this.currentSha === undefined) {
        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) {
@@ -84,7 +82,7 @@ class PoolsUpdater {
        logger.err(`Could not migrate mining pools, rolling back. Exception: ${JSON.stringify(e)}`, logger.tags.mining);
        await DB.query('ROLLBACK;');
      }
-      logger.info('PoolsUpdater completed');
+      logger.notice('PoolsUpdater completed');

    } catch (e) {
      this.lastRun = now - (oneWeek - oneDay); // Try again in 24h instead of waiting next week
@@ -110,20 +108,20 @@ class PoolsUpdater {
  /**
   * Fetch our latest pools-v2.json sha from the db
   */
-  private async getShaFromDb(): Promise<string | null> {
+  private async getShaFromDb(): Promise<string | undefined> {
    try {
      const [rows]: any[] = await DB.query('SELECT string FROM state WHERE name="pools_json_sha"');
-      return (rows.length > 0 ? rows[0].string : null);
+      return (rows.length > 0 ? rows[0].string : undefined);
    } catch (e) {
      logger.err('Cannot fetch pools-v2.json sha from db. Reason: ' + (e instanceof Error ? e.message : e), logger.tags.mining);
-      return null;
+      return undefined;
    }
  }

  /**
   * Fetch our latest pools-v2.json sha from github
   */
-  private async fetchPoolsSha(): Promise<string | null> {
+  private async fetchPoolsSha(): Promise<string | undefined> {
    const response = await this.query(this.treeUrl);

    if (response !== undefined) {
@@ -135,7 +133,7 @@ class PoolsUpdater {
    }

    logger.err(`Cannot find "pools-v2.json" in git tree (${this.treeUrl})`, logger.tags.mining);
-    return null;
+    return undefined;
  }

  /**
--- a/backend/src/tasks/price-feeds/bitfinex-api.ts
+++ b/backend/src/tasks/price-feeds/bitfinex-api.ts
@@ -8,6 +8,9 @@ class BitfinexApi implements PriceFeed {
  public url: string = 'https://api.bitfinex.com/v1/pubticker/BTC';
  public urlHist: string = 'https://api-pub.bitfinex.com/v2/candles/trade:{GRANULARITY}:tBTC{CURRENCY}/hist';

+  constructor() {
+  }
+
  public async $fetchPrice(currency): Promise<number> {
    const response = await query(this.url + currency);
    if (response && response['last_price']) {
--- a/backend/src/tasks/price-feeds/kraken-api.ts
+++ b/backend/src/tasks/price-feeds/kraken-api.ts
@@ -98,7 +98,7 @@ class KrakenApi implements PriceFeed {
    }

    if (Object.keys(priceHistory).length > 0) {
-      logger.info(`Inserted ${Object.keys(priceHistory).length} Kraken EUR, USD, GBP, JPY, CAD, CHF and AUD weekly price history into db`, logger.tags.mining);
+      logger.notice(`Inserted ${Object.keys(priceHistory).length} Kraken EUR, USD, GBP, JPY, CAD, CHF and AUD weekly price history into db`, logger.tags.mining);
    }
  }
 }
--- a/backend/src/tasks/price-updater.ts
+++ b/backend/src/tasks/price-updater.ts
@@ -2,7 +2,8 @@ import * as fs from 'fs';
 import path from 'path';
 import config from '../config';
 import logger from '../logger';
-import PricesRepository, { ApiPrice, MAX_PRICES } from '../repositories/PricesRepository';
+import { IConversionRates } from '../mempool.interfaces';
+import PricesRepository, { MAX_PRICES } from '../repositories/PricesRepository';
 import BitfinexApi from './price-feeds/bitfinex-api';
 import BitflyerApi from './price-feeds/bitflyer-api';
 import CoinbaseApi from './price-feeds/coinbase-api';
@@ -20,18 +21,18 @@ export interface PriceFeed {
 }

 export interface PriceHistory {
-  [timestamp: number]: ApiPrice;
+  [timestamp: number]: IConversionRates;
 }

 class PriceUpdater {
  public historyInserted = false;
-  private lastRun = 0;
-  private lastHistoricalRun = 0;
-  private running = false;
-  private feeds: PriceFeed[] = [];
-  private currencies: string[] = ['USD', 'EUR', 'GBP', 'CAD', 'CHF', 'AUD', 'JPY'];
-  private latestPrices: ApiPrice;
-  private ratesChangedCallback: ((rates: ApiPrice) => void) | undefined;
+  lastRun = 0;
+  lastHistoricalRun = 0;
+  running = false;
+  feeds: PriceFeed[] = [];
+  currencies: string[] = ['USD', 'EUR', 'GBP', 'CAD', 'CHF', 'AUD', 'JPY'];
+  latestPrices: IConversionRates;
+  private ratesChangedCallback: ((rates: IConversionRates) => void) | undefined;

  constructor() {
    this.latestPrices = this.getEmptyPricesObj();
@@ -43,13 +44,8 @@ class PriceUpdater {
    this.feeds.push(new GeminiApi());
  }

-  public getLatestPrices(): ApiPrice {
-    return this.latestPrices;
-  }
-
-  public getEmptyPricesObj(): ApiPrice {
+  public getEmptyPricesObj(): IConversionRates {
    return {
-      time: 0,
      USD: -1,
      EUR: -1,
      GBP: -1,
@@ -60,7 +56,7 @@ class PriceUpdater {
    };
  }

-  public setRatesChangedCallback(fn: (rates: ApiPrice) => void): void {
+  public setRatesChangedCallback(fn: (rates: IConversionRates) => void) {
    this.ratesChangedCallback = fn;
  }

@@ -73,11 +69,6 @@ class PriceUpdater {
  }

  public async $run(): Promise<void> {
-    if (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'testnet') {
-      // Coins have no value on testnet/signet, so we want to always show 0
-      return;
-    }
-
    if (this.running === true) {
      return;
    }
@@ -93,7 +84,7 @@ class PriceUpdater {
      if (this.historyInserted === false && config.DATABASE.ENABLED === true) {
        await this.$insertHistoricalPrices();
      }
-    } catch (e: any) {
+    } catch (e) {
      logger.err(`Cannot save BTC prices in db. Reason: ${e instanceof Error ? e.message : e}`, logger.tags.mining);
    }

@@ -165,10 +156,6 @@ class PriceUpdater {
    }

    this.lastRun = new Date().getTime() / 1000;
-
-    if (this.latestPrices.USD === -1) {
-      this.latestPrices = await PricesRepository.$getLatestConversionRates();
-    }
  }

  /**
@@ -222,7 +209,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[] = [];

@@ -237,7 +224,7 @@ class PriceUpdater {

    // Group them by timestamp and currency, for example
    // grouped[123456789]['USD'] = [1, 2, 3, 4];
-    const grouped = {};
+    const grouped: any = {};
    for (const historicalEntry of historicalPrices) {
      for (const time in historicalEntry) {
        if (existingPriceTimes.includes(parseInt(time, 10))) {
@@ -262,7 +249,7 @@ class PriceUpdater {
    // Average prices and insert everything into the db
    let totalInserted = 0;
    for (const time in grouped) {
-      const prices: ApiPrice = this.getEmptyPricesObj();
+      const prices: IConversionRates = this.getEmptyPricesObj();
      for (const currency in grouped[time]) {
        if (grouped[time][currency].length === 0) {
          continue;
--- a/backend/src/utils/format.ts
+++ b/backend/src/utils/format.ts
@@ -1,29 +0,0 @@
-const byteUnits = ['B', 'kB', 'MB', 'GB', 'TB'];
-
-export function getBytesUnit(bytes: number): string {
-  if (isNaN(bytes) || !isFinite(bytes)) {
-    return 'B';
-  }
-  
-  let unitIndex = 0;
-  while (unitIndex < byteUnits.length && bytes > 1024) {
-    unitIndex++;
-    bytes /= 1024;
-  }
-
-  return byteUnits[unitIndex];
-}
-
-export function formatBytes(bytes: number, toUnit: string, skipUnit = false): string {
-  if (isNaN(bytes) || !isFinite(bytes)) {
-    return `${bytes}`;
-  }
-  
-  let unitIndex = 0;
-  while (unitIndex < byteUnits.length && (toUnit && byteUnits[unitIndex] !== toUnit || (!toUnit && bytes > 1024))) {
-    unitIndex++;
-    bytes /= 1024;
-  }
-
-  return `${bytes.toFixed(2)}${skipUnit ? '' : ' ' + byteUnits[unitIndex]}`;
-}
--- 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
@@ -34,7 +34,6 @@ If you want to use different credentials, specify them in the `docker-compose.ym
      CORE_RPC_PORT: "8332"
      CORE_RPC_USERNAME: "customuser"
      CORE_RPC_PASSWORD: "custompassword"
-      CORE_RPC_TIMEOUT: "60000"
 ```

 The IP address in the example above refers to Docker's default gateway IP address so that the container can hit the `bitcoind` instance running on the host machine. If your setup is different, update it accordingly.
@@ -113,7 +112,6 @@ Below we list all settings from `mempool-config.json` and the corresponding over
    "ADVANCED_GBT_MEMPOOL": false,
    "CPFP_INDEXING": false,
    "MAX_BLOCKS_BULK_QUERY": 0,
-    "DISK_CACHE_BLOCK_INTERVAL": 6
  },
 ```

@@ -145,7 +143,6 @@ Corresponding `docker-compose.yml` overrides:
      MEMPOOL_ADVANCED_GBT_MEMPOOL: ""
      MEMPOOL_CPFP_INDEXING: ""
      MAX_BLOCKS_BULK_QUERY: ""
-      DISK_CACHE_BLOCK_INTERVAL: ""
      ...
 ```

@@ -161,8 +158,7 @@ Corresponding `docker-compose.yml` overrides:
    "HOST": "127.0.0.1",
    "PORT": 8332,
    "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 60000
+    "PASSWORD": "mempool"
  },
 ```

@@ -174,7 +170,6 @@ Corresponding `docker-compose.yml` overrides:
      CORE_RPC_PORT: ""
      CORE_RPC_USERNAME: ""
      CORE_RPC_PASSWORD: ""
-      CORE_RPC_TIMEOUT: 60000
      ...
 ```

@@ -204,9 +199,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 +208,6 @@ Corresponding `docker-compose.yml` overrides:
  api:
    environment:
      ESPLORA_REST_API_URL: ""
-      ESPLORA_UNIX_SOCKET_PATH: ""
-      ESPLORA_RETRY_UNIX_SOCKET_AFTER: ""
      ...
 ```

@@ -228,8 +219,7 @@ Corresponding `docker-compose.yml` overrides:
    "HOST": "127.0.0.1",
    "PORT": 8332,
    "USERNAME": "mempool",
-    "PASSWORD": "mempool",
-    "TIMEOUT": 60000
+    "PASSWORD": "mempool"
  },
 ```

@@ -241,7 +231,6 @@ Corresponding `docker-compose.yml` overrides:
      SECOND_CORE_RPC_PORT: ""
      SECOND_CORE_RPC_USERNAME: ""
      SECOND_CORE_RPC_PASSWORD: ""
-      SECOND_CORE_RPC_TIMEOUT: ""
      ...
 ```

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

@@ -415,7 +403,6 @@ Corresponding `docker-compose.yml` overrides:
    "TLS_CERT_PATH": ""
    "MACAROON_PATH": ""
    "REST_API_URL": "https://localhost:8080"
-    "TIMEOUT": 10000
  }
 ```

@@ -426,7 +413,6 @@ Corresponding `docker-compose.yml` overrides:
      LND_TLS_CERT_PATH: ""
      LND_MACAROON_PATH: ""
      LND_REST_API_URL: "https://localhost:8080"
-      LND_TIMEOUT: 10000
      ...
 ```

@@ -446,26 +432,3 @@ Corresponding `docker-compose.yml` overrides:
      CLIGHTNING_SOCKET: ""
      ...
 ```
-
-<br/>
-
-`mempool-config.json`:
-```json
-  "MAXMIND": {
-    "ENABLED": true,
-    "GEOLITE2_CITY": "/usr/local/share/GeoIP/GeoLite2-City.mmdb",
-    "GEOLITE2_ASN": "/usr/local/share/GeoIP/GeoLite2-ASN.mmdb",
-    "GEOIP2_ISP": "/usr/local/share/GeoIP/GeoIP2-ISP.mmdb"
-  }
-```
-
-Corresponding `docker-compose.yml` overrides:
-```yaml
-  api:
-    environment:
-      MAXMIND_ENABLED: true,
-      MAXMIND_GEOLITE2_CITY: "/backend/GeoIP/GeoLite2-City.mmdb",
-      MAXMIND_GEOLITE2_ASN": "/backend/GeoIP/GeoLite2-ASN.mmdb",
-      MAXMIND_GEOIP2_ISP": "/backend/GeoIP/GeoIP2-ISP.mmdb"
-      ...
-```
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -17,7 +17,6 @@ WORKDIR /backend

 RUN chown 1000:1000 ./
 COPY --from=builder --chown=1000:1000 /build/package ./package/
-COPY --from=builder --chown=1000:1000 /build/GeoIP ./GeoIP/
 COPY --from=builder --chown=1000:1000 /build/mempool-config.json /build/start.sh /build/wait-for-it.sh ./

 USER 1000
--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -26,17 +26,13 @@
    "ADVANCED_GBT_AUDIT": __MEMPOOL_ADVANCED_GBT_AUDIT__,
    "ADVANCED_GBT_MEMPOOL": __MEMPOOL_ADVANCED_GBT_MEMPOOL__,
    "CPFP_INDEXING": __MEMPOOL_CPFP_INDEXING__,
-    "MAX_BLOCKS_BULK_QUERY": __MEMPOOL_MAX_BLOCKS_BULK_QUERY__,
-    "DISK_CACHE_BLOCK_INTERVAL": __MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__,
-    "POOLS_JSON_TREE_URL": "__MEMPOOL_POOLS_JSON_TREE_URL__",
-    "POOLS_JSON_URL": "__MEMPOOL_POOLS_JSON_URL__"
+    "MAX_BLOCKS_BULK_QUERY": __MEMPOOL__MAX_BLOCKS_BULK_QUERY__
  },
  "CORE_RPC": {
    "HOST": "__CORE_RPC_HOST__",
    "PORT": __CORE_RPC_PORT__,
    "USERNAME": "__CORE_RPC_USERNAME__",
-    "PASSWORD": "__CORE_RPC_PASSWORD__",
-    "TIMEOUT": __CORE_RPC_TIMEOUT__
+    "PASSWORD": "__CORE_RPC_PASSWORD__"
  },
  "ELECTRUM": {
    "HOST": "__ELECTRUM_HOST__",
@@ -44,16 +40,13 @@
    "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__",
    "PORT": __SECOND_CORE_RPC_PORT__,
    "USERNAME": "__SECOND_CORE_RPC_USERNAME__",
-    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__",
-    "TIMEOUT": __SECOND_CORE_RPC_TIMEOUT__
+    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__"
  },
  "DATABASE": {
    "ENABLED": __DATABASE_ENABLED__,
@@ -62,8 +55,7 @@
    "PORT": __DATABASE_PORT__,
    "DATABASE": "__DATABASE_DATABASE__",
    "USERNAME": "__DATABASE_USERNAME__",
-    "PASSWORD": "__DATABASE_PASSWORD__",
-    "TIMEOUT": __DATABASE_TIMEOUT__
+    "PASSWORD": "__DATABASE_PASSWORD__"
  },
  "SYSLOG": {
    "ENABLED": __SYSLOG_ENABLED__,
@@ -86,15 +78,12 @@
    "STATS_REFRESH_INTERVAL": __LIGHTNING_STATS_REFRESH_INTERVAL__,
    "GRAPH_REFRESH_INTERVAL": __LIGHTNING_GRAPH_REFRESH_INTERVAL__,
    "LOGGER_UPDATE_INTERVAL": __LIGHTNING_LOGGER_UPDATE_INTERVAL__,
-    "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__",
-    "FORENSICS_INTERVAL": __LIGHTNING_FORENSICS_INTERVAL__,
-    "FORENSICS_RATE_LIMIT": __LIGHTNING_FORENSICS_RATE_LIMIT__
+    "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__"
  },
  "LND": {
    "TLS_CERT_PATH": "__LND_TLS_CERT_PATH__",
    "MACAROON_PATH": "__LND_MACAROON_PATH__",
-    "REST_API_URL": "__LND_REST_API_URL__",
-    "TIMEOUT": __LND_TIMEOUT__
+    "REST_API_URL": "__LND_REST_API_URL__"
  },
  "CLIGHTNING": {
    "SOCKET": "__CLIGHTNING_SOCKET__"
@@ -118,15 +107,5 @@
    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__",
    "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__",
    "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
-  },
-  "MAXMIND": {
-    "ENABLED": __MAXMIND_ENABLED__,
-    "GEOLITE2_CITY": "__MAXMIND_GEOLITE2_CITY__",
-    "GEOLITE2_ASN": "__MAXMIND_GEOLITE2_ASN__",
-    "GEOIP2_ISP": "__MAXMIND_GEOIP2_ISP__"
-  },
-  "MEMPOOL_SERVICES": {
-    "API": "__MEMPOOL_SERVICES_API__",
-    "ACCELERATIONS": __MEMPOOL_SERVICES_ACCELERATIONS__
  }
-}
+}
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -22,6 +22,7 @@ __MEMPOOL_EXTERNAL_MAX_RETRY__=${MEMPOOL_EXTERNAL_MAX_RETRY:=1}
 __MEMPOOL_EXTERNAL_RETRY_INTERVAL__=${MEMPOOL_EXTERNAL_RETRY_INTERVAL:=0}
 __MEMPOOL_USER_AGENT__=${MEMPOOL_USER_AGENT:=mempool}
 __MEMPOOL_STDOUT_LOG_MIN_PRIORITY__=${MEMPOOL_STDOUT_LOG_MIN_PRIORITY:=info}
+__MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=false}
 __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=false}
 __MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json}
 __MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master}
@@ -30,14 +31,12 @@ __MEMPOOL_ADVANCED_GBT_AUDIT__=${MEMPOOL_ADVANCED_GBT_AUDIT:=false}
 __MEMPOOL_ADVANCED_GBT_MEMPOOL__=${MEMPOOL_ADVANCED_GBT_MEMPOOL:=false}
 __MEMPOOL_CPFP_INDEXING__=${MEMPOOL_CPFP_INDEXING:=false}
 __MEMPOOL_MAX_BLOCKS_BULK_QUERY__=${MEMPOOL_MAX_BLOCKS_BULK_QUERY:=0}
-__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__=${MEMPOOL_DISK_CACHE_BLOCK_INTERVAL:=6}

 # CORE_RPC
 __CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1}
 __CORE_RPC_PORT__=${CORE_RPC_PORT:=8332}
 __CORE_RPC_USERNAME__=${CORE_RPC_USERNAME:=mempool}
 __CORE_RPC_PASSWORD__=${CORE_RPC_PASSWORD:=mempool}
-__CORE_RPC_TIMEOUT__=${CORE_RPC_TIMEOUT:=60000}

 # ELECTRUM
 __ELECTRUM_HOST__=${ELECTRUM_HOST:=127.0.0.1}
@@ -46,15 +45,12 @@ __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}
 __SECOND_CORE_RPC_PORT__=${SECOND_CORE_RPC_PORT:=8332}
 __SECOND_CORE_RPC_USERNAME__=${SECOND_CORE_RPC_USERNAME:=mempool}
 __SECOND_CORE_RPC_PASSWORD__=${SECOND_CORE_RPC_PASSWORD:=mempool}
-__SECOND_CORE_RPC_TIMEOUT__=${SECOND_CORE_RPC_TIMEOUT:=60000}

 # DATABASE
 __DATABASE_ENABLED__=${DATABASE_ENABLED:=true}
@@ -64,7 +60,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}
@@ -108,53 +103,40 @@ __LIGHTNING_TOPOLOGY_FOLDER__=${LIGHTNING_TOPOLOGY_FOLDER:=""}
 __LIGHTNING_STATS_REFRESH_INTERVAL__=${LIGHTNING_STATS_REFRESH_INTERVAL:=600}
 __LIGHTNING_GRAPH_REFRESH_INTERVAL__=${LIGHTNING_GRAPH_REFRESH_INTERVAL:=600}
 __LIGHTNING_LOGGER_UPDATE_INTERVAL__=${LIGHTNING_LOGGER_UPDATE_INTERVAL:=30}
-__LIGHTNING_FORENSICS_INTERVAL__=${LIGHTNING_FORENSICS_INTERVAL:=43200}
-__LIGHTNING_FORENSICS_RATE_LIMIT__=${LIGHTNING_FORENSICS_RATE_LIMIT:=20}

 # LND
 __LND_TLS_CERT_PATH__=${LND_TLS_CERT_PATH:=""}
 __LND_MACAROON_PATH__=${LND_MACAROON_PATH:=""}
 __LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"}
-__LND_TIMEOUT__=${LND_TIMEOUT:=10000}

 # CLN
 __CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""}

-# MAXMIND
-__MAXMIND_ENABLED__=${MAXMIND_ENABLED:=true}
-__MAXMIND_GEOLITE2_CITY__=${MAXMIND_GEOLITE2_CITY:="/backend/GeoIP/GeoLite2-City.mmdb"}
-__MAXMIND_GEOLITE2_ASN__=${MAXMIND_GEOLITE2_ASN:="/backend/GeoIP/GeoLite2-ASN.mmdb"}
-__MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_ISP:=""}
-
-# MEMPOOL_SERVICES
-__MEMPOOL_SERVICES_API__==${MEMPOOL_SERVICES_API:=""}
-__MEMPOOL_SERVICES_ACCELERATIONS__==${MEMPOOL_SERVICES_ACCELERATIONS:=false}
-
-
 mkdir -p "${__MEMPOOL_CACHE_DIR__}"

-sed -i "s!__MEMPOOL_NETWORK__!${__MEMPOOL_NETWORK__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_BACKEND__!${__MEMPOOL_BACKEND__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_ENABLED__!${__MEMPOOL_ENABLED__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_HTTP_PORT__!${__MEMPOOL_HTTP_PORT__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_SPAWN_CLUSTER_PROCS__!${__MEMPOOL_SPAWN_CLUSTER_PROCS__}!g" mempool-config.json
+sed -i "s/__MEMPOOL_NETWORK__/${__MEMPOOL_NETWORK__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_BACKEND__/${__MEMPOOL_BACKEND__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_ENABLED__/${__MEMPOOL_ENABLED__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_HTTP_PORT__/${__MEMPOOL_HTTP_PORT__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_SPAWN_CLUSTER_PROCS__/${__MEMPOOL_SPAWN_CLUSTER_PROCS__}/g" mempool-config.json
 sed -i "s!__MEMPOOL_API_URL_PREFIX__!${__MEMPOOL_API_URL_PREFIX__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_POLL_RATE_MS__!${__MEMPOOL_POLL_RATE_MS__}!g" mempool-config.json
+sed -i "s/__MEMPOOL_POLL_RATE_MS__/${__MEMPOOL_POLL_RATE_MS__}/g" mempool-config.json
 sed -i "s!__MEMPOOL_CACHE_DIR__!${__MEMPOOL_CACHE_DIR__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_CLEAR_PROTECTION_MINUTES__!${__MEMPOOL_CLEAR_PROTECTION_MINUTES__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__!${__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_BLOCK_WEIGHT_UNITS__!${__MEMPOOL_BLOCK_WEIGHT_UNITS__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_INITIAL_BLOCKS_AMOUNT__!${__MEMPOOL_INITIAL_BLOCKS_AMOUNT__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__!${__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_INDEXING_BLOCKS_AMOUNT__!${__MEMPOOL_INDEXING_BLOCKS_AMOUNT__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_BLOCKS_SUMMARIES_INDEXING__!${__MEMPOOL_BLOCKS_SUMMARIES_INDEXING__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__!${__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__}!g" mempool-config.json
+sed -i "s/__MEMPOOL_CLEAR_PROTECTION_MINUTES__/${__MEMPOOL_CLEAR_PROTECTION_MINUTES__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__/${__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_BLOCK_WEIGHT_UNITS__/${__MEMPOOL_BLOCK_WEIGHT_UNITS__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_INITIAL_BLOCKS_AMOUNT__/${__MEMPOOL_INITIAL_BLOCKS_AMOUNT__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__/${__MEMPOOL_MEMPOOL_BLOCKS_AMOUNT__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_INDEXING_BLOCKS_AMOUNT__/${__MEMPOOL_INDEXING_BLOCKS_AMOUNT__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_BLOCKS_SUMMARIES_INDEXING__/${__MEMPOOL_BLOCKS_SUMMARIES_INDEXING__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__/${__MEMPOOL_USE_SECOND_NODE_FOR_MINFEE__}/g" mempool-config.json
 sed -i "s!__MEMPOOL_EXTERNAL_ASSETS__!${__MEMPOOL_EXTERNAL_ASSETS__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_EXTERNAL_MAX_RETRY__!${__MEMPOOL_EXTERNAL_MAX_RETRY__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_EXTERNAL_RETRY_INTERVAL__!${__MEMPOOL_EXTERNAL_RETRY_INTERVAL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_USER_AGENT__!${__MEMPOOL_USER_AGENT__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__!${__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__!${__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__}!g" mempool-config.json
+sed -i "s/__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__/${__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_INDEXING_BLOCKS_AMOUNT__/${__MEMPOOL_INDEXING_BLOCKS_AMOUNT__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__/${__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__}/g" mempool-config.json
 sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_POOLS_JSON_TREE_URL__!${__MEMPOOL_POOLS_JSON_TREE_URL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_AUDIT__!${__MEMPOOL_AUDIT__}!g" mempool-config.json
@@ -162,55 +144,50 @@ sed -i "s!__MEMPOOL_ADVANCED_GBT_MEMPOOL__!${__MEMPOOL_ADVANCED_GBT_MEMPOOL__}!g
 sed -i "s!__MEMPOOL_ADVANCED_GBT_AUDIT__!${__MEMPOOL_ADVANCED_GBT_AUDIT__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_CPFP_INDEXING__!${__MEMPOOL_CPFP_INDEXING__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_MAX_BLOCKS_BULK_QUERY__!${__MEMPOOL_MAX_BLOCKS_BULK_QUERY__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__!${__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__}!g" mempool-config.json

-sed -i "s!__CORE_RPC_HOST__!${__CORE_RPC_HOST__}!g" mempool-config.json
-sed -i "s!__CORE_RPC_PORT__!${__CORE_RPC_PORT__}!g" mempool-config.json
-sed -i "s!__CORE_RPC_USERNAME__!${__CORE_RPC_USERNAME__}!g" mempool-config.json
-sed -i "s!__CORE_RPC_PASSWORD__!${__CORE_RPC_PASSWORD__}!g" mempool-config.json
-sed -i "s!__CORE_RPC_TIMEOUT__!${__CORE_RPC_TIMEOUT__}!g" mempool-config.json
+sed -i "s/__CORE_RPC_HOST__/${__CORE_RPC_HOST__}/g" mempool-config.json
+sed -i "s/__CORE_RPC_PORT__/${__CORE_RPC_PORT__}/g" mempool-config.json
+sed -i "s/__CORE_RPC_USERNAME__/${__CORE_RPC_USERNAME__}/g" mempool-config.json
+sed -i "s/__CORE_RPC_PASSWORD__/${__CORE_RPC_PASSWORD__}/g" mempool-config.json

-sed -i "s!__ELECTRUM_HOST__!${__ELECTRUM_HOST__}!g" mempool-config.json
-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/__ELECTRUM_HOST__/${__ELECTRUM_HOST__}/g" mempool-config.json
+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
-sed -i "s!__SECOND_CORE_RPC_USERNAME__!${__SECOND_CORE_RPC_USERNAME__}!g" mempool-config.json
-sed -i "s!__SECOND_CORE_RPC_PASSWORD__!${__SECOND_CORE_RPC_PASSWORD__}!g" mempool-config.json
-sed -i "s!__SECOND_CORE_RPC_TIMEOUT__!${__SECOND_CORE_RPC_TIMEOUT__}!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
+sed -i "s/__SECOND_CORE_RPC_USERNAME__/${__SECOND_CORE_RPC_USERNAME__}/g" mempool-config.json
+sed -i "s/__SECOND_CORE_RPC_PASSWORD__/${__SECOND_CORE_RPC_PASSWORD__}/g" mempool-config.json

-sed -i "s!__DATABASE_ENABLED__!${__DATABASE_ENABLED__}!g" mempool-config.json
-sed -i "s!__DATABASE_HOST__!${__DATABASE_HOST__}!g" mempool-config.json
+sed -i "s/__DATABASE_ENABLED__/${__DATABASE_ENABLED__}/g" mempool-config.json
+sed -i "s/__DATABASE_HOST__/${__DATABASE_HOST__}/g" mempool-config.json
 sed -i "s!__DATABASE_SOCKET__!${__DATABASE_SOCKET__}!g" mempool-config.json
-sed -i "s!__DATABASE_PORT__!${__DATABASE_PORT__}!g" mempool-config.json
-sed -i "s!__DATABASE_DATABASE__!${__DATABASE_DATABASE__}!g" mempool-config.json
-sed -i "s!__DATABASE_USERNAME__!${__DATABASE_USERNAME__}!g" mempool-config.json
-sed -i "s!__DATABASE_PASSWORD__!${__DATABASE_PASSWORD__}!g" mempool-config.json
-sed -i "s!__DATABASE_TIMEOUT__!${__DATABASE_TIMEOUT__}!g" mempool-config.json

-sed -i "s!__SYSLOG_ENABLED__!${__SYSLOG_ENABLED__}!g" mempool-config.json
-sed -i "s!__SYSLOG_HOST__!${__SYSLOG_HOST__}!g" mempool-config.json
-sed -i "s!__SYSLOG_PORT__!${__SYSLOG_PORT__}!g" mempool-config.json
-sed -i "s!__SYSLOG_MIN_PRIORITY__!${__SYSLOG_MIN_PRIORITY__}!g" mempool-config.json
-sed -i "s!__SYSLOG_FACILITY__!${__SYSLOG_FACILITY__}!g" mempool-config.json
+sed -i "s/__DATABASE_PORT__/${__DATABASE_PORT__}/g" mempool-config.json
+sed -i "s/__DATABASE_DATABASE__/${__DATABASE_DATABASE__}/g" mempool-config.json
+sed -i "s/__DATABASE_USERNAME__/${__DATABASE_USERNAME__}/g" mempool-config.json
+sed -i "s/__DATABASE_PASSWORD__/${__DATABASE_PASSWORD__}/g" mempool-config.json

-sed -i "s!__STATISTICS_ENABLED__!${__STATISTICS_ENABLED__}!g" mempool-config.json
-sed -i "s!__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__!${__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__}!g" mempool-config.json
+sed -i "s/__SYSLOG_ENABLED__/${__SYSLOG_ENABLED__}/g" mempool-config.json
+sed -i "s/__SYSLOG_HOST__/${__SYSLOG_HOST__}/g" mempool-config.json
+sed -i "s/__SYSLOG_PORT__/${__SYSLOG_PORT__}/g" mempool-config.json
+sed -i "s/__SYSLOG_MIN_PRIORITY__/${__SYSLOG_MIN_PRIORITY__}/g" mempool-config.json
+sed -i "s/__SYSLOG_FACILITY__/${__SYSLOG_FACILITY__}/g" mempool-config.json

-sed -i "s!__BISQ_ENABLED__!${__BISQ_ENABLED__}!g" mempool-config.json
+sed -i "s/__STATISTICS_ENABLED__/${__STATISTICS_ENABLED__}/g" mempool-config.json
+sed -i "s/__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__/${__STATISTICS_TX_PER_SECOND_SAMPLE_PERIOD__}/g" mempool-config.json
+
+sed -i "s/__BISQ_ENABLED__/${__BISQ_ENABLED__}/g" mempool-config.json
 sed -i "s!__BISQ_DATA_PATH__!${__BISQ_DATA_PATH__}!g" mempool-config.json

-sed -i "s!__SOCKS5PROXY_ENABLED__!${__SOCKS5PROXY_ENABLED__}!g" mempool-config.json
-sed -i "s!__SOCKS5PROXY_USE_ONION__!${__SOCKS5PROXY_USE_ONION__}!g" mempool-config.json
-sed -i "s!__SOCKS5PROXY_HOST__!${__SOCKS5PROXY_HOST__}!g" mempool-config.json
-sed -i "s!__SOCKS5PROXY_PORT__!${__SOCKS5PROXY_PORT__}!g" mempool-config.json
-sed -i "s!__SOCKS5PROXY_USERNAME__!${__SOCKS5PROXY_USERNAME__}!g" mempool-config.json
-sed -i "s!__SOCKS5PROXY_PASSWORD__!${__SOCKS5PROXY_PASSWORD__}!g" mempool-config.json
+sed -i "s/__SOCKS5PROXY_ENABLED__/${__SOCKS5PROXY_ENABLED__}/g" mempool-config.json
+sed -i "s/__SOCKS5PROXY_USE_ONION__/${__SOCKS5PROXY_USE_ONION__}/g" mempool-config.json
+sed -i "s/__SOCKS5PROXY_HOST__/${__SOCKS5PROXY_HOST__}/g" mempool-config.json
+sed -i "s/__SOCKS5PROXY_PORT__/${__SOCKS5PROXY_PORT__}/g" mempool-config.json
+sed -i "s/__SOCKS5PROXY_USERNAME__/${__SOCKS5PROXY_USERNAME__}/g" mempool-config.json
+sed -i "s/__SOCKS5PROXY_PASSWORD__/${__SOCKS5PROXY_PASSWORD__}/g" mempool-config.json

 sed -i "s!__PRICE_DATA_SERVER_TOR_URL__!${__PRICE_DATA_SERVER_TOR_URL__}!g" mempool-config.json
 sed -i "s!__PRICE_DATA_SERVER_CLEARNET_URL__!${__PRICE_DATA_SERVER_CLEARNET_URL__}!g" mempool-config.json
@@ -229,27 +206,13 @@ sed -i "s!__LIGHTNING_TOPOLOGY_FOLDER__!${__LIGHTNING_TOPOLOGY_FOLDER__}!g" memp
 sed -i "s!__LIGHTNING_STATS_REFRESH_INTERVAL__!${__LIGHTNING_STATS_REFRESH_INTERVAL__}!g" mempool-config.json
 sed -i "s!__LIGHTNING_GRAPH_REFRESH_INTERVAL__!${__LIGHTNING_GRAPH_REFRESH_INTERVAL__}!g" mempool-config.json
 sed -i "s!__LIGHTNING_LOGGER_UPDATE_INTERVAL__!${__LIGHTNING_LOGGER_UPDATE_INTERVAL__}!g" mempool-config.json
-sed -i "s!__LIGHTNING_FORENSICS_INTERVAL__!${__LIGHTNING_FORENSICS_INTERVAL__}!g" mempool-config.json
-sed -i "s!__LIGHTNING_FORENSICS_RATE_LIMIT__!${__LIGHTNING_FORENSICS_RATE_LIMIT__}!g" mempool-config.json

 # LND
 sed -i "s!__LND_TLS_CERT_PATH__!${__LND_TLS_CERT_PATH__}!g" mempool-config.json
 sed -i "s!__LND_MACAROON_PATH__!${__LND_MACAROON_PATH__}!g" mempool-config.json
 sed -i "s!__LND_REST_API_URL__!${__LND_REST_API_URL__}!g" mempool-config.json
-sed -i "s!__LND_TIMEOUT__!${__LND_TIMEOUT__}!g" mempool-config.json

 # CLN
 sed -i "s!__CLIGHTNING_SOCKET__!${__CLIGHTNING_SOCKET__}!g" mempool-config.json

-# MAXMIND
-sed -i "s!__MAXMIND_ENABLED__!${__MAXMIND_ENABLED__}!g" mempool-config.json
-sed -i "s!__MAXMIND_GEOLITE2_CITY__!${__MAXMIND_GEOLITE2_CITY__}!g" mempool-config.json
-sed -i "s!__MAXMIND_GEOLITE2_ASN__!${__MAXMIND_GEOLITE2_ASN__}!g" mempool-config.json
-sed -i "s!__MAXMIND_GEOIP2_ISP__!${__MAXMIND_GEOIP2_ISP__}!g" mempool-config.json
-
-# MEMPOOL_SERVICES
-sed -i "s!__MEMPOOL_SERVICES_API__!${__MEMPOOL_SERVICES_API__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_SERVICES_ACCELERATIONS__!${__MEMPOOL_SERVICES_ACCELERATIONS__}!g" mempool-config.json
-
-
 node /backend/package/index.js
--- a/docker/frontend/entrypoint.sh
+++ b/docker/frontend/entrypoint.sh
@@ -10,10 +10,6 @@ cp /etc/nginx/nginx.conf /patch/nginx.conf
 sed -i "s/__MEMPOOL_FRONTEND_HTTP_PORT__/${__MEMPOOL_FRONTEND_HTTP_PORT__}/g" /patch/nginx.conf
 cat /patch/nginx.conf > /etc/nginx/nginx.conf

-if [ "${LIGHTNING_DETECTED_PORT}" != "" ];then
-  export LIGHTNING=true
-fi
-
 # Runtime overrides - read env vars defined in docker compose

 __TESTNET_ENABLED__=${TESTNET_ENABLED:=false}
@@ -39,7 +35,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 +61,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/docker/init.sh
+++ b/docker/init.sh
@@ -3,11 +3,6 @@
 #backend
 cp ./docker/backend/* ./backend/

-#geoip-data
-mkdir -p ./backend/GeoIP/
-wget -O ./backend/GeoIP/GeoLite2-City.mmdb https://raw.githubusercontent.com/mempool/geoip-data/master/GeoLite2-City.mmdb
-wget -O ./backend/GeoIP/GeoLite2-ASN.mmdb https://raw.githubusercontent.com/mempool/geoip-data/master/GeoLite2-ASN.mmdb
-
 #frontend
 localhostIP="127.0.0.1"
 cp ./docker/frontend/* ./frontend
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -54,8 +54,7 @@ src/resources/assets-testnet.json
 src/resources/assets-testnet.minimal.json
 src/resources/pools.json
 src/resources/mining-pools/*
-src/resources/**/*.mp4
-src/resources/**/*.vtt
+src/resources/*.mp4

 # environment config
 mempool-frontend-config.json
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -106,15 +106,13 @@ https://www.transifex.com/mempool/mempool/dashboard/

 * Arabic @baro0k
 * Czech @pixelmade2
-* Danish @pierrevendelboe
 * German @Emzy
 * English (default)
 * Spanish @maxhodler @bisqes
 * Persian @techmix
 * French @Bayernatoor
-* Korean @kcalvinalvinn @sogoagain
+* Korean @kcalvinalvinn
 * Italian @HodlBits
-* Lithuanian @eimze21
 * Hebrew @rapidlab309
 * Georgian @wyd_idk
 * Hungarian @btcdragonlord
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -38,10 +38,6 @@
            "translation": "src/locale/messages.de.xlf",
            "baseHref": "/de/"
          },
-          "da": {
-            "translation": "src/locale/messages.da.xlf",
-            "baseHref": "/da/"
-          },
          "es": {
            "translation": "src/locale/messages.es.xlf",
            "baseHref": "/es/"
--- a/frontend/cypress/e2e/liquid/liquid.spec.ts
+++ b/frontend/cypress/e2e/liquid/liquid.spec.ts
@@ -158,10 +158,10 @@ describe('Liquid', () => {
      it('show empty unblinded TX', () => {
        cy.visit(`${basePath}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=`);
        cy.waitForSkeletonGone();
-        cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', 'ng-star-inserted');
+        cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', '');
        cy.get('.table-tx-vin tr:nth-child(1) .amount').should('contain.text', 'Confidential');
-        cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', 'ng-star-inserted');
-        cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', 'ng-star-inserted');
+        cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', '');
+        cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', '');
        cy.get('.table-tx-vout tr:nth-child(1) .amount').should('contain.text', 'Confidential');
        cy.get('.table-tx-vout tr:nth-child(2) .amount').should('contain.text', 'Confidential');
      });
@@ -169,8 +169,8 @@ describe('Liquid', () => {
      it('show invalid unblinded TX hex', () => {
        cy.visit(`${basePath}/tx/f2f41c0850e8e7e3f1af233161fd596662e67c11ef10ed15943884186fbb7f46#blinded=123`);
        cy.waitForSkeletonGone();
-        cy.get('.table-tx-vin tr').should('have.class', 'ng-star-inserted');
-        cy.get('.table-tx-vout tr').should('have.class', 'ng-star-inserted');
+        cy.get('.table-tx-vin tr').should('have.class', '');
+        cy.get('.table-tx-vout tr').should('have.class', '');
        cy.get('.error-unblinded').contains('Error: Invalid blinding data (invalid hex)');
      });

--- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
+++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
@@ -109,10 +109,10 @@ describe('Liquid Testnet', () => {
      it('show empty unblinded TX', () => {
        cy.visit(`${basePath}/tx/c3d908ab77891e4c569b0df71aae90f4720b157019ebb20db176f4f9c4d626b8#blinded=`);
        cy.waitForSkeletonGone();
-        cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', 'ng-star-inserted');
+        cy.get('.table-tx-vin tr:nth-child(1)').should('have.class', '');
        cy.get('.table-tx-vin tr:nth-child(1) .amount').should('contain.text', 'Confidential');
-        cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', 'ng-star-inserted');
-        cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', 'ng-star-inserted');
+        cy.get('.table-tx-vout tr:nth-child(1)').should('have.class', '');
+        cy.get('.table-tx-vout tr:nth-child(2)').should('have.class', '');
        cy.get('.table-tx-vout tr:nth-child(1) .amount').should('contain.text', 'Confidential');
        cy.get('.table-tx-vout tr:nth-child(2) .amount').should('contain.text', 'Confidential');
      });
@@ -120,8 +120,8 @@ describe('Liquid Testnet', () => {
      it('show invalid unblinded TX hex', () => {
        cy.visit(`${basePath}/tx/2477f220eef1d03f8ffa4a2861c275d155c3562adf0d79523aeeb0c59ee611ba#blinded=5000`);
        cy.waitForSkeletonGone();
-        cy.get('.table-tx-vin tr').should('have.class', 'ng-star-inserted');
-        cy.get('.table-tx-vout tr').should('have.class', 'ng-star-inserted');
+        cy.get('.table-tx-vin tr').should('have.class', '');
+        cy.get('.table-tx-vout tr').should('have.class', '');
        cy.get('.error-unblinded').contains('Error: Invalid blinding data (invalid hex)');
      });

--- 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.0-dev",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "mempool-frontend",
-      "version": "2.6.0-dev",
+      "version": "2.5.0-dev",
      "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.0-dev",
  "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,8 +4,6 @@ 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';
@@ -16,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';
@@ -59,10 +56,6 @@ let routes: Routes = [
            path: 'blocks',
            component: BlocksList,
          },
-          {
-            path: 'rbf',
-            component: RbfList,
-          },
          {
            path: 'terms-of-service',
            component: TermsOfServiceComponent
@@ -169,10 +162,6 @@ let routes: Routes = [
            path: 'blocks',
            component: BlocksList,
          },
-          {
-            path: 'rbf',
-            component: RbfList,
-          },
          {
            path: 'terms-of-service',
            component: TermsOfServiceComponent
@@ -275,10 +264,6 @@ let routes: Routes = [
        path: 'blocks',
        component: BlocksList,
      },
-      {
-        path: 'rbf',
-        component: RbfList,
-      },
      {
        path: 'terms-of-service',
        component: TermsOfServiceComponent
@@ -357,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 = {
@@ -96,9 +87,9 @@ export const languages: Language[] = [
   { code: 'ar', name: 'العربية' },         // Arabic
 // { code: 'bg', name: 'Български' },       // Bulgarian
 // { code: 'bs', name: 'Bosanski' },        // Bosnian
-// { code: 'ca', name: 'Català' },          // Catalan
+   { code: 'ca', name: 'Català' },          // Catalan
   { code: 'cs', name: 'Čeština' },         // Czech
-   { code: 'da', name: 'Dansk' },           // Danish
+// { code: 'da', name: 'Dansk' },           // Danish
   { code: 'de', name: 'Deutsch' },         // German
 // { code: 'et', name: 'Eesti' },           // Estonian
 // { code: 'el', name: 'Ελληνικά' },        // Greek
@@ -145,90 +136,13 @@ export const languages: Language[] = [
 ];

 export const specialBlocks = {
-  '0': {
-    labelEvent: 'Genesis',
-    labelEventCompleted: 'The Genesis of Bitcoin',
-    networks: ['mainnet', 'testnet'],
-  },
-  '210000': {
-    labelEvent: 'Bitcoin\'s 1st Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 25 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '420000': {
-    labelEvent: 'Bitcoin\'s 2nd Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 12.5 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '630000': {
-    labelEvent: 'Bitcoin\'s 3rd Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 6.25 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
  '709632': {
    labelEvent: 'Taproot 🌱 activation',
    labelEventCompleted: 'Taproot 🌱 has been activated!',
-    networks: ['mainnet'],
  },
  '840000': {
-    labelEvent: 'Bitcoin\'s 4th Halving',
+    labelEvent: 'Halving 🥳',
    labelEventCompleted: 'Block Subsidy has halved to 3.125 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '1050000': {
-    labelEvent: 'Bitcoin\'s 5th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 1.5625 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '1260000': {
-    labelEvent: 'Bitcoin\'s 6th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.78125 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '1470000': {
-    labelEvent: 'Bitcoin\'s 7th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.390625 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '1680000': {
-    labelEvent: 'Bitcoin\'s 8th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.1953125 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '1890000': {
-    labelEvent: 'Bitcoin\'s 9th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.09765625 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '2100000': {
-    labelEvent: 'Bitcoin\'s 10th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.04882812 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '2310000': {
-    labelEvent: 'Bitcoin\'s 11th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.02441406 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '2520000': {
-    labelEvent: 'Bitcoin\'s 12th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.01220703 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '2730000': {
-    labelEvent: 'Bitcoin\'s 13th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.00610351 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '2940000': {
-    labelEvent: 'Bitcoin\'s 14th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.00305175 BTC per block',
-    networks: ['mainnet', 'testnet'],
-  },
-  '3150000': {
-    labelEvent: 'Bitcoin\'s 15th Halving',
-    labelEventCompleted: 'Block Subsidy has halved to 0.00152587 BTC per block',
-    networks: ['mainnet', 'testnet'],
  }
 };

--- a/frontend/src/app/bisq/bisq-block/bisq-block.component.html
+++ b/frontend/src/app/bisq/bisq-block/bisq-block.component.html
@@ -24,7 +24,7 @@
                <td>
                  &lrm;{{ block.time | date:'yyyy-MM-dd HH:mm' }}
                  <div class="lg-inline">
-                    <i class="symbol">(<app-time kind="since" [time]="block.time / 1000" [fastRender]="true"></app-time>)</i>
+                    <i class="symbol">(<app-time-since [time]="block.time / 1000" [fastRender]="true"></app-time-since>)</i>
                  </div>
                </td>
              </tr>
--- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html
+++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html
@@ -17,7 +17,7 @@
      <tbody *ngIf="blocks.value; else loadingTmpl">
        <tr *ngFor="let block of blocks.value[0]; trackBy: trackByFn">
          <td><a [routerLink]="['/block/' | relativeUrl, block.hash]" [state]="{ data: { block: block } }">{{ block.height }}</a></td>
-          <td><app-time kind="since" [time]="block.time / 1000" [fastRender]="true"></app-time></td>
+          <td><app-time-since [time]="block.time / 1000" [fastRender]="true"></app-time-since></td>
          <td>{{ calculateTotalOutput(block) / 100 | number: '1.2-2' }} <span class="symbol">BSQ</span></td>
          <td class="d-none d-md-block">{{ block.txs.length }}</td>
        </tr> 
--- 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/bisq/bisq-transaction/bisq-transaction.component.html
+++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
@@ -15,9 +15,11 @@
      </span>
      <span class="grow"></span>
      <div class="container-buttons">
-        <div *ngIf="(latestBlock$ | async) as latestBlock">
-          <app-confirmations [chainTip]="latestBlock?.height" [height]="bisqTx.blockHeight" [hideUnconfirmed]="true" buttonClass="float-right"></app-confirmations>
-        </div>
+        <button *ngIf="(latestBlock$ | async) as latestBlock" type="button" class="btn btn-sm btn-success float-right">
+          <ng-container *ngTemplateOutlet="latestBlock.height - bisqTx.blockHeight + 1 == 1 ? confirmationSingular : confirmationPlural; context: {$implicit: latestBlock.height - bisqTx.blockHeight + 1}"></ng-container>
+          <ng-template #confirmationSingular let-i i18n="shared.confirmation-count.singular|Transaction singular confirmation count">{{ i }} confirmation</ng-template>
+          <ng-template #confirmationPlural let-i i18n="shared.confirmation-count.plural|Transaction plural confirmation count">{{ i }} confirmations</ng-template>
+        </button>
      </div>
    </div>
    
@@ -33,7 +35,7 @@
                  <td>
                    &lrm;{{ bisqTx.time | date:'yyyy-MM-dd HH:mm' }}
                    <div class="lg-inline">
-                      <i class="symbol">(<app-time kind="since" [time]="bisqTx.time / 1000" [fastRender]="true"></app-time>)</i>
+                      <i class="symbol">(<app-time-since [time]="bisqTx.time / 1000" [fastRender]="true"></app-time-since>)</i>
                    </div>
                  </td>
                </tr>
--- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html
+++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html
@@ -37,7 +37,7 @@
            {{ calculateTotalOutput(tx.outputs) / 100 | number: '1.2-2' }} <span class="d-none d-md-inline symbol">BSQ</span>
          </ng-template>
        </td>
-        <td><app-time kind="since" [time]="tx.time / 1000" [fastRender]="true"></app-time></td>
+        <td><app-time-since [time]="tx.time / 1000" [fastRender]="true"></app-time-since></td>
        <td class="d-none d-md-block"><a [routerLink]="['/block/' | relativeUrl, tx.blockHash]" [state]="{ data: { blockHeight: tx.blockHeight } }">{{ tx.blockHeight }}</a></td>
      </tr>
    </tbody>
--- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html
+++ b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html
@@ -70,7 +70,11 @@

    <div class="btn-container">
      <span *ngIf="showConfirmations && latestBlock$ | async as latestBlock">
-        <app-confirmations [chainTip]="latestBlock?.height" [height]="tx.blockHeight" [hideUnconfirmed]="true" buttonClass="mt-2"></app-confirmations>
+        <button type="button" class="btn btn-sm btn-success mt-2">
+          <ng-container *ngTemplateOutlet="latestBlock.height - tx.blockHeight + 1 == 1 ? confirmationSingular : confirmationPlural; context: {$implicit: latestBlock.height - tx.blockHeight + 1}"></ng-container>
+          <ng-template #confirmationSingular let-i i18n="shared.confirmation-count.singular|Transaction singular confirmation count">{{ i }} confirmation</ng-template>
+          <ng-template #confirmationPlural let-i i18n="shared.confirmation-count.plural|Transaction plural confirmation count">{{ i }} confirmations</ng-template>
+        </button>
        &nbsp;
      </span>
      <button type="button" class="btn btn-sm btn-primary mt-2" (click)="switchCurrency()">
--- a/frontend/src/app/bitcoin.utils.ts
+++ b/frontend/src/app/bitcoin.utils.ts
@@ -254,30 +254,3 @@ export function selectPowerOfTen(val: number): { divider: number, unit: string }

  return selectedPowerOfTen;
 }
-
-const featureActivation = {
-  mainnet: {
-    rbf: 399701,
-    segwit: 477120,
-    taproot: 709632,
-  },
-  testnet: {
-    rbf: 720255,
-    segwit: 872730,
-    taproot: 2032291,
-  },
-  signet: {
-    rbf: 0,
-    segwit: 0,
-    taproot: 0,
-  },
-};
-
-export function isFeatureActive(network: string, height: number, feature: 'rbf' | 'segwit' | 'taproot'): boolean {
-  const activationHeight = featureActivation[network || 'mainnet']?.[feature];
-  if (activationHeight != null) {
-    return height >= activationHeight;
-  } else {
-    return false;
-  }
-}
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -1,7 +1,7 @@
 <div class="container-xl about-page">

  <div class="intro">
-    <span style="margin-left: auto; margin-right: -20px; margin-bottom: -20px">&reg;</span>
+    <span style="margin-left: auto; margin-right: -20px; margin-bottom: -20px">&trade;</span>
    <img class="logo" src="/resources/mempool-logo-bigger.png" />
    <div class="version">
      v{{ packetJsonVersion }} [<a href="https://github.com/mempool/mempool/commit/{{ frontendGitCommitHash }}">{{ frontendGitCommitHash }}</a>]
@@ -13,23 +13,7 @@
    <p i18n>Our mempool and blockchain explorer for the Bitcoin community, focusing on the transaction fee market and multi-layer ecosystem, completely self-hosted without any trusted third-parties.</p>
  </div>

-  <video #promoVideo (click)="unmutePromoVideo()" (touchstart)="unmutePromoVideo()" src="/resources/promo-video/mempool-promo.mp4" poster="/resources/promo-video/mempool-promo.jpg" controls loop playsinline [autoplay]="true" [muted]="true">
-    <track label="English" kind="captions" srclang="en" src="/resources/promo-video/en.vtt" [attr.default]="showSubtitles('en') ? '' : null">
-    <track label="日本語" kind="captions" srclang="ja" src="/resources/promo-video/ja.vtt" [attr.default]="showSubtitles('ja') ? '' : null">
-    <track label="中文" kind="captions" srclang="zh" src="/resources/promo-video/zh.vtt" [attr.default]="showSubtitles('zh') ? '' : null">
-    <track label="Svenska" kind="captions" srclang="sv" src="/resources/promo-video/sv.vtt" [attr.default]="showSubtitles('sv') ? '' : null">
-    <track label="Čeština" kind="captions" srclang="cs" src="/resources/promo-video/cs.vtt" [attr.default]="showSubtitles('cs') ? '' : null">
-    <track label="Suomi" kind="captions" srclang="fi" src="/resources/promo-video/fi.vtt" [attr.default]="showSubtitles('fi') ? '' : null">
-    <track label="Français" kind="captions" srclang="fr" src="/resources/promo-video/fr.vtt" [attr.default]="showSubtitles('fr') ? '' : null">
-    <track label="Deutsch" kind="captions" srclang="de" src="/resources/promo-video/de.vtt" [attr.default]="showSubtitles('de') ? '' : null">
-    <track label="Italiano" kind="captions" srclang="it" src="/resources/promo-video/it.vtt" [attr.default]="showSubtitles('it') ? '' : null">
-    <track label="Lietuvių" kind="captions" srclang="lt" src="/resources/promo-video/lt.vtt" [attr.default]="showSubtitles('lt') ? '' : null">
-    <track label="Norsk" kind="captions" srclang="nb" src="/resources/promo-video/nb.vtt" [attr.default]="showSubtitles('nb') ? '' : null">
-    <track label="فارسی" kind="captions" srclang="fa" src="/resources/promo-video/fa.vtt" [attr.default]="showSubtitles('fa') ? '' : null">
-    <track label="Polski" kind="captions" srclang="pl" src="/resources/promo-video/pl.vtt" [attr.default]="showSubtitles('pl') ? '' : null">
-    <track label="Română" kind="captions" srclang="ro" src="/resources/promo-video/ro.vtt" [attr.default]="showSubtitles('ro') ? '' : null">
-    <track label="Português" kind="captions" srclang="pt" src="/resources/promo-video/pt.vtt" [attr.default]="showSubtitles('pt') ? '' : null">
-  </video>
+  <video src="/resources/mempool-promo.mp4" poster="/resources/mempool-promo.jpg" controls loop playsinline [autoplay]="true" [muted]="true"></video>

  <div class="enterprise-sponsor" id="enterprise-sponsors">
    <h3 i18n="about.sponsors.enterprise.withRocket">Enterprise Sponsors 🚀</h3>
@@ -107,7 +91,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">
@@ -119,18 +118,6 @@
        </svg>
        <span>Gemini</span>
      </a>
-      <a href="https://bullbitcoin.com/" target="_blank" title="Bull Bitcoin">
-        <svg aria-hidden="true" class="image" viewBox="0 -5 40 40" xmlns="http://www.w3.org/2000/svg">
-          <g clip-path="url(#a)" fill-rule="evenodd" clip-rule="evenodd" fill="#e21924">
-            <path d="M21.92 14.59a1.18 1.18 0 0 0-1.18-1.18h-1.82v2.36h1.82a1.18 1.18 0 0 0 1.18-1.18ZM21 17.07h-2v2.45h2a1.23 1.23 0 1 0 0-2.45Z"/>
-            <path d="M36.43 0 35 5.59l-8 2.64-2.43-3.61-4.74 2.05-4.74-2.05-2.43 3.61-8-2.64L3.21 0 0 7.86l7.89 5.86-5.56 4 5.56 1.12 2.69-.49v3.17l3.59 4.38.68 3.19 5 2.87 5-2.87.68-3.19 3.59-4.38v-3.17l2.7.49 5.56-1.12-5.56-4 7.89-5.86zM24.69 18.45a2.5 2.5 0 0 1-2.5 2.5h-1.11v1.56h-1.26V21h-.9v1.56h-1.27V21H15.3v-1.42h.64a.9.9 0 0 0 .9-.9V14.3a.901.901 0 0 0-.9-.91h-.64V12h2.35v-1.5h1.27V12h.9v-1.5h1.26V12h.68A2.269 2.269 0 0 1 24 14.31a2.25 2.25 0 0 1-.92 1.82 2.52 2.52 0 0 1 1.58 2.32z"/>
-          </g>
-          <defs>
-            <clipPath id="a"><path fill="#fff" d="M0 0h160v32H0z"/></clipPath>
-          </defs>
-        </svg>
-        <span>Bull Bitcoin</span>
-      </a>
      <a href="https://exodus.com/" target="_blank" title="Exodus">
        <svg width="80" height="80" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
          <circle cx="250" cy="250" r="250" fill="#1F2033"/>
@@ -198,12 +185,12 @@
        <span>Umbrel</span>
      </a>
      <a href="https://github.com/rootzoll/raspiblitz" target="_blank" title="RaspiBlitz">
-        <img class="image" src="/resources/profile/raspiblitz.svg" />
+        <img class="image" src="/resources/profile/raspiblitz.jpg" />
        <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" />
@@ -217,12 +204,12 @@
        <img class="image" src="/resources/profile/nix-bitcoin.png" />
        <span>NixOS</span>
      </a>
-      <a href="https://github.com/Start9Labs/start-os" target="_blank" title="StartOS">
+      <a href="https://github.com/Start9Labs/embassy-os" target="_blank" title="EmbassyOS">
        <img class="image" src="/resources/profile/start9.png" />
-        <span>StartOS</span>
+        <span>EmbassyOS</span>
      </a>
      <a href="https://github.com/btcpayserver/btcpayserver" target="_blank" title="BTCPay Server">
-        <img class="image not-rounded" src="/resources/profile/btcpayserver.svg" />
+        <img class="image" src="/resources/profile/btcpayserver.svg" />
        <span>BTCPay</span>
      </a>
      <a href="https://github.com/bisq-network/bisq" target="_blank" title="Bisq">
@@ -250,7 +237,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">
@@ -281,26 +268,6 @@
        <img class="image" src="/resources/profile/nunchuk.svg" />
        <span>Nunchuk</span>
      </a>
-      <a href="https://github.com/bitcoin-s/bitcoin-s" target="_blank" title="bitcoin-s">
-        <img class="image" src="/resources/profile/bitcoin-s.svg" />
-        <span>bitcoin-s</span>
-      </a>
-      <a href="https://github.com/EdgeApp" target="_blank" title="Edge">
-        <img class="image not-rounded" src="/resources/profile/edge.svg" />
-        <span>Edge</span>
-      </a>
-      <a href="https://github.com/GaloyMoney" target="_blank" title="Galoy">
-        <img class="image" src="/resources/profile/galoy.svg" />
-        <span>Galoy</span>
-      </a>
-      <a href="https://github.com/BoltzExchange" target="_blank" title="Boltz">
-        <img class="image" src="/resources/profile/boltz.svg" />
-        <span>Boltz</span>
-      </a>
-      <a href="https://github.com/MutinyWallet" target="_blank" title="Mutiny">
-        <img class="image not-rounded" src="/resources/profile/mutiny.svg" />
-        <span>Mutiny</span>
-      </a>
    </div>
  </div>

@@ -396,7 +363,7 @@
      Trademark Notice<br>
    </div>
    <p>
-      The Mempool Open Source Project&trade;, mempool.space&trade;, the mempool logo&reg;, the mempool.space logos&trade;, the mempool square logo&reg;, and the mempool blocks logo&trade; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
+      The Mempool Open Source Project&trade;, mempool.space&trade;, the mempool logo&trade;, the mempool.space logos&trade;, the mempool square logo&trade;, and the mempool blocks logo&trade; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
    </p>
    <p>
      While our software is available under an open source software license, the copyright license does not include an implied right or license to use our trademarks. See our <a href="https://mempool.space/trademark-policy">Trademark Policy and Guidelines</a> for more details, published on &lt;https://mempool.space/trademark-policy&gt;.
@@ -405,14 +372,27 @@

  <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>
+    </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/about/about.component.scss
+++ b/frontend/src/app/components/about/about.component.scss
@@ -11,12 +11,6 @@
    line-height: 32px;
  }

-  .image.not-rounded {
-    border-radius: 0;
-    width: 60px;
-    height: 60px;
-  }
-
  .intro {
    margin: 25px auto 30px;
    width: 250px;
@@ -42,11 +36,9 @@

  video {
    width: 640px;
+    height: 360px;
    max-width: 90%;
    margin-top: 0;
-    @media (min-width: 768px) {
-      height: 360px;
-    }
  }

  .social-icons {
@@ -59,13 +51,9 @@
  .enterprise-sponsor,
  .community-integrations-sponsor,
  .maintainers {
-    margin-top: 30px;
+    margin-top: 68px;
    margin-bottom: 68px;
    scroll-margin: 30px;
-
-    @media (min-width: 768px) {
-      margin-top: 68px;
-    }
  }

  .maintainers {
@@ -211,16 +199,6 @@
      a {
        margin: 45px 10px;
      }
-      .bitcointv svg {
-        width: 36px;
-        height: auto;
-        vertical-align: bottom;
-        margin-bottom: 2px;
-        margin-left: 5px;
-      }
-      .bitcointv svg:hover {
-        opacity: 0.75;
-      }
    }
  }

@@ -234,11 +212,6 @@
 }

 .community-integrations-sponsor {
-  max-width: 1110px;
+  max-width: 965px;
  margin: auto;
 }
-
-.community-integrations-sponsor img.image {
-  width: 64px;
-  height: 64px;
-}
--- a/frontend/src/app/components/about/about.component.ts
+++ b/frontend/src/app/components/about/about.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, ElementRef, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Inject, LOCALE_ID, OnInit } from '@angular/core';
 import { WebsocketService } from '../../services/websocket.service';
 import { SeoService } from '../../services/seo.service';
 import { StateService } from '../../services/state.service';
@@ -17,7 +17,6 @@ import { DOCUMENT } from '@angular/common';
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AboutComponent implements OnInit {
-  @ViewChild('promoVideo') promoVideo: ElementRef;
  backendInfo$: Observable<IBackendInfo>;
  sponsors$: Observable<any>;
  translators$: Observable<ITranslators>;
@@ -69,7 +68,7 @@ export class AboutComponent implements OnInit {
      tap(() => this.goToAnchor())
    );
  }
-
+  
  ngAfterViewInit() {
    this.goToAnchor();
  }
@@ -91,12 +90,4 @@ export class AboutComponent implements OnInit {
      this.showNavigateToSponsor = true;
    }
  }
-
-  showSubtitles(language): boolean {
-    return ( this.locale.startsWith( language ) && !this.locale.startsWith('en') );
-  }
-
-  unmutePromoVideo(): void {
-    this.promoVideo.nativeElement.muted = false;
-  }
 }
--- a/frontend/src/app/components/amount/amount.component.html
+++ b/frontend/src/app/components/amount/amount.component.html
@@ -1,15 +1,15 @@
 <ng-container *ngIf="!noFiat && (viewFiat$ | async) && (conversions$ | async) as conversions; else viewFiatVin">
  <span class="fiat" *ngIf="blockConversion; else noblockconversion">
-    {{ addPlus && satoshis >= 0 ? '+' : '' }}{{
+    {{ addPlus && satoshis >= 0 ? '+' : '' }}
+    {{
      (
-        (blockConversion.price[currency] > -1 ? blockConversion.price[currency] : null) ??
-        (blockConversion.price['USD']    > -1 ? blockConversion.price['USD'] * blockConversion.exchangeRates['USD' + currency] : null) ?? 0
+        (blockConversion.price[currency] >= 0 ? blockConversion.price[currency] : null) ??
+        (blockConversion.price['USD'] * blockConversion.exchangeRates['USD' + currency]) ?? 0
      ) * satoshis / 100000000 | fiatCurrency : digitsInfo : currency
    }}
  </span>
  <ng-template #noblockconversion>
-    <span class="fiat">{{ addPlus && satoshis >= 0 ? '+' : '' }}{{ (conversions[currency] > -1 ? conversions[currency] : 0) * satoshis / 100000000 | fiatCurrency : digitsInfo : currency }}
-    </span>
+    <span class="fiat">{{ addPlus && satoshis >= 0 ? '+' : '' }}{{ (conversions ? conversions[currency] : 0) * satoshis / 100000000 | fiatCurrency : digitsInfo : currency }}</span>
  </ng-template>
 </ng-container>

--- 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) {
@@ -59,6 +54,31 @@
  max-height: 270px;
 }

+.formRadioGroup {
+  margin-top: 6px;
+  display: flex;
+  flex-direction: column;
+  @media (min-width: 991px) {
+    position: relative;
+    top: -100px;
+  }
+  @media (min-width: 830px) and (max-width: 991px) {
+    position: relative;
+    top: 0px;
+  }
+  @media (min-width: 830px) {
+    flex-direction: row;
+    float: right;
+    margin-top: 0px;
+  }
+  .btn-sm {
+    font-size: 9px;
+    @media (min-width: 830px) {
+      font-size: 14px;
+    }
+  }
+}
+
 .disabled {
  pointer-events: none;
  opacity: 0.5;
--- 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, acc: 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, acc: 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,16 +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].acc = tx.acc;
-          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 => {
@@ -216,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,
@@ -350,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
@@ -16,7 +16,6 @@ const auditColors = {
  missing: darken(desaturate(hexToColor('f344df'), 0.3), 0.7),
  added: hexToColor('0099ff'),
  selected: darken(desaturate(hexToColor('0099ff'), 0.3), 0.7),
-  accelerated: hexToColor('8F5FF6'),
 };

 // convert from this class's update format to TxSprite's update format
@@ -37,9 +36,7 @@ export default class TxView implements TransactionStripped {
  vsize: number;
  value: number;
  feerate: number;
-  acc?: number;
-  rate?: number;
-  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'added' | 'censored' | 'selected' | 'accelerated';
+  status?: 'found' | 'missing' | 'fresh' | 'added' | 'censored' | 'selected';
  context?: 'projected' | 'actual';
  scene?: BlockScene;

@@ -61,9 +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.acc = tx.acc;
-    this.rate = tx.rate;
+    this.feerate = tx.fee / tx.vsize;
    this.status = tx.status;
    this.initialised = false;
    this.vertexArray = scene.vertexArray;
@@ -162,16 +157,10 @@ 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) {
-      if (this.acc) {
-        return auditColors.accelerated;
-      } else {
-        return feeLevelColor;
-      }
      return feeLevelColor;
    }
    // Block audit
@@ -179,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;
@@ -187,8 +175,6 @@ export default class TxView implements TransactionStripped {
        return auditColors.added;
      case 'selected':
        return marginalFeeColors[feeLevelIndex] || marginalFeeColors[mempoolFeeColors.length - 1];
-      case 'accelerated':
-        return auditColors.accelerated;
      case 'found':
        if (this.context === 'projected') {
          return auditFeeColors[feeLevelIndex] || auditFeeColors[mempoolFeeColors.length - 1];
@@ -196,11 +182,7 @@ export default class TxView implements TransactionStripped {
          return feeLevelColor;
        }
      default:
-        if (this.acc) {
-          return auditColors.accelerated;
-        } else {
-          return feeLevelColor;
-        }
+        return feeLevelColor;
    }
  }
 }
--- a/Show More
+++ b/Show More