Merge branch 'master' into mononaut/fee-widget-gradient

fix recommended fee gradient
2023-05-09 12:51:09 -05:00 · 2023-05-08 13:06:56 -06:00
135 changed files with 1527 additions and 3267 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
    strategy:
      matrix:
-        node: ["16", "17", "18"]
+        node: ["16.16.0", "18.14.1"]
        flavor: ["dev", "prod"]
      fail-fast: false
    runs-on: "ubuntu-latest"
@@ -55,7 +55,7 @@ jobs:
    if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
    strategy:
      matrix:
-        node: ["16", "17", "18"]
+        node: ["16.16.0", "18.14.1"]
        flavor: ["dev", "prod"]
      fail-fast: false
    runs-on: "ubuntu-latest"
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -1485,17 +1485,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/@noble/hashes": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz",
-      "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ]
-    },
    "node_modules/@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2414,9 +2403,12 @@
      "dev": true
    },
    "node_modules/base-x": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",
+      "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
    },
    "node_modules/bech32": {
      "version": "2.0.0",
@@ -2432,16 +2424,18 @@
      }
    },
    "node_modules/bitcoinjs-lib": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.1.tgz",
-      "integrity": "sha512-FYihfgTk29lt1eK2y48OtuarEDUnTprNBW3ctT8yHiOhvmeS3DzAVG6gI0VCvMkydz6UdlXlYNWIPqGD0SUYRQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.0.tgz",
+      "integrity": "sha512-eupi1FBTJmPuAZdChnzTXLv2HBqFW2AICpzXZQLniP0V9FWWeeUQSMKES6sP8isy/xO0ijDexbgkdEyFVrsuJw==",
      "dependencies": {
-        "@noble/hashes": "^1.2.0",
        "bech32": "^2.0.0",
        "bip174": "^2.1.0",
-        "bs58check": "^3.0.1",
+        "bs58check": "^2.1.2",
+        "create-hash": "^1.1.0",
+        "ripemd160": "^2.0.2",
        "typeforce": "^1.11.3",
-        "varuint-bitcoin": "^1.1.2"
+        "varuint-bitcoin": "^1.1.2",
+        "wif": "^2.0.1"
      },
      "engines": {
        "node": ">=8.0.0"
@@ -2546,20 +2540,21 @@
      }
    },
    "node_modules/bs58": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
      "dependencies": {
-        "base-x": "^4.0.0"
+        "base-x": "^3.0.2"
      }
    },
    "node_modules/bs58check": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
-      "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
      "dependencies": {
-        "@noble/hashes": "^1.2.0",
-        "bs58": "^5.0.0"
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
      }
    },
    "node_modules/bser": {
@@ -2673,6 +2668,15 @@
        "node": ">=8"
      }
    },
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
    "node_modules/cjs-module-lexer": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
@@ -2779,6 +2783,18 @@
      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
    },
+    "node_modules/create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
    "node_modules/create-require": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -3809,6 +3825,19 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "dependencies": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/html-escaper": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
@@ -5887,6 +5916,16 @@
        "npm": ">=6"
      }
    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
    "node_modules/media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -6552,6 +6591,19 @@
      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
      "dev": true
    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
    "node_modules/require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -6642,6 +6694,15 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
    "node_modules/run-parallel": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -6763,6 +6824,18 @@
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
    },
+    "node_modules/sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      },
+      "bin": {
+        "sha.js": "bin.js"
+      }
+    },
    "node_modules/shebang-command": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -6915,6 +6988,14 @@
        "node": ">= 0.8"
      }
    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
    "node_modules/string-length": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -7316,6 +7397,11 @@
        "punycode": "^2.1.0"
      }
    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
    "node_modules/utils-merge": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -7384,6 +7470,14 @@
        "node": ">= 8"
      }
    },
+    "node_modules/wif": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
+      "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==",
+      "dependencies": {
+        "bs58check": "<3.0.0"
+      }
+    },
    "node_modules/word-wrap": {
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -8631,11 +8725,6 @@
      "resolved": "https://registry.npmjs.org/@mempool/electrum-client/-/electrum-client-1.1.9.tgz",
      "integrity": "sha512-mlvPiCzUlaETpYW3i6V87A24jjMYgsebaXtUo3WQyyLnYUuxs0KiXQ2mnKh3h15j8Xg/hfxeGIi+5OC9u0nftQ=="
    },
-    "@noble/hashes": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz",
-      "integrity": "sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg=="
-    },
    "@nodelib/fs.scandir": {
      "version": "2.1.5",
      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -9356,9 +9445,12 @@
      "dev": true
    },
    "base-x": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz",
-      "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw=="
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz",
+      "integrity": "sha512-H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
    },
    "bech32": {
      "version": "2.0.0",
@@ -9371,16 +9463,18 @@
      "integrity": "sha512-lkc0XyiX9E9KiVAS1ZiOqK1xfiwvf4FXDDdkDq5crcDzOq+xGytY+14qCsqz7kCiy8rpN1CRNfacRhf9G3JNSA=="
    },
    "bitcoinjs-lib": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.1.tgz",
-      "integrity": "sha512-FYihfgTk29lt1eK2y48OtuarEDUnTprNBW3ctT8yHiOhvmeS3DzAVG6gI0VCvMkydz6UdlXlYNWIPqGD0SUYRQ==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.1.0.tgz",
+      "integrity": "sha512-eupi1FBTJmPuAZdChnzTXLv2HBqFW2AICpzXZQLniP0V9FWWeeUQSMKES6sP8isy/xO0ijDexbgkdEyFVrsuJw==",
      "requires": {
-        "@noble/hashes": "^1.2.0",
        "bech32": "^2.0.0",
        "bip174": "^2.1.0",
-        "bs58check": "^3.0.1",
+        "bs58check": "^2.1.2",
+        "create-hash": "^1.1.0",
+        "ripemd160": "^2.0.2",
        "typeforce": "^1.11.3",
-        "varuint-bitcoin": "^1.1.2"
+        "varuint-bitcoin": "^1.1.2",
+        "wif": "^2.0.1"
      }
    },
    "body-parser": {
@@ -9458,20 +9552,21 @@
      }
    },
    "bs58": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz",
-      "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
+      "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
      "requires": {
-        "base-x": "^4.0.0"
+        "base-x": "^3.0.2"
      }
    },
    "bs58check": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-3.0.1.tgz",
-      "integrity": "sha512-hjuuJvoWEybo7Hn/0xOrczQKKEKD63WguEjlhLExYs2wUBcebDC1jDNK17eEAD2lYfw82d5ASC1d7K3SWszjaQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
+      "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
      "requires": {
-        "@noble/hashes": "^1.2.0",
-        "bs58": "^5.0.0"
+        "bs58": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "safe-buffer": "^5.1.2"
      }
    },
    "bser": {
@@ -9544,6 +9639,15 @@
      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
      "dev": true
    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
    "cjs-module-lexer": {
      "version": "1.2.2",
      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
@@ -9631,6 +9735,18 @@
      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
    "create-require": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -10397,6 +10513,16 @@
      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
    },
+    "hash-base": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+      "requires": {
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      }
+    },
    "html-escaper": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
@@ -11943,6 +12069,16 @@
        "tiny-lru": "10.3.0"
      }
    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
    "media-typer": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -12411,6 +12547,16 @@
      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
      "dev": true
    },
+    "readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      }
+    },
    "require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -12472,6 +12618,15 @@
        "glob": "^7.1.3"
      }
    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
    "run-parallel": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -12560,6 +12715,15 @@
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
    "shebang-command": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -12676,6 +12840,14 @@
      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
    "string-length": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -12929,6 +13101,11 @@
        "punycode": "^2.1.0"
      }
    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+    },
    "utils-merge": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -12982,6 +13159,14 @@
        "isexe": "^2.0.0"
      }
    },
+    "wif": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz",
+      "integrity": "sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==",
+      "requires": {
+        "bs58check": "<3.0.0"
+      }
+    },
    "word-wrap": {
      "version": "1.2.3",
      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
--- a/backend/package.json
+++ b/backend/package.json
@@ -28,8 +28,6 @@
    "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",
--- 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,19 @@
    "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__",
+    "DISK_CACHE_BLOCK_INTERVAL": "__MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__"
  },
  "CORE_RPC": {
    "HOST": "__CORE_RPC_HOST__",
    "PORT": 15,
    "USERNAME": "__CORE_RPC_USERNAME__",
    "PASSWORD": "__CORE_RPC_PASSWORD__",
-    "TIMEOUT": 1000
+    "TIMEOUT": "__CORE_RPC_TIMEOUT__"
  },
  "ELECTRUM": {
    "HOST": "__ELECTRUM_HOST__",
@@ -46,14 +46,14 @@
  "ESPLORA": {
    "REST_API_URL": "__ESPLORA_REST_API_URL__",
    "UNIX_SOCKET_PATH": "__ESPLORA_UNIX_SOCKET_PATH__",
-    "RETRY_UNIX_SOCKET_AFTER": 888
+    "RETRY_UNIX_SOCKET_AFTER": "__ESPLORA_RETRY_UNIX_SOCKET_AFTER__"
  },
  "SECOND_CORE_RPC": {
    "HOST": "__SECOND_CORE_RPC_HOST__",
    "PORT": 17,
    "USERNAME": "__SECOND_CORE_RPC_USERNAME__",
    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__",
-    "TIMEOUT": 2000
+    "TIMEOUT": "__SECOND_CORE_RPC_TIMEOUT__"
  },
  "DATABASE": {
    "ENABLED": false,
@@ -63,7 +63,7 @@
    "DATABASE": "__DATABASE_DATABASE__",
    "USERNAME": "__DATABASE_USERNAME__",
    "PASSWORD": "__DATABASE_PASSWORD__",
-    "TIMEOUT": 3000
+    "TIMEOUT": "__DATABASE_TIMEOUT__"
  },
  "SYSLOG": {
    "ENABLED": false,
@@ -101,14 +101,14 @@
    "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": "",
@@ -119,4 +119,4 @@
  "CLIGHTNING": {
    "SOCKET": "__CLIGHTNING_SOCKET__"
  }
-}
+}
--- a/backend/src/tests/api/difficulty-adjustment.test.ts
+++ b/backend/src/tests/api/difficulty-adjustment.test.ts
@@ -14,11 +14,11 @@ describe('Mempool Difficulty Adjustment', () => {
          750134,                         // Current block height
          0.6280047707459726,             // Previous retarget % (Passed through)
          'mainnet',                      // Network (if testnet, next value is non-zero)
-          0,                              // Latest block timestamp in seconds (only used if difficulty already locked in)
+          0,                              // If not testnet, not used
        ],
        { // Expected Result
          progressPercent: 9.027777777777777,
-          difficultyChange: 13.180707740199772,
+          difficultyChange: 12.562233927411782,
          estimatedRetargetDate: 1661895424692,
          remainingBlocks: 1834,
          remainingTime: 977591692,
@@ -41,7 +41,7 @@ describe('Mempool Difficulty Adjustment', () => {
        ],
        { // Expected Result is same other than timeOffset
          progressPercent: 9.027777777777777,
-          difficultyChange: 13.180707740199772,
+          difficultyChange: 12.562233927411782,
          estimatedRetargetDate: 1661895424692,
          remainingBlocks: 1834,
          remainingTime: 977591692,
@@ -54,29 +54,6 @@ describe('Mempool Difficulty Adjustment', () => {
          expectedBlocks: 161.68833333333333,
        },
      ],
-      [ // Vector 3 (mainnet lock-in (epoch ending 788255))
-        [ // Inputs
-          dt('2023-04-20T09:57:33.000Z'), // Last DA time (in seconds)
-          dt('2023-05-04T14:54:09.000Z'), // Current time (now) (in seconds)
-          788255,                         // Current block height
-          1.7220298879531821,             // Previous retarget % (Passed through)
-          'mainnet',                      // Network (if testnet, next value is non-zero)
-          dt('2023-05-04T14:54:26.000Z'), // Latest block timestamp in seconds
-        ],
-        { // Expected Result
-          progressPercent: 99.95039682539682,
-          difficultyChange: -1.4512637555574193,
-          estimatedRetargetDate: 1683212658129,
-          remainingBlocks: 1,
-          remainingTime: 609129,
-          previousRetarget: 1.7220298879531821,
-          previousTime: 1681984653,
-          nextRetargetHeight: 788256,
-          timeAvg: 609129,
-          timeOffset: 0,
-          expectedBlocks: 2045.66,
-        },
-      ],
    ] as [[number, number, number, number, string, number], DifficultyAdjustment][];

    for (const vector of vectors) {
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -152,94 +152,4 @@ describe('Mempool Backend Config', () => {
      expect(config.EXTERNAL_DATA_SERVER).toStrictEqual(fixture.EXTERNAL_DATA_SERVER);
    });
  });
-
-  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
@@ -6,9 +6,9 @@ const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first

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

    const matches: string[] = []; // present in both mined block and template
@@ -137,7 +137,6 @@ class Audit {
      censored: Object.keys(isCensored),
      added,
      fresh,
-      sigop: [],
      score,
      similarity,
    };
--- 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.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -130,9 +130,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,8 +210,6 @@ class BitcoinRoutes {
          bestDescendant: tx.bestDescendant || null,
          descendants: tx.descendants || null,
          effectiveFeePerVsize: tx.effectiveFeePerVsize || null,
-          sigops: tx.sigops,
-          adjustedVsize: tx.adjustedVsize,
        });
        return;
      }
@@ -224,12 +221,7 @@ class BitcoinRoutes {
    } else {
      let cpfpInfo;
      if (config.DATABASE.ENABLED) {
-        try {
-          cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
-        } catch (e) {
-          res.status(500).send('failed to get CPFP info');
-          return;
-        }
+        cpfpInfo = await transactionRepository.$getCpfpInfo(req.params.txId);
      }
      if (cpfpInfo) {
        res.json(cpfpInfo);
@@ -399,13 +391,9 @@ class BitcoinRoutes {

  private async getBlockAuditSummary(req: Request, res: Response) {
    try {
-      const auditSummary = await blocks.$getBlockAuditSummary(req.params.hash);
-      if (auditSummary) {
-        res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
-        res.json(auditSummary);
-      } else {
-        return res.status(404).send(`audit not available`);
-      }
+      const transactions = await blocks.$getBlockAuditSummary(req.params.hash);
+      res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
+      res.json(transactions);
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
--- 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, CpfpSummary } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
@@ -76,7 +76,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 +96,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,6 +126,12 @@ class Blocks {
      }
    }

+    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.`);
    }
@@ -158,13 +163,6 @@ class Blocks {
    };
  }

-  public summarizeBlockTransactions(hash: string, transactions: TransactionExtended[]): BlockSummary {
-    return {
-      id: hash,
-      transactions: Common.stripTransactions(transactions),
-    };
-  }
-
  private convertLiquidFees(block: IBitcoinApi.VerboseBlock): IBitcoinApi.VerboseBlock {
    block.tx.forEach(tx => {
      tx.fee = Object.values(tx.fee || {}).reduce((total, output) => total + output, 0);
@@ -281,14 +279,10 @@ class Blocks {
      }

      extras.matchRate = null;
-      extras.expectedFees = null;
-      extras.expectedWeight = null;
      if (config.MEMPOOL.AUDIT) {
        const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(block.id);
        if (auditScore != null) {
          extras.matchRate = auditScore.matchRate;
-          extras.expectedFees = auditScore.expectedFees;
-          extras.expectedWeight = auditScore.expectedWeight;
        }
      }
    }
@@ -312,7 +306,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) {
@@ -322,13 +316,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];
        }
      }

@@ -458,46 +450,6 @@ class Blocks {
    }
  }

-  /**
-   * [INDEXING] Index expected fees & weight for all audited blocks
-   */
-  public async $generateAuditStats(): Promise<void> {
-    const blockIds = await BlocksAuditsRepository.$getBlocksWithoutSummaries();
-    if (!blockIds?.length) {
-      return;
-    }
-    let timer = Date.now();
-    let indexedThisRun = 0;
-    let indexedTotal = 0;
-    logger.debug(`Indexing ${blockIds.length} block audit details`);
-    for (const hash of blockIds) {
-      const summary = await BlocksSummariesRepository.$getTemplate(hash);
-      let totalFees = 0;
-      let totalWeight = 0;
-      for (const tx of summary?.transactions || []) {
-        totalFees += tx.fee;
-        totalWeight += (tx.vsize * 4);
-      }
-      await BlocksAuditsRepository.$setSummary(hash, totalFees, totalWeight);
-      const cachedBlock = this.blocks.find(block => block.id === hash);
-      if (cachedBlock) {
-        cachedBlock.extras.expectedFees = totalFees;
-        cachedBlock.extras.expectedWeight = totalWeight;
-      }
-
-      indexedThisRun++;
-      indexedTotal++;
-      const elapsedSeconds = (Date.now() - timer) / 1000;
-      if (elapsedSeconds > 5) {
-        const blockPerSeconds = indexedThisRun / elapsedSeconds;
-        logger.debug(`Indexed ${indexedTotal} / ${blockIds.length} block audit details (${blockPerSeconds.toFixed(1)}/s)`);
-        timer = Date.now();
-        indexedThisRun = 0;
-      }
-    }
-    logger.debug(`Indexing block audit details completed`);
-  }
-
  /**
   * [INDEXING] Index all blocks metadata for the mining dashboard
   */
@@ -642,18 +594,10 @@ class Blocks {
      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 transactions = await this.$getTransactionsExtended(blockHash, block.height, false);
      const cpfpSummary: CpfpSummary = Common.calculateCpfp(block.height, transactions);
      const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions);
-      const blockSummary: BlockSummary = this.summarizeBlockTransactions(block.id, cpfpSummary.transactions);
+      const blockSummary: BlockSummary = this.summarizeBlock(verboseBlock);
      this.updateTimerProgress(timer, `got block data for ${this.currentBlockHeight}`);

      // start async callbacks
@@ -675,13 +619,12 @@ class Blocks {
            for (let i = 10; i >= 0; --i) {
              const newBlock = await this.$indexBlock(lastBlock.height - i);
              this.updateTimerProgress(timer, `reindexed block`);
-              let cpfpSummary;
+              await this.$getStrippedBlockTransactions(newBlock.id, true, true);
+              this.updateTimerProgress(timer, `reindexed block summary`);
              if (config.MEMPOOL.CPFP_INDEXING) {
-                cpfpSummary = await this.$indexCPFP(newBlock.id, lastBlock.height - i);
+                await this.$indexCPFP(newBlock.id, lastBlock.height - i);
                this.updateTimerProgress(timer, `reindexed block cpfp`);
              }
-              await this.$getStrippedBlockTransactions(newBlock.id, true, true, cpfpSummary, newBlock.height);
-              this.updateTimerProgress(timer, `reindexed block summary`);
            }
            await mining.$indexDifficultyAdjustments();
            await DifficultyAdjustmentsRepository.$deleteLastAdjustment();
@@ -689,12 +632,9 @@ class Blocks {
            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);
            indexer.reindex();
          }
-        }
+          await blocksRepository.$saveBlockInDatabase(blockExtended);
+          this.updateTimerProgress(timer, `saved ${this.currentBlockHeight} to database`);

-        await blocksRepository.$saveBlockInDatabase(blockExtended);
-        this.updateTimerProgress(timer, `saved ${this.currentBlockHeight} to database`);
-
-        if (!fastForwarded) {
          const lastestPriceId = await PricesRepository.$getLatestPriceId();
          this.updateTimerProgress(timer, `got latest price id ${this.currentBlockHeight}`);
          if (priceUpdater.historyInserted === true && lastestPriceId !== null) {
@@ -712,7 +652,7 @@ class Blocks {

          // Save blocks summary for visualization if it's enabled
          if (Common.blocksSummariesIndexingEnabled() === true) {
-            await this.$getStrippedBlockTransactions(blockExtended.id, true, false, cpfpSummary, blockExtended.height);
+            await this.$getStrippedBlockTransactions(blockExtended.id, true);
            this.updateTimerProgress(timer, `saved block summary for ${this.currentBlockHeight}`);
          }
          if (config.MEMPOOL.CPFP_INDEXING) {
@@ -738,11 +678,6 @@ class Blocks {
        this.currentDifficulty = block.difficulty;
      }

-      // 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}`);
-
      this.blocks.push(blockExtended);
      if (this.blocks.length > config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4) {
        this.blocks = this.blocks.slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT * 4);
@@ -759,6 +694,11 @@ class Blocks {
        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++;
    }

@@ -835,7 +775,7 @@ class Blocks {
  }

  public async $getStrippedBlockTransactions(hash: string, skipMemoryCache = false,
-    skipDBLookup = false, cpfpSummary?: CpfpSummary, blockHeight?: number): Promise<TransactionStripped[]>
+    skipDBLookup = false): Promise<TransactionStripped[]>
  {
    if (skipMemoryCache === false) {
      // Check the memory cache
@@ -853,35 +793,13 @@ class Blocks {
      }
    }

-    let height = blockHeight;
-    let summary: BlockSummary;
-    if (cpfpSummary) {
-      summary = {
-        id: hash,
-        transactions: cpfpSummary.transactions.map(tx => {
-          return {
-            txid: tx.txid,
-            fee: tx.fee,
-            vsize: tx.vsize,
-            value: Math.round(tx.vout.reduce((acc, vout) => acc + (vout.value ? vout.value : 0), 0)),
-            rate: tx.effectiveFeePerVsize
-          };
-        }),
-      };
-    } else {
-      // Call Core RPC
-      const block = await bitcoinClient.getBlock(hash, 2);
-      summary = this.summarizeBlock(block);
-      height = block.height;
-    }
-    if (height == null) {
-      const block = await bitcoinApi.$getBlock(hash);
-      height = block.height;
-    }
+    // Call Core RPC
+    const block = await bitcoinClient.getBlock(hash, 2);
+    const summary = this.summarizeBlock(block);

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

    return summary.transactions;
@@ -1037,11 +955,19 @@ class Blocks {
  }

  public async $getBlockAuditSummary(hash: string): Promise<any> {
+    let summary;
    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
-      return BlocksAuditsRepository.$getBlockAudit(hash);
-    } else {
-      return null;
+      summary = await BlocksAuditsRepository.$getBlockAudit(hash);
    }
+
+    // fallback to non-audited transaction summary
+    if (!summary?.transactions?.length) {
+      const strippedTransactions = await this.$getStrippedBlockTransactions(hash);
+      summary = {
+        transactions: strippedTransactions
+      };
+    }
+    return summary;
  }

  public getLastDifficultyAdjustmentTime(): number {
@@ -1072,13 +998,9 @@ class Blocks {
  }

  public async $saveCpfp(hash: string, height: number, cpfpSummary: CpfpSummary): Promise<void> {
-    try {
-      const result = await cpfpRepository.$batchSaveClusters(cpfpSummary.clusters);
-      if (!result) {
-        await cpfpRepository.$insertProgressMarker(height);
-      }
-    } catch (e) {
-      // not a fatal error, we'll try again next time the indexer runs
+    const result = await cpfpRepository.$batchSaveClusters(cpfpSummary.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, CpfpCluster, EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats } from '../mempool.interfaces';
+import { Ancestor, CpfpInfo, CpfpSummary, EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
 import config from '../config';
 import { NodeSocket } from '../repositories/NodesSocketsRepository';
 import { isIP } from 'net';
@@ -57,15 +57,15 @@ export class Common {
    return arr;
  }

-  static findRbfTransactions(added: MempoolTransactionExtended[], deleted: MempoolTransactionExtended[]): { [txid: string]: MempoolTransactionExtended[] } {
-    const matches: { [txid: string]: MempoolTransactionExtended[] } = {};
+  static findRbfTransactions(added: TransactionExtended[], deleted: TransactionExtended[]): { [txid: string]: TransactionExtended[] } {
+    const matches: { [txid: string]: TransactionExtended[] } = {};
    added
      .forEach((addedTx) => {
        const foundMatches = deleted.filter((deletedTx) => {
          // 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));
@@ -77,32 +77,6 @@ export class Common {
    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 };
-      }
-      // remove this tx from the spendMap
-      // prevents the same tx being replaced more than once
-      for (const vin of tx.vin) {
-        const key = `${vin.txid}:${vin.vout}`;
-        if (spendMap.get(key)?.txid === tx.txid) {
-          spendMap.delete(key);
-        }
-      }
-    }
-    return matches;
-  }
-
  static stripTransaction(tx: TransactionExtended): TransactionStripped {
    return {
      txid: tx.txid,
@@ -113,10 +87,6 @@ export class Common {
    };
  }

-  static stripTransactions(txs: TransactionExtended[]): TransactionStripped[] {
-    return txs.map(this.stripTransaction);
-  }
-
  static sleep$(ms: number): Promise<void> {
    return new Promise((resolve) => {
       setTimeout(() => {
@@ -132,18 +102,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,
        };
      });
@@ -164,8 +134,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;
@@ -173,17 +143,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
          };
@@ -378,80 +348,40 @@ export class Common {
  }

  static calculateCpfp(height: number, transactions: TransactionExtended[]): CpfpSummary {
-    const clusters: CpfpCluster[] = []; // list of all cpfp clusters in this block
-    const clusterMap: { [txid: string]: CpfpCluster } = {}; // map transactions to their cpfp cluster
-    let clusterTxs: TransactionExtended[] = []; // working list of elements of the current cluster
-    let ancestors: { [txid: string]: boolean } = {}; // working set of ancestors of the current cluster root
+    const clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[] = [];
+    let cluster: TransactionExtended[] = [];
+    let ancestors: { [txid: string]: boolean } = {};
    const txMap = {};
-    // initialize the txMap
-    for (const tx of transactions) {
-      txMap[tx.txid] = tx;
-    }
-    // reverse pass to identify CPFP clusters
    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;
-        clusterTxs.forEach(tx => {
+        cluster.forEach(tx => {
          totalFee += tx?.fee || 0;
          totalVSize += (tx.weight / 4);
        });
        const effectiveFeePerVsize = totalFee / totalVSize;
-        let cluster: CpfpCluster;
-        if (clusterTxs.length > 1) {
-          cluster = {
-            root: clusterTxs[0].txid,
+        if (cluster.length > 1) {
+          clusters.push({
+            root: cluster[0].txid,
            height,
-            txs: clusterTxs.map(tx => { return { txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }; }),
+            txs: cluster.map(tx => { return { txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }; }),
            effectiveFeePerVsize,
-          };
-          clusters.push(cluster);
+          });
        }
-        clusterTxs.forEach(tx => {
+        cluster.forEach(tx => {
          txMap[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
-          if (cluster) {
-            clusterMap[tx.txid] = cluster;
-          }
        });
-        // reset working vars
-        clusterTxs = [];
+        cluster = [];
        ancestors = {};
      }
-      clusterTxs.push(tx);
+      cluster.push(tx);
      tx.vin.forEach(vin => {
        ancestors[vin.txid] = true;
      });
    }
-    // forward pass to enforce ancestor rate caps
-    for (const tx of transactions) {
-      let minAncestorRate = tx.effectiveFeePerVsize;
-      for (const vin of tx.vin) {
-        if (txMap[vin.txid]?.effectiveFeePerVsize) {
-          minAncestorRate = Math.min(minAncestorRate, txMap[vin.txid].effectiveFeePerVsize);
-        }
-      }
-      // check rounded values to skip cases with almost identical fees
-      const roundedMinAncestorRate = Math.ceil(minAncestorRate);
-      const roundedEffectiveFeeRate = Math.floor(tx.effectiveFeePerVsize);
-      if (roundedMinAncestorRate < roundedEffectiveFeeRate) {
-        tx.effectiveFeePerVsize = minAncestorRate;
-        if (!clusterMap[tx.txid]) {
-          // add a single-tx cluster to record the dependent rate
-          const cluster = {
-            root: tx.txid,
-            height,
-            txs: [{ txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }],
-            effectiveFeePerVsize: minAncestorRate,
-          };
-          clusterMap[tx.txid] = cluster;
-          clusters.push(cluster);
-        } else {
-          // update the existing cluster with the dependent rate
-          clusterMap[tx.txid].effectiveFeePerVsize = minAncestorRate;
-        }
-      }
-    }
    return {
      transactions,
      clusters,
@@ -512,119 +442,3 @@ export class Common {
    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 = 59;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -516,29 +516,6 @@ class DatabaseMigration {
      // https://github.com/mempool/mempool/issues/3360
      await this.$executeQuery(`TRUNCATE prices`);
    }
-
-    if (databaseSchemaVersion < 60 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD sigop_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(60);
-    }
-
-    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 expected_fees BIGINT UNSIGNED DEFAULT NULL');
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD expected_weight BIGINT UNSIGNED DEFAULT NULL');
-      await this.updateToSchemaVersion(62);
-    }
-
  }

  /**
@@ -1057,7 +1034,7 @@ class DatabaseMigration {
  }

  public async $blocksReindexingTruncate(): Promise<void> {
-    logger.warn(`Truncating pools, blocks, hashrates and difficulty_adjustments tables for re-indexing (using '--reindex-blocks'). You can cancel this command within 5 seconds`);
+    logger.warn(`Truncating pools, blocks and hashrates for re-indexing (using '--reindex-blocks'). You can cancel this command within 5 seconds`);
    await Common.sleep$(5000);

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

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

-  difficultyChange = (BLOCK_SECONDS_TARGET / (actualTimespan / (blocksInEpoch + 1)) - 1) * 100;
+  difficultyChange = (BLOCK_SECONDS_TARGET / timeAvgSecs - 1) * 100;
  // Max increase is x4 (+300%)
  if (difficultyChange > 300) {
    difficultyChange = 300;
--- a/backend/src/api/disk-cache.ts
+++ b/backend/src/api/disk-cache.ts
@@ -21,7 +21,6 @@ class DiskCache {
  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: [],
@@ -219,13 +218,8 @@ class DiskCache {
      }

      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);
-      }
+      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));
    }
@@ -279,10 +273,6 @@ class DiskCache {
      }
    }
  }
-
-  public setIgnoreBlocksCache(): void {
-    this.ignoreBlocksCache = true;
-  }
 }

 export default new DiskCache();
--- a/backend/src/api/explorer/nodes.api.ts
+++ b/backend/src/api/explorer/nodes.api.ts
@@ -373,7 +373,7 @@ class NodesApi {

  public async $searchNodeByPublicKeyOrAlias(search: string) {
    try {
-      const publicKeySearch = search.replace(/[^a-zA-Z0-9]/g, '') + '%';
+      const publicKeySearch = search.replace('%', '') + '%';
      const aliasSearch = search
        .replace(/[-_.]/g, ' ') // Replace all -_. characters with empty space. Eg: "ln.nicehash" becomes "ln nicehash".  
        .replace(/[^a-zA-Z0-9 ]/g, '') // Remove all special characters and keep just A to Z, 0 to 9.
--- a/backend/src/api/mempool-blocks.ts
+++ b/backend/src/api/mempool-blocks.ts
@@ -1,6 +1,6 @@
 import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats } from '../mempool.interfaces';
-import { Common, OnlineFeeStatsCalculator } from './common';
+import { MempoolBlock, TransactionExtended, TransactionStripped, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction } from '../mempool.interfaces';
+import { Common } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
 import path from 'path';
@@ -36,9 +36,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]);
@@ -52,17 +52,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) {
+      if (a.feePerVsize === b.feePerVsize) {
        // tie-break by lexicographic txid order for stability
        return a.txid < b.txid ? -1 : 1;
      } else {
-        return b.adjustedFeePerVsize - a.adjustedFeePerVsize;
+        return b.feePerVsize - a.feePerVsize;
      }
    });

@@ -102,18 +102,16 @@ class MempoolBlocks {
    return blocks;
  }

-  private calculateMempoolBlocks(transactionsSorted: MempoolTransactionExtended[]): MempoolBlockWithTransactions[] {
+  private calculateMempoolBlocks(transactionsSorted: TransactionExtended[]): 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 transactions: TransactionExtended[] = [];
+    transactionsSorted.forEach((tx) => {
      if (blockWeight + tx.weight <= config.MEMPOOL.BLOCK_WEIGHT_UNITS
        || mempoolBlocks.length === config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT - 1) {
        tx.position = {
@@ -128,9 +126,6 @@ class MempoolBlocks {
          transactions.push(tx);
        }
        transactionIds.push(tx.txid);
-        if (onlineStats) {
-          feeStatsCalculator.processNext(tx);
-        }
      } else {
        mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees));
        blockVsize = 0;
@@ -138,16 +133,6 @@ class MempoolBlocks {
          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, [10, 20, 30, 40, 50, 60, 70, 80, 90]);
-            feeStatsCalculator.processNext(tx);
-          }
-        }
-
        blockVsize += tx.vsize;
        blockWeight = tx.weight;
        blockSize = tx.size;
@@ -157,8 +142,7 @@ class MempoolBlocks {
      }
    });
    if (transactions.length) {
-      const feeStats = onlineStats ? feeStatsCalculator.getRawFeeStats() : undefined;
-      mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees, feeStats));
+      mempoolBlocks.push(this.dataToMempoolBlocks(transactionIds, transactions, blockSize, blockWeight, blockFees));
    }

    return mempoolBlocks;
@@ -205,7 +189,7 @@ class MempoolBlocks {
    return mempoolBlockDeltas;
  }

-  public async $makeBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, saveResults: boolean = false): Promise<MempoolBlockWithTransactions[]> {
+  public async $makeBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, saveResults: boolean = false): Promise<MempoolBlockWithTransactions[]> {
    const start = Date.now();

    // reset mempool short ids
@@ -222,10 +206,9 @@ class MempoolBlocks {
        strippedMempool.set(entry.uid, {
          uid: entry.uid,
          fee: entry.fee,
-          weight: (entry.adjustedVsize * 4),
-          sigops: entry.sigops,
-          feePerVsize: entry.adjustedFeePerVsize || entry.feePerVsize,
-          effectiveFeePerVsize: entry.effectiveFeePerVsize || entry.adjustedFeePerVsize || entry.feePerVsize,
+          weight: entry.weight,
+          feePerVsize: entry.fee / (entry.weight / 4),
+          effectiveFeePerVsize: entry.effectiveFeePerVsize || (entry.fee / (entry.weight / 4)),
          inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => uid != null) as number[],
        });
      }
@@ -269,7 +252,7 @@ class MempoolBlocks {
    return this.mempoolBlocks;
  }

-  public async $updateBlockTemplates(newMempool: { [txid: string]: MempoolTransactionExtended }, added: MempoolTransactionExtended[], removed: MempoolTransactionExtended[], saveResults: boolean = false): Promise<void> {
+  public async $updateBlockTemplates(newMempool: { [txid: string]: TransactionExtended }, added: TransactionExtended[], removed: TransactionExtended[], saveResults: boolean = false): Promise<void> {
    if (!this.txSelectionWorker) {
      // need to reset the worker
      await this.$makeBlockTemplates(newMempool, saveResults);
@@ -288,10 +271,9 @@ class MempoolBlocks {
      return {
        uid: entry.uid || 0,
        fee: entry.fee,
-        weight: (entry.adjustedVsize * 4),
-        sigops: entry.sigops,
-        feePerVsize: entry.adjustedFeePerVsize || entry.feePerVsize,
-        effectiveFeePerVsize: entry.effectiveFeePerVsize || entry.adjustedFeePerVsize || entry.feePerVsize,
+        weight: entry.weight,
+        feePerVsize: entry.fee / (entry.weight / 4),
+        effectiveFeePerVsize: entry.effectiveFeePerVsize || (entry.fee / (entry.weight / 4)),
        inputs: entry.vin.map(v => this.getUid(newMempool[v.txid])).filter(uid => uid != null) as number[],
      };
    });
@@ -328,27 +310,18 @@ class MempoolBlocks {
      }
    }

-    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, [10, 20, 30, 40, 50, 60, 70, 80, 90]);
-    }
-
-    const readyBlocks: { transactionIds, transactions, totalSize, totalWeight, totalFees, feeStats }[] = [];
+    const readyBlocks: { transactionIds, transactions, totalSize, totalWeight, totalFees }[] = [];
    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
    // 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 mempoolTx: TransactionExtended;
      let totalSize = 0;
      let totalVsize = 0;
      let totalWeight = 0;
      let totalFees = 0;
-      const transactions: MempoolTransactionExtended[] = [];
+      const transactions: TransactionExtended[] = [];
      for (let txIndex = 0; txIndex < block.length; txIndex++) {
        txid = block[txIndex];
        if (txid) {
@@ -358,16 +331,8 @@ class MempoolBlocks {
            block: blockIndex,
            vsize: totalVsize + (mempoolTx.vsize / 2),
          };
-          mempoolTx.ancestors = [];
-          mempoolTx.descendants = [];
-          mempoolTx.bestDescendant = null;
          mempoolTx.cpfpChecked = true;

-          // online calculation of stack-of-blocks fee stats
-          if (hasBlockStack && blockIndex === blocks.length - 1 && feeStatsCalculator) {
-            feeStatsCalculator.processNext(mempoolTx);
-          }
-
          totalSize += mempoolTx.size;
          totalVsize += mempoolTx.vsize;
          totalWeight += mempoolTx.weight;
@@ -383,8 +348,7 @@ class MempoolBlocks {
        transactions,
        totalSize,
        totalWeight,
-        totalFees,
-        feeStats: (hasBlockStack && blockIndex === blocks.length - 1 && feeStatsCalculator) ? feeStatsCalculator.getRawFeeStats() : undefined,
+        totalFees
      });
    }

@@ -402,7 +366,7 @@ class MempoolBlocks {
              const relative = {
                txid: txid,
                fee: mempool[txid].fee,
-                weight: (mempool[txid].adjustedVsize * 4),
+                weight: mempool[txid].weight,
              };
              if (matched) {
                descendants.push(relative);
@@ -418,9 +382,7 @@ class MempoolBlocks {
      }
    }

-    const mempoolBlocks = readyBlocks.map((b, index) => {
-      return this.dataToMempoolBlocks(b.transactionIds, b.transactions, b.totalSize, b.totalWeight, b.totalFees, b.feeStats);
-    });
+    const mempoolBlocks = readyBlocks.map(b => this.dataToMempoolBlocks(b.transactionIds, b.transactions, b.totalSize, b.totalWeight, b.totalFees));

    if (saveResults) {
      const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, mempoolBlocks);
@@ -431,10 +393,8 @@ 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(transactionIds: string[], transactions: TransactionExtended[], totalSize: number, totalWeight: number, totalFees: number): MempoolBlockWithTransactions {
+    const feeStats = Common.calcEffectiveFeeStatistics(transactions);
    return {
      blockSize: totalSize,
      blockVSize: (totalWeight / 4), // fractional vsize to avoid rounding errors
@@ -452,7 +412,7 @@ class MempoolBlocks {
    this.nextUid = 1;
  }

-  private setUid(tx: MempoolTransactionExtended): number {
+  private setUid(tx: TransactionExtended): number {
    const uid = this.nextUid;
    this.nextUid++;
    this.uidMap.set(uid, tx.txid);
@@ -460,7 +420,7 @@ class MempoolBlocks {
    return uid;
  }

-  private getUid(tx: MempoolTransactionExtended): number | void {
+  private getUid(tx: TransactionExtended): number | void {
    if (tx?.uid != null && this.uidMap.has(tx.uid)) {
      return tx.uid;
    }
--- 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';
@@ -13,14 +13,13 @@ import rbfCache from './rbf-cache';
 class Mempool {
  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[]) => void) | undefined;
-  private $asyncMempoolChangedCallback: ((newMempool: {[txId: string]: MempoolTransactionExtended; }, newTransactions: MempoolTransactionExtended[],
-    deletedTransactions: MempoolTransactionExtended[]) => Promise<void>) | undefined;
+  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;
@@ -64,38 +63,28 @@ class Mempool {
    return this.latestTransactions;
  }

-  public setMempoolChangedCallback(fn: (newMempool: { [txId: string]: MempoolTransactionExtended; },
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[]) => 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[]) => Promise<void>): void {
+  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 async $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, [], []);
    }
    if (this.$asyncMempoolChangedCallback) {
      await this.$asyncMempoolChangedCallback(this.mempoolCache, [], []);
    }
-    this.addToSpendMap(Object.values(this.mempoolCache));
  }

  public async $updateMemPoolInfo() {
@@ -138,7 +127,7 @@ class Mempool {
    const currentMempoolSize = Object.keys(this.mempoolCache).length;
    this.updateTimerProgress(timer, 'got raw mempool');
    const diff = transactions.length - currentMempoolSize;
-    const newTransactions: MempoolTransactionExtended[] = [];
+    const newTransactions: TransactionExtended[] = [];

    this.mempoolCacheDelta = Math.abs(diff);

@@ -156,11 +145,11 @@ class Mempool {
      }
    };

-    let intervalTimer = Date.now();
+    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);
+          const transaction = await transactionUtils.$getTransactionExtended(txid);
          this.updateTimerProgress(timer, 'fetched new transaction');
          this.mempoolCache[txid] = transaction;
          if (this.inSync) {
@@ -179,20 +168,12 @@ class Mempool {
          logger.debug(`Error finding transaction '${txid}' in the mempool: ` + (e instanceof Error ? e.message : e));
        }
      }
-
-      if (Date.now() - intervalTimer > 5_000) {
-        
-        if (this.inSync) {
-          // Break and restart mempool loop if we spend too much time processing
-          // new transactions that may lead to falling behind on block height
-          logger.debug('Breaking mempool loop because the 5s time limit exceeded.');
-          break;
-        } else {
-          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);
-          intervalTimer = Date.now()
-        }
+      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;
      }
    }

@@ -218,7 +199,7 @@ class Mempool {
      }, 1000 * 60 * config.MEMPOOL.CLEAR_PROTECTION_MINUTES);
    }

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

    if (this.mempoolProtection !== 1) {
      this.mempoolProtection = 0;
@@ -286,7 +267,7 @@ class Mempool {
    }
  }

-  public handleRbfTransactions(rbfTransactions: { [txid: string]: MempoolTransactionExtended[]; }): void {
+  public handleRbfTransactions(rbfTransactions: { [txid: string]: TransactionExtended[]; }): void {
    for (const rbfTransaction in rbfTransactions) {
      if (this.mempoolCache[rbfTransaction] && rbfTransactions[rbfTransaction]?.length) {
        // Store replaced transactions
@@ -295,34 +276,6 @@ class Mempool {
    }
  }

-  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);
-        }
-      }
-    }
-  }
-
  private updateTxPerSecond() {
    const nowMinusTimeSpan = new Date().getTime() - (1000 * config.STATISTICS.TX_PER_SECOND_SAMPLE_PERIOD);
    this.txPerSecondArray = this.txPerSecondArray.filter((unixTime) => unixTime > nowMinusTimeSpan);
--- a/backend/src/api/mining/mining-routes.ts
+++ b/backend/src/api/mining/mining-routes.ts
@@ -26,7 +26,7 @@ class MiningRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fee-rates/:interval', this.$getHistoricalBlockFeeRates)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/sizes-weights/:interval', this.$getHistoricalBlockSizeAndWeight)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty-adjustments/:interval', this.$getDifficultyAdjustments)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/predictions/:interval', this.$getHistoricalBlocksHealth)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/predictions/:interval', this.$getHistoricalBlockPrediction)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/scores', this.$getBlockAuditScores)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/scores/:height', this.$getBlockAuditScores)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/audit/score/:hash', this.$getBlockAuditScore)
@@ -244,15 +244,15 @@ class MiningRoutes {
    }
  }

-  private async $getHistoricalBlocksHealth(req: Request, res: Response) {
+  private async $getHistoricalBlockPrediction(req: Request, res: Response) {
    try {
-      const blocksHealth = await mining.$getBlocksHealthHistory(req.params.interval);
-      const blockCount = await BlocksAuditsRepository.$getBlocksHealthCount();
+      const blockPredictions = await mining.$getBlockPredictionsHistory(req.params.interval);
+      const blockCount = await BlocksAuditsRepository.$getPredictionsCount();
      res.header('Pragma', 'public');
      res.header('Cache-control', 'public');
      res.header('X-total-count', blockCount.toString());
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(blocksHealth.map(health => [health.time, health.height, health.match_rate]));
+      res.json(blockPredictions.map(prediction => [prediction.time, prediction.height, prediction.match_rate]));
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
--- a/backend/src/api/mining/mining.ts
+++ b/backend/src/api/mining/mining.ts
@@ -19,15 +19,12 @@ class Mining {
  private blocksPriceIndexingRunning = false;
  public lastHashrateIndexingDate: number | null = null;
  public lastWeeklyHashrateIndexingDate: number | null = null;
-  
-  public reindexHashrateRequested = false;
-  public reindexDifficultyAdjustmentRequested = false;

  /**
-   * 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)
    );
@@ -106,7 +103,6 @@ class Mining {
        emptyBlocks: emptyBlocksCount.length > 0 ? emptyBlocksCount[0]['count'] : 0,
        slug: poolInfo.slug,
        avgMatchRate: poolInfo.avgMatchRate !== null ? Math.round(100 * poolInfo.avgMatchRate) / 100 : null,
-        avgFeeDelta: poolInfo.avgFeeDelta,
      };
      poolsStats.push(poolStat);
    });
@@ -294,14 +290,6 @@ class Mining {
   * Generate daily hashrate data
   */
  public async $generateNetworkHashrateHistory(): Promise<void> {
-    // If a re-index was requested, truncate first
-    if (this.reindexHashrateRequested === true) {
-      logger.notice(`hashrates will now be re-indexed`);
-      await database.query(`TRUNCATE hashrates`);
-      this.lastHashrateIndexingDate = 0;
-      this.reindexHashrateRequested = false;
-    }
-
    // We only run this once a day around midnight
    const today = new Date().getUTCDate();
    if (today === this.lastHashrateIndexingDate) {
@@ -407,13 +395,6 @@ class Mining {
   * Index difficulty adjustments
   */
  public async $indexDifficultyAdjustments(): Promise<void> {
-    // If a re-index was requested, truncate first
-    if (this.reindexDifficultyAdjustmentRequested === true) {
-      logger.notice(`difficulty_adjustments will now be re-indexed`);
-      await database.query(`TRUNCATE difficulty_adjustments`);
-      this.reindexDifficultyAdjustmentRequested = false;
-    }
-
    const indexedHeightsArray = await DifficultyAdjustmentsRepository.$getAdjustmentsHeights();
    const indexedHeights = {};
    for (const height of indexedHeightsArray) {
@@ -492,11 +473,11 @@ class Mining {
    }
    this.blocksPriceIndexingRunning = true;

-    let totalInserted = 0;
    try {
      const prices: any[] = await PricesRepository.$getPricesTimesAndId();    
      const blocksWithoutPrices: any[] = await BlocksRepository.$getBlocksWithoutPrice();

+      let totalInserted = 0;
      const blocksPrices: BlockPrice[] = [];

      for (const block of blocksWithoutPrices) {
@@ -541,13 +522,7 @@ class Mining {
      }
    } catch (e) {
      this.blocksPriceIndexingRunning = false;
-      logger.err(`Cannot index block prices. ${e}`);
-    }
-
-    if (totalInserted > 0) {
-      logger.info(`Indexing blocks prices completed. Indexed ${totalInserted}`, logger.tags.mining);
-    } else {
-      logger.debug(`Indexing blocks prices completed. Indexed 0.`, logger.tags.mining);
+      throw e;
    }

    this.blocksPriceIndexingRunning = false;
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -4,7 +4,6 @@ import config from '../config';
 import PoolsRepository from '../repositories/PoolsRepository';
 import { PoolTag } from '../mempool.interfaces';
 import diskCache from './disk-cache';
-import mining from './mining/mining';

 class PoolsParser {
  miningPools: any[] = [];
@@ -42,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();

@@ -74,12 +73,14 @@ class PoolsParser {
        if (JSON.stringify(pool.addresses) !== poolDB.addresses ||
          JSON.stringify(pool.regexes) !== poolDB.regexes) {
          // Pool addresses changed or coinbase tags changed
-          logger.notice(`Updating addresses and/or coinbase tags for ${pool.name} mining pool.`);
+          logger.notice(`Updating addresses and/or coinbase tags for ${pool.name} mining pool. If 'AUTOMATIC_BLOCK_REINDEXING' is enabled, we will re-index its blocks and 'unknown' blocks`);
          await PoolsRepository.$updateMiningPoolTags(poolDB.id, pool.addresses, pool.regexes);
          await this.$deleteBlocksForPool(poolDB);
        }
      }
    }
+
+    logger.info('Mining pools-v2.json import completed');
  }

  /**
@@ -117,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(`
@@ -127,15 +132,7 @@ class PoolsParser {
      LIMIT 1`,
      [pool.id]
    );
-
-    let firstKnownBlockPool = 130635; // https://mempool.space/block/0000000000000a067d94ff753eec72830f1205ad3a4c216a08a80c832e551a52
-    if (config.MEMPOOL.NETWORK === 'testnet') {
-      firstKnownBlockPool = 21106; // https://mempool.space/testnet/block/0000000070b701a5b6a1b965f6a38e0472e70b2bb31b973e4638dec400877581
-    } else if (config.MEMPOOL.NETWORK === 'signet') {
-      firstKnownBlockPool = 0;
-    }
-
-    const oldestBlockHeight = oldestPoolBlock.length ?? 0 > 0 ? oldestPoolBlock[0].height : firstKnownBlockPool;
+    const oldestBlockHeight = oldestPoolBlock.length ?? 0 > 0 ? oldestPoolBlock[0].height : 130635;
    const [unknownPool] = await DB.query(`SELECT id from pools where slug = "unknown"`);
    this.uniqueLog(logger.notice, `Deleting blocks with unknown mining pool from height ${oldestBlockHeight} for re-indexing`);
    await DB.query(`
@@ -149,31 +146,16 @@ class PoolsParser {
      WHERE pool_id = ?`,
      [pool.id]
    );
-
-    // Re-index hashrates and difficulty adjustments later
-    mining.reindexHashrateRequested = true;
-    mining.reindexDifficultyAdjustmentRequested = true;
  }

  private async $deleteUnknownBlocks(): Promise<void> {
-    let firstKnownBlockPool = 130635; // https://mempool.space/block/0000000000000a067d94ff753eec72830f1205ad3a4c216a08a80c832e551a52
-    if (config.MEMPOOL.NETWORK === 'testnet') {
-      firstKnownBlockPool = 21106; // https://mempool.space/testnet/block/0000000070b701a5b6a1b965f6a38e0472e70b2bb31b973e4638dec400877581
-    } else if (config.MEMPOOL.NETWORK === 'signet') {
-      firstKnownBlockPool = 0;
-    }
-
    const [unknownPool] = await DB.query(`SELECT id from pools where slug = "unknown"`);
-    this.uniqueLog(logger.notice, `Deleting blocks with unknown mining pool from height ${firstKnownBlockPool} for re-indexing`);
+    this.uniqueLog(logger.notice, `Deleting blocks with unknown mining pool from height 130635 for re-indexing`);
    await DB.query(`
      DELETE FROM blocks
-      WHERE pool_id = ? AND height >= ${firstKnownBlockPool}`,
+      WHERE pool_id = ? AND height >= 130635`,
      [unknownPool[0].id]
    );
-
-    // Re-index hashrates and difficulty adjustments later
-    mining.reindexHashrateRequested = true;
-    mining.reindexDifficultyAdjustmentRequested = true;
  }
 }

--- a/backend/src/api/rbf-cache.ts
+++ b/backend/src/api/rbf-cache.ts
@@ -1,5 +1,5 @@
 import logger from "../logger";
-import { MempoolTransactionExtended, TransactionStripped } from "../mempool.interfaces";
+import { TransactionExtended, TransactionStripped } from "../mempool.interfaces";
 import bitcoinApi from './bitcoin/bitcoin-api-factory';
 import { Common } from "./common";

@@ -23,20 +23,20 @@ class RbfCache {
  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 txs: Map<string, TransactionExtended> = new Map();
  private expiring: Map<string, number> = new Map();

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

-  public add(replaced: MempoolTransactionExtended[], newTxExtended: MempoolTransactionExtended): void {
-    if (!newTxExtended || !replaced?.length || this.txs.has(newTxExtended.txid)) {
+  public add(replaced: TransactionExtended[], newTxExtended: TransactionExtended): void {
+    if (!newTxExtended || !replaced?.length) {
      return;
    }

    const newTx = Common.stripTransaction(newTxExtended) as RbfTransaction;
-    const newTime = newTxExtended.firstSeen || (Date.now() / 1000);
+    const newTime = newTxExtended.firstSeen || Date.now();
    newTx.rbf = newTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
    this.txs.set(newTx.txid, newTxExtended);

@@ -59,7 +59,7 @@ class RbfCache {
          }
        }
      } else {
-        const replacedTime = replacedTxExtended.firstSeen || (Date.now() / 1000);
+        const replacedTime = replacedTxExtended.firstSeen || Date.now();
        replacedTrees.push({
          tx: replacedTx,
          time: replacedTime,
@@ -74,7 +74,7 @@ class RbfCache {
    const treeId = replacedTrees[0].tx.txid;
    const newTree = {
      tx: newTx,
-      time: newTime,
+      time: newTxExtended.firstSeen || Date.now(),
      fullRbf,
      replaces: replacedTrees
    };
@@ -92,7 +92,7 @@ class RbfCache {
    return this.replaces.get(txId);
  }

-  public getTx(txId: string): MempoolTransactionExtended | undefined {
+  public getTx(txId: string): TransactionExtended | undefined {
    return this.txs.get(txId);
  }

@@ -272,7 +272,7 @@ class RbfCache {
    return deflated;
  }

-  async importTree(root, txid, deflated, txs: Map<string, MempoolTransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
+  async importTree(root, txid, deflated, txs: Map<string, TransactionExtended>, mined: boolean = false): Promise<RbfTree | void> {
    const treeInfo = deflated[txid];
    const replaces: RbfTree[] = [];

--- a/backend/src/api/statistics/statistics-api.ts
+++ b/backend/src/api/statistics/statistics-api.ts
@@ -211,7 +211,7 @@ class StatisticsApi {
      CAST(avg(vsize_1800) as DOUBLE) as vsize_1800,
      CAST(avg(vsize_2000) as DOUBLE) as vsize_2000 \
      FROM statistics \
-      ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \
+      WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \
      GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
      ORDER BY statistics.added DESC;`;
  }
@@ -259,7 +259,7 @@ class StatisticsApi {
      vsize_1800,
      vsize_2000 \
      FROM statistics \
-      ${interval === 'all' ? '' : `WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`} \
+      WHERE added BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW() \
      GROUP BY UNIX_TIMESTAMP(added) DIV ${div} \
      ORDER BY statistics.added DESC;`;
  }
@@ -386,17 +386,6 @@ class StatisticsApi {
    }
  }

-  public async $listAll(): Promise<OptimizedStatistic[]> {
-    try {
-      const query = this.getQueryForDays(43200, 'all'); // 12h interval
-      const [rows] = await DB.query({ sql: query, timeout: this.queryTimeout });
-      return this.mapStatisticToOptimizedStatistic(rows as Statistic[]);
-    } catch (e) {
-      logger.err('$listAll() 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
@@ -15,11 +15,10 @@ class StatisticsRoutes {
      .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'))
-      .get(config.MEMPOOL.API_URL_PREFIX + 'statistics/all', this.$getStatisticsByTime.bind(this, 'all'))
    ;
  }

-  private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y' | '4y' | 'all', req: Request, res: Response) {
+  private async $getStatisticsByTime(time: '2h' | '24h' | '1w' | '1m' | '3m' | '6m' | '1y' | '2y' | '3y' | '4y', req: Request, res: Response) {
    res.header('Pragma', 'public');
    res.header('Cache-control', 'public');
    res.setHeader('Expires', new Date(Date.now() + 1000 * 300).toUTCString());
@@ -27,6 +26,10 @@ class StatisticsRoutes {
    try {
      let result;
      switch (time as string) {
+        case '2h':
+          result = await statisticsApi.$list2H();
+          res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
+          break;
        case '24h':
          result = await statisticsApi.$list24H();
          res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
@@ -55,13 +58,8 @@ class StatisticsRoutes {
        case '4y':
          result = await statisticsApi.$list4Y();
          break;
-        case 'all':
-          result = await statisticsApi.$listAll();
-          break;
        default:
          result = await statisticsApi.$list2H();
-          res.setHeader('Expires', new Date(Date.now() + 1000 * 30).toUTCString());
-          break;
      }
      res.json(result);
    } catch (e) {
--- 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
@@ -48,14 +48,12 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
      weight: tx.weight,
      feePerVsize: tx.feePerVsize,
      effectiveFeePerVsize: tx.feePerVsize,
-      sigops: tx.sigops,
      inputs: tx.inputs || [],
      relativesSet: false,
      ancestorMap: new Map<number, AuditTransaction>(),
      children: new Set<AuditTransaction>(),
      ancestorFee: 0,
      ancestorWeight: 0,
-      ancestorSigops: 0,
      score: 0,
      used: false,
      modified: false,
@@ -85,7 +83,6 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
  // (i.e. the package rooted in the transaction with the best ancestor score)
  const blocks: number[][] = [];
  let blockWeight = 4000;
-  let blockSigops = 0;
  let transactions: AuditTransaction[] = [];
  const modified: PairingHeap<AuditTransaction> = new PairingHeap((a, b): boolean => {
    if (a.score === b.score) {
@@ -121,7 +118,7 @@ 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 (blocks.length >= 7 || (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];
@@ -130,7 +127,7 @@ function makeBlockTemplates(mempool: Map<number, CompactThreadTransaction>)
          cpfpClusters.set(nextTx.uid, sortedTxSet.map(tx => tx.uid));
          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();
@@ -158,7 +155,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);
          });
        }

@@ -240,11 +237,9 @@ function setRelatives(
  };
  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;
@@ -256,7 +251,6 @@ function updateDescendants(
  rootTx: AuditTransaction,
  mempool: Map<number, AuditTransaction>,
  modified: PairingHeap<AuditTransaction>,
-  clusterRate: number,
 ): void {
  const descendantSet: Set<AuditTransaction> = new Set();
  // stack of nodes left to visit
@@ -276,10 +270,8 @@ function updateDescendants(
      descendantTx.ancestorMap.delete(rootTx.uid);
      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,7 +1,7 @@
 import logger from '../logger';
 import * as WebSocket from 'ws';
 import {
-  BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse,
+  BlockExtended, TransactionExtended, WebsocketResponse,
  OptimizedStatistic, ILoadingIndicators
 } from '../mempool.interfaces';
 import blocks from './blocks';
@@ -22,14 +22,6 @@ import { deepClone } from '../utils/clone';
 import priceUpdater from '../tasks/price-updater';
 import { ApiPrice } from '../repositories/PricesRepository';

-// valid 'want' subscriptions
-const wantable = [
-  'blocks',
-  'mempool-blocks',
-  'live-2h-chart',
-  'stats',
-];
-
 class WebsocketHandler {
  private wss: WebSocket.Server | undefined;
  private extraInitProperties = {};
@@ -38,52 +30,14 @@ class WebsocketHandler {
  private numConnected = 0;
  private numDisconnected = 0;

-  private socketData: { [key: string]: string } = {};
-  private serializedInitData: string = '{}';
-
  constructor() { }

  setWebsocketServer(wss: WebSocket.Server) {
    this.wss = wss;
  }

-  setExtraInitData(property: string, value: any) {
+  setExtraInitProperties(property: string, value: any) {
    this.extraInitProperties[property] = value;
-    this.updateSocketDataFields(this.extraInitProperties);
-  }
-
-  private updateSocketDataFields(data: { [property: string]: any }): void {
-    for (const property of Object.keys(data)) {
-      if (data[property] != null) {
-        this.socketData[property] = JSON.stringify(data[property]);
-      } else {
-        delete this.socketData[property];
-      }
-    }
-    this.serializedInitData = '{'
-    + Object.keys(this.socketData).map(key => `"${key}": ${this.socketData[key]}`).join(', ')
-    + '}';
-  }
-
-  private updateSocketData(): void {
-    const _blocks = blocks.getBlocks().slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT);
-    const da = difficultyAdjustment.getDifficultyAdjustment();
-    this.updateSocketDataFields({
-      '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() {
@@ -102,33 +56,11 @@ class WebsocketHandler {
          const parsedMessage: WebsocketResponse = JSON.parse(message);
          const response = {};

-          const wantNow = {};
-          if (parsedMessage && parsedMessage.action === 'want' && Array.isArray(parsedMessage.data)) {
-            for (const sub of wantable) {
-              const key = `want-${sub}`;
-              const wants = parsedMessage.data.includes(sub);
-              if (wants && client['wants'] && !client[key]) {
-                wantNow[key] = true;
-              }
-              client[key] = wants;
-            }
-            client['wants'] = true;
-          }
-
-          // send initial data when a client first starts a subscription
-          if (wantNow['want-blocks'] || (parsedMessage && parsedMessage['refresh-blocks'])) {
-            response['blocks'] = this.socketData['blocks'];
-          }
-
-          if (wantNow['want-mempool-blocks']) {
-            response['mempool-blocks'] = this.socketData['mempool-blocks'];
-          }
-
-          if (wantNow['want-stats']) {
-            response['mempoolInfo'] = this.socketData['mempoolInfo'];
-            response['vBytesPerSecond'] = this.socketData['vBytesPerSecond'];
-            response['fees'] = this.socketData['fees'];
-            response['da'] = this.socketData['da'];
+          if (parsedMessage.action === 'want') {
+            client['want-blocks'] = parsedMessage.data.indexOf('blocks') > -1;
+            client['want-mempool-blocks'] = parsedMessage.data.indexOf('mempool-blocks') > -1;
+            client['want-live-2h-chart'] = parsedMessage.data.indexOf('live-2h-chart') > -1;
+            client['want-stats'] = parsedMessage.data.indexOf('stats') > -1;
          }

          if (parsedMessage && parsedMessage['track-tx']) {
@@ -139,29 +71,29 @@ class WebsocketHandler {
              if (parsedMessage['watch-mempool']) {
                const rbfCacheTxid = rbfCache.getReplacedBy(trackTxid);
                if (rbfCacheTxid) {
-                  response['txReplaced'] = JSON.stringify({
+                  response['txReplaced'] = {
                    txid: rbfCacheTxid,
-                  });
+                  };
                  client['track-tx'] = null;
                } else {
                  // It might have appeared before we had the time to start watching for it
                  const tx = memPool.getMempool()[trackTxid];
                  if (tx) {
                    if (config.MEMPOOL.BACKEND === 'esplora') {
-                      response['tx'] = JSON.stringify(tx);
+                      response['tx'] = tx;
                    } else {
                      // tx.prevout is missing from transactions when in bitcoind mode
                      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: ' + (e instanceof Error ? e.message : e));
                      }
                    }
                  } else {
                    try {
-                      const fullTx = await transactionUtils.$getMempoolTransactionExtended(client['track-tx'], true);
-                      response['tx'] = JSON.stringify(fullTx);
+                      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));
                      client['track-mempool-tx'] = parsedMessage['track-tx'];
@@ -171,10 +103,10 @@ class WebsocketHandler {
              }
              const tx = memPool.getMempool()[trackTxid];
              if (tx && tx.position) {
-                response['txPosition'] = JSON.stringify({
+                response['txPosition'] = {
                  txid: trackTxid,
                  position: tx.position,
-                });
+                };
              }
            } else {
              client['track-tx'] = null;
@@ -207,10 +139,10 @@ class WebsocketHandler {
              const index = parsedMessage['track-mempool-block'];
              client['track-mempool-block'] = index;
              const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions();
-              response['projected-block-transactions'] = JSON.stringify({
+              response['projected-block-transactions'] = {
                index: index,
                blockTransactions: mBlocksWithTransactions[index]?.transactions || [],
-              });
+              };
            } else {
              client['track-mempool-block'] = null;
            }
@@ -219,24 +151,21 @@ class WebsocketHandler {
          if (parsedMessage && parsedMessage['track-rbf'] !== undefined) {
            if (['all', 'fullRbf'].includes(parsedMessage['track-rbf'])) {
              client['track-rbf'] = parsedMessage['track-rbf'];
-              response['rbfLatest'] = JSON.stringify(rbfCache.getRbfTrees(parsedMessage['track-rbf'] === 'fullRbf'));
            } else {
              client['track-rbf'] = false;
            }
          }

          if (parsedMessage.action === 'init') {
-            if (!this.socketData['blocks']?.length || !this.socketData['da']) {
-              this.updateSocketData();
-            }
-            if (!this.socketData['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') {
-            response['pong'] = JSON.stringify(true);
+            response['pong'] = true;
          }

          if (parsedMessage['track-donation'] && parsedMessage['track-donation'].length === 22) {
@@ -252,8 +181,7 @@ class WebsocketHandler {
          }

          if (Object.keys(response).length) {
-            const serializedResponse = this.serializeResponse(response);
-            client.send(serializedResponse);
+            client.send(JSON.stringify(response));
          }
        } catch (e) {
          logger.debug('Error parsing websocket message: ' + (e instanceof Error ? e.message : e));
@@ -282,14 +210,11 @@ class WebsocketHandler {
      throw new Error('WebSocket.Server is not set');
    }

-    this.updateSocketDataFields({ '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 }));
    });
  }

@@ -298,17 +223,34 @@ class WebsocketHandler {
      throw new Error('WebSocket.Server is not set');
    }

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

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

    this.printLogs();

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

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

-  async $handleMempoolChange(newMempool: { [txid: string]: MempoolTransactionExtended },
-    newTransactions: MempoolTransactionExtended[], deletedTransactions: MempoolTransactionExtended[]): 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');
    }
@@ -364,55 +304,8 @@ class WebsocketHandler {
    for (const deletedTx of deletedTransactions) {
      rbfCache.evict(deletedTx.txid);
    }
-    memPool.removeFromSpendMap(deletedTransactions);
-    memPool.addToSpendMap(newTransactions);
    const recommendedFees = feeApi.getRecommendedFee();

-    const latestTransactions = newTransactions.slice(0, 6).map((tx) => Common.stripTransaction(tx));
-
-    // update init data
-    this.updateSocketDataFields({
-      'mempoolInfo': mempoolInfo,
-      'vBytesPerSecond': vBytesPerSecond,
-      'mempool-blocks': mBlocks,
-      'transactions': latestTransactions,
-      'loadingIndicators': loadingIndicators.getLoadingIndicators(),
-      'da': da?.previousTime ? da : undefined,
-      'fees': recommendedFees,
-    });
-
-    // cache serialized objects to avoid stringify-ing the same thing for every client
-    const responseCache = { ...this.socketData };
-    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 };
-            }
-          }
-        }
-      }
-    }
-
    this.wss.clients.forEach(async (client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
@@ -421,17 +314,17 @@ class WebsocketHandler {
      const response = {};

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

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

      if (client['track-mempool-tx']) {
@@ -439,13 +332,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;
        }
@@ -459,7 +352,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));
@@ -473,7 +366,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));
@@ -485,7 +378,7 @@ class WebsocketHandler {
        }

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

@@ -514,58 +407,65 @@ 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 === trackTxid) {
+            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({
+          response['rbfTransaction'] = {
            txid: rbfReplacedBy,
-          });
+          }
        }

        const rbfChange = rbfChanges.map[client['track-tx']];
        if (rbfChange) {
-          response['rbfInfo'] = JSON.stringify(rbfChanges.trees[rbfChange]);
+          response['rbfInfo'] = rbfChanges.trees[rbfChange];
        }

        const mempoolTx = newMempool[trackTxid];
        if (mempoolTx && mempoolTx.position) {
-          response['txPosition'] = JSON.stringify({
+          response['txPosition'] = {
            txid: trackTxid,
            position: mempoolTx.position,
-          });
+          };
        }
      }

      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);
+        response['rbfLatest'] = rbfReplacements;
      } else if (client['track-rbf'] === 'fullRbf' && fullRbfReplacements) {
-        response['rbfLatest'] = getCachedResponse('fullrbfLatest', fullRbfReplacements);
+        response['rbfLatest'] = fullRbfReplacements;
      }

      if (Object.keys(response).length) {
-        const serializedResponse = this.serializeResponse(response);
-        client.send(serializedResponse);
+        client.send(JSON.stringify(response));
      }
    });
  }
@@ -597,23 +497,23 @@ class WebsocketHandler {
      }

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

-        const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : [];
-
-        let totalFees = 0;
-        let totalWeight = 0;
-        for (const tx of stripped) {
-          totalFees += tx.fee;
-          totalWeight += (tx.vsize * 4);
-        }
+        const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions.map((tx) => {
+          return {
+            txid: tx.txid,
+            vsize: tx.vsize,
+            fee: tx.fee ? Math.round(tx.fee) : 0,
+            value: tx.value,
+          };
+        }) : [];

        BlocksSummariesRepository.$saveTemplate({
          height: block.height,
          template: {
            id: block.id,
-            transactions: stripped,
+            transactions: stripped
          }
        });

@@ -624,16 +524,11 @@ class WebsocketHandler {
          addedTxs: added,
          missingTxs: censored,
          freshTxs: fresh,
-          sigopTxs: sigop,
          matchRate: matchRate,
-          expectedFees: totalFees,
-          expectedWeight: totalWeight,
        });

        if (block.extras) {
          block.extras.matchRate = matchRate;
-          block.extras.expectedFees = totalFees;
-          block.extras.expectedWeight = totalWeight;
          block.extras.similarity = similarity;
        }
      }
@@ -644,10 +539,6 @@ class WebsocketHandler {
      }
    }

-    const rbfTransactions = Common.findMinedRbfTransactions(transactions, memPool.getSpendMap());
-    memPool.handleMinedRbfTransactions(rbfTransactions);
-    memPool.removeFromSpendMap(transactions);
-
    // Update mempool to remove transactions included in the new block
    for (const txId of txIds) {
      delete _memPool[txId];
@@ -664,62 +555,38 @@ class WebsocketHandler {

    const da = difficultyAdjustment.getDifficultyAdjustment();
    const fees = feeApi.getRecommendedFee();
-    const mempoolInfo = memPool.getMempoolInfo();
-
-    // update init data
-    this.updateSocketDataFields({
-      'mempoolInfo': mempoolInfo,
-      'blocks': [...blocks.getBlocks(), block].slice(-config.MEMPOOL.INITIAL_BLOCKS_AMOUNT),
-      'mempool-blocks': mBlocks,
-      'loadingIndicators': loadingIndicators.getLoadingIndicators(),
-      'da': da?.previousTime ? da : undefined,
-      'fees': fees,
-    });
-
-    const responseCache = { ...this.socketData };
-    function getCachedResponse(key, data): string {
-      if (!responseCache[key]) {
-        responseCache[key] = JSON.stringify(data);
-      }
-      return responseCache[key];
-    }

    this.wss.clients.forEach((client) => {
      if (client.readyState !== WebSocket.OPEN) {
        return;
      }

-      const response = {};
-
-      if (client['want-blocks']) {
-        response['block'] = getCachedResponse('block', block);
+      if (!client['want-blocks']) {
+        return;
      }

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

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

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

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

@@ -784,35 +651,24 @@ 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],
-          });
+          };
        }
      }

-      if (Object.keys(response).length) {
-        const serializedResponse = this.serializeResponse(response);
-        client.send(serializedResponse);
-      }
+      client.send(JSON.stringify(response));
    });
  }

-  // takes a dictionary of JSON serialized values
-  // and zips it together into a valid JSON object
-  private serializeResponse(response): string {
-    return '{'
-        + Object.keys(response).map(key => `"${key}": ${response[key]}`).join(', ')
-        + '}';
-  }
-
  private printLogs(): void {
    if (this.wss) {
      const count = this.wss?.clients?.size || 0;
--- a/backend/src/database.ts
+++ b/backend/src/database.ts
@@ -30,7 +30,7 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr
  }

  public async query<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket |
-    OkPacket[] | ResultSetHeader>(query, params?, connection?: PoolConnection): Promise<[T, FieldPacket[]]>
+    OkPacket[] | ResultSetHeader>(query, params?): Promise<[T, FieldPacket[]]>
  {
    this.checkDBFlag();
    let hardTimeout;
@@ -45,9 +45,7 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr
          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);

-        // Use a specific connection if provided, otherwise delegate to the pool
-        const connectionPromise = connection ? Promise.resolve(connection) : this.getPool();
-        connectionPromise.then((pool: PoolConnection | Pool) => {
+        this.getPool().then(pool => {
          return pool.query(query, params) as Promise<[T, FieldPacket[]]>;
        }).then(result => {
          resolve(result);
@@ -63,33 +61,6 @@ import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } fr
    }
  }

-  public async $atomicQuery<T extends RowDataPacket[][] | RowDataPacket[] | OkPacket |
-    OkPacket[] | ResultSetHeader>(queries: { query, params }[]): Promise<[T, FieldPacket[]][]>
-  {
-    const pool = await this.getPool();
-    const connection = await pool.getConnection();
-    try {
-      await connection.beginTransaction();
-
-      const results: [T, FieldPacket[]][]  = [];
-      for (const query of queries) {
-        const result = await this.query(query.query, query.params, connection) as [T, FieldPacket[]];
-        results.push(result);
-      }
-
-      await connection.commit();
-
-      return results;
-    } catch (e) {
-      logger.err('Could not complete db transaction, rolling back: ' + (e instanceof Error ? e.message : e));
-      connection.rollback();
-      connection.release();
-      throw e;
-    } finally {
-      connection.release();
-    }
-  }
-
  public async checkDbConnection() {
    this.checkDBFlag();
    try {
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -150,7 +150,7 @@ class Server {

    if (config.BISQ.ENABLED) {
      bisq.startBisqService();
-      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitData('bsq-price', price));
+      bisq.setPriceCallbackFunction((price) => websocketHandler.setExtraInitProperties('bsq-price', price));
      blocks.setNewBlockCallback(bisq.handleNewBitcoinBlock.bind(bisq));
      bisqMarkets.startBisqService();
    }
--- a/backend/src/indexer.ts
+++ b/backend/src/indexer.ts
@@ -134,7 +134,6 @@ class Indexer {
      await mining.$generatePoolHashrateHistory();
      await blocks.$generateBlocksSummariesDatabase();
      await blocks.$generateCPFPDatabase();
-      await blocks.$generateAuditStats();
    } catch (e) {
      this.indexerRunning = false;
      logger.err(`Indexer failed, trying again in 10 seconds. Reason: ` + (e instanceof Error ? e.message : e));
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -19,7 +19,6 @@ export interface PoolInfo {
  blockCount: number;
  slug: string;
  avgMatchRate: number | null;
-  avgFeeDelta: number | null;
 }

 export interface PoolStats extends PoolInfo {
@@ -33,18 +32,13 @@ export interface BlockAudit {
  hash: string,
  missingTxs: string[],
  freshTxs: string[],
-  sigopTxs: string[],
  addedTxs: string[],
  matchRate: number,
-  expectedFees?: number,
-  expectedWeight?: number,
 }

 export interface AuditScore {
  hash: string,
  matchRate?: number,
-  expectedFees?: number
-  expectedWeight?: number
 }

 export interface MempoolBlock {
@@ -93,38 +87,28 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
  uid?: number;
 }

-export interface MempoolTransactionExtended extends TransactionExtended {
-  sigops: number;
-  adjustedVsize: number;
-  adjustedFeePerVsize: number;
-}
-
 export interface AuditTransaction {
  uid: number;
  fee: number;
  weight: number;
  feePerVsize: number;
  effectiveFeePerVsize: number;
-  sigops: number;
  inputs: number[];
  relativesSet: boolean;
  ancestorMap: Map<number, 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[];
@@ -187,8 +171,6 @@ export interface BlockExtension {
  feeRange: number[]; // fee rate percentiles
  reward: number;
  matchRate: number | null;
-  expectedFees: number | null;
-  expectedWeight: number | null;
  similarity?: number;
  pool: {
    id: number; // Note - This is the `unique_id`, not to mix with the auto increment `id`
@@ -255,21 +237,9 @@ export interface EffectiveFeeStats {
  feeRange: number[]; // 2nd, 10th, 25th, 50th, 75th, 90th, 98th percentiles
 }

-export interface WorkingEffectiveFeeStats extends EffectiveFeeStats {
-  minFee: number;
-  maxFee: number;
-}
-
-export interface CpfpCluster {
-  root: string,
-  height: number,
-  txs: Ancestor[],
-  effectiveFeePerVsize: number,
-}
-
 export interface CpfpSummary {
  transactions: TransactionExtended[];
-  clusters: CpfpCluster[];
+  clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[];
 }

 export interface Statistic {
--- a/backend/src/repositories/BlocksAuditsRepository.ts
+++ b/backend/src/repositories/BlocksAuditsRepository.ts
@@ -6,32 +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, match_rate, expected_fees, expected_weight)
-        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
-          JSON.stringify(audit.addedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]);
+      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 $setSummary(hash: string, expectedFees: number, expectedWeight: number) {
-    try {
-      await DB.query(`
-        UPDATE blocks_audits SET
-        expected_fees = ?,
-        expected_weight = ?
-        WHERE hash = ?
-      `, [expectedFees, expectedWeight, hash]);
-    } catch (e: any) {
-      logger.err(`Cannot update block audit in db. Reason: ` + (e instanceof Error ? e.message : 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`;

@@ -44,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;
    }
  }
@@ -64,17 +52,10 @@ 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,
-        template,
-        missing_txs as missingTxs,
-        added_txs as addedTxs,
-        fresh_txs as freshTxs,
-        sigop_txs as sigopTxs,
-        match_rate as matchRate,
-        expected_fees as expectedFees,
-        expected_weight as expectedWeight
+        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}"
      `);
      
@@ -82,10 +63,12 @@ class BlocksAuditRepositories {
        rows[0].missingTxs = JSON.parse(rows[0].missingTxs);
        rows[0].addedTxs = JSON.parse(rows[0].addedTxs);
        rows[0].freshTxs = JSON.parse(rows[0].freshTxs);
-        rows[0].sigopTxs = JSON.parse(rows[0].sigopTxs);
+        rows[0].transactions = JSON.parse(rows[0].transactions);
        rows[0].template = JSON.parse(rows[0].template);

-        return rows[0];
+        if (rows[0].transactions.length) {
+          return rows[0];
+        }
      }
      return null;
    } catch (e: any) {
@@ -97,7 +80,7 @@ class BlocksAuditRepositories {
  public async $getBlockAuditScore(hash: string): Promise<AuditScore> {
    try {
      const [rows]: any[] = await DB.query(
-        `SELECT hash, match_rate as matchRate, expected_fees as expectedFees, expected_weight as expectedWeight
+        `SELECT hash, match_rate as matchRate
        FROM blocks_audits
        WHERE blocks_audits.hash = "${hash}"
      `);
@@ -111,7 +94,7 @@ class BlocksAuditRepositories {
  public async $getBlockAuditScores(maxHeight: number, minHeight: number): Promise<AuditScore[]> {
    try {
      const [rows]: any[] = await DB.query(
-        `SELECT hash, match_rate as matchRate, expected_fees as expectedFees, expected_weight as expectedWeight
+        `SELECT hash, match_rate as matchRate
        FROM blocks_audits
        WHERE blocks_audits.height BETWEEN ? AND ?
      `, [minHeight, maxHeight]);
@@ -121,32 +104,6 @@ class BlocksAuditRepositories {
      throw e;
    }
  }
-
-  public async $getBlocksWithoutSummaries(): Promise<string[]> {
-    try {
-      const [fromRows]: any[] = await DB.query(`
-        SELECT height
-        FROM blocks_audits
-        WHERE expected_fees IS NULL
-        ORDER BY height DESC
-        LIMIT 1
-      `);
-      if (!fromRows?.length) {
-        return [];
-      }
-      const fromHeight = fromRows[0].height;
-      const [idRows]: any[] = await DB.query(`
-        SELECT hash
-        FROM blocks_audits
-        WHERE height <= ?
-        ORDER BY height DESC
-      `, [fromHeight]);
-      return idRows.map(row => row.hash);
-    } catch (e: any) {
-      logger.err(`Cannot fetch block audit from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
 }

 export default new BlocksAuditRepositories();
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -577,6 +577,19 @@ class BlocksRepository {
    }
  }

+  /**
+   * Return blocks height
+   */
+   public async $getBlocksHeightsAndTimestamp(): Promise<object[]> {
+    try {
+      const [rows]: any[] = await DB.query(`SELECT height, blockTimestamp as timestamp FROM blocks`);
+      return rows;
+    } catch (e) {
+      logger.err('Cannot get blocks height and timestamp from the db. Reason: ' + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
  /**
   * Get general block stats
   */
@@ -864,7 +877,7 @@ class BlocksRepository {
  /**
   * Get all blocks which have not be linked to a price yet
   */
-  public async $getBlocksWithoutPrice(): Promise<object[]> {
+   public async $getBlocksWithoutPrice(): Promise<object[]> {
    try {
      const [rows]: any[] = await DB.query(`
        SELECT UNIX_TIMESTAMP(blocks.blockTimestamp) as timestamp, blocks.height
@@ -876,7 +889,7 @@ class BlocksRepository {
      return rows;
    } catch (e) {
      logger.err('Cannot get blocks height and timestamp from the db. Reason: ' + (e instanceof Error ? e.message : e));
-      return [];
+      throw e;
    }
  }

@@ -896,6 +909,7 @@ class BlocksRepository {
        logger.debug(`Cannot save blocks prices for blocks [${blockPrices[0].height} to ${blockPrices[blockPrices.length - 1].height}] because it has already been indexed, ignoring`);
      } else {
        logger.err(`Cannot save blocks prices for blocks [${blockPrices[0].height} to ${blockPrices[blockPrices.length - 1].height}] into db. Reason: ` + (e instanceof Error ? e.message : e));
+        throw e;
      }
    }
  }
@@ -914,7 +928,7 @@ class BlocksRepository {
      return blocks;
    } catch (e) {
      logger.err(`Cannot get blocks with missing coinstatsindex. Reason: ` + (e instanceof Error ? e.message : e));
-      return [];
+      throw e;
    }
  }

@@ -1018,14 +1032,10 @@ class BlocksRepository {

    // Match rate is not part of the blocks table, but it is part of APIs so we must include it
    extras.matchRate = null;
-    extras.expectedFees = null;
-    extras.expectedWeight = null;
    if (config.MEMPOOL.AUDIT) {
      const auditScore = await BlocksAuditsRepository.$getBlockAuditScore(dbBlk.id);
      if (auditScore != null) {
        extras.matchRate = auditScore.matchRate;
-        extras.expectedFees = auditScore.expectedFees;
-        extras.expectedWeight = auditScore.expectedWeight;
      }
    }

--- a/backend/src/repositories/BlocksSummariesRepository.ts
+++ b/backend/src/repositories/BlocksSummariesRepository.ts
@@ -36,35 +36,21 @@ 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;
      }
    }
  }

-  public async $getTemplate(id: string): Promise<BlockSummary | undefined> {
-    try {
-      const [templates]: any[] = await DB.query(`SELECT * from blocks_templates WHERE id = ?`, [id]);
-      if (templates.length > 0) {
-        return {
-          id: templates[0].id,
-          transactions: JSON.parse(templates[0].template),
-        };
-      }
-    } catch (e) {
-      logger.err(`Cannot get block template for block id ${id}. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-    return undefined;
-  }
-
  public async $getIndexedSummariesId(): Promise<string[]> {
    try {
      const [rows]: any[] = await DB.query(`SELECT id from blocks_summaries`);
--- a/backend/src/repositories/CpfpRepository.ts
+++ b/backend/src/repositories/CpfpRepository.ts
@@ -1,19 +1,62 @@
+import cluster, { Cluster } from 'cluster';
 import { RowDataPacket } from 'mysql2';
 import DB from '../database';
 import logger from '../logger';
-import { Ancestor, CpfpCluster } from '../mempool.interfaces';
+import { Ancestor } from '../mempool.interfaces';
 import transactionRepository from '../repositories/TransactionRepository';

 class CpfpRepository {
+  public async $saveCluster(clusterRoot: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number): Promise<boolean> {
+    if (!txs[0]) {
+      return false;
+    }
+    // skip clusters of transactions with the same fees
+    const roundedEffectiveFee = Math.round(effectiveFeePerVsize * 100) / 100;
+    const equalFee = txs.reduce((acc, tx) => {
+      return (acc && Math.round(((tx.fee || 0) / (tx.weight / 4)) * 100) / 100 === roundedEffectiveFee);
+    }, true);
+    if (equalFee) {
+      return false;
+    }
+
+    try {
+      const packedTxs = Buffer.from(this.pack(txs));
+      await DB.query(
+        `
+          INSERT INTO compact_cpfp_clusters(root, height, txs, fee_rate)
+          VALUE (UNHEX(?), ?, ?, ?)
+          ON DUPLICATE KEY UPDATE
+            height = ?,
+            txs = ?,
+            fee_rate = ?
+        `,
+        [clusterRoot, height, packedTxs, effectiveFeePerVsize, height, packedTxs, effectiveFeePerVsize]
+      );
+      const maxChunk = 10;
+      let chunkIndex = 0;
+      while (chunkIndex < txs.length) {
+        const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk).map(tx => {
+          return { txid: tx.txid, cluster: clusterRoot };
+        });
+        await transactionRepository.$batchSetCluster(chunk);
+        chunkIndex += maxChunk;
+      }
+      return true;
+    } catch (e: any) {
+      logger.err(`Cannot save cpfp cluster into db. Reason: ` + (e instanceof Error ? e.message : e));
+      throw e;
+    }
+  }
+
  public async $batchSaveClusters(clusters: { root: string, height: number, txs: Ancestor[], effectiveFeePerVsize: number }[]): Promise<boolean> {
    try {
-      const clusterValues: [string, number, Buffer, number][] = [];
-      const txs: { txid: string, cluster: string }[] = [];
+      const clusterValues: any[] = [];
+      const txs: any[] = [];

      for (const cluster of clusters) {
-        if (cluster.txs?.length) {
+        if (cluster.txs?.length > 1) {
          const roundedEffectiveFee = Math.round(cluster.effectiveFeePerVsize * 100) / 100;
-          const equalFee = cluster.txs.length > 1 && cluster.txs.reduce((acc, tx) => {
+          const equalFee = cluster.txs.reduce((acc, tx) => {
            return (acc && Math.round(((tx.fee || 0) / (tx.weight / 4)) * 100) / 100 === roundedEffectiveFee);
          }, true);
          if (!equalFee) {
@@ -34,10 +77,16 @@ class CpfpRepository {
        return false;
      }

-      const queries: { query, params }[] = [];
-
      const maxChunk = 100;
      let chunkIndex = 0;
+      // insert transactions in batches of up to 100 rows
+      while (chunkIndex < txs.length) {
+        const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk);
+        await transactionRepository.$batchSetCluster(chunk);
+        chunkIndex += maxChunk;
+      }
+
+      chunkIndex = 0;
      // insert clusters in batches of up to 100 rows
      while (chunkIndex < clusterValues.length) {
        const chunk = clusterValues.slice(chunkIndex, chunkIndex + maxChunk);
@@ -49,23 +98,12 @@ class CpfpRepository {
          return (' (UNHEX(?), ?, ?, ?)');
        }) + ';';
        const values = chunk.flat();
-        queries.push({
+        await DB.query(
          query,
-          params: values,
-        });
+          values
+        );
        chunkIndex += maxChunk;
      }
-
-      chunkIndex = 0;
-      // insert transactions in batches of up to 100 rows
-      while (chunkIndex < txs.length) {
-        const chunk = txs.slice(chunkIndex, chunkIndex + maxChunk);
-        queries.push(transactionRepository.buildBatchSetQuery(chunk));
-        chunkIndex += maxChunk;
-      }
-
-      await DB.$atomicQuery(queries);
-
      return true;
    } catch (e: any) {
      logger.err(`Cannot save cpfp clusters into db. Reason: ` + (e instanceof Error ? e.message : e));
@@ -73,7 +111,7 @@ class CpfpRepository {
    }
  }

-  public async $getCluster(clusterRoot: string): Promise<CpfpCluster | void> {
+  public async $getCluster(clusterRoot: string): Promise<Cluster | void> {
    const [clusterRows]: any = await DB.query(
      `
        SELECT *
@@ -84,7 +122,6 @@ class CpfpRepository {
    );
    const cluster = clusterRows[0];
    if (cluster?.txs) {
-      cluster.effectiveFeePerVsize = cluster.fee_rate;
      cluster.txs = this.unpack(cluster.txs);
      return cluster;
    }
--- a/backend/src/repositories/PoolsRepository.ts
+++ b/backend/src/repositories/PoolsRepository.ts
@@ -39,8 +39,7 @@ class PoolsRepository {
          pools.name AS name,
          pools.link AS link,
          slug,
-          AVG(blocks_audits.match_rate) AS avgMatchRate,
-          AVG((CAST(blocks.fees as SIGNED) - CAST(blocks_audits.expected_fees as SIGNED)) / NULLIF(CAST(blocks_audits.expected_fees as SIGNED), 0)) AS avgFeeDelta
+          AVG(blocks_audits.match_rate) AS avgMatchRate
      FROM blocks
      JOIN pools on pools.id = pool_id
      LEFT JOIN blocks_audits ON blocks_audits.height = blocks.height
--- a/backend/src/repositories/TransactionRepository.ts
+++ b/backend/src/repositories/TransactionRepository.ts
@@ -25,8 +25,9 @@ class TransactionRepository {
    }
  }

-  public buildBatchSetQuery(txs: { txid: string, cluster: string }[]): { query, params } {
-    let query = `
+  public async $batchSetCluster(txs): Promise<void> {
+    try {
+      let query = `
          INSERT IGNORE INTO compact_transactions
          (
            txid,
@@ -34,22 +35,13 @@ class TransactionRepository {
          )
          VALUES
      `;
-    query += txs.map(tx => {
-      return (' (UNHEX(?), UNHEX(?))');
-    }) + ';';
-    const values = txs.map(tx => [tx.txid, tx.cluster]).flat();
-    return {
-      query,
-      params: values,
-    };
-  }
-
-  public async $batchSetCluster(txs): Promise<void> {
-    try {
-      const query = this.buildBatchSetQuery(txs);
+      query += txs.map(tx => {
+        return (' (UNHEX(?), UNHEX(?))');
+      }) + ';';
+      const values = txs.map(tx => [tx.txid, tx.cluster]).flat();
      await DB.query(
-        query.query,
-        query.params,
+        query,
+        values
      );
    } catch (e: any) {
      logger.err(`Cannot save cpfp transactions into db. Reason: ` + (e instanceof Error ? e.message : e));
@@ -113,7 +105,6 @@ class TransactionRepository {
    return {
      descendants,
      ancestors,
-      effectiveFeePerVsize: cluster.effectiveFeePerVsize,
    };
  }
 }
--- a/backend/src/tasks/pools-updater.ts
+++ b/backend/src/tasks/pools-updater.ts
@@ -71,7 +71,7 @@ class PoolsUpdater {
      poolsParser.setMiningPools(poolsJson);

      if (config.DATABASE.ENABLED === false) { // Don't run db operations
-        logger.info(`Mining pools-v2.json (${githubSha}) import completed (no database)`);
+        logger.info('Mining pools-v2.json import completed (no database)');
        return;
      }

@@ -84,7 +84,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(`Mining pools-v2.json (${githubSha}) import completed`);
+      logger.info('PoolsUpdater completed');

    } catch (e) {
      this.lastRun = now - (oneWeek - oneDay); // Try again in 24h instead of waiting next week
--- a/contributors/0xflicker.txt
+++ b/contributors/0xflicker.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 June 24, 2023.
-
-Signed: 0xflicker
--- a/contributors/joostjager.txt
+++ b/contributors/joostjager.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: joostjager
--- 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/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -27,9 +27,7 @@
    "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__"
+    "DISK_CACHE_BLOCK_INTERVAL": __MEMPOOL_DISK_CACHE_BLOCK_INTERVAL__
  },
  "CORE_RPC": {
    "HOST": "__CORE_RPC_HOST__",
@@ -63,7 +61,7 @@
    "DATABASE": "__DATABASE_DATABASE__",
    "USERNAME": "__DATABASE_USERNAME__",
    "PASSWORD": "__DATABASE_PASSWORD__",
-    "TIMEOUT": __DATABASE_TIMEOUT__
+    "TIMEOUT": "__DATABASE_TIMEOUT__"
  },
  "SYSLOG": {
    "ENABLED": __SYSLOG_ENABLED__,
@@ -86,15 +84,13 @@
    "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__
+    "TIMEOUT": "__LND_TIMEOUT__"
  },
  "CLIGHTNING": {
    "SOCKET": "__CLIGHTNING_SOCKET__"
@@ -125,4 +121,4 @@
    "GEOLITE2_ASN": "__MAXMIND_GEOLITE2_ASN__",
    "GEOIP2_ISP": "__MAXMIND_GEOIP2_ISP__"
  }
-}
+}
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -46,7 +46,7 @@ __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_UNIX_SOCKET_PATH__=${ESPLORA_UNIX_SOCKET_PATH:=null}
 __ESPLORA_RETRY_UNIX_SOCKET_AFTER__=${ESPLORA_RETRY_UNIX_SOCKET_AFTER:=30000}

 # SECOND_CORE_RPC
@@ -108,8 +108,6 @@ __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:=""}
@@ -129,28 +127,28 @@ __MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_ISP:=""}

 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_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
@@ -160,53 +158,53 @@ sed -i "s!__MEMPOOL_CPFP_INDEXING__!${__MEMPOOL_CPFP_INDEXING__}!g" mempool-conf
 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/__CORE_RPC_TIMEOUT__/${__CORE_RPC_TIMEOUT__}/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/__SECOND_CORE_RPC_TIMEOUT__/${__SECOND_CORE_RPC_TIMEOUT__}/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
@@ -225,8 +223,6 @@ 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
--- a/frontend/cypress/e2e/liquid/liquid.spec.ts
+++ b/frontend/cypress/e2e/liquid/liquid.spec.ts
@@ -1,4 +1,4 @@
-describe.skip('Liquid', () => {
+describe('Liquid', () => {
  const baseModule = Cypress.env('BASE_MODULE');
  const basePath = '';

--- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
+++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
@@ -1,4 +1,4 @@
-describe.skip('Liquid Testnet', () => {
+describe('Liquid Testnet', () => {
  const baseModule = Cypress.env('BASE_MODULE');
  const basePath = '/testnet';

--- a/frontend/cypress/e2e/mainnet/mainnet.spec.ts
+++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts
@@ -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-warning').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-warning').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/package.json
+++ b/frontend/package.json
@@ -35,7 +35,7 @@
    "start:local-staging": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-staging",
    "start:mixed": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c mixed",
    "build": "npm run generate-config && npm run ng -- build --configuration production --localize && npm run sync-assets && npm run build-mempool.js",
-    "sync-assets": "rsync -av ./src/resources ./dist/mempool/browser && node sync-assets.js 'dist/mempool/browser/resources'",
+    "sync-assets": "rsync -av ./src/resources ./dist/mempool/browser && node sync-assets.js 'dist/mempool/browser/resources/'",
    "sync-assets-dev": "node sync-assets.js 'src/resources/'",
    "generate-config": "node generate-config.js",
    "build-mempool.js": "npm run build-mempool-js && npm run build-mempool-liquid-js && npm run build-mempool-bisq-js",
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -4,7 +4,8 @@ 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 { ClockComponent } from './components/clock/clock.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';
@@ -357,16 +358,12 @@ let routes: Routes = [
    ],
  },
  {
-    path: 'clock',
-    redirectTo: 'clock/mempool/0'
+    path: 'clock-mined',
+    component: ClockMinedComponent,
  },
  {
-    path: 'clock/:mode',
-    redirectTo: 'clock/:mode/0'
-  },
-  {
-    path: 'clock/:mode/:index',
-    component: ClockComponent,
+    path: 'clock-mempool',
+    component: ClockMempoolComponent,
  },
  {
    path: 'status',
--- 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,9 @@
  </ng-container>
  </div>

+  <app-language-selector></app-language-selector>
+
+  <app-global-footer></app-global-footer>
 </div>

 <ng-template #loadingTmpl>
@@ -121,4 +124,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>
    
--- 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/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,7 +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">
+  <video 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">
@@ -119,18 +119,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"/>
@@ -173,21 +161,6 @@
        </svg>
        <span>Exodus</span>
      </a>
-      <a href="https://www.luminex.io" target="_blank" title="Luminex">
-        <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="66.95" height="80" viewBox="0 0 300.43 385" style="padding-top: 10px;">
-          <defs>
-            <style>
-              .lum-cls-1 {
-                fill: #f2ea25;
-              }
-            </style>
-          </defs>
-          <path class="lum-cls-1" d="m309.02,90.04c0,49.65-38.73,90.04-95.34,90.04s-95.34-40.39-95.34-90.04S153.77,0,213.69,0c56.28,0,95.34,40.39,95.34,90.04Zm-63.56,0c0-20.52-14.23-37.07-31.78-37.07s-31.78,16.55-31.78,37.07,14.23,37.07,31.78,37.07,31.78-16.55,31.78-37.07Z"/>
-          <path class="lum-cls-1" d="m311.87,372.67h-66.34l-31.84-47.76-31.84,47.76h-66.34l58.38-90.22-53.07-79.61h66.34l26.54,42.46,26.53-42.46h66.34l-53.07,79.61,58.38,90.22Z"/>
-          <rect class="lum-cls-1" width="60.69" height="372.67"/>
-        </svg>
-        <span>Luminex</span>
-      </a>
    </div>
  </div>

@@ -220,7 +193,7 @@
        <img class="image" src="/resources/profile/mynodebtc.png" />
        <span>myNode</span>
      </a>
-      <a href="https://code.samourai.io/ronindojo/RoninDojo" target="_blank" title="RoninDojo">
+      <a href="https://github.com/RoninDojo/RoninDojo" target="_blank" title="RoninDojo">
        <img class="image" src="/resources/profile/ronindojo.png" />
        <span>RoninDojo</span>
      </a>
@@ -232,9 +205,9 @@
        <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" />
@@ -411,7 +384,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;.
@@ -420,6 +393,27 @@

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

  <br>
--- 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>;
@@ -92,11 +91,7 @@ export class AboutComponent implements OnInit {
    }
  }

-  showSubtitles(language): boolean {
+  showSubtitles(language) {
    return ( this.locale.startsWith( language ) && !this.locale.startsWith('en') );
  }
-
-  unmutePromoVideo(): void {
-    this.promoVideo.nativeElement.muted = false;
-  }
 }
--- 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-overview-graph/tx-view.ts
+++ b/frontend/src/app/components/block-overview-graph/tx-view.ts
@@ -37,7 +37,7 @@ export default class TxView implements TransactionStripped {
  value: number;
  feerate: number;
  rate?: number;
-  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'added' | 'censored' | 'selected';
+  status?: 'found' | 'missing' | 'fresh' | 'added' | 'censored' | 'selected';
  context?: 'projected' | 'actual';
  scene?: BlockScene;

@@ -171,7 +171,6 @@ export default class TxView implements TransactionStripped {
      case 'censored':
        return auditColors.censored;
      case 'missing':
-      case 'sigop':
        return marginalFeeColors[feeLevelIndex] || marginalFeeColors[mempoolFeeColors.length - 1];
      case 'fresh':
        return auditColors.missing;
--- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
+++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
@@ -44,7 +44,6 @@
          <td *ngSwitchCase="'found'"><span class="badge badge-success" i18n="transaction.audit.match">Match</span></td>
          <td *ngSwitchCase="'censored'"><span class="badge badge-danger" i18n="transaction.audit.removed">Removed</span></td>
          <td *ngSwitchCase="'missing'"><span class="badge badge-warning" i18n="transaction.audit.marginal">Marginal fee rate</span></td>
-          <td *ngSwitchCase="'sigop'"><span class="badge badge-warning" i18n="transaction.audit.sigop">High sigop count</span></td>
          <td *ngSwitchCase="'fresh'"><span class="badge badge-warning" i18n="transaction.audit.recently-broadcasted">Recently broadcasted</span></td>
          <td *ngSwitchCase="'added'"><span class="badge badge-warning" i18n="transaction.audit.added">Added</span></td>
          <td *ngSwitchCase="'selected'"><span class="badge badge-warning" i18n="transaction.audit.marginal">Marginal fee rate</span></td>
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.html
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.html
@@ -3,7 +3,7 @@
 <div class="full-container">
  <div class="card-header mb-0 mb-md-4">
    <div class="d-flex d-md-block align-items-baseline">
-      <span i18n="mining.blocks-health">Block Health</span>
+      <span i18n="mining.block-prediction-accuracy">Block Prediction Accuracy</span>
      <button class="btn p-0 pl-2" style="margin: 0 0 4px 0px" (click)="onSaveChart()">
        <fa-icon [icon]="['fas', 'download']" [fixedWidth]="true"></fa-icon>
      </button>
@@ -12,34 +12,34 @@
    <form [formGroup]="radioGroupForm" class="formRadioGroup" *ngIf="(statsObservable$ | async) as stats">
      <div class="btn-group btn-group-toggle" name="radioBasic" [class]="{'disabled': isLoading}">
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 144" [class.active]="radioGroupForm.get('dateSpan').value === '24h'">
-          <input type="radio" [value]="'24h'" fragment="24h" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 24h
+          <input type="radio" [value]="'24h'" fragment="24h" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 24h
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 432" [class.active]="radioGroupForm.get('dateSpan').value === '3d'">
-          <input type="radio" [value]="'3d'" fragment="3d" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 3D
+          <input type="radio" [value]="'3d'" fragment="3d" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 3D
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 1008" [class.active]="radioGroupForm.get('dateSpan').value === '1w'">
-          <input type="radio" [value]="'1w'" fragment="1w" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 1W
+          <input type="radio" [value]="'1w'" fragment="1w" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 1W
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 4320" [class.active]="radioGroupForm.get('dateSpan').value === '1m'">
-          <input type="radio" [value]="'1m'" fragment="1m" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 1M
+          <input type="radio" [value]="'1m'" fragment="1m" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 1M
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 12960" [class.active]="radioGroupForm.get('dateSpan').value === '3m'">
-          <input type="radio" [value]="'3m'" fragment="3m" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 3M
+          <input type="radio" [value]="'3m'" fragment="3m" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 3M
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 25920" [class.active]="radioGroupForm.get('dateSpan').value === '6m'">
-          <input type="radio" [value]="'6m'" fragment="6m" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 6M
+          <input type="radio" [value]="'6m'" fragment="6m" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 6M
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 52560" [class.active]="radioGroupForm.get('dateSpan').value === '1y'">
-          <input type="radio" [value]="'1y'" fragment="1y" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 1Y
+          <input type="radio" [value]="'1y'" fragment="1y" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 1Y
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 105120" [class.active]="radioGroupForm.get('dateSpan').value === '2y'">
-          <input type="radio" [value]="'2y'" fragment="2y" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 2Y
+          <input type="radio" [value]="'2y'" fragment="2y" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 2Y
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount >= 157680" [class.active]="radioGroupForm.get('dateSpan').value === '3y'">
-          <input type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> 3Y
+          <input type="radio" [value]="'3y'" fragment="3y" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> 3Y
        </label>
        <label class="btn btn-primary btn-sm" *ngIf="stats.blockCount > 157680" [class.active]="radioGroupForm.get('dateSpan').value === 'all'">
-          <input type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-health' | relativeUrl]" formControlName="dateSpan"> ALL
+          <input type="radio" [value]="'all'" fragment="all" [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" formControlName="dateSpan"> ALL
        </label>
      </div>
    </form>
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.scss
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.scss
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.ts
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.ts
@@ -13,9 +13,9 @@ import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pi
 import { StateService } from '../../services/state.service';

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

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

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

-  getHealthColor(matchRate) {
+  getPredictionColor(matchRate) {
    return this.colorGradient(
      Math.pow((100 - matchRate) / 100, 0.5),
      {red: 67, green: 171, blue: 71},
@@ -294,7 +294,7 @@ export class BlockHealthGraphComponent implements OnInit {
    download(this.chartInstance.getDataURL({
      pixelRatio: 2,
      excludeComponents: ['dataZoom'],
-    }), `block-health-${this.timespan}-${Math.round(now.getTime() / 1000)}.svg`);
+    }), `block-fees-${this.timespan}-${Math.round(now.getTime() / 1000)}.svg`);
    // @ts-ignore
    this.chartOptions.grid.bottom = prevBottom;
    this.chartOptions.backgroundColor = 'none';
--- a/frontend/src/app/components/block/block.component.html
+++ b/frontend/src/app/components/block/block.component.html
@@ -63,7 +63,7 @@
                    *ngIf="blockAudit?.matchRate != null; else nullHealth"
                  >{{ blockAudit?.matchRate }}%</span>
                  <ng-template #nullHealth>
-                    <ng-container *ngIf="!isLoadingOverview; else loadingHealth">
+                    <ng-container *ngIf="!isLoadingAudit; else loadingHealth">
                      <span class="health-badge badge badge-secondary" i18n="unknown">Unknown</span>
                    </ng-container>
                  </ng-template>
@@ -121,7 +121,7 @@
    <ng-container *ngIf="!isLoadingBlock; else loadingRest">
      <tr *ngIf="network !== 'liquid' && network !== 'liquidtestnet'">
        <td i18n="mempool-block.fee-span">Fee span</td>
-        <td><span>{{ block?.extras?.minFee | number:'1.0-0' }} - {{ block?.extras?.maxFee | number:'1.0-0' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></span></td>
+        <td><span>{{ block.extras.feeRange[1] | number:'1.0-0' }} - {{ block.extras.feeRange[block.extras.feeRange.length - 1] | number:'1.0-0' }} <span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></span></td>
      </tr>
      <tr *ngIf="block?.extras?.medianFee != undefined">
        <td class="td-width" i18n="block.median-fee">Median fee</td>
@@ -226,9 +226,6 @@
            (txClickEvent)="onTxClick($event)" (txHoverEvent)="onTxHover($event)" [unavailable]="!isMobile && !showAudit"></app-block-overview-graph>
          <ng-container *ngIf="!isMobile || mode !== 'actual'; else emptyBlockInfo"></ng-container>
        </div>
-        <ng-container *ngIf="network !== 'liquid'">
-          <ng-container *ngTemplateOutlet="isMobile && mode === 'actual' ? actualDetails : expectedDetails"></ng-container>
-        </ng-container>
      </div>
      <div class="col-sm" *ngIf="!isMobile">
        <h3 class="block-subtitle actual" *ngIf="!isMobile"><ng-container i18n="block.actual-block">Actual Block</ng-container> <a class="info-link" [routerLink]="['/docs/faq' | relativeUrl ]" fragment="how-do-block-audits-work"><fa-icon [icon]="['fas', 'info-circle']" [fixedWidth]="true"></fa-icon></a></h3>
@@ -238,9 +235,6 @@
            (txClickEvent)="onTxClick($event)" (txHoverEvent)="onTxHover($event)" [unavailable]="isMobile && !showAudit"></app-block-overview-graph>
          <ng-container *ngTemplateOutlet="emptyBlockInfo"></ng-container>
        </div>
-        <ng-container *ngIf="network !== 'liquid'">
-          <ng-container *ngTemplateOutlet="actualDetails"></ng-container>
-        </ng-container>
      </div>
    </div>
  </div>
@@ -391,60 +385,5 @@
  </a>
 </ng-template>

-<ng-template #expectedDetails>
-  <table *ngIf="block && blockAudit && blockAudit.expectedFees != null" class="table table-borderless table-striped audit-details-table">
-    <tbody>
-      <tr>
-        <td i18n="block.total-fees|Total fees in a block">Total fees</td>
-        <td>
-          <app-amount [satoshis]="blockAudit.expectedFees" digitsInfo="1.2-3" [noFiat]="true"></app-amount>
-        </td>
-      </tr>
-      <tr>
-        <td i18n="block.weight">Weight</td>
-        <td [innerHTML]="'&lrm;' + (blockAudit.expectedWeight | wuBytes: 2)"></td>
-      </tr>
-      <tr>
-        <td i18n="mempool-block.transactions">Transactions</td>
-        <td>{{ blockAudit.template?.length || 0 }}</td>
-      </tr>
-    </tbody>
-  </table>
-</ng-template>
-
-<ng-template #actualDetails>
-  <table *ngIf="block && blockAudit && blockAudit.expectedFees != null" class="table table-borderless table-striped audit-details-table">
-    <tbody>
-      <tr>
-        <td i18n="block.total-fees|Total fees in a block">Total fees</td>
-        <td>
-          <app-amount [satoshis]="block.extras.totalFees" digitsInfo="1.2-3" [noFiat]="true"></app-amount>
-          <span *ngIf="blockAudit.feeDelta" class="difference" [class.positive]="blockAudit.feeDelta <= 0" [class.negative]="blockAudit.feeDelta > 0">
-            {{ blockAudit.feeDelta < 0 ? '+' : '' }}{{ (-blockAudit.feeDelta * 100) | amountShortener: 2 }}%
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td i18n="block.weight">Weight</td>
-        <td [innerHTML]>
-          <span [innerHTML]="'&lrm;' + (block.weight | wuBytes: 2)"></span>
-          <span *ngIf="blockAudit.weightDelta" class="difference" [class.positive]="blockAudit.weightDelta <= 0" [class.negative]="blockAudit.weightDelta > 0">
-            {{ blockAudit.weightDelta < 0 ? '+' : '' }}{{ (-blockAudit.weightDelta * 100) | amountShortener: 2 }}%
-          </span>
-        </td>
-      </tr>
-      <tr>
-        <td i18n="mempool-block.transactions">Transactions</td>
-        <td>
-          {{ block.tx_count }}
-          <span *ngIf="blockAudit.txDelta" class="difference" [class.positive]="blockAudit.txDelta <= 0" [class.negative]="blockAudit.txDelta > 0">
-            {{ blockAudit.txDelta < 0 ? '+' : '' }}{{ (-blockAudit.txDelta * 100) | amountShortener: 2 }}%
-          </span>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</ng-template>
-
 <br>
 <br>
--- a/frontend/src/app/components/block/block.component.scss
+++ b/frontend/src/app/components/block/block.component.scss
@@ -38,17 +38,6 @@
      color: rgba(255, 255, 255, 0.4);
      margin-left: 5px;
    }
-
-    .difference {
-      margin-left: 0.5em;
-  
-      &.positive {
-        color: rgb(66, 183, 71);
-      }
-      &.negative {
-        color: rgb(183, 66, 66);
-      }
-    }
  }
 }

@@ -263,10 +252,3 @@ h1 {
  top: 11px;
  margin-left: 10px;
 }
-
-.audit-details-table {
-  margin-top: 1.25rem;
-  @media (max-width: 767.98px) {
-    margin-top: 0.75rem;
-  }
-}
--- a/frontend/src/app/components/block/block.component.ts
+++ b/frontend/src/app/components/block/block.component.ts
@@ -2,9 +2,9 @@ import { Component, OnInit, OnDestroy, ViewChildren, QueryList } from '@angular/
 import { Location } from '@angular/common';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { ElectrsApiService } from '../../services/electrs-api.service';
-import { switchMap, tap, throttleTime, catchError, map, shareReplay, startWith } from 'rxjs/operators';
+import { switchMap, tap, throttleTime, catchError, map, shareReplay, startWith, pairwise, filter } from 'rxjs/operators';
 import { Transaction, Vout } from '../../interfaces/electrs.interface';
-import { Observable, of, Subscription, asyncScheduler, EMPTY, combineLatest, forkJoin } from 'rxjs';
+import { Observable, of, Subscription, asyncScheduler, EMPTY, combineLatest } from 'rxjs';
 import { StateService } from '../../services/state.service';
 import { SeoService } from '../../services/seo.service';
 import { WebsocketService } from '../../services/websocket.service';
@@ -44,6 +44,7 @@ export class BlockComponent implements OnInit, OnDestroy {
  strippedTransactions: TransactionStripped[];
  overviewTransitionDirection: string;
  isLoadingOverview = true;
+  isLoadingAudit = true;
  error: any;
  blockSubsidy: number;
  fees: number;
@@ -137,8 +138,6 @@ export class BlockComponent implements OnInit, OnDestroy {

        if (block.id === this.blockHash) {
          this.block = block;
-          block.extras.minFee = this.getMinBlockFee(block);
-          block.extras.maxFee = this.getMaxBlockFee(block);
          if (block?.extras?.reward != undefined) {
            this.fees = block.extras.reward / 100000000 - this.blockSubsidy;
          }
@@ -235,8 +234,6 @@ export class BlockComponent implements OnInit, OnDestroy {
        }
        this.updateAuditAvailableFromBlockHeight(block.height);
        this.block = block;
-        block.extras.minFee = this.getMinBlockFee(block);
-        block.extras.maxFee = this.getMaxBlockFee(block);
        this.blockHeight = block.height;
        this.lastBlockHeight = this.blockHeight;
        this.nextBlockHeight = block.height + 1;
@@ -280,111 +277,134 @@ export class BlockComponent implements OnInit, OnDestroy {
      this.isLoadingOverview = false;
    });

-    this.overviewSubscription = block$.pipe(
-      switchMap((block) => {
-        return forkJoin([
-          this.apiService.getStrippedBlockTransactions$(block.id)
-            .pipe(
-              catchError((err) => {
-                this.overviewError = err;
-                return of(null);
-              })
-            ),
-          !this.isAuditAvailableFromBlockHeight(block.height) ? of(null) : this.apiService.getBlockAudit$(block.id)
-            .pipe(
-              catchError((err) => {
-                this.overviewError = err;
-                return of(null);
-              })
-            )
-        ]);
-      })
-    )
-    .subscribe(([transactions, blockAudit]) => {      
-      if (transactions) {
+    if (!this.auditSupported) {
+      this.overviewSubscription = block$.pipe(
+        startWith(null),
+        pairwise(),
+        switchMap(([prevBlock, block]) => this.apiService.getStrippedBlockTransactions$(block.id)
+          .pipe(
+            catchError((err) => {
+              this.overviewError = err;
+              return of([]);
+            }),
+            switchMap((transactions) => {
+              if (prevBlock) {
+                return of({ transactions, direction: (prevBlock.height < block.height) ? 'right' : 'left' });
+              } else {
+                return of({ transactions, direction: 'down' });
+              }
+            })
+          )
+        ),
+      )
+      .subscribe(({transactions, direction}: {transactions: TransactionStripped[], direction: string}) => {
        this.strippedTransactions = transactions;
-      } else {
-        this.strippedTransactions = [];
-      }
+        this.isLoadingOverview = false;
+        this.setupBlockGraphs();
+      },
+      (error) => {
+        this.error = error;
+        this.isLoadingOverview = false;
+      });
+    }

-      this.blockAudit = null;
-      if (transactions && blockAudit) {
-        const inTemplate = {};
-        const inBlock = {};
-        const isAdded = {};
-        const isCensored = {};
-        const isMissing = {};
-        const isSelected = {};
-        const isFresh = {};
-        const isSigop = {};
-        this.numMissing = 0;
-        this.numUnexpected = 0;
-
-        if (blockAudit?.template) {
-          for (const tx of blockAudit.template) {
-            inTemplate[tx.txid] = true;
-          }
-          for (const tx of transactions) {
-            inBlock[tx.txid] = true;
-          }
-          for (const txid of blockAudit.addedTxs) {
-            isAdded[txid] = true;
-          }
-          for (const txid of blockAudit.missingTxs) {
-            isCensored[txid] = true;
-          }
-          for (const txid of blockAudit.freshTxs || []) {
-            isFresh[txid] = true;
-          }
-          for (const txid of blockAudit.sigopTxs || []) {
-            isSigop[txid] = true;
-          }
-          // set transaction statuses
-          for (const tx of blockAudit.template) {
-            tx.context = 'projected';
-            if (isCensored[tx.txid]) {
-              tx.status = 'censored';
-            } else if (inBlock[tx.txid]) {
-              tx.status = 'found';
-            } else {
-              tx.status = isFresh[tx.txid] ? 'fresh' : (isSigop[tx.txid] ? 'sigop' : 'missing');
-              isMissing[tx.txid] = true;
-              this.numMissing++;
-            }
-          }
-          for (const [index, tx] of transactions.entries()) {
-            tx.context = 'actual';
-            if (index === 0) {
-              tx.status = null;
-            } else if (isAdded[tx.txid]) {
-              tx.status = 'added';
-            } else if (inTemplate[tx.txid]) {
-              tx.status = 'found';
-            } else {
-              tx.status = 'selected';
-              isSelected[tx.txid] = true;
-              this.numUnexpected++;
-            }
-          }
-          for (const tx of transactions) {
-            inBlock[tx.txid] = true;
-          }
-
-          blockAudit.feeDelta = blockAudit.expectedFees > 0 ? (blockAudit.expectedFees - this.block.extras.totalFees) / blockAudit.expectedFees : 0;
-          blockAudit.weightDelta = blockAudit.expectedWeight > 0 ? (blockAudit.expectedWeight - this.block.weight) / blockAudit.expectedWeight : 0;
-          blockAudit.txDelta = blockAudit.template.length > 0 ? (blockAudit.template.length - this.block.tx_count) / blockAudit.template.length : 0;
-          this.blockAudit = blockAudit;
-          this.setAuditAvailable(true);
-        } else {
-          this.setAuditAvailable(false);
+    if (this.auditSupported) {
+      this.auditSubscription = block$.pipe(
+        startWith(null),
+        pairwise(),
+        switchMap(([prevBlock, block]) => {
+          this.isLoadingAudit = true;
+          this.blockAudit = null;
+          return this.apiService.getBlockAudit$(block.id)
+            .pipe(
+              catchError((err) => {
+                this.overviewError = err;
+                this.isLoadingAudit = false;
+                return of([]);
+              })
+            );
        }
-      } else {
-        this.setAuditAvailable(false);
-      }
+        ),
+        filter((response) => response != null),
+        map((response) => {
+          const blockAudit = response.body;
+          const inTemplate = {};
+          const inBlock = {};
+          const isAdded = {};
+          const isCensored = {};
+          const isMissing = {};
+          const isSelected = {};
+          const isFresh = {};
+          this.numMissing = 0;
+          this.numUnexpected = 0;

-      this.isLoadingOverview = false;
-      this.setupBlockGraphs();
-    });
+          if (blockAudit?.template) {
+            for (const tx of blockAudit.template) {
+              inTemplate[tx.txid] = true;
+            }
+            for (const tx of blockAudit.transactions) {
+              inBlock[tx.txid] = true;
+            }
+            for (const txid of blockAudit.addedTxs) {
+              isAdded[txid] = true;
+            }
+            for (const txid of blockAudit.missingTxs) {
+              isCensored[txid] = true;
+            }
+            for (const txid of blockAudit.freshTxs || []) {
+              isFresh[txid] = true;
+            }
+            // set transaction statuses
+            for (const tx of blockAudit.template) {
+              tx.context = 'projected';
+              if (isCensored[tx.txid]) {
+                tx.status = 'censored';
+              } else if (inBlock[tx.txid]) {
+                tx.status = 'found';
+              } else {
+                tx.status = isFresh[tx.txid] ? 'fresh' : 'missing';
+                isMissing[tx.txid] = true;
+                this.numMissing++;
+              }
+            }
+            for (const [index, tx] of blockAudit.transactions.entries()) {
+              tx.context = 'actual';
+              if (index === 0) {
+                tx.status = null;
+              } else if (isAdded[tx.txid]) {
+                tx.status = 'added';
+              } else if (inTemplate[tx.txid]) {
+                tx.status = 'found';
+              } else {
+                tx.status = 'selected';
+                isSelected[tx.txid] = true;
+                this.numUnexpected++;
+              }
+            }
+            for (const tx of blockAudit.transactions) {
+              inBlock[tx.txid] = true;
+            }
+            this.setAuditAvailable(true);
+          } else {
+            this.setAuditAvailable(false);
+          }
+          return blockAudit;
+        }),
+        catchError((err) => {
+          console.log(err);
+          this.error = err;
+          this.isLoadingOverview = false;
+          this.isLoadingAudit = false;
+          this.setAuditAvailable(false);
+          return of(null);
+        }),
+      ).subscribe((blockAudit) => {
+        this.blockAudit = blockAudit;
+        this.setupBlockGraphs();
+        this.isLoadingOverview = false;
+        this.isLoadingAudit = false;
+      });
+    }

    this.networkChangedSubscription = this.stateService.networkChanged$
      .subscribe((network) => this.network = network);
@@ -619,50 +639,24 @@ export class BlockComponent implements OnInit, OnDestroy {
  }

  updateAuditAvailableFromBlockHeight(blockHeight: number): void {
-    if (!this.isAuditAvailableFromBlockHeight(blockHeight)) {
-      this.setAuditAvailable(false);
-    }
-  }
-  
-  isAuditAvailableFromBlockHeight(blockHeight: number): boolean {
    if (!this.auditSupported) {
-      return false;
+      this.setAuditAvailable(false);
    }
    switch (this.stateService.network) {
      case 'testnet':
        if (blockHeight < this.stateService.env.TESTNET_BLOCK_AUDIT_START_HEIGHT) {
-          return false;
+          this.setAuditAvailable(false);
        }
        break;
      case 'signet':
        if (blockHeight < this.stateService.env.SIGNET_BLOCK_AUDIT_START_HEIGHT) {
-          return false;
+          this.setAuditAvailable(false);
        }
        break;
      default:
        if (blockHeight < this.stateService.env.MAINNET_BLOCK_AUDIT_START_HEIGHT) {
-          return false;
+          this.setAuditAvailable(false);
        }
    }
-    return true;
-  }
-
-  getMinBlockFee(block: BlockExtended): number {
-    if (block?.extras?.feeRange) {
-      // heuristic to check if feeRange is adjusted for effective rates
-      if (block.extras.medianFee === block.extras.feeRange[3]) {
-        return block.extras.feeRange[1];
-      } else {
-        return block.extras.feeRange[0];
-      }
-    }
-    return 0;
-  }
-
-  getMaxBlockFee(block: BlockExtended): number {
-    if (block?.extras?.feeRange) {
-      return block.extras.feeRange[block.extras.feeRange.length - 1];
-    }
-    return 0;
  }
 }
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.html
@@ -13,10 +13,10 @@
        [class.offscreen]="!static && count && i >= count"
        id="bitcoin-block-{{ block.height }}" [ngStyle]="blockStyles[i]"
        [class.blink-bg]="isSpecial(block.height)">
-        <a draggable="false" [routerLink]="[getHref(i, block) | relativeUrl]" [state]="{ data: { block: block } }"
+        <a draggable="false" [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }"
          class="blockLink" [ngClass]="{'disabled': (this.stateService.blockScrolling$ | async)}">&nbsp;</a>
        <div *ngIf="!minimal" [attr.data-cy]="'bitcoin-block-' + i + '-height'" class="block-height">
-          <a [routerLink]="[getHref(i, block) | relativeUrl]" [state]="{ data: { block: block } }">{{ block.height
+          <a [routerLink]="['/block/' | relativeUrl, block.id]" [state]="{ data: { block: block } }">{{ block.height
            }}</a>
        </div>
        <div class="block-body">
@@ -31,8 +31,9 @@
              </div>
            </ng-template>
            <div [attr.data-cy]="'bitcoin-block-' + offset + '-index-' + i + '-fee-span'" class="fee-span"
-              *ngIf="block?.extras?.minFee != null && block?.extras?.maxFee != null; else emptyfeespan">
-              {{ block.extras.minFee | number:feeRounding }} - {{ block.extras.maxFee | number:feeRounding }} <ng-container
+              *ngIf="block?.extras?.feeRange; else emptyfeespan">
+              {{ block?.extras?.feeRange?.[0] | number:feeRounding }} - {{
+              block?.extras?.feeRange[block?.extras?.feeRange?.length - 1] | number:feeRounding }} <ng-container
                i18n="shared.sat-vbyte|sat/vB">sat/vB</ng-container>
            </div>
            <ng-template #emptyfeespan>
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
@@ -27,7 +27,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
  @Input() minimal: boolean = false;
  @Input() blockWidth: number = 125;
  @Input() spotlight: number = 0;
-  @Input() getHref?: (index, block) => string = (index, block) => `/block/${block.id}`;
  
  specialBlocks = specialBlocks;
  network = '';
@@ -114,9 +113,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
            this.blocksFilled = false;
          }

-          block.extras.minFee = this.getMinBlockFee(block);
-          block.extras.maxFee = this.getMaxBlockFee(block);
-
          this.blocks.unshift(block);
          this.blocks = this.blocks.slice(0, this.dynamicBlocksAmount);

@@ -243,10 +239,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
      if (height >= 0) {
        this.cacheService.loadBlock(height);
        block = this.cacheService.getCachedBlock(height) || null;
-        if (block) {
-          block.extras.minFee = this.getMinBlockFee(block);
-          block.extras.maxFee = this.getMaxBlockFee(block);
-        }
      }
      this.blocks.push(block || {
        placeholder: height < 0,
@@ -285,8 +277,6 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
  onBlockLoaded(block: BlockExtended) {
    const blockIndex = this.height - block.height;
    if (blockIndex >= 0 && blockIndex < this.blocks.length) {
-      block.extras.minFee = this.getMinBlockFee(block);
-      block.extras.maxFee = this.getMaxBlockFee(block);
      this.blocks[blockIndex] = block;
      this.blockStyles[blockIndex] = this.getStyleForBlock(block, blockIndex);
    }
@@ -375,23 +365,4 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
    }
    return emptyBlocks;
  }
-
-  getMinBlockFee(block: BlockExtended): number {
-    if (block?.extras?.feeRange) {
-      // heuristic to check if feeRange is adjusted for effective rates
-      if (block.extras.medianFee === block.extras.feeRange[3]) {
-        return block.extras.feeRange[1];
-      } else {
-        return block.extras.feeRange[0];
-      }
-    }
-    return 0;
-  }
-
-  getMaxBlockFee(block: BlockExtended): number {
-    if (block?.extras?.feeRange) {
-      return block.extras.feeRange[block.extras.feeRange.length - 1];
-    }
-    return 0;
-  }
 }
--- a/frontend/src/app/components/blockchain/blockchain.component.html
+++ b/frontend/src/app/components/blockchain/blockchain.component.html
@@ -1,9 +1,9 @@
 <div class="text-center" class="blockchain-wrapper" [class.time-ltr]="timeLtr" [class.ltr-transition]="ltrTransitionEnabled" #container>
-  <div class="position-container" [ngClass]="network ? network : ''" [style.--divider-offset]="dividerOffset + 'px'" [style.--mempool-offset]="mempoolOffset + 'px'">
+  <div class="position-container" [ngClass]="network ? network : ''">
    <span>
      <div class="blocks-wrapper">
        <div class="scroll-spacer" *ngIf="minScrollWidth" [style.left]="minScrollWidth + 'px'"></div>
-        <app-mempool-blocks [hidden]="pageIndex > 0" [allBlocks]="scrollableMempool" (widthChange)="onMempoolWidthChange($event)"></app-mempool-blocks>
+        <app-mempool-blocks [hidden]="pageIndex > 0"></app-mempool-blocks>
        <app-blockchain-blocks [hidden]="pageIndex > 0"></app-blockchain-blocks>
        <ng-container *ngFor="let page of pages; trackBy: trackByPageFn">
          <app-blockchain-blocks [static]="true" [offset]="page.offset" [height]="page.height" [count]="blocksPerPage" [loadingTip]="loadingTip" [connected]="connected"></app-blockchain-blocks>
--- a/frontend/src/app/components/blockchain/blockchain.component.scss
+++ b/frontend/src/app/components/blockchain/blockchain.component.scss
@@ -26,14 +26,43 @@
  position: absolute;
  left: 0;
  top: 75px;
-  --divider-offset: 50vw;
-  --mempool-offset: 0px;
-  transform: translateX(calc(var(--divider-offset) + var(--mempool-offset)));
+  transform: translateX(50vw);
 }

-.blockchain-wrapper.time-ltr {
-  .position-container {
-    transform: translateX(calc(100vw - var(--divider-offset) - var(--mempool-offset)));
+.position-container.liquid, .position-container.liquidtestnet {
+  transform: translateX(420px);
+}
+
+@media (min-width: 768px) {
+  .blockchain-wrapper.time-ltr {
+    .position-container.liquid, .position-container.liquidtestnet {
+      transform: translateX(calc(100vw - 420px));
+    }
+  }
+}
+
+@media (max-width: 767.98px) {
+  .blockchain-wrapper {
+    .position-container {
+      transform: translateX(95vw);
+    }
+    .position-container.liquid, .position-container.liquidtestnet {
+      transform: translateX(50vw);
+    }
+    .position-container.loading {
+      transform: translateX(50vw);
+    }
+  }
+  .blockchain-wrapper.time-ltr {
+    .position-container {
+      transform: translateX(5vw);
+    }
+    .position-container.liquid, .position-container.liquidtestnet {
+      transform: translateX(50vw);
+    }
+    .position-container.loading {
+      transform: translateX(50vw);
+    }
  }
 }

--- a/frontend/src/app/components/blockchain/blockchain.component.ts
+++ b/frontend/src/app/components/blockchain/blockchain.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, Output, EventEmitter, HostListener, ChangeDetectorRef } from '@angular/core';
+import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { firstValueFrom, Subscription } from 'rxjs';
 import { StateService } from '../../services/state.service';

@@ -13,95 +13,43 @@ export class BlockchainComponent implements OnInit, OnDestroy {
  @Input() pageIndex: number;
  @Input() blocksPerPage: number = 8;
  @Input() minScrollWidth: number = 0;
-  @Input() scrollableMempool: boolean = false;
-
-  @Output() mempoolOffsetChange: EventEmitter<number> = new EventEmitter();

  network: string;
  timeLtrSubscription: Subscription;
  timeLtr: boolean = this.stateService.timeLtr.value;
  ltrTransitionEnabled = false;
-  flipping = false;
  connectionStateSubscription: Subscription;
  loadingTip: boolean = true;
  connected: boolean = true;

-  dividerOffset: number = 0;
-  mempoolOffset: number = 0;
-
  constructor(
    public stateService: StateService,
-    private cd: ChangeDetectorRef,
  ) {}

-  ngOnInit(): void {
-    this.onResize();
+  ngOnInit() {
    this.network = this.stateService.network;
    this.timeLtrSubscription = this.stateService.timeLtr.subscribe((ltr) => {
      this.timeLtr = !!ltr;
    });
    this.connectionStateSubscription = this.stateService.connectionState$.subscribe(state => {
      this.connected = (state === 2);
-    });
-    firstValueFrom(this.stateService.chainTip$).then(() => {
+    })
+    firstValueFrom(this.stateService.chainTip$).then(tip => {
      this.loadingTip = false;
    });
  }

-  ngOnDestroy(): void {
+  ngOnDestroy() {
    this.timeLtrSubscription.unsubscribe();
    this.connectionStateSubscription.unsubscribe();
  }

-  trackByPageFn(index: number, item: { index: number }): number {
+  trackByPageFn(index: number, item: { index: number }) {
    return item.index;
  }

-  toggleTimeDirection(): void {
-    this.ltrTransitionEnabled = false;
-    const prevOffset = this.mempoolOffset;
-    this.mempoolOffset = 0;
-    this.mempoolOffsetChange.emit(0);
-    setTimeout(() => {
-      this.ltrTransitionEnabled = true;
-      this.flipping = true;
-      this.stateService.timeLtr.next(!this.timeLtr);
-      setTimeout(() => {
-        this.ltrTransitionEnabled = false;
-        this.flipping = false;
-        this.mempoolOffset = prevOffset;
-        this.mempoolOffsetChange.emit(this.mempoolOffset);
-      },  1000);
-    }, 0);
-    this.cd.markForCheck();
-  }
-
-  onMempoolWidthChange(width): void {
-    if (this.flipping) {
-      return;
-    }
-    this.mempoolOffset = Math.max(0, width - this.dividerOffset);
-    this.cd.markForCheck();
-    setTimeout(() => {
-      this.mempoolOffsetChange.emit(this.mempoolOffset);
-    }, 0);
-  }
-
-  @HostListener('window:resize', ['$event'])
-  onResize(): void {
-    if (window.innerWidth >= 768) {
-      if (this.stateService.isLiquid()) {
-        this.dividerOffset = 420;
-      } else {
-        this.dividerOffset = window.innerWidth * 0.5;
-      }
-    } else {
-      if (this.stateService.isLiquid()) {
-        this.dividerOffset = window.innerWidth * 0.5;
-      } else {
-        this.dividerOffset = window.innerWidth * 0.95;
-      }
-    }
-    this.cd.markForCheck();
+  toggleTimeDirection() {
+    this.ltrTransitionEnabled = true;
+    this.stateService.timeLtr.next(!this.timeLtr);
  }
 }
--- a/frontend/src/app/components/blocks-list/blocks-list.component.html
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.html
@@ -13,12 +13,12 @@
        <th *ngIf="indexingAvailable" class="pool text-left" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}" i18n="mining.pool-name"
          i18n-ngbTooltip="mining.pool-name" ngbTooltip="Pool" placement="bottom" #miningpool [disableTooltip]="!isEllipsisActive(miningpool)">Pool</th>
        <th class="timestamp" i18n="latest-blocks.timestamp" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">Timestamp</th>
+        <th class="mined" i18n="latest-blocks.mined" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">Mined</th>
        <th *ngIf="auditAvailable" class="health text-right" i18n="latest-blocks.health" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"
          i18n-ngbTooltip="latest-blocks.health" ngbTooltip="Health" placement="bottom" #health [disableTooltip]="!isEllipsisActive(health)">Health</th>
        <th *ngIf="indexingAvailable" class="reward text-right" i18n="latest-blocks.reward" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"
          i18n-ngbTooltip="latest-blocks.reward" ngbTooltip="Reward" placement="bottom" #reward [disableTooltip]="!isEllipsisActive(reward)">Reward</th>
        <th *ngIf="indexingAvailable && !widget" class="fees text-right" i18n="latest-blocks.fees" [class]="indexingAvailable ? '' : 'legacy'">Fees</th>
-        <th *ngIf="auditAvailable && !widget" class="fee-delta" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"></th>
        <th *ngIf="indexingAvailable" class="txs text-right" i18n="dashboard.txs" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}"
          i18n-ngbTooltip="dashboard.txs" ngbTooltip="TXs" placement="bottom" #txs [disableTooltip]="!isEllipsisActive(txs)">TXs</th>
        <th *ngIf="!indexingAvailable" class="txs text-right" i18n="dashboard.txs" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">Transactions</th>
@@ -42,18 +42,26 @@
          <td class="timestamp" *ngIf="!widget" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
            &lrm;{{ block.timestamp * 1000 | date:'yyyy-MM-dd HH:mm' }}
          </td>
+          <td class="mined" *ngIf="!widget" [class]="indexingAvailable ? '' : 'legacy'">
+            <app-time kind="since" [time]="block.timestamp" [fastRender]="true"></app-time>
+          </td>
          <td *ngIf="auditAvailable" class="health text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
            <a
-              *ngIf="block?.extras?.matchRate != null; else nullHealth"
              class="health-badge badge"
-              [class.badge-success]="block.extras.matchRate >= 99"
-              [class.badge-warning]="block.extras.matchRate >= 75 && block.extras.matchRate < 99"
-              [class.badge-danger]="block.extras.matchRate < 75"
-              [routerLink]="block.extras.matchRate != null ? ['/block/' | relativeUrl, block.id] : null"
+              [class.badge-success]="auditScores[block.id] >= 99"
+              [class.badge-warning]="auditScores[block.id] >= 75 && auditScores[block.id] < 99"
+              [class.badge-danger]="auditScores[block.id] < 75"
+              [routerLink]="auditScores[block.id] != null ? ['/block/' | relativeUrl, block.id] : null"
              [state]="{ data: { block: block } }"
-            >{{ block.extras.matchRate }}%</a>
+              *ngIf="auditScores[block.id] != null; else nullHealth"
+            >{{ auditScores[block.id] }}%</a>
            <ng-template #nullHealth>
-              <span class="health-badge badge badge-secondary" i18n="unknown">Unknown</span>
+              <ng-container *ngIf="!loadingScores; else loadingHealth">
+                <span class="health-badge badge badge-secondary" i18n="unknown">Unknown</span>
+              </ng-container>
+            </ng-template>
+            <ng-template #loadingHealth>
+              <span class="skeleton-loader" style="max-width: 60px"></span>
            </ng-template>
          </td>
          <td *ngIf="indexingAvailable" class="reward text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
@@ -62,11 +70,6 @@
          <td *ngIf="indexingAvailable && !widget" class="fees text-right" [class]="indexingAvailable ? '' : 'legacy'">
            <app-amount [satoshis]="block.extras.totalFees" [noFiat]="true" digitsInfo="1.2-2"></app-amount>
          </td>
-          <td *ngIf="auditAvailable" class="fee-delta" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
-            <span *ngIf="block.extras.feeDelta" class="difference" [class.positive]="block.extras.feeDelta >= 0" [class.negative]="block.extras.feeDelta < 0">
-              {{ block.extras.feeDelta > 0 ? '+' : '' }}{{ (block.extras.feeDelta * 100) | amountShortener: 2 }}%
-            </span>
-          </td>
          <td class="txs text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
            {{ block.tx_count | number }}
          </td>
@@ -103,9 +106,6 @@
            <td *ngIf="indexingAvailable && !widget" class="fees text-right" [class]="indexingAvailable ? '' : 'legacy'">
              <span class="skeleton-loader" style="max-width: 75px"></span>
            </td>
-            <td *ngIf="auditAvailable && !widget" class="fee-delta" [class]="indexingAvailable ? '' : 'legacy'">
-              <span class="skeleton-loader" style="max-width: 75px"></span>
-            </td>
            <td class="txs text-right" [ngClass]="{'widget': widget, 'legacy': !indexingAvailable}">
              <span class="skeleton-loader" style="max-width: 75px"></span>
            </td>
--- a/frontend/src/app/components/blocks-list/blocks-list.component.scss
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.scss
@@ -23,17 +23,6 @@ tr, td, th {
  border: 0px;
  padding-top: 0.65rem !important;
  padding-bottom: 0.7rem !important;
-
-  .difference {
-    margin-left: 0.5em;
-
-    &.positive {
-      color: rgb(66, 183, 71);
-    }
-    &.negative {
-      color: rgb(183, 66, 66);
-    }
-  }
 }

 .clear-link {
@@ -101,7 +90,7 @@ tr, td, th {
 }

 .timestamp {
-  width: 10%;
+  width: 18%;
  @media (max-width: 1100px) {
    display: none;
  }
@@ -134,8 +123,8 @@ tr, td, th {
 }

 .txs {
-  padding-right: 20px;
-  width: 6%;
+  padding-right: 40px;
+  width: 8%;
  @media (max-width: 1100px) {
    padding-right: 10px;
  }
@@ -171,16 +160,6 @@ tr, td, th {
 .fees.widget {
  width: 20%;
 }
-.fee-delta {
-  width: 6%;
-  padding-left: 0;
-  @media (max-width: 991px) {
-    display: none;
-  }
-}
-.fee-delta.widget {
-  display: none;
-}

 .reward {
  width: 8%;
@@ -235,7 +214,7 @@ tr, td, th {

 .health {
  width: 10%;
-  @media (max-width: 1100px) {
+  @media (max-width: 1105px) {
    width: 13%;
  }
  @media (max-width: 560px) {
--- a/frontend/src/app/components/blocks-list/blocks-list.component.ts
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.ts
@@ -1,6 +1,6 @@
-import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef } from '@angular/core';
-import { BehaviorSubject, combineLatest, Observable, timer, of } from 'rxjs';
-import { delayWhen, map, retryWhen, scan, switchMap, tap } from 'rxjs/operators';
+import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, Input } from '@angular/core';
+import { BehaviorSubject, combineLatest, concat, Observable, timer, EMPTY, Subscription, of } from 'rxjs';
+import { catchError, delayWhen, map, retryWhen, scan, skip, switchMap, tap } from 'rxjs/operators';
 import { BlockExtended } from '../../interfaces/node-api.interface';
 import { ApiService } from '../../services/api.service';
 import { StateService } from '../../services/state.service';
@@ -12,14 +12,19 @@ import { WebsocketService } from '../../services/websocket.service';
  styleUrls: ['./blocks-list.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class BlocksList implements OnInit {
+export class BlocksList implements OnInit, OnDestroy {
  @Input() widget: boolean = false;

  blocks$: Observable<BlockExtended[]> = undefined;
+  auditScores: { [hash: string]: number | void } = {};
+
+  auditScoreSubscription: Subscription;
+  latestScoreSubscription: Subscription;

  indexingAvailable = false;
  auditAvailable = false;
  isLoading = true;
+  loadingScores = true;
  fromBlockHeight = undefined;
  paginationMaxSize: number;
  page = 1;
@@ -34,7 +39,6 @@ export class BlocksList implements OnInit {
    private apiService: ApiService,
    private websocketService: WebsocketService,
    public stateService: StateService,
-    private cd: ChangeDetectorRef,
  ) {
  }

@@ -61,7 +65,7 @@ export class BlocksList implements OnInit {
                  this.blocksCount = blocks[0].height + 1;
                }
                this.isLoading = false;
-                this.lastBlockHeight = Math.max(...blocks.map(o => o.height));
+                this.lastBlockHeight = Math.max(...blocks.map(o => o.height))
              }),
              map(blocks => {
                if (this.indexingAvailable) {
@@ -77,7 +81,7 @@ export class BlocksList implements OnInit {
                return blocks;
              }),
              retryWhen(errors => errors.pipe(delayWhen(() => timer(10000))))
-            );
+            )
        })
      ),
      this.stateService.blocks$
@@ -108,25 +112,68 @@ export class BlocksList implements OnInit {
            acc = acc.slice(0, this.widget ? 6 : 15);
          }
          return acc;
-        }, []),
-        switchMap((blocks) => {
-          blocks.forEach(block => {
-            block.extras.feeDelta = block.extras.expectedFees ? (block.extras.totalFees - block.extras.expectedFees) / block.extras.expectedFees : 0;
-          });
-          return of(blocks);
-        })
+        }, [])
      );
+
+    if (this.indexingAvailable && this.auditAvailable) {
+      this.auditScoreSubscription = this.fromHeightSubject.pipe(
+        switchMap((fromBlockHeight) => {
+          this.loadingScores = true;
+          return this.apiService.getBlockAuditScores$(this.page === 1 ? undefined : fromBlockHeight)
+            .pipe(
+              catchError(() => {
+                return EMPTY;
+              })
+            );
+        })
+      ).subscribe((scores) => {
+        Object.values(scores).forEach(score => {
+          this.auditScores[score.hash] = score?.matchRate != null ? score.matchRate : null;
+        });
+        this.loadingScores = false;
+      });
+
+      this.latestScoreSubscription = this.stateService.blocks$.pipe(
+        switchMap((block) => {
+          if (block[0]?.extras?.matchRate != null) {
+            return of({
+              hash: block[0].id,
+              matchRate: block[0]?.extras?.matchRate,
+            });
+          }
+          else if (block[0]?.id && this.auditScores[block[0].id] === undefined) {
+            return this.apiService.getBlockAuditScore$(block[0].id)
+              .pipe(
+                catchError(() => {
+                  return EMPTY;
+                })
+              );
+          } else {
+            return EMPTY;
+          }
+        }),
+      ).subscribe((score) => {
+        if (score && score.hash) {
+          this.auditScores[score.hash] = score?.matchRate != null ? score.matchRate : null;
+        }
+      });
+    }
  }

-  pageChange(page: number): void {
+  ngOnDestroy(): void {
+    this.auditScoreSubscription?.unsubscribe();
+    this.latestScoreSubscription?.unsubscribe();
+  }
+
+  pageChange(page: number) {
    this.fromHeightSubject.next((this.blocksCount - 1) - (page - 1) * 15);
  }

-  trackByBlock(index: number, block: BlockExtended): number {
+  trackByBlock(index: number, block: BlockExtended) {
    return block.height;
  }

-  isEllipsisActive(e): boolean {
+  isEllipsisActive(e) {
    return (e.offsetWidth < e.scrollWidth);
  }
 }
--- a/frontend/src/app/components/clock-face/clock-face.component.ts
+++ b/frontend/src/app/components/clock-face/clock-face.component.ts
@@ -26,6 +26,7 @@ export class ClockFaceComponent implements OnInit, OnChanges, OnDestroy {

  constructor(
    public stateService: StateService,
+    private websocketService: WebsocketService,
    private cd: ChangeDetectorRef
  ) {
    this.updateTime();
--- a/frontend/src/app/components/clock/clock-mempool.component.html
+++ b/frontend/src/app/components/clock/clock-mempool.component.html
@@ -0,0 +1 @@
+<app-clock mode="mempool"></app-clock>
--- a/frontend/src/app/components/clock/clock-mempool.component.ts
+++ b/frontend/src/app/components/clock/clock-mempool.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-clock-mempool',
+  templateUrl: './clock-mempool.component.html',
+})
+export class ClockMempoolComponent {}
--- a/frontend/src/app/components/clock/clock-mined.component.html
+++ b/frontend/src/app/components/clock/clock-mined.component.html
@@ -0,0 +1 @@
+<app-clock mode="block"></app-clock>
--- a/frontend/src/app/components/clock/clock-mined.component.ts
+++ b/frontend/src/app/components/clock/clock-mined.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-clock-mined',
+  templateUrl: './clock-mined.component.html',
+})
+export class ClockMinedComponent {}
--- a/frontend/src/app/components/clock/clock.component.html
+++ b/frontend/src/app/components/clock/clock.component.html
@@ -1,19 +1,14 @@
 <div class="clock-wrapper" [style]="wrapperStyle">
  <div class="clockchain-bar" [style.height]="chainHeight + 'px'">
    <div class="clockchain">
-      <app-clockchain
-        [width]="chainWidth"
-        [height]="chainHeight"
-        [mode]="mode"
-        [index]="blockIndex"
-      ></app-clockchain>
+      <app-clockchain [width]="chainWidth" [height]="chainHeight" [mode]="mode"></app-clockchain>
    </div>
  </div>
  <div class="clock-face">
    <app-clock-face [size]="clockSize">
      <div class="block-wrapper">
-        <ng-container *ngIf="blocks && blocks.length">
-          <ng-container *ngIf="mode === 'mined'; else mempoolMode;">
+        <ng-container *ngIf="block && block.height >= 0">
+          <ng-container *ngIf="mode === 'block'; else mempoolMode;">
            <div class="block-cube">
              <div class="side top"></div>
              <div class="side bottom"></div>
@@ -25,12 +20,12 @@
          </ng-container>
          <ng-template #mempoolMode>
            <div class="block-sizer" [style]="blockSizerStyle">
-              <app-mempool-block-overview [index]="blockIndex" [pixelAlign]="true"></app-mempool-block-overview>
+              <app-mempool-block-overview [index]="0" [pixelAlign]="true"></app-mempool-block-overview>
            </div>
          </ng-template>
          <div class="fader"></div>
          <div class="title-wrapper">
-            <h1 class="block-height">{{ blocks[mode === 'mempool' ? 0 : blockIndex].height }}</h1>
+            <h1 class="block-height">{{ block.height }}</h1>
          </div>
        </ng-container>
      </div>
@@ -45,15 +40,15 @@
    </div>
    <div class="stats top right">
      <p class="label" i18n="clock.priority-rate|priority fee rate">priority rate</p>
-      <p *ngIf="recommendedFees$ | async as recommendedFees;" i18n="shared.sat-vbyte|sat/vB">{{ recommendedFees.fastestFee }} sat/vB</p>
+      <p *ngIf="recommendedFees$ | async as recommendedFees;" i18n="shared.sat-vbyte|sat/vB">{{ recommendedFees.fastestFee + 300 }} sat/vB</p>
    </div>
-    <div *ngIf="mode !== 'mempool' && blocks?.length" class="stats bottom left">
-      <p [innerHTML]="blocks[blockIndex].size | bytes: 2"></p>
+    <div *ngIf="mode !== 'mempool' && block" class="stats bottom left">
+      <p [innerHTML]="block.size | bytes: 2"></p>
      <p class="label" i18n="clock.block-size">block size</p>
    </div>
-    <div *ngIf="mode !== 'mempool' && blocks?.length" class="stats bottom right">
+    <div *ngIf="mode !== 'mempool' && block" class="stats bottom right">
      <p class="force-wrap">
-        <ng-container *ngTemplateOutlet="blocks[blockIndex].tx_count === 1 ? transactionsSingular : transactionsPlural; context: {$implicit: blocks[blockIndex].tx_count | number}"></ng-container>
+        <ng-container *ngTemplateOutlet="block.tx_count === 1 ? transactionsSingular : transactionsPlural; context: {$implicit: block.tx_count | number}"></ng-container>
        <ng-template #transactionsSingular let-i i18n="shared.transaction-count.singular">{{ i }} <span class="label">transaction</span></ng-template>
        <ng-template #transactionsPlural let-i i18n="shared.transaction-count.plural">{{ i }} <span class="label">transactions</span></ng-template>
      </p>
--- a/frontend/src/app/components/clock/clock.component.ts
+++ b/frontend/src/app/components/clock/clock.component.ts
@@ -1,11 +1,10 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, Input, OnInit } from '@angular/core';
-import { Observable, Subscription, of, switchMap, tap } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { StateService } from '../../services/state.service';
 import { BlockExtended } from '../../interfaces/node-api.interface';
 import { WebsocketService } from '../../services/websocket.service';
 import { MempoolInfo, Recommendedfees } from '../../interfaces/websocket.interface';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
+import { ActivatedRoute } from '@angular/router';

@Component({
  selector: 'app-clock',
@@ -14,14 +13,12 @@ import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pi
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ClockComponent implements OnInit {
+  @Input() mode: 'block' | 'mempool' = 'block';
  hideStats: boolean = false;
-  mode: 'mempool' | 'mined' = 'mined';
-  blockIndex: number;
-  pageSubscription: Subscription;
  blocksSubscription: Subscription;
  recommendedFees$: Observable<Recommendedfees>;
  mempoolInfo$: Observable<MempoolInfo>;
-  blocks: BlockExtended[] = [];
+  block: BlockExtended;
  clockSize: number = 300;
  chainWidth: number = 384;
  chainHeight: number = 60;
@@ -44,8 +41,6 @@ export class ClockComponent implements OnInit {
    public stateService: StateService,
    private websocketService: WebsocketService,
    private route: ActivatedRoute,
-    private router: Router,
-    private relativeUrlPipe: RelativeUrlPipe,
    private cd: ChangeDetectorRef,
  ) {
    this.route.queryParams.subscribe((params) => {
@@ -57,45 +52,19 @@ export class ClockComponent implements OnInit {

  ngOnInit(): void {
    this.resizeCanvas();
-    this.websocketService.want(['blocks', 'stats', 'mempool-blocks']);
+    this.websocketService.want(['blocks']);

    this.blocksSubscription = this.stateService.blocks$
      .subscribe(([block]) => {
        if (block) {
-          this.blocks.unshift(block);
-          this.blocks = this.blocks.slice(0, 16);
-          if (this.blocks[this.blockIndex]) {
-            this.blockStyle = this.getStyleForBlock(this.blocks[this.blockIndex]);
-            this.cd.markForCheck();
-          }
+          this.block = block;
+          this.blockStyle = this.getStyleForBlock(this.block);
+          this.cd.markForCheck();
        }
      });

    this.recommendedFees$ = this.stateService.recommendedFees$;
    this.mempoolInfo$ = this.stateService.mempoolInfo$;
-
-    this.pageSubscription = this.route.paramMap.pipe(
-      switchMap((params: ParamMap) => {
-        const rawMode: string = params.get('mode');
-        const mode = rawMode === 'mempool' ? 'mempool' : 'mined';
-        const index: number = Number.parseInt(params.get('index'));
-        if (mode !== rawMode || index < 0 || isNaN(index)) {
-          this.router.navigate([this.relativeUrlPipe.transform('/clock'), mode, index || 0]);
-        }
-        return of({
-          mode,
-          index,
-        });
-      }),
-      tap((page: { mode: 'mempool' | 'mined', index: number }) => {
-        this.mode = page.mode;
-        this.blockIndex = page.index || 0;
-        if (this.blocks[this.blockIndex]) {
-          this.blockStyle = this.getStyleForBlock(this.blocks[this.blockIndex]);
-          this.cd.markForCheck();
-        }
-      })
-    ).subscribe();
  }

  getStyleForBlock(block: BlockExtended) {
--- a/frontend/src/app/components/clockchain/clockchain.component.html
+++ b/frontend/src/app/components/clockchain/clockchain.component.html
@@ -5,20 +5,8 @@
  <div class="position-container" [ngClass]="network ? network : ''" [style.top]="(height / 3) + 'px'">
    <span>
      <div class="blocks-wrapper">
-        <app-mempool-blocks
-          [minimal]="true"
-          [count]="mempoolBlocks"
-          [blockWidth]="blockWidth"
-          [spotlight]="mode === 'mempool' ? index + 1 : 0"
-          [getHref]="getMempoolUrl"
-        ></app-mempool-blocks>
-        <app-blockchain-blocks
-          [minimal]="true"
-          [count]="blockchainBlocks"
-          [blockWidth]="blockWidth"
-          [spotlight]="mode === 'mined' ? -index - 1 : 0"
-          [getHref]="getMinedUrl"
-        ></app-blockchain-blocks>
+        <app-mempool-blocks [minimal]="true" [count]="mempoolBlocks" [blockWidth]="blockWidth" [spotlight]="mode === 'mempool' ? 1 : 0"></app-mempool-blocks>
+        <app-blockchain-blocks [minimal]="true" [count]="blockchainBlocks" [blockWidth]="blockWidth" [spotlight]="mode === 'block' ? -1 : 0"></app-blockchain-blocks>
      </div>
      <div class="divider" [style.top]="-(height / 6) + 'px'">
        <svg
--- a/frontend/src/app/components/clockchain/clockchain.component.ts
+++ b/frontend/src/app/components/clockchain/clockchain.component.ts
@@ -11,8 +11,7 @@ import { StateService } from '../../services/state.service';
 export class ClockchainComponent implements OnInit, OnChanges, OnDestroy {
  @Input() width: number = 300;
  @Input() height: number = 60;
-  @Input() mode: 'mempool' | 'mined';
-  @Input() index: number = 0;
+  @Input() mode: 'mempool' | 'block';

  mempoolBlocks: number = 3;
  blockchainBlocks: number = 6;
@@ -71,12 +70,4 @@ export class ClockchainComponent implements OnInit, OnChanges, OnDestroy {
    this.ltrTransitionEnabled = true;
    this.stateService.timeLtr.next(!this.timeLtr);
  }
-
-  getMempoolUrl(index): string {
-    return `/clock/mempool/${index}`;
-  }
-
-  getMinedUrl(index): string {
-    return `/clock/block/${index}`;
-  }
 }
--- a/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts
+++ b/frontend/src/app/components/fee-distribution-graph/fee-distribution-graph.component.ts
@@ -1,9 +1,5 @@
 import { OnChanges } from '@angular/core';
 import { Component, Input, OnInit, ChangeDetectionStrategy } from '@angular/core';
-import { TransactionStripped } from '../../interfaces/websocket.interface';
-import { StateService } from '../../services/state.service';
-import { VbytesPipe } from '../../shared/pipes/bytes-pipe/vbytes.pipe';
-import { selectPowerOfTen } from '../../bitcoin.utils';

@Component({
  selector: 'app-fee-distribution-graph',
@@ -11,121 +7,47 @@ import { selectPowerOfTen } from '../../bitcoin.utils';
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FeeDistributionGraphComponent implements OnInit, OnChanges {
-  @Input() feeRange: number[];
-  @Input() vsize: number;
-  @Input() transactions: TransactionStripped[];
+  @Input() data: any;
  @Input() height: number | string = 210;
  @Input() top: number | string = 20;
  @Input() right: number | string = 22;
  @Input() left: number | string = 30;
-  @Input() numSamples: number = 200;
-  @Input() numLabels: number = 10;
-
-  simple: boolean = false;
-  data: number[][];
-  labelInterval: number = 50;

  mempoolVsizeFeesOptions: any;
  mempoolVsizeFeesInitOptions = {
    renderer: 'svg'
  };

-  constructor(
-    private stateService: StateService,
-    private vbytesPipe: VbytesPipe,
-  ) { }
+  constructor() { }

-  ngOnInit(): void {
+  ngOnInit() {
    this.mountChart();
  }

-  ngOnChanges(): void {
-    this.simple = !!this.feeRange?.length;
-    this.prepareChart();
+  ngOnChanges() {
    this.mountChart();
  }

-  prepareChart(): void {
-    if (this.simple) {
-      this.data = this.feeRange.map((rate, index) => [index * 10, rate]);
-      this.labelInterval = 1;
-      return;
-    }
-    this.data = [];
-    if (!this.transactions?.length) {
-      return;
-    }
-    const samples = [];
-    const txs = this.transactions.map(tx => { return { vsize: tx.vsize, rate: tx.rate || (tx.fee / tx.vsize) }; }).sort((a, b) => { return b.rate - a.rate; });
-    const maxBlockVSize = this.stateService.env.BLOCK_WEIGHT_UNITS / 4;
-    const sampleInterval = maxBlockVSize / this.numSamples;
-    let cumVSize = 0;
-    let sampleIndex = 0;
-    let nextSample = 0;
-    let txIndex = 0;
-    this.labelInterval = this.numSamples / this.numLabels;
-    while (nextSample <= maxBlockVSize) {
-      if (txIndex >= txs.length) {
-        samples.push([(1 - (sampleIndex / this.numSamples)) * 100, 0]);
-        nextSample += sampleInterval;
-        sampleIndex++;
-        continue;
-      }
-
-      while (txs[txIndex] && nextSample < cumVSize + txs[txIndex].vsize) {
-        samples.push([(1 - (sampleIndex / this.numSamples)) * 100, txs[txIndex].rate]);
-        nextSample += sampleInterval;
-        sampleIndex++;
-      }
-      cumVSize += txs[txIndex].vsize;
-      txIndex++;
-    }
-    this.data = samples.reverse();
-  }
-
-  mountChart(): void {
+  mountChart() {
    this.mempoolVsizeFeesOptions = {
      grid: {
        height: '210',
        right: '20',
        top: '22',
-        left: '40',
+        left: '30',
      },
      xAxis: {
        type: 'category',
        boundaryGap: false,
-        name: '% Weight',
-        nameLocation: 'middle',
-        nameGap: 0,
-        nameTextStyle: {
-          verticalAlign: 'top',
-          padding: [30, 0, 0, 0],
-        },
-        axisLabel: {
-          interval: (index: number): boolean => { return index && (index % this.labelInterval === 0); },
-          formatter: (value: number): string => { return Number(value).toFixed(0); },
-        },
-        axisTick: {
-          interval: (index:number): boolean => { return (index % this.labelInterval === 0); },
-        },
      },
      yAxis: {
        type: 'value',
-        // name: 'Effective Fee Rate s/vb',
-        // nameLocation: 'middle',
        splitLine: {
          lineStyle: {
            type: 'dotted',
            color: '#ffffff66',
            opacity: 0.25,
          }
-        },
-        axisLabel: {
-          formatter: (value: number): string => {
-            const selectedPowerOfTen = selectPowerOfTen(value);
-            const newVal = Math.round(value / selectedPowerOfTen.divider);
-            return `${newVal}${selectedPowerOfTen.unit}`;
-          },
        }
      },
      series: [{
@@ -136,18 +58,14 @@ export class FeeDistributionGraphComponent implements OnInit, OnChanges {
          position: 'top',
          color: '#ffffff',
          textShadowBlur: 0,
-          formatter: (label: { data: number[] }): string => {
-            const value = label.data[1];
-            const selectedPowerOfTen = selectPowerOfTen(value);
-            const newVal = Math.round(value / selectedPowerOfTen.divider);
-            return `${newVal}${selectedPowerOfTen.unit}`;
+          formatter: (label: any) => {
+            return Math.floor(label.data);
          },
        },
-        showAllSymbol: false,
        smooth: true,
        lineStyle: {
          color: '#D81B60',
-          width: 1,
+          width: 4,
        },
        itemStyle: {
          color: '#b71c1c',
--- a/frontend/src/app/components/fees-box/fees-box.component.html
+++ b/frontend/src/app/components/fees-box/fees-box.component.html
@@ -1,4 +1,4 @@
-<div class="fee-estimation-wrapper" *ngIf="(isLoading$ | async) === false && (recommendedFees$ | async) as recommendedFees; else loadingFees">
+<div class="fee-estimation-wrapper" *ngIf="(isLoadingWebSocket$ | async) === false && (recommendedFees$ | async) as recommendedFees; else loadingFees">
  <div class="d-flex">
    <div class="fee-progress-bar" [style.background]="noPriority">
      <span class="fee-label" i18n="fees-box.no-priority" i18n-ngbTooltip="Transaction feerate tooltip (economy)" ngbTooltip="Either 2x the minimum, or the Low Priority rate (whichever is lower)" placement="top">No Priority</span>
--- a/frontend/src/app/components/fees-box/fees-box.component.ts
+++ b/frontend/src/app/components/fees-box/fees-box.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
 import { StateService } from '../../services/state.service';
-import { Observable, combineLatest } from 'rxjs';
+import { Observable } from 'rxjs';
 import { Recommendedfees } from '../../interfaces/websocket.interface';
 import { feeLevels, mempoolFeeColors } from '../../app.constants';
-import { map, startWith, tap } from 'rxjs/operators';
+import { tap } from 'rxjs/operators';

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

  ngOnInit(): void {
-    this.isLoading$ = combineLatest(
-      this.stateService.isLoadingWebSocket$.pipe(startWith(false)),
-      this.stateService.loadingIndicators$.pipe(startWith({ mempool: 0 })),
-    ).pipe(map(([socket, indicators]) => {
-      return socket || (indicators.mempool != null && indicators.mempool !== 100);
-    }));
+    this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$;
    this.recommendedFees$ = this.stateService.recommendedFees$
      .pipe(
        tap((fees) => {
-          let feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => fees.minimumFee >= feeLvl);
+          let feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => fees.economyFee >= feeLvl);
          feeLevelIndex = feeLevelIndex >= 0 ? feeLevels.length - feeLevelIndex : feeLevelIndex;
          const startColor = '#' + (mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);

+          feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => fees.hourFee >= feeLvl);
+          feeLevelIndex = feeLevelIndex >= 0 ? feeLevels.length - feeLevelIndex : feeLevelIndex;
+          const lowColor = '#' + (mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);
+
+          feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => fees.halfHourFee >= feeLvl);
+          feeLevelIndex = feeLevelIndex >= 0 ? feeLevels.length - feeLevelIndex : feeLevelIndex;
+          const medColor = '#' + (mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);
+
          feeLevelIndex = feeLevels.slice().reverse().findIndex((feeLvl) => fees.fastestFee >= feeLvl);
          feeLevelIndex = feeLevelIndex >= 0 ? feeLevels.length - feeLevelIndex : feeLevelIndex;
-          const endColor = '#' + (mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);
+          const highColor = '#' + (mempoolFeeColors[feeLevelIndex - 1] || mempoolFeeColors[mempoolFeeColors.length - 1]);

-          this.gradient = `linear-gradient(to right, ${startColor}, ${endColor})`;
+          this.gradient = `linear-gradient(to right, ${lowColor} 0%, ${medColor} 50%, ${highColor} 100%)`;
          this.noPriority = startColor;
        }
      )
--- a/frontend/src/app/components/graphs/graphs.component.html
+++ b/frontend/src/app/components/graphs/graphs.component.html
@@ -22,7 +22,7 @@
      <a class="dropdown-item" routerLinkActive="active"
        [routerLink]="['/graphs/mining/block-sizes-weights' | relativeUrl]" i18n="mining.block-sizes-weights">Block Sizes and Weights</a>
      <a *ngIf="stateService.env.AUDIT" class="dropdown-item" routerLinkActive="active"
-        [routerLink]="['/graphs/mining/block-health' | relativeUrl]" i18n="mining.block-health">Block Health</a>
+        [routerLink]="['/graphs/mining/block-prediction' | relativeUrl]" i18n="mining.block-prediction-accuracy">Block Prediction Accuracy</a>
    </div>
  </div>

--- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html
+++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html
@@ -44,7 +44,7 @@
    </ng-container>
  </a>

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

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

-<main>
-  <router-outlet></router-outlet>
-</main>
+<br />

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

 </ng-container>
--- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.ts
+++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.ts
@@ -19,7 +19,6 @@ export class LiquidMasterPageComponent implements OnInit {
  network$: Observable<string>;
  urlLanguage: string;
  networkPaths: { [network: string]: string };
-  footerVisible = true;

  constructor(
    private stateService: StateService,
@@ -28,18 +27,13 @@ export class LiquidMasterPageComponent implements OnInit {
    private navigationService: NavigationService,
  ) { }

-  ngOnInit(): void {
+  ngOnInit() {
    this.env = this.stateService.env;
    this.connectionState$ = this.stateService.connectionState$;
    this.network$ = merge(of(''), this.stateService.networkChanged$);
    this.urlLanguage = this.languageService.getLanguageForUrl();
    this.navigationService.subnetPaths.subscribe((paths) => {
      this.networkPaths = paths;
-      if (paths.liquid.indexOf('docs') > -1) {
-        this.footerVisible = false;
-      } else {
-        this.footerVisible = true;
-      }
    });
  }

@@ -47,7 +41,7 @@ export class LiquidMasterPageComponent implements OnInit {
    this.navCollapsed = !this.navCollapsed;
  }

-  onResize(): void {
+  onResize(event: any) {
    this.isMobile = window.innerWidth <= 767.98;
  }
 }
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="{ val: network$ | async } as network">
 <header>
  <nav class="navbar navbar-expand-md navbar-dark bg-dark">
-  <a class="navbar-brand" [ngClass]="{'dual-logos': subdomain}" [routerLink]="['/' | relativeUrl]" (click)="brandClick($event)">
+  <a class="navbar-brand" [ngClass]="{'dual-logos': subdomain}" [routerLink]="['/' | relativeUrl]">
  <ng-template [ngIf]="subdomain">
    <div class="subdomain_container">
      <img [src]="'/api/v1/enterprise/images/' + subdomain + '/logo'" class="subdomain_logo">
@@ -17,7 +17,7 @@
    </ng-container>
  </a>

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

 <app-testnet-alert *ngIf="network.val === 'testnet' || network.val === 'signet'"></app-testnet-alert>

-<main>
+<main style="margin-top: 24px;">
  <router-outlet></router-outlet>
 </main>

-<app-global-footer *ngIf="footerVisible"></app-global-footer>
+<app-global-footer></app-global-footer>
 </ng-container>
--- a/frontend/src/app/components/master-page/master-page.component.ts
+++ b/frontend/src/app/components/master-page/master-page.component.ts
@@ -20,8 +20,6 @@ export class MasterPageComponent implements OnInit {
  urlLanguage: string;
  subdomain = '';
  networkPaths: { [network: string]: string };
-  networkPaths$: Observable<Record<string, string>>;
-  footerVisible = true;

  constructor(
    public stateService: StateService,
@@ -30,7 +28,7 @@ export class MasterPageComponent implements OnInit {
    private navigationService: NavigationService,
  ) { }

-  ngOnInit(): void {
+  ngOnInit() {
    this.env = this.stateService.env;
    this.connectionState$ = this.stateService.connectionState$;
    this.network$ = merge(of(''), this.stateService.networkChanged$);
@@ -38,11 +36,6 @@ export class MasterPageComponent implements OnInit {
    this.subdomain = this.enterpriseService.getSubdomain();
    this.navigationService.subnetPaths.subscribe((paths) => {
      this.networkPaths = paths;
-      if (paths.mainnet.indexOf('docs') > -1) {
-        this.footerVisible = false;
-      } else {
-        this.footerVisible = true;
-      }
    });
  }

@@ -50,11 +43,7 @@ export class MasterPageComponent implements OnInit {
    this.navCollapsed = !this.navCollapsed;
  }

-  onResize(): void {
+  onResize(event: any) {
    this.isMobile = window.innerWidth <= 767.98;
  }
-
-  brandClick(e): void {
-    this.stateService.resetScroll$.next(true);
-  }
 }
--- a/frontend/src/app/components/mempool-block/mempool-block.component.html
+++ b/frontend/src/app/components/mempool-block/mempool-block.component.html
@@ -39,11 +39,11 @@
            </tr>
          </tbody>
        </table>
-        <app-fee-distribution-graph *ngIf="webGlEnabled" [transactions]="mempoolBlockTransactions$ | async" [feeRange]="mempoolBlock.isStack ? mempoolBlock.feeRange : []" [vsize]="mempoolBlock.blockVSize" ></app-fee-distribution-graph>
+        <app-fee-distribution-graph *ngIf="webGlEnabled" [data]="mempoolBlock.feeRange" ></app-fee-distribution-graph>
      </div>
      <div class="col-md chart-container">
        <app-mempool-block-overview *ngIf="webGlEnabled" [index]="mempoolBlockIndex" (txPreviewEvent)="setTxPreview($event)"></app-mempool-block-overview>
-        <app-fee-distribution-graph *ngIf="!webGlEnabled" [transactions]="mempoolBlockTransactions$ | async" [feeRange]="mempoolBlock.isStack ? mempoolBlock.feeRange : []" [vsize]="mempoolBlock.blockVSize" ></app-fee-distribution-graph>
+        <app-fee-distribution-graph *ngIf="!webGlEnabled" [data]="mempoolBlock.feeRange" ></app-fee-distribution-graph>
      </div>
    </div>
  </div>
--- a/frontend/src/app/components/mempool-block/mempool-block.component.ts
+++ b/frontend/src/app/components/mempool-block/mempool-block.component.ts
@@ -17,7 +17,6 @@ export class MempoolBlockComponent implements OnInit, OnDestroy {
  network$: Observable<string>;
  mempoolBlockIndex: number;
  mempoolBlock$: Observable<MempoolBlock>;
-  mempoolBlockTransactions$: Observable<TransactionStripped[]>;
  ordinal$: BehaviorSubject<string> = new BehaviorSubject('');
  previewTx: TransactionStripped | void;
  webGlEnabled: boolean;
@@ -54,7 +53,6 @@ export class MempoolBlockComponent implements OnInit, OnDestroy {
                const ordinal = this.getOrdinal(mempoolBlocks[this.mempoolBlockIndex]);
                this.ordinal$.next(ordinal);
                this.seoService.setTitle(ordinal);
-                mempoolBlocks[this.mempoolBlockIndex].isStack = mempoolBlocks[this.mempoolBlockIndex].blockVSize > this.stateService.blockVSize;
                return mempoolBlocks[this.mempoolBlockIndex];
              })
            );
@@ -64,8 +62,6 @@ export class MempoolBlockComponent implements OnInit, OnDestroy {
        })
      );

-    this.mempoolBlockTransactions$ = this.stateService.liveMempoolBlockTransactions$.pipe(map(txMap => Object.values(txMap)));
-
    this.network$ = this.stateService.networkChanged$;
  }

--- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html
+++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.html
@@ -8,7 +8,7 @@
          [style.right]="mempoolBlockStyles[i].right"
        ></div>
        <div @blockEntryTrigger [@.disabled]="i > 0 || !animateEntry" [attr.data-cy]="'mempool-block-' + i" class="bitcoin-block text-center mempool-block" [class.hide-block]="count && i >= count" id="mempool-block-{{ i }}" [ngStyle]="mempoolBlockStyles[i]" [class.blink-bg]="projectedBlock.blink">
-          <a draggable="false" [routerLink]="[getHref(i) | relativeUrl]"
+          <a draggable="false" [routerLink]="['/mempool-block/' | relativeUrl, i]"
            class="blockLink" [ngClass]="{'disabled': (this.stateService.blockScrolling$ | async)}">&nbsp;</a>
          <div class="block-body">
            <ng-container *ngIf="!minimal">
--- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts
+++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, HostListener, Input, OnChanges, SimpleChanges, Output, EventEmitter } from '@angular/core';
+import { Component, OnInit, OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef, HostListener, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { Subscription, Observable, fromEvent, merge, of, combineLatest } from 'rxjs';
 import { MempoolBlock } from '../../interfaces/websocket.interface';
 import { StateService } from '../../services/state.service';
 import { Router } from '@angular/router';
-import { take, map, switchMap, tap } from 'rxjs/operators';
+import { take, map, switchMap } from 'rxjs/operators';
 import { feeLevels, mempoolFeeColors } from '../../app.constants';
 import { specialBlocks } from '../../app.constants';
 import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
@@ -28,10 +28,6 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
  @Input() blockWidth: number = 125;
  @Input() count: number = null;
  @Input() spotlight: number = 0;
-  @Input() getHref?: (index) => string = (index) => `/mempool-block/${index}`;
-  @Input() allBlocks: boolean = false;
-
-  @Output() widthChange: EventEmitter<number> = new EventEmitter();

  specialBlocks = specialBlocks;
  mempoolBlocks: MempoolBlock[] = [];
@@ -108,7 +104,7 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
    this.mempoolEmptyBlocks.forEach((b) => {
      this.mempoolEmptyBlockStyles.push(this.getStyleForMempoolEmptyBlock(b.index));
    });
-    this.reduceEmptyBlocksToFitScreen(this.mempoolEmptyBlocks);
+    this.reduceMempoolBlocksToFitScreen(this.mempoolEmptyBlocks);

    this.mempoolBlocks.map(() => {
      this.updateMempoolBlockStyles();
@@ -146,24 +142,16 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
          this.mempoolBlocksFull = JSON.parse(stringifiedBlocks);
          this.mempoolBlocks = this.reduceMempoolBlocksToFitScreen(JSON.parse(stringifiedBlocks));

-          this.now = Date.now();
-
          this.updateMempoolBlockStyles();
          this.calculateTransactionPosition();
- 
          return this.mempoolBlocks;
-        }),
-        tap(() => {
-          this.cd.markForCheck();
-          this.widthChange.emit(this.containerOffset + this.mempoolBlocks.length * this.blockOffset);
        })
      );

    this.difficultyAdjustments$ = this.stateService.difficultyAdjustment$
      .pipe(
        map((da) => {
-          this.now = Date.now();
-          this.cd.markForCheck();
+          this.now = new Date().getTime();
          return da;
        })
      );
@@ -256,42 +244,18 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
  @HostListener('window:resize', ['$event'])
  onResize(): void {
    this.animateEntry = false;
-    this.reduceEmptyBlocksToFitScreen(this.mempoolEmptyBlocks);
  }

  trackByFn(index: number, block: MempoolBlock) {
    return (block.isStack) ? `stack-${block.index}` : block.index;
  }

-  reduceEmptyBlocksToFitScreen(blocks: MempoolBlock[]): MempoolBlock[] {
-    const innerWidth = this.stateService.env.BASE_MODULE !== 'liquid' && window.innerWidth <= 767.98 ? window.innerWidth : window.innerWidth / 2;
-    let blocksAmount = this.stateService.env.MEMPOOL_BLOCKS_AMOUNT;
-    if (!this.allBlocks) {
-      blocksAmount = Math.min(this.stateService.env.MEMPOOL_BLOCKS_AMOUNT, Math.floor(innerWidth / (this.blockWidth + this.blockPadding)));
-    }
-    while (blocks.length < blocksAmount) {
-      blocks.push({
-        blockSize: 0,
-        blockVSize: 0,
-        feeRange: [],
-        index: blocks.length,
-        medianFee: 0,
-        nTx: 0,
-        totalFees: 0
-      });
-    }
-    while (blocks.length > blocksAmount) {
-      blocks.pop();
-    }
-    return blocks;
-  }
-
  reduceMempoolBlocksToFitScreen(blocks: MempoolBlock[]): MempoolBlock[] {
    const innerWidth = this.stateService.env.BASE_MODULE !== 'liquid' && window.innerWidth <= 767.98 ? window.innerWidth : window.innerWidth / 2;
-    let blocksAmount = this.stateService.env.MEMPOOL_BLOCKS_AMOUNT;
+    let blocksAmount;
    if (this.count) {
      blocksAmount = 8;
-    } else if (!this.allBlocks) {
+    } else {
      blocksAmount = Math.min(this.stateService.env.MEMPOOL_BLOCKS_AMOUNT, Math.floor(innerWidth / (this.blockWidth + this.blockPadding)));
    }
    while (blocks.length > blocksAmount) {
--- a/frontend/src/app/components/mempool-graph/mempool-graph.component.ts
+++ b/frontend/src/app/components/mempool-graph/mempool-graph.component.ts
@@ -24,7 +24,6 @@ import { download, formatterXAxis, formatterXAxisLabel } from '../../shared/grap
 export class MempoolGraphComponent implements OnInit, OnChanges {
  @Input() data: any[];
  @Input() filterSize = 100000;
-  @Input() limitFilterFee = 1;
  @Input() height: number | string = 200;
  @Input() top: number | string = 20;
  @Input() right: number | string = 10;
@@ -41,9 +40,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
  };
  windowPreference: string;
  hoverIndexSerie = 0;
-  maxFee: number;
  feeLimitIndex: number;
-  maxFeeIndex: number;
  feeLevelsOrdered = [];
  chartColorsOrdered = chartColors;
  inverted: boolean;
@@ -101,9 +98,8 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
  }

  generateArray(mempoolStats: OptimizedMempoolStats[]) {
-    const finalArray: number[][][] = [];
+    let finalArray: number[][][] = [];
    let feesArray: number[][] = [];
-
    let maxTier = 0;
    for (let index = 37; index > -1; index--) {
      feesArray = [];
@@ -115,8 +111,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
      });
      finalArray.push(feesArray);
    }
-    this.maxFeeIndex = maxTier;
-
+    this.feeLimitIndex = maxTier;
    finalArray.reverse();
    return finalArray;
  }
@@ -129,7 +124,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
    const newColors = [];
    for (let index = 0; index < series.length; index++) {
      const value = series[index];
-      if (index >= this.feeLimitIndex && index <= this.maxFeeIndex) {
+      if (index < this.feeLimitIndex) {
        newColors.push(this.chartColorsOrdered[index]);
        seriesGraph.push({
          zlevel: 0,
@@ -186,7 +181,7 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
        alwaysShowContent: false,
        position: (pos, params, el, elRect, size) => {
          const positions = { top: (this.template === 'advanced') ? 0 : -30 };
-          positions[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 100;
+          positions[['left', 'right'][+(pos[0] < size.viewSize[0] / 2)]] = 60;
          return positions;
        },
        extraCssText: `width: ${(this.template === 'advanced') ? '275px' : '200px'};
@@ -194,19 +189,10 @@ export class MempoolGraphComponent implements OnInit, OnChanges {
                      border: none;
                      box-shadow: none;`,
        axisPointer: {
-          type: 'cross',
-          label: {
-            formatter: (params: any) => {
-              if (params.axisDimension === 'y') {
-                return this.vbytesPipe.transform(params.value, 2, 'vB', 'MvB', true)
-              } else {
-                return formatterXAxis(this.locale, this.windowPreference, params.value);
-              }
-            }
-          }
+          type: 'line',
        },
        formatter: (params: any) => {
-          const axisValueLabel: string = formatterXAxis(this.locale, this.windowPreference, params[0].axisValue);
+          const axisValueLabel: string = formatterXAxis(this.locale, this.windowPreference, params[0].axisValue);         
          const { totalValue, totalValueArray } = this.getTotalValues(params);
          const itemFormatted = [];
          let totalParcial = 0;
@@ -388,26 +374,21 @@ export class MempoolGraphComponent implements OnInit, OnChanges {

  orderLevels() {
    this.feeLevelsOrdered = [];
-    const maxIndex = Math.min(feeLevels.length, this.maxFeeIndex);
-    for (let i = 0; i < feeLevels.length; i++) {
-      if (feeLevels[i] === this.limitFilterFee) {
-        this.feeLimitIndex = i;
-      }
-      if (feeLevels[i] <= feeLevels[this.maxFeeIndex]) {
+    let maxIndex = Math.min(feeLevels.length, this.feeLimitIndex);
+    for (let i = 0; i < maxIndex; i++) {
        if (this.stateService.network === 'liquid' || this.stateService.network === 'liquidtestnet') {
-          if (i === maxIndex || feeLevels[i] == null) {
+          if (i === maxIndex - 1) {
            this.feeLevelsOrdered.push(`${(feeLevels[i] / 10).toFixed(1)}+`);
          } else {
            this.feeLevelsOrdered.push(`${(feeLevels[i] / 10).toFixed(1)} - ${(feeLevels[i + 1]  / 10).toFixed(1)}`);
          }
        } else {
-          if (i === maxIndex || feeLevels[i] == null) {
+          if (i === maxIndex - 1) {
            this.feeLevelsOrdered.push(`${feeLevels[i]}+`);
          } else {
            this.feeLevelsOrdered.push(`${feeLevels[i]} - ${feeLevels[i + 1]}`);
          }
        }
-      }
    }
    this.chartColorsOrdered =  chartColors.slice(0, this.feeLevelsOrdered.length);
  }
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.html
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.html
@@ -94,8 +94,7 @@
          <th class="" i18n="master-page.blocks">Blocks</th>
          <th *ngIf="auditAvailable" class="health text-right widget" i18n="latest-blocks.avg_health"
            i18n-ngbTooltip="latest-blocks.avg_health" ngbTooltip="Avg Health" placement="bottom" #health [disableTooltip]="!isEllipsisActive(health)">Avg Health</th>
-          <th *ngIf="auditAvailable" class="d-none d-sm-table-cell" i18n="mining.fees-per-block">Avg Block Fees</th>
-          <th class="d-none d-lg-table-cell" i18n="mining.empty-blocks">Empty blocks</th>
+          <th class="d-none d-md-table-cell" i18n="mining.empty-blocks">Empty blocks</th>
        </tr>
      </thead>
      <tbody [attr.data-cy]="'pools-table'" *ngIf="(miningStatsObservable$ | async) as miningStats">
@@ -122,15 +121,7 @@
              <span class="health-badge badge badge-secondary" i18n="unknown">Unknown</span>
            </ng-template>
          </td>
-          <td *ngIf="auditAvailable" class="d-none d-sm-table-cell">
-            <span *ngIf="pool.avgFeeDelta != null; else nullFeeDelta" class="difference" [class.positive]="pool.avgFeeDelta >= 0" [class.negative]="pool.avgFeeDelta < 0">
-              {{ pool.avgFeeDelta > 0 ? '+' : '' }}{{ (pool.avgFeeDelta * 100) | amountShortener: 2 }}%
-            </span>
-            <ng-template #nullFeeDelta>
-              -
-            </ng-template>
-          </td>        
-          <td class="d-none d-lg-table-cell">{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
+          <td class="d-none d-md-table-cell">{{ pool.emptyBlocks }} ({{ pool.emptyBlockRatio }}%)</td>
        </tr>
        <tr style="border-top: 1px solid #555">
          <td class="d-none d-md-table-cell"></td>
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
@@ -110,15 +110,4 @@
 .disabled {
  pointer-events: none;
  opacity: 0.5;
-}
-
-td {
-  .difference {
-    &.positive {
-      color: rgb(66, 183, 71);
-    }
-    &.negative {
-      color: rgb(183, 66, 66);
-    }
-  }
-}
+}
--- a/frontend/src/app/components/search-form/search-form.component.ts
+++ b/frontend/src/app/components/search-form/search-form.component.ts
@@ -153,7 +153,7 @@ export class SearchFormComponent implements OnInit {
          const matchesBlockHeight = this.regexBlockheight.test(searchText);
          const matchesTxId = this.regexTransaction.test(searchText) && !this.regexBlockhash.test(searchText);
          const matchesBlockHash = this.regexBlockhash.test(searchText);
-          const matchesAddress = !matchesTxId && this.regexAddress.test(searchText);
+          const matchesAddress = this.regexAddress.test(searchText);

          if (matchesAddress && this.network === 'bisq') {
            searchText = 'B' + searchText;
@@ -198,7 +198,7 @@ export class SearchFormComponent implements OnInit {
    const searchText = result || this.searchForm.value.searchText.trim();
    if (searchText) {
      this.isSearching = true;
-      if (!this.regexTransaction.test(searchText) && this.regexAddress.test(searchText)) {
+      if (this.regexAddress.test(searchText)) {
        this.navigate('/address/', searchText);
      } else if (this.regexBlockhash.test(searchText) || this.regexBlockheight.test(searchText)) {
        this.navigate('/block/', searchText);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wiz	ef78b252f3	Merge branch 'master' into mononaut/fee-widget-gradient	2023-05-09 12:51:09 -05:00
Mononaut	db4886fb41	fix recommended fee gradient	2023-05-08 13:06:56 -06:00