Liquid audit re-indexing

Merge branch 'natsoni/fix-liquid-db-migration' into natsoni/fix-liquid-expired-txos
Move table re-index to own migrations
2024-04-18 12:13:57 +02:00 · 2024-04-18 11:56:27 +02:00 · 2024-04-16 22:43:13 +02:00 · 2024-04-16 16:12:31 +02:00 · 2024-04-16 12:15:45 +02:00 · 2024-04-16 12:15:14 +02:00
399 changed files with 21933 additions and 43774 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
      - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain
        # Latest version available on this commit is 1.71.1
        # Commit date is Aug 3, 2023
-        uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
+        uses: dtolnay/rust-toolchain@bb45937a053e097f8591208d8e74c90db1873d07
        with:
          toolchain: ${{ steps.gettoolchain.outputs.toolchain }}

@@ -257,7 +257,7 @@ jobs:
            spec: |
              cypress/e2e/mainnet/*.spec.ts
              cypress/e2e/signet/*.spec.ts
-              cypress/e2e/testnet4/*.spec.ts
+              cypress/e2e/testnet/*.spec.ts
          - module: "liquid"
            spec: |
              cypress/e2e/liquid/liquid.spec.ts
--- a/backend/.eslintrc
+++ b/backend/.eslintrc
@@ -20,7 +20,6 @@
    "@typescript-eslint/no-this-alias": 1,
    "@typescript-eslint/no-var-requires": 1,
    "@typescript-eslint/explicit-function-return-type": 1,
-    "@typescript-eslint/no-unused-vars": 1,
    "no-console": 1,
    "no-constant-condition": 1,
    "no-dupe-else-if": 1,
@@ -33,8 +32,6 @@
    "prefer-rest-params": 1,
    "quotes": [1, "single", { "allowTemplateLiterals": true }],
    "semi": 1,
-    "curly": [1, "all"],
-    "eqeqeq": 1,
-    "no-trailing-spaces": 1
+    "eqeqeq": 1
  }
 }
--- a/backend/README.md
+++ b/backend/README.md
@@ -181,7 +181,7 @@ Create a new wallet, if needed:
   bitcoin-cli -regtest createwallet test
   ```

-Load wallet (this command may take a while if you have a lot of UTXOs):
+Load wallet (this command may take a while if you have lot of UTXOs):
   ```
   bitcoin-cli -regtest loadwallet test
   ```
@@ -233,9 +233,9 @@ By default, mining pools will be not automatically updated regularly (`config.ME

 To manually update your mining pools, you can use the `--update-pools` command line flag when you run the nodejs backend. For example `npm run start --update-pools`. This will trigger the mining pools update and automatically re-index appropriate blocks.

-You can enable the automatic mining pools update by settings `config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING` to `true` in your `mempool-config.json`.
+You can enabled the automatic mining pools update by settings `config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING` to `true` in your `mempool-config.json`.

-When a `coinbase tag` or `coinbase address` change is detected, all blocks tagged to the `unknown` mining pools (starting from height 130635) will be deleted from the `blocks` table. Additionally, all blocks which were tagged to the pool which has been updated will also be deleted from the `blocks` table. Of course, those blocks will be automatically reindexed.
+When a `coinbase tag` or `coinbase address` change is detected, all blocks tagged to the `unknown` mining pools (starting from height 130635) will be deleted from the `blocks` table. Additionaly, all blocks which were tagged to the pool which has been updated will also be deleted from the `blocks` table. Of course, those blocks will be automatically reindexed.

 ### Re-index tables

--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -59,8 +59,7 @@
    "RETRY_UNIX_SOCKET_AFTER": 30000,
    "REQUEST_TIMEOUT": 10000,
    "FALLBACK_TIMEOUT": 5000,
-    "FALLBACK": [],
-    "MAX_BEHIND_TIP": 2
+    "FALLBACK": []
  },
  "SECOND_CORE_RPC": {
    "HOST": "127.0.0.1",
@@ -140,8 +139,6 @@
    "ENABLED": false,
    "AUDIT": false,
    "AUDIT_START_HEIGHT": 774000,
-    "STATISTICS": false,
-    "STATISTICS_START_TIME": 1481932800,
    "SERVERS": [
      "list",
      "of",
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -13,17 +13,17 @@
        "@babel/core": "^7.24.0",
        "@mempool/electrum-client": "1.1.9",
        "@types/node": "^18.15.3",
-        "axios": "~1.7.2",
+        "axios": "~1.6.1",
        "bitcoinjs-lib": "~6.1.3",
        "crypto-js": "~4.2.0",
        "express": "~4.19.2",
        "maxmind": "~4.3.11",
-        "mysql2": "~3.10.0",
+        "mysql2": "~3.9.4",
        "redis": "^4.6.6",
        "rust-gbt": "file:./rust-gbt",
        "socks-proxy-agent": "~7.0.0",
        "typescript": "~4.9.3",
-        "ws": "~8.17.1"
+        "ws": "~8.16.0"
      },
      "devDependencies": {
        "@babel/code-frame": "^7.18.6",
@@ -2318,11 +2318,11 @@
      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
    },
    "node_modules/axios": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
+      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
      "dependencies": {
-        "follow-redirects": "^1.15.6",
+        "follow-redirects": "^1.15.0",
        "form-data": "^4.0.0",
        "proxy-from-env": "^1.1.0"
      }
@@ -6197,9 +6197,9 @@
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
    },
    "node_modules/mysql2": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.10.0.tgz",
-      "integrity": "sha512-qx0mfWYt1DpTPkw8mAcHW/OwqqyNqBLBHvY5IjN8+icIYTjt6znrgYJ+gxqNNRpVknb5Wc/gcCM4XjbCR0j5tw==",
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.4.tgz",
+      "integrity": "sha512-OEESQuwxMza803knC1YSt7NMuc1BrK9j7gZhCSs2WAyxr1vfiI7QLaLOKTh5c9SWGz98qVyQUbK8/WckevNQhg==",
      "dependencies": {
        "denque": "^2.1.0",
        "generate-function": "^2.3.1",
@@ -7690,9 +7690,9 @@
      }
    },
    "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
      "engines": {
        "node": ">=10.0.0"
      },
@@ -9509,11 +9509,11 @@
      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
    },
    "axios": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz",
+      "integrity": "sha512-vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g==",
      "requires": {
-        "follow-redirects": "^1.15.6",
+        "follow-redirects": "^1.15.0",
        "form-data": "^4.0.0",
        "proxy-from-env": "^1.1.0"
      }
@@ -12382,9 +12382,9 @@
      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
    },
    "mysql2": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.10.0.tgz",
-      "integrity": "sha512-qx0mfWYt1DpTPkw8mAcHW/OwqqyNqBLBHvY5IjN8+icIYTjt6znrgYJ+gxqNNRpVknb5Wc/gcCM4XjbCR0j5tw==",
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.9.4.tgz",
+      "integrity": "sha512-OEESQuwxMza803knC1YSt7NMuc1BrK9j7gZhCSs2WAyxr1vfiI7QLaLOKTh5c9SWGz98qVyQUbK8/WckevNQhg==",
      "requires": {
        "denque": "^2.1.0",
        "generate-function": "^2.3.1",
@@ -13424,9 +13424,9 @@
      }
    },
    "ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
+      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
      "requires": {}
    },
    "y18n": {
--- a/backend/package.json
+++ b/backend/package.json
@@ -42,17 +42,17 @@
    "@babel/core": "^7.24.0",
    "@mempool/electrum-client": "1.1.9",
    "@types/node": "^18.15.3",
-    "axios": "~1.7.2",
+    "axios": "~1.6.1",
    "bitcoinjs-lib": "~6.1.3",
    "crypto-js": "~4.2.0",
    "express": "~4.19.2",
    "maxmind": "~4.3.11",
-    "mysql2": "~3.10.0",
+    "mysql2": "~3.9.4",
    "rust-gbt": "file:./rust-gbt",
    "redis": "^4.6.6",
    "socks-proxy-agent": "~7.0.0",
    "typescript": "~4.9.3",
-    "ws": "~8.17.1"
+    "ws": "~8.16.0"
  },
  "devDependencies": {
    "@babel/code-frame": "^7.18.6",
--- a/backend/src/fixtures/mempool-config.template.json
+++ b/backend/src/fixtures/mempool-config.template.json
@@ -1,14 +1,4 @@
 {
-  "NETWORKS": {
-    "TESTNET": {
-      "ENABLED": true,
-      "WEIGHT": "__NETWORKS_TESTNET_WEIGHT__"
-    },
-    "MAINNET": {
-      "ENABLED": true,
-      "WEIGHT": "__NETWORKS_MAINNET_WEIGHT__"
-    }
-  },
  "MEMPOOL": {
    "ENABLED": true,
    "OFFICIAL": false,
@@ -70,8 +60,7 @@
    "RETRY_UNIX_SOCKET_AFTER": 888,
    "REQUEST_TIMEOUT": 10000,
    "FALLBACK_TIMEOUT": 5000,
-    "FALLBACK": [],
-    "MAX_BEHIND_TIP": 2
+    "FALLBACK": []
  },
  "SECOND_CORE_RPC": {
    "HOST": "__SECOND_CORE_RPC_HOST__",
@@ -142,8 +131,6 @@
    "ENABLED": false,
    "AUDIT": false,
    "AUDIT_START_HEIGHT": 774000,
-    "STATISTICS": false,
-    "STATISTICS_START_TIME": 1481932800,
    "SERVERS": []
  },
  "MEMPOOL_SERVICES": {
--- a/backend/src/tests/api/common.ts
+++ b/backend/src/tests/api/common.ts
@@ -4,37 +4,21 @@ import { MempoolTransactionExtended } from '../../mempool.interfaces';
 const randomTransactions = require('./test-data/transactions-random.json');
 const replacedTransactions = require('./test-data/transactions-replaced.json');
 const rbfTransactions = require('./test-data/transactions-rbfs.json');
-const nonStandardTransactions = require('./test-data/non-standard-txs.json');

-describe('Common', () => {
-  describe('RBF', () => {
+describe('Mempool Utils', () => {
+  test('should detect RBF transactions with fast method', () => {
    const newTransactions = rbfTransactions.concat(randomTransactions);
-    test('should detect RBF transactions with fast method', () => {
-      const result: { [txid: string]: MempoolTransactionExtended[] } = Common.findRbfTransactions(newTransactions, replacedTransactions);
-      expect(Object.values(result).length).toEqual(2);
-      expect(result).toHaveProperty('7219d95161f3718335991ac6d967d24eedec370908c9879bb1e192e6d797d0a6');
-      expect(result).toHaveProperty('5387881d695d4564d397026dc5f740f816f8390b4b2c5ec8c20309122712a875');
-    });
-
-    test('should detect RBF transactions with scalable method', () => {
-      const result: { [txid: string]: MempoolTransactionExtended[] } = Common.findRbfTransactions(newTransactions, replacedTransactions, true);
-      expect(Object.values(result).length).toEqual(2);
-      expect(result).toHaveProperty('7219d95161f3718335991ac6d967d24eedec370908c9879bb1e192e6d797d0a6');
-      expect(result).toHaveProperty('5387881d695d4564d397026dc5f740f816f8390b4b2c5ec8c20309122712a875');
-    });
+    const result: { [txid: string]: MempoolTransactionExtended[] } = Common.findRbfTransactions(newTransactions, replacedTransactions);
+    expect(Object.values(result).length).toEqual(2);
+    expect(result).toHaveProperty('7219d95161f3718335991ac6d967d24eedec370908c9879bb1e192e6d797d0a6');
+    expect(result).toHaveProperty('5387881d695d4564d397026dc5f740f816f8390b4b2c5ec8c20309122712a875');
  });

-  describe('Mempool Goggles', () => {
-    test('should detect nonstandard transactions', () => {
-      nonStandardTransactions.forEach((tx) => {
-        expect(Common.isNonStandard(tx)).toEqual(true);
-      });
-    });
-  
-    test('should not misclassify as nonstandard transactions', () => {
-      randomTransactions.forEach((tx) => {
-        expect(Common.isNonStandard(tx)).toEqual(false);
-      });
-    });
+  test.only('should detect RBF transactions with scalable method', () => {
+    const newTransactions = rbfTransactions.concat(randomTransactions);
+    const result: { [txid: string]: MempoolTransactionExtended[] } = Common.findRbfTransactions(newTransactions, replacedTransactions, true);
+    expect(Object.values(result).length).toEqual(2);
+    expect(result).toHaveProperty('7219d95161f3718335991ac6d967d24eedec370908c9879bb1e192e6d797d0a6');
+    expect(result).toHaveProperty('5387881d695d4564d397026dc5f740f816f8390b4b2c5ec8c20309122712a875');
  });
 });
--- a/backend/src/tests/api/test-data/non-standard-txs.json
+++ b/backend/src/tests/api/test-data/non-standard-txs.json
@@ -1,52 +0,0 @@
-[
-  {
-    "txid": "50136231cb7eeeffb17fc41d1cca213426abe5bf3760e3d6421cad0c0edad367",
-    "version": 1,
-    "locktime": 0,
-    "vin": [
-        {
-            "txid": "c7f86fb7b830124057475b282809f3474ef3565daa3de0b599980fb9e84ab019",
-            "vout": 4217,
-            "prevout": {
-                "scriptpubkey": "001466197b5eadd8067ec194a457e1044b6d1fbdd3b3",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 66197b5eadd8067ec194a457e1044b6d1fbdd3b3",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qvcvhkh4dmqr8asv553t7zpztd50mm5ang4na33",
-                "value": 106
-            },
-            "scriptsig": "",
-            "scriptsig_asm": "",
-            "witness": [
-                "3043021f2af6060a142c6cfd7428adad6a50745d2424813d7ced5c0bbcca85e70de1be022021440ca1c8c3ed49ecd1b64dca6911adcd430c5d3dd60d77ffe0072953999f5b01",
-                "02ead5c34e3d2c506574b562f857576e11380b6ba15d9f0ad7b7303fdaa9c1513d"
-            ],
-            "is_coinbase": false,
-            "sequence": 4294967295
-        }
-    ],
-    "vout": [
-        {
-            "scriptpubkey": "6a023a29",
-            "scriptpubkey_asm": "OP_RETURN OP_PUSHBYTES_2 3a29",
-            "scriptpubkey_type": "op_return",
-            "value": 0
-        },
-        {
-            "scriptpubkey": "6a036d7648",
-            "scriptpubkey_asm": "OP_RETURN OP_PUSHBYTES_3 6d7648",
-            "scriptpubkey_type": "op_return",
-            "value": 0
-        }
-    ],
-    "size": 186,
-    "weight": 420,
-    "sigops": 1,
-    "fee": 106,
-    "status": {
-        "confirmed": true,
-        "block_height": 836361,
-        "block_hash": "0000000000000000000341cc26cda4af82cd25f7063c448772228cbf2836915b",
-        "block_time": 1711448028
-    }
-  }
-]
--- a/backend/src/tests/api/test-data/transactions-random.json
+++ b/backend/src/tests/api/test-data/transactions-random.json
@@ -273,63 +273,5 @@
        },
        "bestDescendant": null,
        "cpfpChecked": true
-    },
-    {
-        "txid": "20b984492b5264162a4c92c9a34bc7fa08b67d669de7b4c5982ad3cb28aaecf6",
-        "version": 2,
-        "locktime": 0,
-        "vin": [
-            {
-                "txid": "3adda6afd547193793c248e667c2b7dbf26d705003de65e3a25e5be698286aef",
-                "vout": 2,
-                "prevout": {
-                    "scriptpubkey": "0014989cf12774fc705609610c7b9419f2d1c4807644",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 989cf12774fc705609610c7b9419f2d1c4807644",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1qnzw0zfm5l3c9vztpp3aegx0j68zgqajyffr2r6",
-                    "value": 27619
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "304402205d7f1e0d928982645c2bcc4c730c4545c382d6520c2a14eebc71594702cd06b302200511d452ce51c79017536f50acb115eefe7c04506ad12b9307d2b5d56b999beb01",
-                    "03716cb4f0430fe69c596a12c6680c55803150645989b406772838d548cde7cca5"
-                ],
-                "is_coinbase": false,
-                "sequence": 4294967295
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "6a5d0614c0a2331441",
-                "scriptpubkey_asm": "OP_RETURN OP_PUSHNUM_13 OP_PUSHBYTES_6 14c0a2331441",
-                "scriptpubkey_type": "op_return",
-                "value": 0
-            },
-            {
-                "scriptpubkey": "5114d71c6c3ea7ba7e6ee477a0bfd82c20c78997882c",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_20 d71c6c3ea7ba7e6ee477a0bfd82c20c78997882c",
-                "scriptpubkey_type": "unknown",
-                "scriptpubkey_address": "bc1p6uwxc048hflxaerh5zlastpqc7ye0zpvq7gq2a",
-                "value": 546
-            },
-            {
-                "scriptpubkey": "0014989cf12774fc705609610c7b9419f2d1c4807644",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 989cf12774fc705609610c7b9419f2d1c4807644",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qnzw0zfm5l3c9vztpp3aegx0j68zgqajyffr2r6",
-                "value": 23073
-            }
-        ],
-        "size": 240,
-        "weight": 633,
-        "sigops": 1,
-        "fee": 4000,
-        "status": {
-            "confirmed": true,
-            "block_height": 848136,
-            "block_hash": "00000000000000000002c69c7a3010fcd596c0c7451c23e7cd1f5e19ebf8ee6d",
-            "block_time": 1718517071
-        }
    }
 ]
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -63,7 +63,6 @@ describe('Mempool Backend Config', () => {
        REQUEST_TIMEOUT: 10000,
        FALLBACK_TIMEOUT: 5000,
        FALLBACK: [],
-        MAX_BEHIND_TIP: 2,
       });

      expect(config.CORE_RPC).toStrictEqual({
@@ -136,8 +135,6 @@ describe('Mempool Backend Config', () => {
        ENABLED: false,
        AUDIT: false,
        AUDIT_START_HEIGHT: 774000,
-        STATISTICS: false,
-        STATISTICS_START_TIME: 1481932800,
        SERVERS: []
      });

@@ -157,17 +154,6 @@ describe('Mempool Backend Config', () => {
        PAID: false,
        API_KEY: '',
      });
-
-      expect(config.NETWORKS).toStrictEqual({
-        MAINNET: {
-          ENABLED: true,
-          WEIGHT: 'foo'
-        },
-        TESTNET: {
-          ENABLED: false,
-          WEIGHT: 'bar'
-        }
-      })
    });
  });

@@ -201,8 +187,6 @@ describe('Mempool Backend Config', () => {
      expect(config.MEMPOOL_SERVICES).toStrictEqual(fixture.MEMPOOL_SERVICES);

      expect(config.REDIS).toStrictEqual(fixture.REDIS);
-      
-      expect(config.NETWORKS).toStrictEqual(fixture.NETWORKS);
    });
  });

@@ -210,22 +194,6 @@ describe('Mempool Backend Config', () => {
    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 generateKeys(obj, prefix = '') {
-        let keys: string[] = [];
-      
-        for (const key in obj) {
-          if (obj.hasOwnProperty(key)) {
-            const newPrefix = prefix ? `${prefix}_${key}` : key;
-            if (typeof obj[key] === 'object' && obj[key] !== null) {
-              keys = keys.concat(generateKeys(obj[key], newPrefix));
-            } else {
-              keys.push(`${newPrefix}`);
-            }
-          }
-        }
-        return keys;
-      }

      function parseJson(jsonObj, root?) {
        for (const [key, value] of Object.entries(jsonObj)) {
@@ -237,31 +205,6 @@ describe('Mempool Backend Config', () => {
            continue;
          }

-          if (root === 'NETWORKS') {
-            const keys = generateKeys(value);
-            keys.forEach(item => {
-              const replaceStr = `__${root}_${key}_${item}__`;
-              const envVarStr = `${root}_${key}_${item}`;
-
-              let defaultEntry = replaceStr + '=' + '\\${' + envVarStr + ':=(.*)' + '}';
-              if (process.env.CI) {
-               console.log(`looking for ${defaultEntry} in the start.sh script`);
-              }
-
-             const re = new RegExp(defaultEntry);
-             expect(startSh).toMatch(re);
-
-             const sedStr = 'sed -i "s!' + replaceStr + '!${' + replaceStr + '}!g" mempool-config.json';
-             if (process.env.CI) {
-               console.log(`looking for ${sedStr} in the start.sh script`);
-             }
-             expect(startSh).toContain(sedStr);
-
-
-            });
-            continue;
-          }
-
          if (root) {
              //The flattened string, i.e, __MEMPOOL_ENABLED__
              const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
@@ -318,8 +261,6 @@ describe('Mempool Backend Config', () => {
                const replaceStr = `${root ? '__' + root + '_' : '__'}${key}__`;
                expect(dockerJson).toContain(`"${key}": ${replaceStr}`);
                break;
-              } else if (typeof value === 'object') {
-                break;
              } else {
                //Check for top level config keys
                expect(dockerJson).toContain(`"${key}"`);
--- a/backend/src/tests/gbt/gbt-tests.ts
+++ b/backend/src/tests/gbt/gbt-tests.ts
@@ -13,7 +13,7 @@ const vectorBuffer: Buffer = fs.readFileSync(path.join(__dirname, './', './test-

 describe('Rust GBT', () => {
  test('should produce the same template as getBlockTemplate from Bitcoin Core', async () => {
-    const rustGbt = new GbtGenerator(4_000_000, 8);
+    const rustGbt = new GbtGenerator();
    const { mempool, maxUid } = mempoolFromArrayBuffer(vectorBuffer.buffer);
    const result = await rustGbt.make(mempool, [], maxUid);

--- a/backend/src/api/acceleration/acceleration.routes.ts
+++ b/backend/src/api/acceleration/acceleration.routes.ts
@@ -14,7 +14,6 @@ class AccelerationRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history', this.$getAcceleratorAccelerationsHistory.bind(this))
      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history/aggregated', this.$getAcceleratorAccelerationsHistoryAggregated.bind(this))
      .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/stats', this.$getAcceleratorAccelerationsStats.bind(this))
-      .post(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/estimate', this.$getAcceleratorEstimate.bind(this))
    ;
  }

@@ -65,20 +64,6 @@ class AccelerationRoutes {
      res.status(500).end();
    }
  }
-
-  private async $getAcceleratorEstimate(req: Request, res: Response): Promise<void> {
-    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
-    try {
-      const response = await axios.post(url, req.body, { responseType: 'stream', timeout: 10000 });
-      for (const key in response.headers) {
-        res.setHeader(key, response.headers[key]);
-      }
-      response.data.pipe(res);
-    } catch (e) {
-      logger.err(`Unable to get acceleration estimate from ${url} in $getAcceleratorEstimate(), ${e}`, this.tag);
-      res.status(500).end();
-    }
-  }
 }

 export default new AccelerationRoutes();
--- a/backend/src/api/audit.ts
+++ b/backend/src/api/audit.ts
@@ -75,6 +75,10 @@ class Audit {
    let failures = 0;
    let blockIndex = 1;
    while (projectedBlocks[blockIndex] && failures < 500) {
+      if (index >= projectedBlocks[blockIndex].transactionIds.length) {
+        index = 0;
+        blockIndex++;
+      }
      const txid = projectedBlocks[blockIndex].transactionIds[index];
      const tx = mempool[txid];
      if (tx) {
@@ -98,10 +102,6 @@ class Audit {
        logger.warn('projected transaction missing from mempool cache');
      }
      index++;
-      if (index >= projectedBlocks[blockIndex].transactionIds.length) {
-        index = 0;
-        blockIndex++;
-      }
    }

    // mark unexpected transactions in the mined block as 'added'
--- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
+++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
@@ -1,4 +1,4 @@
-import { IBitcoinApi, TestMempoolAcceptResult } from './bitcoin-api.interface';
+import { IBitcoinApi } from './bitcoin-api.interface';
 import { IEsploraApi } from './esplora-api.interface';

 export interface AbstractBitcoinApi {
@@ -22,13 +22,11 @@ export interface AbstractBitcoinApi {
  $getScriptHash(scripthash: string): Promise<IEsploraApi.ScriptHash>;
  $getScriptHashTransactions(address: string, lastSeenTxId: string): Promise<IEsploraApi.Transaction[]>;
  $sendRawTransaction(rawTransaction: string): Promise<string>;
-  $testMempoolAccept(rawTransactions: string[], maxfeerate?: number): Promise<TestMempoolAcceptResult[]>;
  $getOutspend(txId: string, vout: number): Promise<IEsploraApi.Outspend>;
  $getOutspends(txId: string): Promise<IEsploraApi.Outspend[]>;
  $getBatchedOutspends(txId: string[]): Promise<IEsploraApi.Outspend[][]>;
  $getBatchedOutspendsInternal(txId: string[]): Promise<IEsploraApi.Outspend[][]>;
  $getOutSpendsByOutpoint(outpoints: { txid: string, vout: number }[]): Promise<IEsploraApi.Outspend[]>;
-  $getCoinbaseTx(blockhash: string): Promise<IEsploraApi.Transaction>;

  startHealthChecks(): void;
  getHealthStatus(): HealthCheckHost[];
--- a/backend/src/api/bitcoin/bitcoin-api.interface.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.interface.ts
@@ -205,16 +205,3 @@ export namespace IBitcoinApi {
    "utxo_size_inc": number;
  }
 }
-
-export interface TestMempoolAcceptResult {
-  txid: string,
-  wtxid: string,
-  allowed?: boolean,
-  vsize?: number,
-  fees?: {
-    base: number,
-    "effective-feerate": number,
-    "effective-includes": string[],
-  },
-  ['reject-reason']?: string,
-}
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -1,6 +1,6 @@
 import * as bitcoinjs from 'bitcoinjs-lib';
 import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-factory';
-import { IBitcoinApi, TestMempoolAcceptResult } from './bitcoin-api.interface';
+import { IBitcoinApi } from './bitcoin-api.interface';
 import { IEsploraApi } from './esplora-api.interface';
 import blocks from '../blocks';
 import mempool from '../mempool';
@@ -107,14 +107,8 @@ class BitcoinApi implements AbstractBitcoinApi {
      .then((rpcBlock: IBitcoinApi.Block) => rpcBlock.tx);
  }

-  async $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]> {
-    const verboseBlock: IBitcoinApi.VerboseBlock = await this.bitcoindClient.getBlock(hash, 2);
-    const transactions: IEsploraApi.Transaction[] = [];
-    for (const tx of verboseBlock.tx) {
-      const converted = await this.$convertTransaction(tx, true);
-      transactions.push(converted);
-    }
-    return transactions;
+  $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]> {
+    throw new Error('Method getTxsForBlock not supported by the Bitcoin RPC API.');
  }

  $getRawBlock(hash: string): Promise<Buffer> {
@@ -165,21 +159,13 @@ class BitcoinApi implements AbstractBitcoinApi {
    const mp = mempool.getMempool();
    for (const tx in mp) {
      for (const vout of mp[tx].vout) {
-        if (vout.scriptpubkey_address?.indexOf(prefix) === 0) {
+        if (vout.scriptpubkey_address.indexOf(prefix) === 0) {
          found[vout.scriptpubkey_address] = '';
          if (Object.keys(found).length >= 10) {
            return Object.keys(found);
          }
        }
      }
-      for (const vin of mp[tx].vin) {
-        if (vin.prevout?.scriptpubkey_address?.indexOf(prefix) === 0) {
-          found[vin.prevout?.scriptpubkey_address] = '';
-          if (Object.keys(found).length >= 10) {
-            return Object.keys(found);
-          }
-        }
-      }
    }
    return Object.keys(found);
  }
@@ -188,14 +174,6 @@ class BitcoinApi implements AbstractBitcoinApi {
    return this.bitcoindClient.sendRawTransaction(rawTransaction);
  }

-  async $testMempoolAccept(rawTransactions: string[], maxfeerate?: number): Promise<TestMempoolAcceptResult[]> {
-    if (rawTransactions.length) {
-      return this.bitcoindClient.testMempoolAccept(rawTransactions, maxfeerate ?? undefined);
-    } else {
-      return [];
-    }
-  }
-
  async $getOutspend(txId: string, vout: number): Promise<IEsploraApi.Outspend> {
    const txOut = await this.bitcoindClient.getTxOut(txId, vout, false);
    return {
@@ -246,11 +224,6 @@ class BitcoinApi implements AbstractBitcoinApi {
    return outspends;
  }

-  async $getCoinbaseTx(blockhash: string): Promise<IEsploraApi.Transaction> {
-    const txids = await this.$getTxIdsForBlock(blockhash);
-    return this.$getRawTransaction(txids[0]);
-  }
-
  $getEstimatedHashrate(blockHeight: number): Promise<number> {
    // 120 is the default block span in Core
    return this.bitcoindClient.getNetworkHashPs(120, blockHeight);
--- a/backend/src/api/bitcoin/bitcoin.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -55,7 +55,6 @@ class BitcoinRoutes {
          .get(config.MEMPOOL.API_URL_PREFIX + 'mempool/recent', this.getRecentMempoolTransactions)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId', this.getTransaction)
          .post(config.MEMPOOL.API_URL_PREFIX + 'tx', this.$postTransaction)
-          .post(config.MEMPOOL.API_URL_PREFIX + 'txs/test', this.$testTransactions)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/hex', this.getRawTransaction)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/status', this.getTransactionStatus)
          .get(config.MEMPOOL.API_URL_PREFIX + 'tx/:txId/outspends', this.getTransactionOutspends)
@@ -160,8 +159,7 @@ class BitcoinRoutes {
          effectiveFeePerVsize: tx.effectiveFeePerVsize || null,
          sigops: tx.sigops,
          adjustedVsize: tx.adjustedVsize,
-          acceleration: tx.acceleration,
-          acceleratedBy: tx.acceleratedBy || undefined,
+          acceleration: tx.acceleration
        });
        return;
      }
@@ -751,19 +749,6 @@ class BitcoinRoutes {
    }
  }

-  private async $testTransactions(req: Request, res: Response) {
-    try {
-      const rawTxs = Common.getTransactionsFromRequest(req);
-      const maxfeerate = parseFloat(req.query.maxfeerate as string);
-      const result = await bitcoinApi.$testMempoolAccept(rawTxs, maxfeerate);
-      res.send(result);
-    } catch (e: any) {
-      res.setHeader('content-type', 'text/plain');
-      res.status(400).send(e.message && e.code ? 'testmempoolaccept RPC error: ' + JSON.stringify({ code: e.code, message: e.message })
-        : (e.message || 'Error'));
-    }
-  }
-
 }

 export default new BitcoinRoutes();
--- a/backend/src/api/bitcoin/esplora-api.interface.ts
+++ b/backend/src/api/bitcoin/esplora-api.interface.ts
@@ -54,7 +54,7 @@ export namespace IEsploraApi {
    scriptpubkey: string;
    scriptpubkey_asm: string;
    scriptpubkey_type: string;
-    scriptpubkey_address?: string;
+    scriptpubkey_address: string;
    value: number;
    // Elements
    valuecommitment?: number;
--- a/backend/src/api/bitcoin/esplora-api.ts
+++ b/backend/src/api/bitcoin/esplora-api.ts
@@ -5,7 +5,6 @@ import { AbstractBitcoinApi, HealthCheckHost } from './bitcoin-api-abstract-fact
 import { IEsploraApi } from './esplora-api.interface';
 import logger from '../../logger';
 import { Common } from '../common';
-import { TestMempoolAcceptResult } from './bitcoin-api.interface';

 interface FailoverHost {
  host: string,
@@ -25,7 +24,6 @@ interface FailoverHost {
 class FailoverRouter {
  activeHost: FailoverHost;
  fallbackHost: FailoverHost;
-  maxSlippage: number = config.ESPLORA.MAX_BEHIND_TIP ?? 2;
  maxHeight: number = 0;
  hosts: FailoverHost[];
  multihost: boolean;
@@ -94,13 +92,13 @@ class FailoverRouter {
        );
        if (result) {
          const height = result.data;
-          host.latestHeight = height;
-          this.maxHeight = Math.max(height || 0, ...this.hosts.map(h => (!(h.unreachable || h.timedOut || h.outOfSync) ? h.latestHeight || 0 : 0)));
+          this.maxHeight = Math.max(height, this.maxHeight);
          const rtt = result.config['meta'].rtt;
          host.rtts.unshift(rtt);
          host.rtts.slice(0, 5);
          host.rtt = host.rtts.reduce((acc, l) => acc + l, 0) / host.rtts.length;
-          if (height == null || isNaN(height) || (this.maxHeight - height > this.maxSlippage)) {
+          host.latestHeight = height;
+          if (height == null || isNaN(height) || (this.maxHeight - height > 2)) {
            host.outOfSync = true;
          } else {
            host.outOfSync = false;
@@ -127,6 +125,7 @@ class FailoverRouter {
      host.checked = true;
      host.lastChecked = Date.now();

+      // switch if the current host is out of sync or significantly slower than the next best alternative
      const rankOrder = this.sortHosts();
      // switch if the current host is out of sync or significantly slower than the next best alternative
      if (this.activeHost.outOfSync || this.activeHost.unreachable || (this.activeHost !== rankOrder[0] && rankOrder[0].preferred) || (!this.activeHost.preferred && this.activeHost.rtt > (rankOrder[0].rtt * 2) + 50)) {
@@ -184,6 +183,7 @@ class FailoverRouter {

  // depose the active host and choose the next best replacement
  private electHost(): void {
+    this.activeHost.outOfSync = true;
    this.activeHost.failures = 0;
    const rankOrder = this.sortHosts();
    this.activeHost = rankOrder[0];
@@ -194,7 +194,6 @@ class FailoverRouter {
    host.failures++;
    if (host.failures > 5 && this.multihost) {
      logger.warn(`🚨🚨🚨 Too many esplora failures on ${this.activeHost.host}, falling back to next best alternative 🚨🚨🚨`);
-      this.activeHost.unreachable = true;
      this.electHost();
      return this.activeHost;
    } else {
@@ -328,10 +327,6 @@ class ElectrsApi implements AbstractBitcoinApi {
    throw new Error('Method not implemented.');
  }

-  $testMempoolAccept(rawTransactions: string[], maxfeerate?: number): Promise<TestMempoolAcceptResult[]> {
-    throw new Error('Method not implemented.');
-  }
-
  $getOutspend(txId: string, vout: number): Promise<IEsploraApi.Outspend> {
    return this.failoverRouter.$get<IEsploraApi.Outspend>('/tx/' + txId + '/outspend/' + vout);
  }
@@ -352,11 +347,6 @@ class ElectrsApi implements AbstractBitcoinApi {
    return this.failoverRouter.$post<IEsploraApi.Outspend[]>('/internal/txs/outspends/by-outpoint', outpoints.map(out => `${out.txid}:${out.vout}`), 'json');
  }

-  async $getCoinbaseTx(blockhash: string): Promise<IEsploraApi.Transaction> {
-    const txid = await this.failoverRouter.$get<string>(`/block/${blockhash}/txid/0`);
-    return this.failoverRouter.$get<IEsploraApi.Transaction>('/tx/' + txid);
-  }
-
  public startHealthChecks(): void {
    this.failoverRouter.startHealthChecks();
  }
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -295,12 +295,10 @@ class Blocks {
    extras.virtualSize = block.weight / 4.0;
    if (coinbaseTx?.vout.length > 0) {
      extras.coinbaseAddress = coinbaseTx.vout[0].scriptpubkey_address ?? null;
-      extras.coinbaseAddresses = [...new Set<string>(coinbaseTx.vout.map(v => v.scriptpubkey_address).filter(a => a) as string[])];
      extras.coinbaseSignature = coinbaseTx.vout[0].scriptpubkey_asm ?? null;
      extras.coinbaseSignatureAscii = transactionUtils.hex2ascii(coinbaseTx.vin[0].scriptsig) ?? null;
    } else {
      extras.coinbaseAddress = null;
-      extras.coinbaseAddresses = null;
      extras.coinbaseSignature = null;
      extras.coinbaseSignatureAscii = null;
    }
@@ -692,52 +690,6 @@ class Blocks {
    this.classifyingBlocks = false;
  }

-  /**
-   * [INDEXING] Index missing coinbase addresses for all blocks
-   */
-  public async $indexCoinbaseAddresses(): Promise<void> {
-    try {
-      // Get all indexed block hash
-      const unindexedBlocks = await blocksRepository.$getBlocksWithoutCoinbaseAddresses();
-
-      if (!unindexedBlocks?.length) {
-        return;
-      }
-
-      logger.info(`Indexing missing coinbase addresses for ${unindexedBlocks.length} blocks`);
-
-      // Logging
-      let count = 0;
-      let countThisRun = 0;
-      let timer = Date.now() / 1000;
-      const startedAt = Date.now() / 1000;
-      for (const { height, hash } of unindexedBlocks) {
-        // Logging
-        const elapsedSeconds = (Date.now() / 1000) - timer;
-        if (elapsedSeconds > 5) {
-          const runningFor = (Date.now() / 1000) - startedAt;
-          const blockPerSeconds = countThisRun / elapsedSeconds;
-          const progress = Math.round(count / unindexedBlocks.length * 10000) / 100;
-          logger.debug(`Indexing coinbase addresses for #${height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${count}/${unindexedBlocks.length} (${progress}%) | elapsed: ${runningFor.toFixed(2)} seconds`);
-          timer = Date.now() / 1000;
-          countThisRun = 0;
-        }
-
-        const coinbaseTx = await bitcoinApi.$getCoinbaseTx(hash);
-        const addresses = new Set<string>(coinbaseTx.vout.map(v => v.scriptpubkey_address).filter(a => a) as string[]);
-        await blocksRepository.$saveCoinbaseAddresses(hash, [...addresses]);
-
-        // Logging
-        count++;
-        countThisRun++;
-      }
-      logger.notice(`coinbase addresses indexing completed: indexed ${count} blocks`);
-    } catch (e) {
-      logger.err(`coinbase addresses indexing failed. Trying again in 10 seconds. Reason: ${(e instanceof Error ? e.message : e)}`);
-      throw e;
-    }
-  }
-
  /**
   * [INDEXING] Index all blocks metadata for the mining dashboard
   */
@@ -887,11 +839,8 @@ class Blocks {
      } else {
        this.currentBlockHeight++;
        logger.debug(`New block found (#${this.currentBlockHeight})!`);
-        // skip updating the orphan block cache if we've fallen behind the chain tip
-        if (this.currentBlockHeight >= blockHeightTip - 2) {
-          this.updateTimerProgress(timer, `getting orphaned blocks for ${this.currentBlockHeight}`);
-          await chainTips.updateOrphanedBlocks();
-        }
+        this.updateTimerProgress(timer, `getting orphaned blocks for ${this.currentBlockHeight}`);
+        await chainTips.updateOrphanedBlocks();
      }

      this.updateTimerProgress(timer, `getting block data for ${this.currentBlockHeight}`);
@@ -1307,7 +1256,6 @@ class Blocks {
        utxoset_size: block.extras.utxoSetSize ?? null,
        coinbase_raw: block.extras.coinbaseRaw ?? null,
        coinbase_address: block.extras.coinbaseAddress ?? null,
-        coinbase_addresses: block.extras.coinbaseAddresses ?? null,
        coinbase_signature: block.extras.coinbaseSignature ?? null,
        coinbase_signature_ascii: block.extras.coinbaseSignatureAscii ?? null,
        pool_slug: block.extras.pool.slug ?? null,
--- a/backend/src/api/chain-tips.ts
+++ b/backend/src/api/chain-tips.ts
@@ -12,68 +12,32 @@ export interface OrphanedBlock {
  height: number;
  hash: string;
  status: 'valid-fork' | 'valid-headers' | 'headers-only';
-  prevhash: string;
 }

 class ChainTips {
  private chainTips: ChainTip[] = [];
-  private orphanedBlocks: { [hash: string]: OrphanedBlock } = {};
-  private blockCache: { [hash: string]: OrphanedBlock } = {};
-  private orphansByHeight: { [height: number]: OrphanedBlock[] } = {};
+  private orphanedBlocks: OrphanedBlock[] = [];

  public async updateOrphanedBlocks(): Promise<void> {
    try {
      this.chainTips = await bitcoinClient.getChainTips();
-
-      const start = Date.now();
-      const breakAt = start + 10000;
-      let newOrphans = 0;
-      this.orphanedBlocks = {};
+      this.orphanedBlocks = [];

      for (const chain of this.chainTips) {
        if (chain.status === 'valid-fork' || chain.status === 'valid-headers') {
-          const orphans: OrphanedBlock[] = [];
-          let hash = chain.hash;
-          do {
-            let orphan = this.blockCache[hash];
-            if (!orphan) {
-              const block = await bitcoinClient.getBlock(hash);
-              if (block && block.confirmations === -1) {
-                newOrphans++;
-                orphan = {
-                  height: block.height,
-                  hash: block.hash,
-                  status: chain.status,
-                  prevhash: block.previousblockhash,
-                };
-                this.blockCache[hash] = orphan;
-              }
-            }
-            if (orphan) {
-              orphans.push(orphan);
-            }
-            hash = orphan?.prevhash;
-          } while (hash && (Date.now() < breakAt));
-          for (const orphan of orphans) {
-            this.orphanedBlocks[orphan.hash] = orphan;
+          let block = await bitcoinClient.getBlock(chain.hash);
+          while (block && block.confirmations === -1) {
+            this.orphanedBlocks.push({
+              height: block.height,
+              hash: block.hash,
+              status: chain.status
+            });
+            block = await bitcoinClient.getBlock(block.previousblockhash);
          }
        }
-        if (Date.now() >= breakAt) {
-          logger.debug(`Breaking orphaned blocks updater after 10s, will continue next block`);
-          break;
-        }
      }

-      this.orphansByHeight = {};
-      const allOrphans = Object.values(this.orphanedBlocks);
-      for (const orphan of allOrphans) {
-        if (!this.orphansByHeight[orphan.height]) {
-          this.orphansByHeight[orphan.height] = [];
-        }
-        this.orphansByHeight[orphan.height].push(orphan);
-      }
-
-      logger.debug(`Updated orphaned blocks cache. Fetched ${newOrphans} new orphaned blocks. Total ${allOrphans.length}`);
+      logger.debug(`Updated orphaned blocks cache. Found ${this.orphanedBlocks.length} orphaned blocks`);
    } catch (e) {
      logger.err(`Cannot get fetch orphaned blocks. Reason: ${e instanceof Error ? e.message : e}`);
    }
@@ -84,7 +48,13 @@ class ChainTips {
      return [];
    }

-    return this.orphansByHeight[height] || [];
+    const orphans: OrphanedBlock[] = [];
+    for (const block of this.orphanedBlocks) {
+      if (block.height === height) {
+        orphans.push(block);
+      }
+    }
+    return orphans;
  }
 }

--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -258,15 +258,9 @@ export class Common {
    let opreturnCount = 0;
    for (const vout of tx.vout) {
      // scriptpubkey
-      if (['nonstandard', 'provably_unspendable', 'empty'].includes(vout.scriptpubkey_type)) {
+      if (['unknown', 'provably_unspendable', 'empty'].includes(vout.scriptpubkey_type)) {
        // (non-standard output type)
        return true;
-      } else if (vout.scriptpubkey_type === 'unknown') {
-        // undefined segwit version/length combinations are actually standard in outputs
-        // https://github.com/bitcoin/bitcoin/blob/2c79abc7ad4850e9e3ba32a04c530155cda7f980/src/script/interpreter.cpp#L1950-L1951
-        if (vout.scriptpubkey.startsWith('00') || !this.isWitnessProgram(vout.scriptpubkey)) {
-          return true;
-        }
      } else if (vout.scriptpubkey_type === 'multisig') {
        if (!DEFAULT_PERMIT_BAREMULTISIG) {
          // bare-multisig
@@ -314,27 +308,6 @@ export class Common {
    return false;
  }

-  // A witness program is any valid scriptpubkey that consists of a 1-byte push opcode
-  // followed by a data push between 2 and 40 bytes.
-  // https://github.com/bitcoin/bitcoin/blob/2c79abc7ad4850e9e3ba32a04c530155cda7f980/src/script/script.cpp#L224-L240
-  static isWitnessProgram(scriptpubkey: string): false | { version: number, program: string } {
-    if (scriptpubkey.length < 8 || scriptpubkey.length > 84) {
-      return false;
-    }
-    const version = parseInt(scriptpubkey.slice(0,2), 16);
-    if (version !== 0 && version < 0x51 || version > 0x60) {
-        return false;
-    }
-    const push = parseInt(scriptpubkey.slice(2,4), 16);
-    if (push + 2 === (scriptpubkey.length / 2)) {
-      return {
-        version: version ? version - 0x50 : 0,
-        program: scriptpubkey.slice(4),
-      };
-    }
-    return false;
-  }
-
  static getNonWitnessSize(tx: TransactionExtended): number {
    let weight = tx.weight;
    let hasWitness = false;
@@ -904,10 +877,9 @@ export class Common {
    let medianFee = 0;
    let medianWeight = 0;

-    // calculate the "medianFee" as the average fee rate of the middle 0.25% weight units of transactions
-    const halfWidth = config.MEMPOOL.BLOCK_WEIGHT_UNITS / 800;
-    const leftBound = Math.floor((config.MEMPOOL.BLOCK_WEIGHT_UNITS / 2) - halfWidth);
-    const rightBound = Math.ceil((config.MEMPOOL.BLOCK_WEIGHT_UNITS / 2) + halfWidth);
+    // calculate the "medianFee" as the average fee rate of the middle 10000 weight units of transactions
+    const leftBound = 1995000;
+    const rightBound = 2005000;
    for (let i = 0; i < sortedTxs.length && weightCount < rightBound; i++) {
      const left = weightCount;
      const right = weightCount + sortedTxs[i].weight;
@@ -974,33 +946,6 @@ export class Common {
    return this.validateTransactionHex(matches[1].toLowerCase());
  }

-  static getTransactionsFromRequest(req: Request, limit: number = 25): string[] {
-    if (!Array.isArray(req.body) || req.body.some(hex => typeof hex !== 'string')) {
-      throw Object.assign(new Error('Invalid request body (should be an array of hexadecimal strings)'), { code: -1 });
-    }
-
-    if (limit && req.body.length > limit) {
-      throw Object.assign(new Error('Exceeded maximum of 25 transactions'), { code: -1 });
-    }
-
-    const txs = req.body;
-
-    return txs.map(rawTx => {
-      // Support both upper and lower case hex
-      // Support both txHash= Form and direct API POST
-      const reg = /^((?:[a-fA-F0-9]{2})+)$/;
-      const matches = reg.exec(rawTx);
-      if (!matches || !matches[1]) {
-        throw Object.assign(new Error('Invalid hex string'), { code: -2 });
-      }
-
-      // Guaranteed to be a hex string of multiple of 2
-      // Guaranteed to be lower case
-      // Guaranteed to pass validation (see function below)
-      return this.validateTransactionHex(matches[1].toLowerCase());
-    });
-  }
-
  private static validateTransactionHex(txhex: string): string {
    // Do not mutate txhex

--- 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 = 80;
+  private static currentVersion = 82;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -652,11 +652,6 @@ class DatabaseMigration {
      await this.$executeQuery('ALTER TABLE `prices` ADD `THB` float DEFAULT "-1"');
      await this.$executeQuery('ALTER TABLE `prices` ADD `TRY` float DEFAULT "-1"');
      await this.$executeQuery('ALTER TABLE `prices` ADD `ZAR` float DEFAULT "-1"');
-
-      await this.$executeQuery('TRUNCATE hashrates');
-      await this.$executeQuery('TRUNCATE difficulty_adjustments');
-      await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
-
      await this.updateToSchemaVersion(75);
    }

@@ -675,22 +670,33 @@ class DatabaseMigration {
      await this.updateToSchemaVersion(78);
    }

-    if (databaseSchemaVersion < 79 && config.MEMPOOL.NETWORK === 'mainnet') {
-      // Clear bad data
-      await this.$executeQuery(`TRUNCATE accelerations`);
-      this.uniqueLog(logger.notice, `'accelerations' table has been truncated`);
-      await this.$executeQuery(`
-        UPDATE state
-        SET number = 0
-        WHERE name = 'last_acceleration_block'
-      `);
+    if (databaseSchemaVersion < 79 && isBitcoin === true) {
+      await this.$executeQuery('TRUNCATE hashrates');
      await this.updateToSchemaVersion(79);
    }

-    if (databaseSchemaVersion < 80) {
-      await this.$executeQuery('ALTER TABLE `blocks` ADD coinbase_addresses JSON DEFAULT NULL');
+    if (databaseSchemaVersion < 80 && isBitcoin === true) {
+      await this.$executeQuery('TRUNCATE difficulty_adjustments');
      await this.updateToSchemaVersion(80);
    }
+
+    if (databaseSchemaVersion < 81 && isBitcoin === true) {
+      await this.$executeQuery(`UPDATE state SET string = NULL WHERE name = 'pools_json_sha'`);
+      await this.updateToSchemaVersion(81);
+    }
+
+    if (databaseSchemaVersion < 82 && config.MEMPOOL.NETWORK === 'liquid') {
+      await this.$executeQuery('TRUNCATE TABLE elements_pegs');
+      await this.$executeQuery('TRUNCATE TABLE federation_txos');
+      await this.$executeQuery('SET FOREIGN_KEY_CHECKS = 0');
+      await this.$executeQuery('TRUNCATE TABLE federation_addresses');
+      await this.$executeQuery('SET FOREIGN_KEY_CHECKS = 1');
+      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4')`); // Federation change address
+      await this.$executeQuery(`INSERT INTO federation_addresses (bitcoinaddress) VALUES ('3EiAcrzq1cELXScc98KeCswGWZaPGceT1d')`); // Federation change address
+      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_elements_block';`);
+      await this.$executeQuery(`UPDATE state SET number = 0 WHERE name = 'last_bitcoin_block_audit';`);
+      await this.updateToSchemaVersion(71);
+    }
  }

  /**
--- a/backend/src/api/explorer/channels.routes.ts
+++ b/backend/src/api/explorer/channels.routes.ts
@@ -54,11 +54,9 @@ class ChannelsRoutes {

      if (index < -1) {
        res.status(400).send('Invalid index');
-        return;
      }
      if (['open', 'active', 'closed'].includes(status) === false) {
        res.status(400).send('Invalid status');
-        return;
      }

      const channels = await channelsApi.$getChannelsForNode(req.query.public_key, index, 10, status);
--- a/backend/src/api/explorer/nodes.api.ts
+++ b/backend/src/api/explorer/nodes.api.ts
@@ -666,9 +666,7 @@ class NodesApi {
        node.last_update = null;
      }
  
-      const uniqueAddr = [...new Set(node.addresses?.map(a => a.addr))];
-      const formattedSockets = (uniqueAddr.join(',')) ?? '';
-
+      const sockets = (node.addresses?.map(a => a.addr).join(',')) ?? '';
      const query = `INSERT INTO nodes(
          public_key,
          first_seen,
@@ -697,13 +695,13 @@ class NodesApi {
        node.alias,
        this.aliasToSearchText(node.alias),
        node.color,
-        formattedSockets,
+        sockets,
        JSON.stringify(node.features),
        node.last_update,
        node.alias,
        this.aliasToSearchText(node.alias),
        node.color,
-        formattedSockets,
+        sockets,
        JSON.stringify(node.features),
      ]);
    } catch (e) {
@@ -715,9 +713,7 @@ class NodesApi {
   * Update node sockets
   */
  public async $updateNodeSockets(publicKey: string, sockets: {network: string; addr: string}[]): Promise<void> {
-    const uniqueAddr = [...new Set(sockets.map(a => a.addr))];
-
-    const formattedSockets = (uniqueAddr.join(',')) ?? '';
+    const formattedSockets = (sockets.map(a => a.addr).join(',')) ?? '';
    try {
      await DB.query(`UPDATE nodes SET sockets = ? WHERE public_key = ?`, [formattedSockets, publicKey]);
    } catch (e) {
--- a/backend/src/api/liquid/elements-parser.ts
+++ b/backend/src/api/liquid/elements-parser.ts
@@ -306,7 +306,7 @@ class ElementsParser {

    for (const utxo of unspentAsTip) {
      if (utxo.expiredAt === 0 && block.height >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring in this block
-        await DB.query(`UPDATE federation_txos SET unspent = 0, lastblockupdate = ?, expiredAt = ? WHERE txid = ? AND txindex = ?`, [confirmedTip, block.time, utxo.txid, utxo.txindex]);
+        await DB.query(`UPDATE federation_txos SET lastblockupdate = ?, expiredAt = ? WHERE txid = ? AND txindex = ?`, [confirmedTip, block.time, utxo.txid, utxo.txindex]);
      } else if (utxo.expiredAt === 0 && confirmedTip >= utxo.blocknumber + utxo.timelock) { // The UTXO is expiring before the tip: we need to keep track of it
        await DB.query(`UPDATE federation_txos SET lastblockupdate = ? WHERE txid = ? AND txindex = ?`, [utxo.blocknumber + utxo.timelock - 1, utxo.txid, utxo.txindex]); 
      } else {
--- a/backend/src/api/mempool-blocks.ts
+++ b/backend/src/api/mempool-blocks.ts
@@ -1,13 +1,11 @@
 import { GbtGenerator, GbtResult, ThreadTransaction as RustThreadTransaction, ThreadAcceleration as RustThreadAcceleration } from 'rust-gbt';
 import logger from '../logger';
-import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, TransactionClassified, TransactionCompressed, MempoolDeltaChange, GbtCandidates, PoolTag } from '../mempool.interfaces';
+import { MempoolBlock, MempoolTransactionExtended, MempoolBlockWithTransactions, MempoolBlockDelta, Ancestor, CompactThreadTransaction, EffectiveFeeStats, TransactionClassified, TransactionCompressed, MempoolDeltaChange, GbtCandidates } from '../mempool.interfaces';
 import { Common, OnlineFeeStatsCalculator } from './common';
 import config from '../config';
 import { Worker } from 'worker_threads';
 import path from 'path';
 import mempool from './mempool';
-import { Acceleration } from './services/acceleration';
-import PoolsRepository from '../repositories/PoolsRepository';

 const MAX_UINT32 = Math.pow(2, 32) - 1;

@@ -16,14 +14,12 @@ class MempoolBlocks {
  private mempoolBlockDeltas: MempoolBlockDelta[] = [];
  private txSelectionWorker: Worker | null = null;
  private rustInitialized: boolean = false;
-  private rustGbtGenerator: GbtGenerator = new GbtGenerator(config.MEMPOOL.BLOCK_WEIGHT_UNITS, config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT);
+  private rustGbtGenerator: GbtGenerator = new GbtGenerator();

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

-  private pools: { [id: number]: PoolTag } = {};
-
  public getMempoolBlocks(): MempoolBlock[] {
    return this.mempoolBlocks.map((block) => {
      return {
@@ -45,18 +41,6 @@ class MempoolBlocks {
    return this.mempoolBlockDeltas;
  }

-  public async updatePools$(): Promise<void> {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
-      this.pools = {};
-      return;
-    }
-    const allPools = await PoolsRepository.$getPools();
-    this.pools = {};
-    for (const pool of allPools) {
-      this.pools[pool.uniqueId] = pool;
-    }
-  }
-
  private calculateMempoolDeltas(prevBlocks: MempoolBlockWithTransactions[], mempoolBlocks: MempoolBlockWithTransactions[]): MempoolBlockDelta[] {
    const mempoolBlockDeltas: MempoolBlockDelta[] = [];
    for (let i = 0; i < Math.max(mempoolBlocks.length, prevBlocks.length); i++) {
@@ -230,7 +214,7 @@ class MempoolBlocks {

  private resetRustGbt(): void {
    this.rustInitialized = false;
-    this.rustGbtGenerator = new GbtGenerator(config.MEMPOOL.BLOCK_WEIGHT_UNITS, config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT);
+    this.rustGbtGenerator = new GbtGenerator();
  }

  public async $rustMakeBlockTemplates(txids: string[], newMempool: { [txid: string]: MempoolTransactionExtended }, candidates: GbtCandidates | undefined, saveResults: boolean = false, useAccelerations: boolean = false, accelerationPool?: number): Promise<MempoolBlockWithTransactions[]> {
@@ -262,7 +246,7 @@ class MempoolBlocks {
    });

    // run the block construction algorithm in a separate thread, and wait for a result
-    const rustGbt = saveResults ? this.rustGbtGenerator : new GbtGenerator(config.MEMPOOL.BLOCK_WEIGHT_UNITS, config.MEMPOOL.MEMPOOL_BLOCKS_AMOUNT);
+    const rustGbt = saveResults ? this.rustGbtGenerator : new GbtGenerator();
    try {
      const { blocks, blockWeights, rates, clusters, overflow } = this.convertNapiResultTxids(
        await rustGbt.make(transactions as RustThreadTransaction[], convertedAccelerations as RustThreadAcceleration[], this.nextUid),
@@ -349,7 +333,7 @@ class MempoolBlocks {
    }
  }

-  private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], candidates: GbtCandidates | undefined, accelerations: { [txid: string]: Acceleration }, accelerationPool, saveResults): MempoolBlockWithTransactions[] {
+  private processBlockTemplates(mempool: { [txid: string]: MempoolTransactionExtended }, blocks: string[][], blockWeights: number[] | null, rates: [string, number][], clusters: string[][], candidates: GbtCandidates | undefined, accelerations, accelerationPool, saveResults): MempoolBlockWithTransactions[] {
    for (const txid of Object.keys(candidates?.txs ?? mempool)) {
      if (txid in mempool) {
        mempool[txid].cpfpDirty = false;
@@ -412,7 +396,7 @@ class MempoolBlocks {
      }
    }

-    const isAcceleratedBy : { [txid: string]: number[] | false } = {};
+    const isAccelerated : { [txid: string]: boolean } = {};

    const sizeLimit = (config.MEMPOOL.BLOCK_WEIGHT_UNITS / 4) * 1.2;
    // update this thread's mempool with the results
@@ -443,19 +427,17 @@ class MempoolBlocks {
          };

          const acceleration = accelerations[txid];
-          if (isAcceleratedBy[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) {
+          if (isAccelerated[txid] || (acceleration && (!accelerationPool || acceleration.pools.includes(accelerationPool)))) {
            if (!mempoolTx.acceleration) {
              mempoolTx.cpfpDirty = true;
            }
            mempoolTx.acceleration = true;
-            mempoolTx.acceleratedBy = isAcceleratedBy[txid] || acceleration?.pools;
            for (const ancestor of mempoolTx.ancestors || []) {
              if (!mempool[ancestor.txid].acceleration) {
                mempool[ancestor.txid].cpfpDirty = true;
              }
              mempool[ancestor.txid].acceleration = true;
-              mempool[ancestor.txid].acceleratedBy = mempoolTx.acceleratedBy;
-              isAcceleratedBy[ancestor.txid] = mempoolTx.acceleratedBy;
+              isAccelerated[ancestor.txid] = true;
            }
          } else {
            if (mempoolTx.acceleration) {
@@ -493,7 +475,7 @@ class MempoolBlocks {
      const deltas = this.calculateMempoolDeltas(this.mempoolBlocks, mempoolBlocks);
      this.mempoolBlocks = mempoolBlocks;
      this.mempoolBlockDeltas = deltas;
-      this.updateAccelerationPositions(mempool, accelerations, mempoolBlocks);
+
    }

    return mempoolBlocks;
@@ -640,124 +622,6 @@ class MempoolBlocks {
      tx.acc ? 1 : 0,
    ];
  }
-
-  // estimates and saves positions of accelerations in mining partner mempools
-  private updateAccelerationPositions(mempoolCache: { [txid: string]: MempoolTransactionExtended }, accelerations: { [txid: string]: Acceleration }, mempoolBlocks: MempoolBlockWithTransactions[]): void {
-    const accelerationPositions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] } = {};
-    // keep track of simulated mempool blocks for each active pool
-    const pools: {
-      [pool: string]: { name: string, block: number, vsize: number, accelerations: string[], complete: boolean };
-    } = {};
-    // prepare a list of accelerations in ascending order (we'll pop items off the end of the list)
-    const accQueue: { acceleration: Acceleration, rate: number, vsize: number }[] = Object.values(accelerations).map(acc => {
-      let vsize = mempoolCache[acc.txid].vsize;
-      for (const ancestor of mempoolCache[acc.txid].ancestors || []) {
-        vsize += (ancestor.weight / 4);
-      }
-      return {
-        acceleration: acc,
-        rate: mempoolCache[acc.txid].effectiveFeePerVsize,
-        vsize
-      };
-    }).sort((a, b) => a.rate - b.rate);
-    // initialize the pool tracker
-    for (const { acceleration }  of accQueue) {
-      accelerationPositions[acceleration.txid] = [];
-      for (const pool of acceleration.pools) {
-        if (!pools[pool]) {
-          pools[pool] = {
-            name: this.pools[pool]?.name || 'unknown',
-            block: 0,
-            vsize: 0,
-            accelerations: [],
-            complete: false,
-          };
-        }
-        pools[pool].accelerations.push(acceleration.txid);
-      }
-      for (const ancestor of mempoolCache[acceleration.txid].ancestors || []) {
-        accelerationPositions[ancestor.txid] = [];
-      }
-    }
-
-    for (const pool of Object.keys(pools)) {
-      // if any pools accepted *every* acceleration, we can just use the GBT result positions directly
-      if (pools[pool].accelerations.length === Object.keys(accelerations).length) {
-        pools[pool].complete = true;
-      }
-    }
-
-    let block = 0;
-    let index = 0;
-    let next = accQueue.pop();
-    // build simulated blocks for each pool by taking the best option from
-    // either the mempool or the list of accelerations.
-    while (next && block < mempoolBlocks.length) {
-      while (next && index < mempoolBlocks[block].transactions.length) {
-        const nextTx = mempoolBlocks[block].transactions[index];
-        if (next.rate >= (nextTx.rate || (nextTx.fee / nextTx.vsize))) {
-          for (const pool of next.acceleration.pools) {
-            if (pools[pool].vsize + next.vsize <= 999_000) {
-              pools[pool].vsize += next.vsize;
-            } else {
-              pools[pool].block++;
-              pools[pool].vsize = next.vsize;
-            }
-            // insert the acceleration into matching pool's blocks
-            if (pools[pool].complete && mempoolCache[next.acceleration.txid]?.position !== undefined) {
-              accelerationPositions[next.acceleration.txid].push({
-                ...mempoolCache[next.acceleration.txid].position as { block: number, vsize: number },
-                poolId: pool,
-                pool: pools[pool].name
-              });
-            } else {
-              accelerationPositions[next.acceleration.txid].push({
-                poolId: pool,
-                pool: pools[pool].name,
-                block: pools[pool].block,
-                vsize: pools[pool].vsize - (next.vsize / 2),
-              });
-            }
-            // and any accelerated ancestors
-            for (const ancestor of mempoolCache[next.acceleration.txid].ancestors || []) {
-              if (pools[pool].complete && mempoolCache[ancestor.txid]?.position !== undefined) {
-                accelerationPositions[ancestor.txid].push({
-                  ...mempoolCache[ancestor.txid].position as { block: number, vsize: number },
-                  poolId: pool,
-                  pool: pools[pool].name,
-                });
-              } else {
-                accelerationPositions[ancestor.txid].push({
-                  poolId: pool,
-                  pool: pools[pool].name,
-                  block: pools[pool].block,
-                  vsize: pools[pool].vsize - (next.vsize / 2),
-                });
-              }
-            }
-          }
-          next = accQueue.pop();
-        } else {
-          // skip accelerated transactions and their CPFP ancestors
-          if (accelerationPositions[nextTx.txid] == null) {
-            // insert into all pools' blocks
-            for (const pool of Object.keys(pools)) {
-              if (pools[pool].vsize + nextTx.vsize <= 999_000) {
-                pools[pool].vsize += nextTx.vsize;
-              } else {
-                pools[pool].block++;
-                pools[pool].vsize = nextTx.vsize;
-              }
-            }
-          }
-          index++;
-        }
-      }
-      block++;
-      index = 0;
-    }
-    mempool.setAccelerationPositions(accelerationPositions);
-  }
 }

 export default new MempoolBlocks();
--- a/backend/src/api/mempool.ts
+++ b/backend/src/api/mempool.ts
@@ -27,7 +27,6 @@ class Mempool {
    deletedTransactions: MempoolTransactionExtended[], accelerationDelta: string[], candidates?: GbtCandidates) => Promise<void>) | undefined;

  private accelerations: { [txId: string]: Acceleration } = {};
-  private accelerationPositions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] } = {};

  private txPerSecondArray: number[] = [];
  private txPerSecond: number = 0;
@@ -405,10 +404,6 @@ class Mempool {

      const newAccelerationMap: { [txid: string]: Acceleration } = {};
      for (const acceleration of newAccelerations) {
-        // skip transactions we don't know about
-        if (!this.mempoolCache[acceleration.txid]) {
-          continue;
-        }
        newAccelerationMap[acceleration.txid] = acceleration;
        if (this.accelerations[acceleration.txid] == null) {
          // new acceleration
@@ -515,14 +510,6 @@ class Mempool {
    }
  }

-  setAccelerationPositions(positions: { [txid: string]: { poolId: number, pool: string, block: number, vsize: number }[] }): void {
-    this.accelerationPositions = positions;
-  }
-
-  getAccelerationPositions(txid: string): { [pool: number]: { poolId: number, pool: string, block: number, vsize: number } } | undefined {
-    return this.accelerationPositions[txid];
-  }
-
  private startTimer() {
    const state: any = {
      start: Date.now(),
--- a/backend/src/api/mining/mining-routes.ts
+++ b/backend/src/api/mining/mining-routes.ts
@@ -24,7 +24,6 @@ class MiningRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/difficulty-adjustments', this.$getDifficultyAdjustments)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/reward-stats/:blockCount', this.$getRewardStats)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fees/:interval', this.$getHistoricalBlockFees)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/fees', this.$getBlockFeesTimespan)
      .get(config.MEMPOOL.API_URL_PREFIX + 'mining/blocks/rewards/:interval', this.$getHistoricalBlockRewards)
      .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)
@@ -218,24 +217,6 @@ class MiningRoutes {
    }
  }

-  private async $getBlockFeesTimespan(req: Request, res: Response) {
-    try {
-      if (!parseInt(req.query.from as string, 10) || !parseInt(req.query.to as string, 10)) {
-        throw new Error('Invalid timestamp range');
-      }
-      if (parseInt(req.query.from as string, 10) > parseInt(req.query.to as string, 10)) {
-        throw new Error('from must be less than to');
-      }
-      const blockFees = await mining.$getBlockFeesTimespan(parseInt(req.query.from as string, 10), parseInt(req.query.to as string, 10));
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(blockFees);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
  private async $getHistoricalBlockRewards(req: Request, res: Response) {
    try {
      const blockRewards = await mining.$getHistoricalBlockRewards(req.params.interval);
--- a/backend/src/api/mining/mining.ts
+++ b/backend/src/api/mining/mining.ts
@@ -45,22 +45,11 @@ class Mining {
   */
  public async $getHistoricalBlockFees(interval: string | null = null): Promise<any> {
    return await BlocksRepository.$getHistoricalBlockFees(
-      this.getTimeRange(interval),
+      this.getTimeRange(interval, 5),
      Common.getSqlInterval(interval)
    );
  }

-  /**
-   * Get timespan block total fees
-   */
-  public async $getBlockFeesTimespan(from: number, to: number): Promise<number> {
-    return await BlocksRepository.$getHistoricalBlockFees(
-      this.getTimeRangeFromTimespan(from, to),
-      null,
-      {from, to}
-    );
-  }
-  
  /**
   * Get historical block rewards
   */
@@ -657,24 +646,6 @@ class Mining {
    }
  }

-  private getTimeRangeFromTimespan(from: number, to: number, scale = 1): number {
-    const timespan = to - from;
-    switch (true) {
-      case timespan > 3600 * 24 * 365 * 4: return 86400 * scale; // 24h
-      case timespan > 3600 * 24 * 365 * 3: return 43200 * scale; // 12h
-      case timespan > 3600 * 24 * 365 * 2: return 43200 * scale; // 12h
-      case timespan > 3600 * 24 * 365: return 28800 * scale; // 8h
-      case timespan > 3600 * 24 * 30 * 6: return 28800 * scale; // 8h
-      case timespan > 3600 * 24 * 30 * 3: return 10800 * scale; // 3h
-      case timespan > 3600 * 24 * 30: return 7200 * scale; // 2h
-      case timespan > 3600 * 24 * 7: return 1800 * scale; // 30min
-      case timespan > 3600 * 24 * 3: return 300 * scale; // 5min
-      case timespan > 3600 * 24: return 1 * scale;
-      default: return 1 * scale;
-    }
-  }
-  
-
  // Finds the oldest block in a consecutive chain back from the tip
  // assumes `blocks` is sorted in ascending height order
  private getOldestConsecutiveBlock(blocks: DifficultyBlock[]): DifficultyBlock {
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -52,28 +52,6 @@ class PoolsParser {
        continue;
      }

-      // One of the two fields 'addresses' or 'regexes' must be a non-empty array
-      if (!pool.addresses && !pool.regexes) {
-        logger.err(`Mining pool ${pool.name} must have at least one of the fields 'addresses' or 'regexes'. Skipping.`);
-        continue;
-      }
-      
-      pool.addresses = pool.addresses || [];
-      pool.regexes = pool.regexes || [];
-      
-      if (pool.addresses.length === 0 && pool.regexes.length === 0) {
-        logger.err(`Mining pool ${pool.name} has no 'addresses' nor 'regexes' defined. Skipping.`);
-        continue;
-      }
-      
-      if (pool.addresses.length === 0) {
-        logger.warn(`Mining pool ${pool.name} has no 'addresses' defined.`);
-      }
-      
-      if (pool.regexes.length === 0) {
-        logger.warn(`Mining pool ${pool.name} has no 'regexes' defined.`);
-      }      
-
      const poolDB = await PoolsRepository.$getPoolByUniqueId(pool.id, false);
      if (!poolDB) {
        // New mining pool
--- a/backend/src/api/redis-cache.ts
+++ b/backend/src/api/redis-cache.ts
@@ -155,7 +155,7 @@ class RedisCache {
    const toAdd = this.cacheQueue.slice(0, this.txFlushLimit);
    try {
      const msetData = toAdd.map(tx => {
-        const minified: any = structuredClone(tx);
+        const minified: any = { ...tx };
        delete minified.hex;
        for (const vin of minified.vin) {
          delete vin.inner_redeemscript_asm;
--- a/backend/src/api/services/acceleration.ts
+++ b/backend/src/api/services/acceleration.ts
@@ -10,12 +10,6 @@ export interface Acceleration {
  effectiveFee: number,
  feeDelta: number,
  pools: number[],
-  positions?: {
-    [pool: number]: {
-      block: number,
-      vbytes: number,
-    },
-  },
 };

 export interface AccelerationHistory {
@@ -31,7 +25,10 @@ export interface AccelerationHistory {
  feeDelta: number,
  blockHash: string,
  blockHeight: number,
-  pools: number[];
+  pools: {
+    pool_unique_id: number,
+    username: string,
+  }[],
 };

 class AccelerationApi {
--- a/backend/src/api/statistics/statistics-api.ts
+++ b/backend/src/api/statistics/statistics-api.ts
@@ -64,7 +64,7 @@ class StatisticsApi {
    }
  }

-  public async $create(statistics: Statistic, convertToDatetime = false): Promise<number | undefined> {
+  public async $create(statistics: Statistic): Promise<number | undefined> {
    try {
      const query = `INSERT INTO statistics(
              added,
@@ -114,7 +114,7 @@ class StatisticsApi {
              vsize_1800,
              vsize_2000
            )
-            VALUES (${convertToDatetime ? `FROM_UNIXTIME(${statistics.added})` : statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+            VALUES (${statistics.added}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
               ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;

      const params: (string | number)[] = [
@@ -456,59 +456,6 @@ class StatisticsApi {
      };
    });
  }
-
-  public mapOptimizedStatisticToStatistic(statistic: OptimizedStatistic[]): Statistic[] {
-    return statistic.map((s) => {
-      return {
-        added: s.added,
-        unconfirmed_transactions: s.count,
-        tx_per_second: 0,
-        vbytes_per_second: s.vbytes_per_second,
-        mempool_byte_weight: s.mempool_byte_weight || 0,
-        total_fee: s.total_fee || 0,
-        min_fee: s.min_fee,
-        fee_data: '',
-        vsize_1: s.vsizes[0],
-        vsize_2: s.vsizes[1],
-        vsize_3: s.vsizes[2],
-        vsize_4: s.vsizes[3],
-        vsize_5: s.vsizes[4],
-        vsize_6: s.vsizes[5],
-        vsize_8: s.vsizes[6],
-        vsize_10: s.vsizes[7],
-        vsize_12: s.vsizes[8],
-        vsize_15: s.vsizes[9],
-        vsize_20: s.vsizes[10],
-        vsize_30: s.vsizes[11],
-        vsize_40: s.vsizes[12],
-        vsize_50: s.vsizes[13],
-        vsize_60: s.vsizes[14],
-        vsize_70: s.vsizes[15],
-        vsize_80: s.vsizes[16],
-        vsize_90: s.vsizes[17],
-        vsize_100: s.vsizes[18],
-        vsize_125: s.vsizes[19],
-        vsize_150: s.vsizes[20],
-        vsize_175: s.vsizes[21],
-        vsize_200: s.vsizes[22],
-        vsize_250: s.vsizes[23],
-        vsize_300: s.vsizes[24],
-        vsize_350: s.vsizes[25],
-        vsize_400: s.vsizes[26],
-        vsize_500: s.vsizes[27],
-        vsize_600: s.vsizes[28],
-        vsize_700: s.vsizes[29],
-        vsize_800: s.vsizes[30],
-        vsize_900: s.vsizes[31],
-        vsize_1000: s.vsizes[32],
-        vsize_1200: s.vsizes[33],
-        vsize_1400: s.vsizes[34],
-        vsize_1600: s.vsizes[35],
-        vsize_1800: s.vsizes[36],
-        vsize_2000: s.vsizes[37],
-      }
-    });
-  }
 }

 export default new StatisticsApi();
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -3,7 +3,6 @@ import * as WebSocket from 'ws';
 import {
  BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse,
  OptimizedStatistic, ILoadingIndicators, GbtCandidates, TxTrackingInfo,
-  MempoolBlockDelta, MempoolDelta, MempoolDeltaTxids
 } from '../mempool.interfaces';
 import blocks from './blocks';
 import memPool from './mempool';
@@ -206,8 +205,7 @@ class WebsocketHandler {
                }
                response['txPosition'] = JSON.stringify({
                  txid: trackTxid,
-                  position,
-                  accelerationPositions: memPool.getAccelerationPositions(tx.txid),
+                  position
                });
              }
            } else {
@@ -348,17 +346,6 @@ class WebsocketHandler {
            }
          }

-          if (parsedMessage && parsedMessage['track-accelerations'] != null) {
-            if (parsedMessage['track-accelerations']) {
-              client['track-accelerations'] = true;
-              response['accelerations'] = JSON.stringify({
-                accelerations: Object.values(memPool.getAccelerations()),
-              });
-            } else {
-              client['track-accelerations'] = false;
-            }
-          }
-
          if (parsedMessage.action === 'init') {
            if (!this.socketData['blocks']?.length || !this.socketData['da'] || !this.socketData['backendInfo'] || !this.socketData['conversions']) {
              this.updateSocketData();
@@ -377,18 +364,6 @@ class WebsocketHandler {
            client['track-donation'] = parsedMessage['track-donation'];
          }

-          if (parsedMessage['track-mempool-txids'] === true) {
-            client['track-mempool-txids'] = true;
-          } else if (parsedMessage['track-mempool-txids'] === false) {
-            delete client['track-mempool-txids'];
-          }
-
-          if (parsedMessage['track-mempool'] === true) {
-            client['track-mempool'] = true;
-          } else if (parsedMessage['track-mempool'] === false) {
-            delete client['track-mempool'];
-          }
-
          if (Object.keys(response).length) {
            client.send(this.serializeResponse(response));
          }
@@ -549,7 +524,6 @@ class WebsocketHandler {
    const vBytesPerSecond = memPool.getVBytesPerSecond();
    const rbfTransactions = Common.findRbfTransactions(newTransactions, deletedTransactions);
    const da = difficultyAdjustment.getDifficultyAdjustment();
-    const accelerations = memPool.getAccelerations();
    memPool.handleRbfTransactions(rbfTransactions);
    const rbfChanges = rbfCache.getRbfChanges();
    let rbfReplacements;
@@ -571,33 +545,6 @@ class WebsocketHandler {

    const latestTransactions = memPool.getLatestTransactions();

-    if (memPool.isInSync()) {
-      this.mempoolSequence++;
-    }
-
-    const replacedTransactions: { replaced: string, by: TransactionExtended }[] = [];
-    for (const tx of newTransactions) {
-      if (rbfTransactions[tx.txid]) {
-        for (const replaced of rbfTransactions[tx.txid]) {
-          replacedTransactions.push({ replaced: replaced.txid, by: tx });
-        }
-      }
-    }
-    const mempoolDeltaTxids: MempoolDeltaTxids = {
-      sequence: this.mempoolSequence,
-      added: newTransactions.map(tx => tx.txid),
-      removed: deletedTransactions.map(tx => tx.txid),
-      mined: [],
-      replaced: replacedTransactions.map(replacement => ({ replaced: replacement.replaced, by: replacement.by.txid })),
-    };
-    const mempoolDelta: MempoolDelta = {
-      sequence: this.mempoolSequence,
-      added: newTransactions,
-      removed: deletedTransactions.map(tx => tx.txid),
-      mined: [],
-      replaced: replacedTransactions,
-    };
-
    // update init data
    const socketDataFields = {
      'mempoolInfo': mempoolInfo,
@@ -657,11 +604,9 @@ class WebsocketHandler {
    const addressCache = this.makeAddressCache(newTransactions);
    const removedAddressCache = this.makeAddressCache(deletedTransactions);

-    // pre-compute acceleration delta
-    const accelerationUpdate = {
-      added: accelerationDelta.map(txid => accelerations[txid]).filter(acc => acc != null),
-      removed: accelerationDelta.filter(txid => !accelerations[txid]),
-    };
+    if (memPool.isInSync()) {
+      this.mempoolSequence++;
+    }

    // TODO - Fix indentation after PR is merged
    for (const server of this.webSocketServers) {
@@ -821,9 +766,7 @@ class WebsocketHandler {
            position: {
              ...mempoolTx.position,
              accelerated: mempoolTx.acceleration || undefined,
-              acceleratedBy: mempoolTx.acceleratedBy || undefined,
-            },
-            accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
+            }
          };
          if (!mempoolTx.cpfpChecked && !mempoolTx.acceleration) {
            calculateCpfp(mempoolTx, newMempool);
@@ -836,7 +779,7 @@ class WebsocketHandler {
              effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize || null,
              sigops: mempoolTx.sigops,
              adjustedVsize: mempoolTx.adjustedVsize,
-              acceleration: mempoolTx.acceleration,
+              acceleration: mempoolTx.acceleration
            };
          }
          response['txPosition'] = JSON.stringify(positionData);
@@ -861,7 +804,6 @@ class WebsocketHandler {
            txInfo.position = {
              ...mempoolTx.position,
              accelerated: mempoolTx.acceleration || undefined,
-              acceleratedBy: mempoolTx.acceleratedBy || undefined,
            };
            if (!mempoolTx.cpfpChecked) {
              calculateCpfp(mempoolTx, newMempool);
@@ -905,18 +847,6 @@ class WebsocketHandler {
        response['rbfLatestSummary'] = getCachedResponse('rbfLatestSummary', rbfSummary);
      }

-      if (client['track-mempool-txids']) {
-        response['mempool-txids'] = getCachedResponse('mempool-txids', mempoolDeltaTxids);
-      }
-
-      if (client['track-mempool']) {
-        response['mempool-transactions'] = getCachedResponse('mempool-transactions', mempoolDelta);
-      }
-
-      if (client['track-accelerations'] && (accelerationUpdate.added.length || accelerationUpdate.removed.length)) {
-        response['accelerations'] = getCachedResponse('accelerations', accelerationUpdate);
-      }
-
      if (Object.keys(response).length) {
        client.send(this.serializeResponse(response));
      }
@@ -1062,31 +992,6 @@ class WebsocketHandler {

    const mBlocksWithTransactions = mempoolBlocks.getMempoolBlocksWithTransactions();

-    if (memPool.isInSync()) {
-      this.mempoolSequence++;
-    }
-
-    const replacedTransactions: { replaced: string, by: TransactionExtended }[] = [];
-    for (const txid of Object.keys(rbfTransactions)) {
-      for (const replaced of rbfTransactions[txid].replaced) {
-        replacedTransactions.push({ replaced: replaced.txid, by: rbfTransactions[txid].replacedBy });
-      }
-    }
-    const mempoolDeltaTxids: MempoolDeltaTxids = {
-      sequence: this.mempoolSequence,
-      added: [],
-      removed: [],
-      mined: transactions.map(tx => tx.txid),
-      replaced: replacedTransactions.map(replacement => ({ replaced: replacement.replaced, by: replacement.by.txid })),
-    };
-    const mempoolDelta: MempoolDelta = {
-      sequence: this.mempoolSequence,
-      added: [],
-      removed: [],
-      mined: transactions.map(tx => tx.txid),
-      replaced: replacedTransactions,
-    };
-
    const responseCache = { ...this.socketData };
    function getCachedResponse(key, data): string {
      if (!responseCache[key]) {
@@ -1095,6 +1000,10 @@ class WebsocketHandler {
      return responseCache[key];
    }

+    if (memPool.isInSync()) {
+      this.mempoolSequence++;
+    }
+
    // TODO - Fix indentation after PR is merged
    for (const server of this.webSocketServers) {
    server.clients.forEach((client) => {
@@ -1138,9 +1047,7 @@ class WebsocketHandler {
              position: {
                ...mempoolTx.position,
                accelerated: mempoolTx.acceleration || undefined,
-                acceleratedBy: mempoolTx.acceleratedBy || undefined,
-              },
-              accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
+              }
            });
          }
        }
@@ -1159,7 +1066,6 @@ class WebsocketHandler {
                  ...mempoolTx.position,
                },
                accelerated: mempoolTx.acceleration || undefined,
-                acceleratedBy: mempoolTx.acceleratedBy || undefined,
              };
            }
          }
@@ -1279,14 +1185,6 @@ class WebsocketHandler {
        }
      }

-      if (client['track-mempool-txids']) {
-        response['mempool-txids'] = getCachedResponse('mempool-txids', mempoolDeltaTxids);
-      }
-
-      if (client['track-mempool']) {
-        response['mempool-transactions'] = getCachedResponse('mempool-transactions', mempoolDelta);
-      }
-
      if (Object.keys(response).length) {
        client.send(this.serializeResponse(response));
      }
@@ -1300,7 +1198,7 @@ class WebsocketHandler {
  // and zips it together into a valid JSON object
  private serializeResponse(response): string {
    return '{'
-        + Object.keys(response).filter(key => response[key] != null).map(key => `"${key}": ${response[key]}`).join(', ')
+        + Object.keys(response).map(key => `"${key}": ${response[key]}`).join(', ')
        + '}';
  }

--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -51,7 +51,6 @@ interface IConfig {
    REQUEST_TIMEOUT: number;
    FALLBACK_TIMEOUT: number;
    FALLBACK: string[];
-    MAX_BEHIND_TIP: number;
  };
  LIGHTNING: {
    ENABLED: boolean;
@@ -142,8 +141,6 @@ interface IConfig {
    ENABLED: boolean;
    AUDIT: boolean;
    AUDIT_START_HEIGHT: number;
-    STATISTICS: boolean;
-    STATISTICS_START_TIME: number | string;
    SERVERS: string[];
  },
  MEMPOOL_SERVICES: {
@@ -160,16 +157,6 @@ interface IConfig {
    PAID: boolean;
    API_KEY: string;
  },
-  NETWORKS: {
-    MAINNET: {
-      ENABLED: boolean;
-      WEIGHT: 'foo';
-    },
-    TESTNET: {
-      ENABLED: boolean;
-      WEIGHT: 'bar'
-    }
-  };
 }

 const defaults: IConfig = {
@@ -221,7 +208,6 @@ const defaults: IConfig = {
    'REQUEST_TIMEOUT': 10000,
    'FALLBACK_TIMEOUT': 5000,
    'FALLBACK': [],
-    'MAX_BEHIND_TIP': 2,
  },
  'ELECTRUM': {
    'HOST': '127.0.0.1',
@@ -312,8 +298,6 @@ const defaults: IConfig = {
    'ENABLED': false,
    'AUDIT': false,
    'AUDIT_START_HEIGHT': 774000,
-    'STATISTICS': false,
-    'STATISTICS_START_TIME': 1481932800,
    'SERVERS': [],
  },
  'MEMPOOL_SERVICES': {
@@ -330,16 +314,6 @@ const defaults: IConfig = {
    'PAID': false,
    'API_KEY': '',
  },
-  'NETWORKS': {
-    'MAINNET': {
-      'ENABLED': true,
-      'WEIGHT': 'foo',
-    },
-    'TESTNET': {
-      'ENABLED': false,
-      'WEIGHT': 'bar'
-    }
-  }
 };

 class Config implements IConfig {
@@ -361,7 +335,6 @@ class Config implements IConfig {
  MEMPOOL_SERVICES: IConfig['MEMPOOL_SERVICES'];
  REDIS: IConfig['REDIS'];
  FIAT_PRICE: IConfig['FIAT_PRICE'];
-  NETWORKS: IConfig['NETWORKS'];

  constructor() {
    const configs = this.merge(configFromFile, defaults);
@@ -383,7 +356,6 @@ class Config implements IConfig {
    this.MEMPOOL_SERVICES = configs.MEMPOOL_SERVICES;
    this.REDIS = configs.REDIS;
    this.FIAT_PRICE = configs.FIAT_PRICE;
-    this.NETWORKS = configs.NETWORKS;
  }

  merge = (...objects: object[]): IConfig => {
--- a/backend/src/database.ts
+++ b/backend/src/database.ts
@@ -2,7 +2,8 @@ import * as fs from 'fs';
 import path from 'path';
 import config from './config';
 import { createPool, Pool, PoolConnection } from 'mysql2/promise';
-import logger, { LogLevel } from './logger';
+import { LogLevel } from './logger';
+import logger from './logger';
 import { FieldPacket, OkPacket, PoolOptions, ResultSetHeader, RowDataPacket } from 'mysql2/typings/mysql';
 import { execSync } from 'child_process';

--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -45,7 +45,6 @@ import bitcoinCoreRoutes from './api/bitcoin/bitcoin-core.routes';
 import bitcoinSecondClient from './api/bitcoin/bitcoin-second-client';
 import accelerationRoutes from './api/acceleration/acceleration.routes';
 import aboutRoutes from './api/about.routes';
-import mempoolBlocks from './api/mempool-blocks';

 class Server {
  private wss: WebSocket.Server | undefined;
@@ -132,7 +131,6 @@ class Server {
      })
      .use(express.urlencoded({ extended: true }))
      .use(express.text({ type: ['text/plain', 'application/base64'] }))
-      .use(express.json())
      ;

    if (config.DATABASE.ENABLED && config.FIAT_PRICE.ENABLED) {
@@ -150,7 +148,6 @@ class Server {

    await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
    await syncAssets.syncAssets$();
-    await mempoolBlocks.updatePools$();
    if (config.MEMPOOL.ENABLED) {
      if (config.MEMPOOL.CACHE_ENABLED) {
        await diskCache.$loadMempoolCache();
--- a/backend/src/indexer.ts
+++ b/backend/src/indexer.ts
@@ -8,7 +8,6 @@ import priceUpdater from './tasks/price-updater';
 import PricesRepository from './repositories/PricesRepository';
 import config from './config';
 import auditReplicator from './replication/AuditReplication';
-import statisticsReplicator from './replication/StatisticsReplication';
 import AccelerationRepository from './repositories/AccelerationRepository';

 export interface CoreIndex {
@@ -182,7 +181,6 @@ class Indexer {
      }

      this.runSingleTask('blocksPrices');
-      await blocks.$indexCoinbaseAddresses();
      await mining.$indexDifficultyAdjustments();
      await mining.$generateNetworkHashrateHistory();
      await mining.$generatePoolHashrateHistory();
@@ -190,7 +188,6 @@ class Indexer {
      await blocks.$generateCPFPDatabase();
      await blocks.$generateAuditStats();
      await auditReplicator.$sync();
-      await statisticsReplicator.$sync();
      await AccelerationRepository.$indexPastAccelerations();
      // do not wait for classify blocks to finish
      blocks.$classifyBlocks();
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -71,22 +71,6 @@ export interface MempoolBlockDelta {
  changed: MempoolDeltaChange[];
 }

-export interface MempoolDeltaTxids {
-  sequence: number,
-  added: string[];
-  removed: string[];
-  mined: string[];
-  replaced: { replaced: string, by: string }[];
-}
-
-export interface MempoolDelta {
-  sequence: number,
-  added: MempoolTransactionExtended[];
-  removed: string[];
-  mined: string[];
-  replaced: { replaced: string, by: TransactionExtended }[];
-}
-
 interface VinStrippedToScriptsig {
  scriptsig: string;
 }
@@ -111,7 +95,6 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
    vsize: number,
  };
  acceleration?: boolean;
-  acceleratedBy?: number[];
  replacement?: boolean;
  uid?: number;
  flags?: number;
@@ -287,7 +270,6 @@ export interface BlockExtension {
  coinbaseRaw: string;
  orphans: OrphanedBlock[] | null;
  coinbaseAddress: string | null;
-  coinbaseAddresses: string[] | null;
  coinbaseSignature: string | null;
  coinbaseSignatureAscii: string | null;
  virtualSize: number;
@@ -424,7 +406,6 @@ export interface Statistic {

 export interface OptimizedStatistic {
  added: string;
-  count: number;
  vbytes_per_second: number;
  total_fee: number;
  mempool_byte_weight: number;
@@ -434,7 +415,7 @@ export interface OptimizedStatistic {

 export interface TxTrackingInfo {
  replacedBy?: string,
-  position?: { block: number, vsize: number, accelerated?: boolean, acceleratedBy?: number[] },
+  position?: { block: number, vsize: number, accelerated?: boolean },
  cpfp?: {
    ancestors?: Ancestor[],
    bestDescendant?: Ancestor | null,
@@ -445,7 +426,6 @@ export interface TxTrackingInfo {
  },
  utxoSpent?: { [vout: number]: { vin: number, txid: string } },
  accelerated?: boolean,
-  acceleratedBy?: number[],
  confirmed?: boolean
 }

--- a/backend/src/replication/StatisticsReplication.ts
+++ b/backend/src/replication/StatisticsReplication.ts
@@ -1,228 +0,0 @@
-import DB from '../database';
-import logger from '../logger';
-import { $sync } from './replicator';
-import config from '../config';
-import { Common } from '../api/common';
-import statistics from '../api/statistics/statistics-api';
-
-interface MissingStatistics {
-  '24h': Set<number>;
-  '1w': Set<number>;
-  '1m': Set<number>;
-  '3m': Set<number>;
-  '6m': Set<number>;
-  '2y': Set<number>;
-  'all': Set<number>;
-}
-
-const steps = {
-  '24h': 60,
-  '1w': 300,
-  '1m': 1800,
-  '3m': 7200,
-  '6m': 10800,
-  '2y': 28800,
-  'all': 43200,
-};
-
-/**
- * Syncs missing statistics data from trusted servers
- */
-class StatisticsReplication {
-  inProgress: boolean = false;
-
-  public async $sync(): Promise<void> {
-    if (!config.REPLICATION.ENABLED || !config.REPLICATION.STATISTICS || !config.STATISTICS.ENABLED) {
-      // replication not enabled, or statistics not enabled
-      return;
-    }
-    if (this.inProgress) {
-      logger.info(`StatisticsReplication sync already in progress`, 'Replication');
-      return;
-    }
-    this.inProgress = true;
-
-    const missingStatistics = await this.$getMissingStatistics();
-    const missingIntervals = Object.keys(missingStatistics).filter(key => missingStatistics[key].size > 0);
-    const totalMissing =  missingIntervals.reduce((total, key) => total + missingStatistics[key].size, 0);
-
-    if (totalMissing === 0) {
-      this.inProgress = false;
-      logger.info(`Statistics table is complete, no replication needed`, 'Replication');
-      return;
-    }
-    
-    for (const interval of missingIntervals) {
-      logger.debug(`Missing ${missingStatistics[interval].size} statistics rows in '${interval}' timespan`, 'Replication');
-    }
-    logger.debug(`Fetching ${missingIntervals.join(', ')} statistics endpoints from trusted servers to fill ${totalMissing} rows missing in statistics`, 'Replication');
-    
-    let totalSynced = 0;
-    let totalMissed = 0;
-
-    for (const interval of missingIntervals) {
-      const results = await this.$syncStatistics(interval, missingStatistics[interval]);
-      totalSynced += results.synced;
-      totalMissed += results.missed;
-
-      logger.info(`Found ${totalSynced} / ${totalSynced + totalMissed} of ${totalMissing} missing statistics rows`, 'Replication');
-      await Common.sleep$(3000);
-    }
-
-    logger.debug(`Synced ${totalSynced} statistics rows, ${totalMissed} still missing`, 'Replication');
-
-    this.inProgress = false;
-  }
-
-  private async $syncStatistics(interval: string, missingTimes: Set<number>): Promise<any> {
-  
-    let success = false;
-    let synced = 0;
-    let missed = new Set(missingTimes);
-    const syncResult = await $sync(`/api/v1/statistics/${interval}`);
-    if (syncResult && syncResult.data?.length) {
-      success = true;
-      logger.info(`Fetched /api/v1/statistics/${interval} from ${syncResult.server}`);     
-    
-      for (const stat of syncResult.data) {
-        const time = this.roundToNearestStep(stat.added, steps[interval]);
-        if (missingTimes.has(time)) {
-          try {
-            await statistics.$create(statistics.mapOptimizedStatisticToStatistic([stat])[0], true);
-            if (missed.delete(time)) {
-              synced++;
-            }
-          } catch (e: any) {
-            logger.err(`Failed to insert statistics row at ${stat.added} (${interval}) from ${syncResult.server}. Reason: ` + (e instanceof Error ? e.message : e));
-          }
-        }
-      }
-
-    } else {
-      logger.warn(`An error occured when trying to fetch /api/v1/statistics/${interval}`);
-    }
-
-    return { success, synced, missed: missed.size };
-  }
-
-  private async $getMissingStatistics(): Promise<MissingStatistics> {
-    try {
-      const now = Math.floor(Date.now() / 1000);
-      const day = 60 * 60 * 24;
-
-      const startTime = this.getStartTimeFromConfig();
-
-      const missingStatistics: MissingStatistics = {
-        '24h': new Set<number>(),
-        '1w': new Set<number>(),
-        '1m': new Set<number>(),
-        '3m': new Set<number>(),
-        '6m': new Set<number>(),
-        '2y': new Set<number>(),
-        'all': new Set<number>()
-      };
-
-      const intervals = [              // [start,               end,                 label ]
-                                          [now - day,           now - 60,            '24h']       , // from 24 hours ago to now = 1 minute granularity
-        startTime < now - day ?           [now - day * 7,       now - day,           '1w' ] : null, // from 1 week ago to 24 hours ago = 5 minutes granularity
-        startTime < now - day * 7 ?       [now - day * 30,      now - day * 7,       '1m' ] : null, // from 1 month ago to 1 week ago = 30 minutes granularity
-        startTime < now - day * 30 ?      [now - day * 90,      now - day * 30,      '3m' ] : null, // from 3 months ago to 1 month ago = 2 hours granularity
-        startTime < now - day * 90 ?      [now - day * 180,     now - day * 90,      '6m' ] : null, // from 6 months ago to 3 months ago = 3 hours granularity
-        startTime < now - day * 180 ?     [now - day * 365 * 2, now - day * 180,     '2y' ] : null, // from 2 years ago to 6 months ago = 8 hours granularity
-        startTime < now - day * 365 * 2 ? [startTime,           now - day * 365 * 2, 'all'] : null, // from start of statistics to 2 years ago = 12 hours granularity   
-      ];
-
-      for (const interval of intervals) {
-        if (!interval) {
-          continue;
-        }
-        missingStatistics[interval[2] as string] = await this.$getMissingStatisticsInterval(interval, startTime);
-      }
-      
-      return missingStatistics;
-    } catch (e: any) {
-      logger.err(`Cannot fetch missing statistics times from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  private async $getMissingStatisticsInterval(interval: any, startTime: number): Promise<Set<number>> {
-    try {
-      const start = interval[0];
-      const end = interval[1];
-      const step = steps[interval[2]];
-
-      const [rows]: any[] = await DB.query(`
-        SELECT UNIX_TIMESTAMP(added) as added
-        FROM statistics
-        WHERE added >= FROM_UNIXTIME(?) AND added <= FROM_UNIXTIME(?)
-        GROUP BY UNIX_TIMESTAMP(added) DIV ${step} ORDER BY statistics.added DESC
-      `, [start, end]);
-
-      const startingTime = Math.max(startTime, start) - Math.max(startTime, start) % step;
-
-      const timeSteps: number[] = [];
-      for (let time = startingTime; time < end; time += step) {
-        timeSteps.push(time);
-      }
-
-      if (timeSteps.length === 0) {
-        return new Set<number>();
-      }
-      
-      const roundedTimesAlreadyHere = new Set(rows.map(row => this.roundToNearestStep(row.added, step)));
-      const missingTimes = new Set(timeSteps.filter(time => !roundedTimesAlreadyHere.has(time)));
-
-      // Don't bother fetching if very few rows are missing
-      if (missingTimes.size < timeSteps.length * 0.005) {
-        return new Set();
-      }
-
-      return missingTimes;
-    } catch (e: any) {
-      logger.err(`Cannot fetch missing statistics times from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  private roundToNearestStep(time: number, step: number): number {
-    const remainder = time % step;
-    if (remainder < step / 2) {
-      return time - remainder;
-    } else {
-      return time + (step - remainder);
-    }
-  }
-
-  private getStartTimeFromConfig(): number {
-    const now = Math.floor(Date.now() / 1000);
-    const day = 60 * 60 * 24;
-
-    let startTime: number;
-    if (typeof(config.REPLICATION.STATISTICS_START_TIME) === 'string' && ['24h', '1w', '1m', '3m', '6m', '2y', 'all'].includes(config.REPLICATION.STATISTICS_START_TIME)) {
-      if (config.REPLICATION.STATISTICS_START_TIME === 'all') {
-        startTime = 1481932800;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '2y') {
-        startTime = now - day * 365 * 2;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '6m') {
-        startTime = now - day * 180;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '3m') {
-        startTime = now - day * 90;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '1m') {
-        startTime = now - day * 30;
-      } else if (config.REPLICATION.STATISTICS_START_TIME === '1w') {
-        startTime = now - day * 7;
-      } else {
-        startTime = now - day;
-      }
-    } else {
-      startTime = Math.max(config.REPLICATION.STATISTICS_START_TIME as number || 1481932800, 1481932800);
-    }
-
-    return startTime;
-  }
-
-}
-
-export default new StatisticsReplication();
-
--- a/backend/src/repositories/AccelerationRepository.ts
+++ b/backend/src/repositories/AccelerationRepository.ts
@@ -244,8 +244,6 @@ class AccelerationRepository {
    let count = 0;
    try {
      while (!done) {
-        // don't DDoS the services backend
-        Common.sleep$(500 + (Math.random() * 1000));
        const accelerations = await accelerationApi.$fetchAccelerationHistory(page);
        page++;
        if (!accelerations?.length) {
@@ -308,10 +306,10 @@ class AccelerationRepository {
        }
        const accelerationSummaries = accelerations.map(acc => ({
          ...acc,
-          pools: acc.pools,
+          pools: acc.pools.map(pool => pool.pool_unique_id),
        }))
        for (const acc of accelerations) {
-          if (blockTxs[acc.txid] && acc.pools.includes(block.extras.pool.id)) {
+          if (blockTxs[acc.txid]) {
            const tx = blockTxs[acc.txid];
            const accelerationInfo = accelerationCosts.getAccelerationInfo(tx, boostRate, transactions);
            accelerationInfo.cost = Math.max(0, Math.min(acc.feeDelta, accelerationInfo.cost));
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -40,7 +40,6 @@ interface DatabaseBlock {
  avgFeeRate: number;
  coinbaseRaw: string;
  coinbaseAddress: string;
-  coinbaseAddresses: string;
  coinbaseSignature: string;
  coinbaseSignatureAscii: string;
  avgTxSize: number;
@@ -83,7 +82,6 @@ const BLOCK_DB_FIELDS = `
  blocks.avg_fee_rate AS avgFeeRate,
  blocks.coinbase_raw AS coinbaseRaw,
  blocks.coinbase_address AS coinbaseAddress,
-  blocks.coinbase_addresses AS coinbaseAddresses,
  blocks.coinbase_signature AS coinbaseSignature,
  blocks.coinbase_signature_ascii AS coinbaseSignatureAscii,
  blocks.avg_tx_size AS avgTxSize,
@@ -116,7 +114,7 @@ class BlocksRepository {
        pool_id,            fees,                fee_span,          median_fee,
        reward,             version,             bits,              nonce,
        merkle_root,        previous_block_hash, avg_fee,           avg_fee_rate,
-        median_timestamp,   header,              coinbase_address,  coinbase_addresses,
+        median_timestamp,   header,              coinbase_address,
        coinbase_signature, utxoset_size,        utxoset_change,    avg_tx_size,
        total_inputs,       total_outputs,       total_input_amt,   total_output_amt,
        fee_percentiles,    segwit_total_txs,    segwit_total_size, segwit_total_weight,
@@ -127,7 +125,7 @@ class BlocksRepository {
        ?, ?, ?, ?,
        ?, ?, ?, ?,
        ?, ?, ?, ?,
-        FROM_UNIXTIME(?), ?, ?, ?,
+        FROM_UNIXTIME(?), ?, ?,
        ?, ?, ?, ?,
        ?, ?, ?, ?,
        ?, ?, ?, ?,
@@ -163,7 +161,6 @@ class BlocksRepository {
        block.mediantime,
        block.extras.header,
        block.extras.coinbaseAddress,
-        block.extras.coinbaseAddresses ? JSON.stringify(block.extras.coinbaseAddresses) : null,
        truncatedCoinbaseSignature,
        block.extras.utxoSetSize,
        block.extras.utxoSetChange,
@@ -666,7 +663,7 @@ class BlocksRepository {
  /**
   * Get the historical averaged block fees
   */
-  public async $getHistoricalBlockFees(div: number, interval: string | null, timespan?: {from: number, to: number}): Promise<any> {
+  public async $getHistoricalBlockFees(div: number, interval: string | null): Promise<any> {
    try {
      let query = `SELECT
        CAST(AVG(blocks.height) as INT) as avgHeight,
@@ -680,8 +677,6 @@ class BlocksRepository {

      if (interval !== null) {
        query += ` WHERE blockTimestamp BETWEEN DATE_SUB(NOW(), INTERVAL ${interval}) AND NOW()`;
-      } else if (timespan) {
-        query += ` WHERE blockTimestamp BETWEEN FROM_UNIXTIME(${timespan.from}) AND FROM_UNIXTIME(${timespan.to})`;
      }

      query += ` GROUP BY UNIX_TIMESTAMP(blockTimestamp) DIV ${div}`;
@@ -925,25 +920,6 @@ class BlocksRepository {
    }
  }

-  /**
-   * Get all indexed blocks with missing coinbase addresses
-   */
-  public async $getBlocksWithoutCoinbaseAddresses(): Promise<any> {
-    try {
-      const [blocks] = await DB.query(`
-        SELECT height, hash, coinbase_addresses
-        FROM blocks
-        WHERE coinbase_addresses IS NULL AND
-          coinbase_address IS NOT NULL
-        ORDER BY height DESC
-      `);
-      return blocks;
-    } catch (e) {
-      logger.err(`Cannot get blocks with missing coinbase addresses. Reason: ` + (e instanceof Error ? e.message : e));
-      return [];
-    }
-  }
-
  /**
   * Save indexed median fee to avoid recomputing it later
   * 
@@ -982,25 +958,6 @@ class BlocksRepository {
    }
  }

-  /**
-   * Save coinbase addresses
-   * 
-   * @param id
-   * @param addresses
-   */
-  public async $saveCoinbaseAddresses(id: string, addresses: string[]): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE blocks SET coinbase_addresses = ?
-        WHERE hash = ?`,
-        [JSON.stringify(addresses), id]
-      );
-    } catch (e) {
-      logger.err(`Cannot update block coinbase addresses. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
  /**
   * Convert a mysql row block into a BlockExtended. Note that you
   * must provide the correct field into dbBlk object param
@@ -1040,7 +997,6 @@ class BlocksRepository {
    extras.avgFeeRate = dbBlk.avgFeeRate;
    extras.coinbaseRaw = dbBlk.coinbaseRaw;
    extras.coinbaseAddress = dbBlk.coinbaseAddress;
-    extras.coinbaseAddresses = dbBlk.coinbaseAddresses ? JSON.parse(dbBlk.coinbaseAddresses) : [];
    extras.coinbaseSignature = dbBlk.coinbaseSignature;
    extras.coinbaseSignatureAscii = dbBlk.coinbaseSignatureAscii;
    extras.avgTxSize = dbBlk.avgTxSize;
--- a/backend/src/tasks/price-feeds/free-currency-api.ts
+++ b/backend/src/tasks/price-feeds/free-currency-api.ts
@@ -76,7 +76,7 @@ class FreeCurrencyApi implements ConversionFeed {
  }

  public async $fetchConversionRates(date: string): Promise<ConversionRates> {
-    const response = await query(`${this.API_URL_PREFIX}historical?date=${date}&apikey=${this.API_KEY}`, true);
+    const response = await query(`${this.API_URL_PREFIX}historical?date=${date}&apikey=${this.API_KEY}`);
    if (response && response['data'] && (response['data'][date] || this.PAID)) {
      if (this.PAID) {
        response['data'] = this.convertData(response['data']);
--- a/backend/src/tasks/price-updater.ts
+++ b/backend/src/tasks/price-updater.ts
@@ -59,7 +59,7 @@ class PriceUpdater {
  private currencyConversionFeed: ConversionFeed | undefined;
  private newCurrencies: string[] = ['BGN', 'BRL', 'CNY', 'CZK', 'DKK', 'HKD', 'HRK', 'HUF', 'IDR', 'ILS', 'INR', 'ISK', 'KRW', 'MXN', 'MYR', 'NOK', 'NZD', 'PHP', 'PLN', 'RON', 'RUB', 'SEK', 'SGD', 'THB', 'TRY', 'ZAR'];
  private lastTimeConversionsRatesFetched: number = 0;
-  private latestConversionsRatesFromFeed: ConversionRates = { USD: -1 };
+  private latestConversionsRatesFromFeed: ConversionRates = {};
  private ratesChangedCallback: ((rates: ApiPrice) => void) | undefined;

  constructor() {
@@ -157,9 +157,9 @@ class PriceUpdater {
      try {
        this.latestConversionsRatesFromFeed = await this.currencyConversionFeed.$fetchLatestConversionRates();
        this.lastTimeConversionsRatesFetched = Math.round(new Date().getTime() / 1000);
-        logger.debug(`Fetched currencies conversion rates from conversions API: ${JSON.stringify(this.latestConversionsRatesFromFeed)}`);
+        logger.debug(`Fetched currencies conversion rates from external API: ${JSON.stringify(this.latestConversionsRatesFromFeed)}`);
      } catch (e) {
-        logger.err(`Cannot fetch conversion rates from conversions API. Reason: ${(e instanceof Error ? e.message : e)}`);
+        logger.err(`Cannot fetch conversion rates from the API. Reason: ${(e instanceof Error ? e.message : e)}`);
      }
    }

@@ -408,17 +408,17 @@ class PriceUpdater {
    try {
      const remainingQuota = await this.currencyConversionFeed?.$getQuota();
      if (remainingQuota['month']['remaining'] < 500) { // We need some calls left for the daily updates
-        logger.debug(`Not enough conversions API credit to insert missing prices in ${priceTimesToFill.length} rows (${remainingQuota['month']['remaining']} calls left).`, logger.tags.mining);
+        logger.debug(`Not enough currency API credit to insert missing prices in ${priceTimesToFill.length} rows (${remainingQuota['month']['remaining']} calls left).`, logger.tags.mining);
        this.additionalCurrenciesHistoryInserted = true; // Do not try again until next day
        return;
      }
    } catch (e) {
-      logger.err(`Cannot fetch conversions API credit, insertion of missing prices aborted. Reason: ${(e instanceof Error ? e.message : e)}`);
+      logger.err(`Cannot fetch currency API credit, insertion of missing prices aborted. Reason: ${(e instanceof Error ? e.message : e)}`);
      return;
    }

    this.additionalCurrenciesHistoryRunning = true;
-    logger.debug(`Inserting missing historical conversion rates using conversions API to fill ${priceTimesToFill.length} rows`, logger.tags.mining);
+    logger.debug(`Fetching missing conversion rates from external API to fill ${priceTimesToFill.length} rows`, logger.tags.mining);

    let conversionRates: { [timestamp: number]: ConversionRates } = {};
    let totalInserted = 0;
@@ -430,23 +430,10 @@ class PriceUpdater {
      const month = new Date(priceTime.time * 1000).getMonth();
      const yearMonthTimestamp = new Date(year, month, 1).getTime() / 1000;
      if (conversionRates[yearMonthTimestamp] === undefined) {
-        try {
-          if (year === new Date().getFullYear() && month === new Date().getMonth()) { // For rows in the current month, we use the latest conversion rates
-            conversionRates[yearMonthTimestamp] = this.latestConversionsRatesFromFeed;
-          } else {
-            conversionRates[yearMonthTimestamp] = await this.currencyConversionFeed?.$fetchConversionRates(`${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-15`) || { USD: -1 };
-          }
-
-          if (conversionRates[yearMonthTimestamp]['USD'] < 0) {
-            throw new Error('Incorrect USD conversion rate');
-          }
-        } catch (e) {
-          if ((e instanceof Error ? e.message : '').includes('429')) { // Continue 60 seconds later if and only if error is 429
-            this.lastFailedHistoricalRun = Math.round(new Date().getTime() / 1000);
-            logger.info(`Got a 429 error from conversions API. This is expected to happen a few times during the initial historical price insertion, process will resume in 60 seconds.`, logger.tags.mining);
-          } else {
-            logger.err(`Cannot fetch conversion rates from conversions API for ${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-01, trying again next day. Error: ${(e instanceof Error ? e.message : e)}`, logger.tags.mining);
-          }
+        conversionRates[yearMonthTimestamp] = await this.currencyConversionFeed?.$fetchConversionRates(`${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-01`) || { USD: -1 };
+        if (conversionRates[yearMonthTimestamp]['USD'] < 0) {
+          logger.err(`Cannot fetch conversion rates from the API for ${year}-${month + 1 < 10 ? `0${month + 1}` : `${month + 1}`}-01. Aborting insertion of missing prices.`, logger.tags.mining);
+          this.lastFailedHistoricalRun = Math.round(new Date().getTime() / 1000);
          break;
        }
      }
--- a/backend/src/utils/axios-query.ts
+++ b/backend/src/utils/axios-query.ts
@@ -5,7 +5,7 @@ import config from '../config';
 import logger from '../logger';
 import * as https from 'https';

-export async function query(path, throwOnFail: boolean = false): Promise<object | undefined> {
+export async function query(path): Promise<object | undefined> {
 type axiosOptions = {
   headers: {
     'User-Agent': string
@@ -21,7 +21,6 @@ export async function query(path, throwOnFail: boolean = false): Promise<object
   timeout: config.SOCKS5PROXY.ENABLED ? 30000 : 10000
 };
 let retry = 0;
- let lastError: any = null;

 while (retry < config.MEMPOOL.EXTERNAL_MAX_RETRY) {
   try {
@@ -51,7 +50,6 @@ export async function query(path, throwOnFail: boolean = false): Promise<object
     }
     return data.data;
   } catch (e) {
-     lastError = e;
     logger.warn(`Could not connect to ${path} (Attempt ${retry + 1}/${config.MEMPOOL.EXTERNAL_MAX_RETRY}). Reason: ` + (e instanceof Error ? e.message : e));
     retry++;
   }
@@ -61,10 +59,5 @@ export async function query(path, throwOnFail: boolean = false): Promise<object
 }

 logger.err(`Could not connect to ${path}. All ${config.MEMPOOL.EXTERNAL_MAX_RETRY} attempts failed`);
-
- if (throwOnFail && lastError) {
-    throw lastError;
-  }
-
 return undefined;
 }
--- a/contributors/bitcoinmechanic.txt
+++ b/contributors/bitcoinmechanic.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: bitcoinmechanic
--- a/contributors/henrialb.txt
+++ b/contributors/henrialb.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 April 12, 2024.
-
-Signed: henrialb
--- a/contributors/mackalex.txt
+++ b/contributors/mackalex.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 18th, 2024.
-
-Signed: mackalex
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.14.0-buster-slim AS builder
+FROM node:20.12.0-buster-slim AS builder

 ARG commitHash
 ENV MEMPOOL_COMMIT_HASH=${commitHash}
@@ -24,7 +24,7 @@ RUN npm install --omit=dev --omit=optional
 WORKDIR /build
 RUN npm run package

-FROM node:20.14.0-buster-slim
+FROM node:20.12.0-buster-slim

 WORKDIR /backend

--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -60,8 +60,7 @@
    "RETRY_UNIX_SOCKET_AFTER": __ESPLORA_RETRY_UNIX_SOCKET_AFTER__,
    "REQUEST_TIMEOUT": __ESPLORA_REQUEST_TIMEOUT__,
    "FALLBACK_TIMEOUT": __ESPLORA_FALLBACK_TIMEOUT__,
-    "FALLBACK": __ESPLORA_FALLBACK__,
-    "MAX_BEHIND_TIP": __ESPLORA_MAX_BEHIND_TIP__
+    "FALLBACK": __ESPLORA_FALLBACK__
  },
  "SECOND_CORE_RPC": {
    "HOST": "__SECOND_CORE_RPC_HOST__",
@@ -138,8 +137,6 @@
    "ENABLED": __REPLICATION_ENABLED__,
    "AUDIT": __REPLICATION_AUDIT__,
    "AUDIT_START_HEIGHT": __REPLICATION_AUDIT_START_HEIGHT__,
-    "STATISTICS": __REPLICATION_STATISTICS__,
-    "STATISTICS_START_TIME": __REPLICATION_STATISTICS_START_TIME__,
    "SERVERS": __REPLICATION_SERVERS__
  },
  "MEMPOOL_SERVICES": {
@@ -155,15 +152,5 @@
    "ENABLED": __FIAT_PRICE_ENABLED__,
    "PAID": __FIAT_PRICE_PAID__,
    "API_KEY": "__FIAT_PRICE_API_KEY__"
-  },
-  "NETWORKS": {
-    "MAINNET": {
-      "ENABLED": __NETWORKS_MAINNET_ENABLED__,
-      "WEIGHT": "__NETWORKS_MAINNET_WEIGHT__,"
-    },
-    "TESTNET": {
-      "ENABLED": __NETWORKS_TESTNET_ENABLED__,
-      "WEIGHT": "__NETWORKS_TESTNET_WEIGHT__"
-    }
  }
 }
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -62,7 +62,6 @@ __ESPLORA_RETRY_UNIX_SOCKET_AFTER__=${ESPLORA_RETRY_UNIX_SOCKET_AFTER:=30000}
 __ESPLORA_REQUEST_TIMEOUT__=${ESPLORA_REQUEST_TIMEOUT:=5000}
 __ESPLORA_FALLBACK_TIMEOUT__=${ESPLORA_FALLBACK_TIMEOUT:=5000}
 __ESPLORA_FALLBACK__=${ESPLORA_FALLBACK:=[]}
-__ESPLORA_MAX_BEHIND_TIP__=${ESPLORA_MAX_BEHIND_TIP:=2}

 # SECOND_CORE_RPC
 __SECOND_CORE_RPC_HOST__=${SECOND_CORE_RPC_HOST:=127.0.0.1}
@@ -139,8 +138,6 @@ __MAXMIND_GEOIP2_ISP__=${MAXMIND_GEOIP2_ISP:=""}
 __REPLICATION_ENABLED__=${REPLICATION_ENABLED:=false}
 __REPLICATION_AUDIT__=${REPLICATION_AUDIT:=false}
 __REPLICATION_AUDIT_START_HEIGHT__=${REPLICATION_AUDIT_START_HEIGHT:=774000}
-__REPLICATION_STATISTICS__=${REPLICATION_STATISTICS:=false}
-__REPLICATION_STATISTICS_START_TIME__=${REPLICATION_STATISTICS_START_TIME:=1481932800}
 __REPLICATION_SERVERS__=${REPLICATION_SERVERS:=[]}

 # MEMPOOL_SERVICES
@@ -157,12 +154,6 @@ __FIAT_PRICE_ENABLED__=${FIAT_PRICE_ENABLED:=true}
 __FIAT_PRICE_PAID__=${FIAT_PRICE_PAID:=false}
 __FIAT_PRICE_API_KEY__=${FIAT_PRICE_API_KEY:=""}

-# NETWORKS
-__NETWORKS_TESTNET_ENABLED__=${NETWORKS_TESTNET_ENABLED:=true}
-__NETWORKS_TESTNET_WEIGHT__=${NETWORKS_TESTNET_WEIGHT:="0.1"}
-__NETWORKS_MAINNET_ENABLED__=${NETWORKS_MAINNET_ENABLED:=true}
-__NETWORKS_MAINNET_WEIGHT__=${NETWORKS_MAINNET_WEIGHT:="0.2"}
-
 mkdir -p "${__MEMPOOL_CACHE_DIR__}"

 sed -i "s!__MEMPOOL_NETWORK__!${__MEMPOOL_NETWORK__}!g" mempool-config.json
@@ -223,7 +214,6 @@ sed -i "s!__ESPLORA_RETRY_UNIX_SOCKET_AFTER__!${__ESPLORA_RETRY_UNIX_SOCKET_AFTE
 sed -i "s!__ESPLORA_REQUEST_TIMEOUT__!${__ESPLORA_REQUEST_TIMEOUT__}!g" mempool-config.json
 sed -i "s!__ESPLORA_FALLBACK_TIMEOUT__!${__ESPLORA_FALLBACK_TIMEOUT__}!g" mempool-config.json
 sed -i "s!__ESPLORA_FALLBACK__!${__ESPLORA_FALLBACK__}!g" mempool-config.json
-sed -i "s!__ESPLORA_MAX_BEHIND_TIP__!${__ESPLORA_MAX_BEHIND_TIP__}!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
@@ -294,8 +284,6 @@ sed -i "s!__MAXMIND_GEOIP2_ISP__!${__MAXMIND_GEOIP2_ISP__}!g" mempool-config.jso
 sed -i "s!__REPLICATION_ENABLED__!${__REPLICATION_ENABLED__}!g" mempool-config.json
 sed -i "s!__REPLICATION_AUDIT__!${__REPLICATION_AUDIT__}!g" mempool-config.json
 sed -i "s!__REPLICATION_AUDIT_START_HEIGHT__!${__REPLICATION_AUDIT_START_HEIGHT__}!g" mempool-config.json
-sed -i "s!__REPLICATION_STATISTICS__!${__REPLICATION_STATISTICS__}!g" mempool-config.json
-sed -i "s!__REPLICATION_STATISTICS_START_TIME__!${__REPLICATION_STATISTICS_START_TIME__}!g" mempool-config.json
 sed -i "s!__REPLICATION_SERVERS__!${__REPLICATION_SERVERS__}!g" mempool-config.json

 # MEMPOOL_SERVICES
@@ -312,10 +300,4 @@ sed -i "s!__FIAT_PRICE_ENABLED__!${__FIAT_PRICE_ENABLED__}!g" mempool-config.jso
 sed -i "s!__FIAT_PRICE_PAID__!${__FIAT_PRICE_PAID__}!g" mempool-config.json
 sed -i "s!__FIAT_PRICE_API_KEY__!${__FIAT_PRICE_API_KEY__}!g" mempool-config.json

-# NETWORKS
-sed -i "s!__NETWORKS_TESTNET_ENABLED__!${__NETWORKS_TESTNET_ENABLED__}!g" mempool-config.json
-sed -i "s!__NETWORKS_TESTNET_WEIGHT__!${__NETWORKS_TESTNET_WEIGHT__}!g" mempool-config.json
-sed -i "s!__NETWORKS_MAINNET_ENABLED__!${__NETWORKS_MAINNET_ENABLED__}!g" mempool-config.json
-sed -i "s!__NETWORKS_MAINNET_WEIGHT__!${__NETWORKS_MAINNET_WEIGHT__}!g" mempool-config.json
-
 node /backend/package/index.js
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.14.0-buster-slim AS builder
+FROM node:20.12.0-buster-slim AS builder

 ARG commitHash
 ENV DOCKER_COMMIT_HASH=${commitHash}
@@ -13,7 +13,7 @@ RUN npm install --omit=dev --omit=optional

 RUN npm run build

-FROM nginx:1.27.0-alpine
+FROM nginx:1.25.4-alpine

 WORKDIR /patch

--- a/docker/frontend/entrypoint.sh
+++ b/docker/frontend/entrypoint.sh
@@ -16,9 +16,7 @@ fi

 # Runtime overrides - read env vars defined in docker compose

-__MAINNET_ENABLED__=${MAINNET_ENABLED:=true}
 __TESTNET_ENABLED__=${TESTNET_ENABLED:=false}
-__TESTNET4_ENABLED__=${TESTNET_ENABLED:=false}
 __SIGNET_ENABLED__=${SIGNET_ENABLED:=false}
 __LIQUID_ENABLED__=${LIQUID_ENABLED:=false}
 __LIQUID_TESTNET_ENABLED__=${LIQUID_TESTNET_ENABLED:=false}
@@ -30,7 +28,6 @@ __NGINX_PORT__=${NGINX_PORT:=8999}
 __BLOCK_WEIGHT_UNITS__=${BLOCK_WEIGHT_UNITS:=4000000}
 __MEMPOOL_BLOCKS_AMOUNT__=${MEMPOOL_BLOCKS_AMOUNT:=8}
 __BASE_MODULE__=${BASE_MODULE:=mempool}
-__ROOT_NETWORK__=${ROOT_NETWORK:=}
 __MEMPOOL_WEBSITE_URL__=${MEMPOOL_WEBSITE_URL:=https://mempool.space}
 __LIQUID_WEBSITE_URL__=${LIQUID_WEBSITE_URL:=https://liquid.network}
 __MINING_DASHBOARD__=${MINING_DASHBOARD:=true}
@@ -45,9 +42,7 @@ __HISTORICAL_PRICE__=${HISTORICAL_PRICE:=true}
 __ADDITIONAL_CURRENCIES__=${ADDITIONAL_CURRENCIES:=false}

 # Export as environment variables to be used by envsubst
-export __MAINNET_ENABLED__
 export __TESTNET_ENABLED__
-export __TESTNET4_ENABLED__
 export __SIGNET_ENABLED__
 export __LIQUID_ENABLED__
 export __LIQUID_TESTNET_ENABLED__
@@ -59,7 +54,6 @@ export __NGINX_PORT__
 export __BLOCK_WEIGHT_UNITS__
 export __MEMPOOL_BLOCKS_AMOUNT__
 export __BASE_MODULE__
-export __ROOT_NETWORK__
 export __MEMPOOL_WEBSITE_URL__
 export __LIQUID_WEBSITE_URL__
 export __MINING_DASHBOARD__
--- a/frontend/.eslintrc
+++ b/frontend/.eslintrc
@@ -34,8 +34,6 @@
    "prefer-rest-params": 1,
    "quotes": [1, "single", { "allowTemplateLiterals": true }],
    "semi": 1,
-    "curly": [1, "all"],
-    "eqeqeq": 1,
-    "no-trailing-spaces": 1
+    "eqeqeq": 1
  }
 }
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@@ -63,7 +63,6 @@ src/resources/pools.json
 src/resources/mining-pools/*
 src/resources/**/*.mp4
 src/resources/**/*.vtt
-src/resources/customize.js

 # environment config
 mempool-frontend-config.json
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -166,7 +166,6 @@
              "src/resources",
              "src/robots.txt",
              "src/config.js",
-              "src/customize.js",
              "src/config.template.js"
            ],
            "styles": [
@@ -181,11 +180,6 @@
                "bundleName": "wiz",
                "inject": false
              },
-              {
-                "input": "src/theme-bukele.scss",
-                "bundleName": "bukele",
-                "inject": false
-              },
              "node_modules/@fortawesome/fontawesome-svg-core/styles.css"
            ],
            "vendorChunk": true,
--- a/frontend/custom-sv-config.json
+++ b/frontend/custom-sv-config.json
@@ -1,52 +0,0 @@
-{
-  "theme": "bukele",
-  "enterprise": "onbtc",
-  "branding": {
-    "name": "onbtc",
-    "title": "Bitcoin Office",
-    "site_id": 19,
-    "header_img": "/resources/onbtclogo.svg",
-    "footer_img": "/resources/onbtclogo.svg",
-    "rounded_corner": true
-  },
-  "dashboard": {
-    "widgets": [
-      {
-        "component": "fees",
-        "mobileOrder": 4
-      },
-      {
-        "component": "balance",
-        "mobileOrder": 1,
-        "props": {
-          "address": "32ixEdVJWo3kmvJGMTZq5jAQVZZeuwnqzo"
-        }
-      },
-      {
-        "component": "twitter",
-        "mobileOrder": 5,
-        "props": {
-          "handle": "nayibbukele"
-        }
-      },
-      {
-        "component": "address",
-        "mobileOrder": 2,
-        "props": {
-          "address": "32ixEdVJWo3kmvJGMTZq5jAQVZZeuwnqzo",
-          "period": "1m"
-        }
-      },
-      {
-        "component": "blocks"
-      },
-      {
-        "component": "addressTransactions",
-        "mobileOrder": 3,
-        "props": {
-          "address": "32ixEdVJWo3kmvJGMTZq5jAQVZZeuwnqzo"
-        }
-      }
-    ]
-  }
-}
--- a/frontend/cypress/e2e/liquid/liquid.spec.ts
+++ b/frontend/cypress/e2e/liquid/liquid.spec.ts
@@ -45,7 +45,6 @@ describe('Liquid', () => {

    it('loads a specific block page', () => {
      cy.visit(`${basePath}/block/7e1369a23a5ab861e7bdede2aadcccae4ea873ffd9caf11c7c5541eb5bcdff54`);
-      cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
      cy.waitForSkeletonGone();
    });

@@ -72,6 +71,20 @@ describe('Liquid', () => {
      });
    });

+    it('renders unconfidential addresses correctly on mobile', () => {
+      cy.viewport('iphone-6');
+      cy.visit(`${basePath}/address/ex1qqmmjdwrlg59c8q4l75sj6wedjx57tj5grt8pat`);
+      cy.waitForSkeletonGone();
+      //TODO: Add proper IDs for these selectors
+      const firstRowSelector = '.container-xl > :nth-child(3) > div > :nth-child(1) > .table > tbody';
+      const thirdRowSelector = '.container-xl > :nth-child(3) > div > :nth-child(3)';
+      cy.get(firstRowSelector).invoke('css', 'width').then(firstRowWidth => {
+        cy.get(thirdRowSelector).invoke('css', 'width').then(thirdRowWidth => {
+          expect(parseInt(firstRowWidth)).to.be.lessThan(parseInt(thirdRowWidth));
+        });
+      });
+    });
+
    describe('peg in/peg out', () => {
      it('loads peg in addresses', () => {
        cy.visit(`${basePath}/tx/fe764f7bedfc2a37b29d9c8aef67d64a57d253a6b11c5a55555cfd5826483a58`);
--- a/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
+++ b/frontend/cypress/e2e/liquidtestnet/liquidtestnet.spec.ts
@@ -46,8 +46,7 @@ describe('Liquid Testnet', () => {
    });

    it('loads a specific block page', () => {
-      cy.visit(`${basePath}/block/fb4cbcbff3993ca4bf8caf657d55a23db5ed4ab1cfa33c489303c2e04e1c38e0`);
-      cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
+      cy.visit(`${basePath}/block/7e1369a23a5ab861e7bdede2aadcccae4ea873ffd9caf11c7c5541eb5bcdff54`);
      cy.waitForSkeletonGone();
    });

--- a/frontend/cypress/e2e/mainnet/mainnet.spec.ts
+++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts
@@ -103,7 +103,6 @@ describe('Mainnet', () => {

    it('check op_return tx tooltip', () => {
      cy.visit('/block/00000000000000000003c5f542bed265319c6cf64238cf1f1bb9bca3ebf686d2');
-      cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
      cy.waitForSkeletonGone();
      cy.get('tbody > :nth-child(2) > :nth-child(1) > a').first().trigger('onmouseover');
      cy.get('tbody > :nth-child(2) > :nth-child(1) > a').first().trigger('mouseenter');
@@ -112,10 +111,9 @@ describe('Mainnet', () => {

    it('check op_return coinbase tooltip', () => {
      cy.visit('/block/00000000000000000003c5f542bed265319c6cf64238cf1f1bb9bca3ebf686d2');
-      cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
      cy.waitForSkeletonGone();
-      cy.get('tbody > :nth-child(2) > :nth-child(1) > a').first().trigger('onmouseover');
-      cy.get('tbody > :nth-child(2) > :nth-child(1) > a').first().trigger('mouseenter');
+      cy.get('div > a > .badge').first().trigger('onmouseover');
+      cy.get('div > a > .badge').first().trigger('mouseenter');
      cy.get('.tooltip-inner').should('be.visible');
    });

@@ -285,7 +283,6 @@ describe('Mainnet', () => {
        it('loads genesis block and keypress arrow right', () => {
          cy.viewport('macbook-16');
          cy.visit('/block/0');
-          cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
          cy.waitForSkeletonGone();
          cy.waitForPageIdle();

@@ -298,7 +295,6 @@ describe('Mainnet', () => {
        it('loads genesis block and keypress arrow left', () => {
          cy.viewport('macbook-16');
          cy.visit('/block/0');
-          cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
          cy.waitForSkeletonGone();
          cy.waitForPageIdle();

@@ -327,7 +323,6 @@ describe('Mainnet', () => {
        it('loads genesis block and click on the arrow left', () => {
          cy.viewport('macbook-16');
          cy.visit('/block/0');
-          cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
          cy.waitForSkeletonGone();
          cy.waitForPageIdle();
          cy.get('[ngbtooltip="Next Block"] > .ng-fa-icon > .svg-inline--fa').should('be.visible');
@@ -344,7 +339,7 @@ describe('Mainnet', () => {
      cy.visit('/');
      cy.waitForSkeletonGone();

-      cy.changeNetwork('testnet4');
+      cy.changeNetwork('testnet');
      cy.changeNetwork('signet');
      cy.changeNetwork('mainnet');
    });
@@ -444,7 +439,6 @@ describe('Mainnet', () => {
    describe('blocks', () => {
      it('shows empty blocks properly', () => {
        cy.visit('/block/0000000000000000000bd14f744ef2e006e61c32214670de7eb891a5732ee775');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.waitForPageIdle();
        cy.get('h2').invoke('text').should('equal', '1 transaction');
@@ -452,7 +446,6 @@ describe('Mainnet', () => {

      it('expands and collapses the block details', () => {
        cy.visit('/block/0');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.waitForPageIdle();
        cy.get('.btn.btn-outline-info').click().then(() => {
@@ -465,7 +458,6 @@ describe('Mainnet', () => {
      });
      it('shows blocks with no pagination', () => {
        cy.visit('/block/00000000000000000001ba40caf1ad4cec0ceb77692662315c151953bfd7c4c4');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.waitForPageIdle();
        cy.get('.block-tx-title h2').invoke('text').should('equal', '19 transactions');
@@ -475,7 +467,6 @@ describe('Mainnet', () => {
      it('supports pagination on the block screen', () => {
        // 41 txs
        cy.visit('/block/00000000000000000009f9b7b0f63ad50053ad12ec3b7f5ca951332f134f83d8');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.get('.pagination-container a').invoke('text').then((text1) => {
          cy.get('.active + li').first().click().then(() => {
@@ -491,7 +482,6 @@ describe('Mainnet', () => {
      it('shows blocks pagination with 5 pages (desktop)', () => {
        cy.viewport(760, 800);
        cy.visit('/block/000000000000000000049281946d26fcba7d99fdabc1feac524bc3a7003d69b3').then(() => {
-          cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
          cy.waitForSkeletonGone();
          cy.waitForPageIdle();
        });
@@ -503,7 +493,6 @@ describe('Mainnet', () => {
      it('shows blocks pagination with 3 pages (mobile)', () => {
        cy.viewport(669, 800);
        cy.visit('/block/000000000000000000049281946d26fcba7d99fdabc1feac524bc3a7003d69b3').then(() => {
-          cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
          cy.waitForSkeletonGone();
          cy.waitForPageIdle();
        });
--- a/frontend/cypress/e2e/signet/signet.spec.ts
+++ b/frontend/cypress/e2e/signet/signet.spec.ts
@@ -95,14 +95,12 @@ describe('Signet', () => {
    describe('blocks', () => {
      it('shows empty blocks properly', () => {
        cy.visit('/signet/block/00000133d54e4589f6436703b067ec23209e0a21b8a9b12f57d0592fd85f7a42');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.get('h2').invoke('text').should('equal', '1 transaction');
      });

      it('expands and collapses the block details', () => {
        cy.visit('/signet/block/0');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.get('.btn.btn-outline-info').click().then(() => {
          cy.get('#details').should('be.visible');
@@ -115,7 +113,6 @@ describe('Signet', () => {

      it('shows blocks with no pagination', () => {
        cy.visit('/signet/block/00000078f920a96a69089877b934ce7fd009ab55e3170920a021262cb258e7cc');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.get('h2').invoke('text').should('equal', '13 transactions');
        cy.get('ul.pagination').first().children().should('have.length', 5);
@@ -124,7 +121,6 @@ describe('Signet', () => {
      it('supports pagination on the block screen', () => {
        // 43 txs
        cy.visit('/signet/block/00000094bd52f73bdbfc4bece3a94c21fec2dc968cd54210496e69e4059d66a6');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
        cy.waitForSkeletonGone();
        cy.get('.header-bg.box > a').invoke('text').then((text1) => {
          cy.get('.active + li').first().click().then(() => {
--- a/frontend/cypress/e2e/testnet4/testnet4.spec.ts
+++ b/frontend/cypress/e2e/testnet4/testnet4.spec.ts
@@ -2,7 +2,7 @@ import { emitMempoolInfo } from '../../support/websocket';

 const baseModule = Cypress.env('BASE_MODULE');

-describe('Testnet4', () => {
+describe('Testnet', () => {
  beforeEach(() => {
    cy.intercept('/api/block-height/*').as('block-height');
    cy.intercept('/api/block/*').as('block');
@@ -13,7 +13,7 @@ describe('Testnet4', () => {
  if (baseModule === 'mempool') {

    it('loads the dashboard', () => {
-      cy.visit('/testnet4');
+      cy.visit('/testnet');
      cy.waitForSkeletonGone();
    });

@@ -25,7 +25,7 @@ describe('Testnet4', () => {

    it.skip('loads the dashboard with the skeleton blocks', () => {
      cy.mockMempoolSocket();
-      cy.visit('/testnet4');
+      cy.visit('/testnet');
      cy.get(':nth-child(1) > #bitcoin-block-0').should('be.visible');
      cy.get(':nth-child(2) > #bitcoin-block-0').should('be.visible');
      cy.get(':nth-child(3) > #bitcoin-block-0').should('be.visible');
@@ -45,7 +45,7 @@ describe('Testnet4', () => {
    });

    it('loads the pools screen', () => {
-      cy.visit('/testnet4');
+      cy.visit('/testnet');
      cy.waitForSkeletonGone();
      cy.get('#btn-pools').click().then(() => {
        cy.wait(1000);
@@ -53,7 +53,7 @@ describe('Testnet4', () => {
    });

    it('loads the graphs screen', () => {
-      cy.visit('/testnet4');
+      cy.visit('/testnet');
      cy.waitForSkeletonGone();
      cy.get('#btn-graphs').click().then(() => {
        cy.wait(1000);
@@ -63,7 +63,7 @@ describe('Testnet4', () => {
    describe('tv mode', () => {
      it('loads the tv screen - desktop', () => {
        cy.viewport('macbook-16');
-        cy.visit('/testnet4/graphs');
+        cy.visit('/testnet/graphs');
        cy.waitForSkeletonGone();
        cy.get('#btn-tv').click().then(() => {
          cy.wait(1000);
@@ -73,7 +73,7 @@ describe('Testnet4', () => {
      });

      it('loads the tv screen - mobile', () => {
-        cy.visit('/testnet4/graphs');
+        cy.visit('/testnet/graphs');
        cy.waitForSkeletonGone();
        cy.get('#btn-tv').click().then(() => {
          cy.viewport('iphone-6');
@@ -85,7 +85,7 @@ describe('Testnet4', () => {


    it('loads the api screen', () => {
-      cy.visit('/testnet4');
+      cy.visit('/testnet');
      cy.waitForSkeletonGone();
      cy.get('#btn-docs').click().then(() => {
        cy.wait(1000);
@@ -94,15 +94,13 @@ describe('Testnet4', () => {

    describe('blocks', () => {
      it('shows empty blocks properly', () => {
-        cy.visit('/testnet4/block/0');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
+        cy.visit('/testnet/block/0');
        cy.waitForSkeletonGone();
        cy.get('h2').invoke('text').should('equal', '1 transaction');
      });

      it('expands and collapses the block details', () => {
-        cy.visit('/testnet4/block/0');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
+        cy.visit('/testnet/block/0');
        cy.waitForSkeletonGone();
        cy.get('.btn.btn-outline-info').click().then(() => {
          cy.get('#details').should('be.visible');
@@ -114,17 +112,15 @@ describe('Testnet4', () => {
      });

      it('shows blocks with no pagination', () => {
-        cy.visit('/testnet4/block/000000000066e8b6cc78a93f8989587f5819624bae2eb1c05f535cadded19f99');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
+        cy.visit('/testnet/block/000000000000002f8ce27716e74ecc7ad9f7b5101fed12d09e28bb721b9460ea');
        cy.waitForSkeletonGone();
-        cy.get('h2').invoke('text').should('equal', '18 transactions');
+        cy.get('h2').invoke('text').should('equal', '11 transactions');
        cy.get('ul.pagination').first().children().should('have.length', 5);
      });

      it('supports pagination on the block screen', () => {
        // 48 txs
-        cy.visit('/testnet4/block/000000000000006982d53f8273bdff21dafc380c292eabc669b5ab6d732311c3');
-        cy.get('.pagination').scrollIntoView({ offset: { top: 200, left: 0 } });
+        cy.visit('/testnet/block/000000000000002ca3878ebd98b313a1c2d531f2e70a6575d232ca7564dea7a9');
        cy.waitForSkeletonGone();
        cy.get('.header-bg.box > a').invoke('text').then((text1) => {
          cy.get('.active + li').first().click().then(() => {
--- a/frontend/cypress/support/commands.ts
+++ b/frontend/cypress/support/commands.ts
@@ -72,7 +72,7 @@ Cypress.Commands.add('mockMempoolSocket', () => {
  mockWebSocket();
 });

-Cypress.Commands.add('changeNetwork', (network: "testnet" | "testnet4" | "signet" | "liquid" | "mainnet") => {
+Cypress.Commands.add('changeNetwork', (network: "testnet" | "signet" | "liquid" | "mainnet") => {
  cy.get('.dropdown-toggle').click().then(() => {
    cy.get(`a.${network}`).click().then(() => {
      cy.waitForPageIdle();
--- a/frontend/cypress/support/index.d.ts
+++ b/frontend/cypress/support/index.d.ts
@@ -5,6 +5,6 @@ declare namespace Cypress {
        waitForSkeletonGone(): Chainable<any>
        waitForPageIdle(): Chainable<any>
        mockMempoolSocket(): Chainable<any>
-        changeNetwork(network: "testnet"|"testnet4"|"signet"|"liquid"|"mainnet"): Chainable<any>
+        changeNetwork(network: "testnet"|"signet"|"liquid"|"mainnet"): Chainable<any>
    }
 }
--- a/frontend/generate-config.js
+++ b/frontend/generate-config.js
@@ -4,14 +4,11 @@ const { spawnSync } = require('child_process');
 const CONFIG_FILE_NAME = 'mempool-frontend-config.json';
 const GENERATED_CONFIG_FILE_NAME = 'src/resources/config.js';
 const GENERATED_TEMPLATE_CONFIG_FILE_NAME = 'src/resources/config.template.js';
-const GENERATED_CUSTOMIZATION_FILE_NAME = 'src/resources/customize.js';

 let settings = [];
 let configContent = {};
 let gitCommitHash = '';
 let packetJsonVersion = '';
-let customConfig;
-let customConfigContent;

 try {
  const rawConfig = fs.readFileSync(CONFIG_FILE_NAME);
@@ -25,18 +22,7 @@ try {
  }
 }

-if (configContent && configContent.CUSTOMIZATION) {
-  try {
-    customConfig = readConfig(configContent.CUSTOMIZATION);
-    customConfigContent = JSON.parse(customConfig);
-  } catch (e) {
-    console.log(`failed to load customization config from ${configContent.CUSTOMIZATION}`);
-  }
-}
-
-const baseModuleName = configContent.BASE_MODULE || 'mempool';
-const customBuildName = (customConfigContent && customConfigContent.enterprise) ? ('.' + customConfigContent.enterprise) : '';
-const indexFilePath = 'src/index.' + baseModuleName + customBuildName + '.html';
+const indexFilePath = configContent.BASE_MODULE ? 'src/index.' + configContent.BASE_MODULE + '.html' : 'src/index.mempool.html';

 try {
  fs.copyFileSync(indexFilePath, 'src/index.html');
@@ -123,17 +109,6 @@ writeConfigTemplate(GENERATED_TEMPLATE_CONFIG_FILE_NAME, newConfigTemplate);

 const currentConfig = readConfig(GENERATED_CONFIG_FILE_NAME);

-let customConfigJs = '';
-if (customConfig) {
-  console.log(`Customizing frontend using ${configContent.CUSTOMIZATION}`);
-  customConfigJs = `(function (window) {
-    window.__env = window.__env || {};
-    window.__env.customize = ${customConfig};
-    }((typeof global !== 'undefined') ? global : this));
-  `;
-}
-writeConfig(GENERATED_CUSTOMIZATION_FILE_NAME, customConfigJs);
-
 if (currentConfig && currentConfig === newConfig) {
  console.log(`No configuration updates, skipping ${GENERATED_CONFIG_FILE_NAME} file update`);
  return;
--- a/frontend/mempool-frontend-config.sample.json
+++ b/frontend/mempool-frontend-config.sample.json
@@ -1,10 +1,8 @@
 {
  "TESTNET_ENABLED": false,
-  "TESTNET4_ENABLED": false,
  "SIGNET_ENABLED": false,
  "LIQUID_ENABLED": false,
  "LIQUID_TESTNET_ENABLED": false,
-  "MAINNET_ENABLED": true,
  "ITEMS_PER_PAGE": 10,
  "KEEP_BLOCKS_AMOUNT": 8,
  "NGINX_PROTOCOL": "http",
@@ -13,7 +11,6 @@
  "BLOCK_WEIGHT_UNITS": 4000000,
  "MEMPOOL_BLOCKS_AMOUNT": 8,
  "BASE_MODULE": "mempool",
-  "ROOT_NETWORK": "",
  "MEMPOOL_WEBSITE_URL": "https://mempool.space",
  "LIQUID_WEBSITE_URL": "https://liquid.network",
  "MINING_DASHBOARD": true,
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -34,9 +34,9 @@
        "clipboard": "^2.0.11",
        "domino": "^2.1.6",
        "echarts": "~5.5.0",
-        "esbuild": "^0.21.1",
+        "esbuild": "^0.20.2",
        "lightweight-charts": "~3.8.0",
-        "ngx-echarts": "~17.2.0",
+        "ngx-echarts": "~17.1.0",
        "ngx-infinite-scroll": "^17.0.0",
        "qrcode": "1.5.1",
        "rxjs": "~7.8.1",
@@ -62,7 +62,7 @@
      "optionalDependencies": {
        "@cypress/schematic": "^2.5.0",
        "@types/cypress": "^1.1.3",
-        "cypress": "^13.12.0",
+        "cypress": "^13.7.0",
        "cypress-fail-on-console-error": "~5.1.0",
        "cypress-wait-until": "^2.0.1",
        "mock-socket": "~9.3.1",
@@ -3196,9 +3196,9 @@
      }
    },
    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.1.tgz",
-      "integrity": "sha512-O7yppwipkXvnEPjzkSXJRk2g4bS8sUx9p9oXHq9MU/U7lxUzZVsnFZMDTmeeX9bfQxrFcvOacl/ENgOh0WP9pA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
      "cpu": [
        "ppc64"
      ],
@@ -3211,9 +3211,9 @@
      }
    },
    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.1.tgz",
-      "integrity": "sha512-hh3jKWikdnTtHCglDAeVO3Oyh8MaH8xZUaWMiCCvJ9/c3NtPqZq+CACOlGTxhddypXhl+8B45SeceYBfB/e8Ow==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
      "cpu": [
        "arm"
      ],
@@ -3226,9 +3226,9 @@
      }
    },
    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.1.tgz",
-      "integrity": "sha512-jXhccq6es+onw7x8MxoFnm820mz7sGa9J14kLADclmiEUH4fyj+FjR6t0M93RgtlI/awHWhtF0Wgfhqgf9gDZA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
      "cpu": [
        "arm64"
      ],
@@ -3241,9 +3241,9 @@
      }
    },
    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.1.tgz",
-      "integrity": "sha512-NPObtlBh4jQHE01gJeucqEhdoD/4ya2owSIS8lZYS58aR0x7oZo9lB2lVFxgTANSa5MGCBeoQtr+yA9oKCGPvA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
      "cpu": [
        "x64"
      ],
@@ -3256,9 +3256,9 @@
      }
    },
    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.1.tgz",
-      "integrity": "sha512-BLT7TDzqsVlQRmJfO/FirzKlzmDpBWwmCUlyggfzUwg1cAxVxeA4O6b1XkMInlxISdfPAOunV9zXjvh5x99Heg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
      "cpu": [
        "arm64"
      ],
@@ -3271,9 +3271,9 @@
      }
    },
    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.1.tgz",
-      "integrity": "sha512-D3h3wBQmeS/vp93O4B+SWsXB8HvRDwMyhTNhBd8yMbh5wN/2pPWRW5o/hM3EKgk9bdKd9594lMGoTCTiglQGRQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
      "cpu": [
        "x64"
      ],
@@ -3286,9 +3286,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.1.tgz",
-      "integrity": "sha512-/uVdqqpNKXIxT6TyS/oSK4XE4xWOqp6fh4B5tgAwozkyWdylcX+W4YF2v6SKsL4wCQ5h1bnaSNjWPXG/2hp8AQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
      "cpu": [
        "arm64"
      ],
@@ -3301,9 +3301,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.1.tgz",
-      "integrity": "sha512-paAkKN1n1jJitw+dAoR27TdCzxRl1FOEITx3h201R6NoXUojpMzgMLdkXVgCvaCSCqwYkeGLoe9UVNRDKSvQgw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
      "cpu": [
        "x64"
      ],
@@ -3316,9 +3316,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.1.tgz",
-      "integrity": "sha512-tRHnxWJnvNnDpNVnsyDhr1DIQZUfCXlHSCDohbXFqmg9W4kKR7g8LmA3kzcwbuxbRMKeit8ladnCabU5f2traA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
      "cpu": [
        "arm"
      ],
@@ -3331,9 +3331,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.1.tgz",
-      "integrity": "sha512-G65d08YoH00TL7Xg4LaL3gLV21bpoAhQ+r31NUu013YB7KK0fyXIt05VbsJtpqh/6wWxoLJZOvQHYnodRrnbUQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
      "cpu": [
        "arm64"
      ],
@@ -3346,9 +3346,9 @@
      }
    },
    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.1.tgz",
-      "integrity": "sha512-tt/54LqNNAqCz++QhxoqB9+XqdsaZOtFD/srEhHYwBd3ZUOepmR1Eeot8bS+Q7BiEvy9vvKbtpHf+r6q8hF5UA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
      "cpu": [
        "ia32"
      ],
@@ -3361,9 +3361,9 @@
      }
    },
    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.1.tgz",
-      "integrity": "sha512-MhNalK6r0nZD0q8VzUBPwheHzXPr9wronqmZrewLfP7ui9Fv1tdPmg6e7A8lmg0ziQCziSDHxh3cyRt4YMhGnQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
      "cpu": [
        "loong64"
      ],
@@ -3376,9 +3376,9 @@
      }
    },
    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.1.tgz",
-      "integrity": "sha512-YCKVY7Zen5rwZV+nZczOhFmHaeIxR4Zn3jcmNH53LbgF6IKRwmrMywqDrg4SiSNApEefkAbPSIzN39FC8VsxPg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
      "cpu": [
        "mips64el"
      ],
@@ -3391,9 +3391,9 @@
      }
    },
    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.1.tgz",
-      "integrity": "sha512-bw7bcQ+270IOzDV4mcsKAnDtAFqKO0jVv3IgRSd8iM0ac3L8amvCrujRVt1ajBTJcpDaFhIX+lCNRKteoDSLig==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
      "cpu": [
        "ppc64"
      ],
@@ -3406,9 +3406,9 @@
      }
    },
    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.1.tgz",
-      "integrity": "sha512-ARmDRNkcOGOm1AqUBSwRVDfDeD9hGYRfkudP2QdoonBz1ucWVnfBPfy7H4JPI14eYtZruRSczJxyu7SRYDVOcg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
      "cpu": [
        "riscv64"
      ],
@@ -3421,9 +3421,9 @@
      }
    },
    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.1.tgz",
-      "integrity": "sha512-o73TcUNMuoTZlhwFdsgr8SfQtmMV58sbgq6gQq9G1xUiYnHMTmJbwq65RzMx89l0iya69lR4bxBgtWiiOyDQZA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
      "cpu": [
        "s390x"
      ],
@@ -3436,9 +3436,9 @@
      }
    },
    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.1.tgz",
-      "integrity": "sha512-da4/1mBJwwgJkbj4fMH7SOXq2zapgTo0LKXX1VUZ0Dxr+e8N0WbS80nSZ5+zf3lvpf8qxrkZdqkOqFfm57gXwA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
      "cpu": [
        "x64"
      ],
@@ -3451,9 +3451,9 @@
      }
    },
    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.1.tgz",
-      "integrity": "sha512-CPWs0HTFe5woTJN5eKPvgraUoRHrCtzlYIAv9wBC+FAyagBSaf+UdZrjwYyTGnwPGkThV4OCI7XibZOnPvONVw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
      "cpu": [
        "x64"
      ],
@@ -3466,9 +3466,9 @@
      }
    },
    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.1.tgz",
-      "integrity": "sha512-xxhTm5QtzNLc24R0hEkcH+zCx/o49AsdFZ0Cy5zSd/5tOj4X2g3/2AJB625NoadUuc4A8B3TenLJoYdWYOYCew==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
      "cpu": [
        "x64"
      ],
@@ -3481,9 +3481,9 @@
      }
    },
    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.1.tgz",
-      "integrity": "sha512-CWibXszpWys1pYmbr9UiKAkX6x+Sxw8HWtw1dRESK1dLW5fFJ6rMDVw0o8MbadusvVQx1a8xuOxnHXT941Hp1A==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
      "cpu": [
        "x64"
      ],
@@ -3496,9 +3496,9 @@
      }
    },
    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.1.tgz",
-      "integrity": "sha512-jb5B4k+xkytGbGUS4T+Z89cQJ9DJ4lozGRSV+hhfmCPpfJ3880O31Q1srPCimm+V6UCbnigqD10EgDNgjvjerQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
      "cpu": [
        "arm64"
      ],
@@ -3511,9 +3511,9 @@
      }
    },
    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.1.tgz",
-      "integrity": "sha512-PgyFvjJhXqHn1uxPhyN1wZ6dIomKjiLUQh1LjFvjiV1JmnkZ/oMPrfeEAZg5R/1ftz4LZWZr02kefNIQ5SKREQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
      "cpu": [
        "ia32"
      ],
@@ -3526,9 +3526,9 @@
      }
    },
    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.1.tgz",
-      "integrity": "sha512-W9NttRZQR5ehAiqHGDnvfDaGmQOm6Fi4vSlce8mjM75x//XKuVAByohlEX6N17yZnVXxQFuh4fDRunP8ca6bfA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
      "cpu": [
        "x64"
      ],
@@ -6105,11 +6105,11 @@
      }
    },
    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "dependencies": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      },
      "engines": {
        "node": ">=8"
@@ -8028,9 +8028,9 @@
      "peer": true
    },
    "node_modules/cypress": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.12.0.tgz",
-      "integrity": "sha512-udzS2JilmI9ApO/UuqurEwOvThclin5ntz7K0BtnHBs+tg2Bl9QShLISXpSEMDv/u8b6mqdoAdyKeZiSqKWL8g==",
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.0.tgz",
+      "integrity": "sha512-UimjRSJJYdTlvkChcdcfywKJ6tUYuwYuk/n1uMMglrvi+ZthNhoRYcxnWgTqUtkl17fXrPAsD5XT2rcQYN1xKA==",
      "hasInstallScript": true,
      "optional": true,
      "dependencies": {
@@ -9196,9 +9196,9 @@
      }
    },
    "node_modules/esbuild": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.1.tgz",
-      "integrity": "sha512-GPqx+FX7mdqulCeQ4TsGZQ3djBJkx5k7zBGtqt9ycVlWNg8llJ4RO9n2vciu8BN2zAEs6lPbPl0asZsAh7oWzg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
      "hasInstallScript": true,
      "bin": {
        "esbuild": "bin/esbuild"
@@ -9207,29 +9207,29 @@
        "node": ">=12"
      },
      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.1",
-        "@esbuild/android-arm": "0.21.1",
-        "@esbuild/android-arm64": "0.21.1",
-        "@esbuild/android-x64": "0.21.1",
-        "@esbuild/darwin-arm64": "0.21.1",
-        "@esbuild/darwin-x64": "0.21.1",
-        "@esbuild/freebsd-arm64": "0.21.1",
-        "@esbuild/freebsd-x64": "0.21.1",
-        "@esbuild/linux-arm": "0.21.1",
-        "@esbuild/linux-arm64": "0.21.1",
-        "@esbuild/linux-ia32": "0.21.1",
-        "@esbuild/linux-loong64": "0.21.1",
-        "@esbuild/linux-mips64el": "0.21.1",
-        "@esbuild/linux-ppc64": "0.21.1",
-        "@esbuild/linux-riscv64": "0.21.1",
-        "@esbuild/linux-s390x": "0.21.1",
-        "@esbuild/linux-x64": "0.21.1",
-        "@esbuild/netbsd-x64": "0.21.1",
-        "@esbuild/openbsd-x64": "0.21.1",
-        "@esbuild/sunos-x64": "0.21.1",
-        "@esbuild/win32-arm64": "0.21.1",
-        "@esbuild/win32-ia32": "0.21.1",
-        "@esbuild/win32-x64": "0.21.1"
+        "@esbuild/aix-ppc64": "0.20.2",
+        "@esbuild/android-arm": "0.20.2",
+        "@esbuild/android-arm64": "0.20.2",
+        "@esbuild/android-x64": "0.20.2",
+        "@esbuild/darwin-arm64": "0.20.2",
+        "@esbuild/darwin-x64": "0.20.2",
+        "@esbuild/freebsd-arm64": "0.20.2",
+        "@esbuild/freebsd-x64": "0.20.2",
+        "@esbuild/linux-arm": "0.20.2",
+        "@esbuild/linux-arm64": "0.20.2",
+        "@esbuild/linux-ia32": "0.20.2",
+        "@esbuild/linux-loong64": "0.20.2",
+        "@esbuild/linux-mips64el": "0.20.2",
+        "@esbuild/linux-ppc64": "0.20.2",
+        "@esbuild/linux-riscv64": "0.20.2",
+        "@esbuild/linux-s390x": "0.20.2",
+        "@esbuild/linux-x64": "0.20.2",
+        "@esbuild/netbsd-x64": "0.20.2",
+        "@esbuild/openbsd-x64": "0.20.2",
+        "@esbuild/sunos-x64": "0.20.2",
+        "@esbuild/win32-arm64": "0.20.2",
+        "@esbuild/win32-ia32": "0.20.2",
+        "@esbuild/win32-x64": "0.20.2"
      }
    },
    "node_modules/esbuild-wasm": {
@@ -10151,9 +10151,9 @@
      }
    },
    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "dependencies": {
        "to-regex-range": "^5.0.1"
      },
@@ -13289,9 +13289,9 @@
      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
    },
    "node_modules/ngx-echarts": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/ngx-echarts/-/ngx-echarts-17.2.0.tgz",
-      "integrity": "sha512-i3XDE9d53zmJH4bp8RQ/271oPlhBkczO1M3VtWk8nCXdxQq9qx8UckjWEQ7oV1AbSDLGK5sRiFu5EaY5hvdWPA==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/ngx-echarts/-/ngx-echarts-17.1.0.tgz",
+      "integrity": "sha512-DSNF/aKmJSxJWb9UwPUgNtY8Ma9SmViDBRacvAwpakc/5mJerunxndDgoBQkYk5JFKAjXX6bp4ZWLRKL3/5AGA==",
      "dependencies": {
        "tslib": "^2.3.0"
      },
@@ -20562,141 +20562,141 @@
      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="
    },
    "@esbuild/aix-ppc64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.1.tgz",
-      "integrity": "sha512-O7yppwipkXvnEPjzkSXJRk2g4bS8sUx9p9oXHq9MU/U7lxUzZVsnFZMDTmeeX9bfQxrFcvOacl/ENgOh0WP9pA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
+      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
      "optional": true
    },
    "@esbuild/android-arm": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.1.tgz",
-      "integrity": "sha512-hh3jKWikdnTtHCglDAeVO3Oyh8MaH8xZUaWMiCCvJ9/c3NtPqZq+CACOlGTxhddypXhl+8B45SeceYBfB/e8Ow==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
+      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
      "optional": true
    },
    "@esbuild/android-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.1.tgz",
-      "integrity": "sha512-jXhccq6es+onw7x8MxoFnm820mz7sGa9J14kLADclmiEUH4fyj+FjR6t0M93RgtlI/awHWhtF0Wgfhqgf9gDZA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
+      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
      "optional": true
    },
    "@esbuild/android-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.1.tgz",
-      "integrity": "sha512-NPObtlBh4jQHE01gJeucqEhdoD/4ya2owSIS8lZYS58aR0x7oZo9lB2lVFxgTANSa5MGCBeoQtr+yA9oKCGPvA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
+      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
      "optional": true
    },
    "@esbuild/darwin-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.1.tgz",
-      "integrity": "sha512-BLT7TDzqsVlQRmJfO/FirzKlzmDpBWwmCUlyggfzUwg1cAxVxeA4O6b1XkMInlxISdfPAOunV9zXjvh5x99Heg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
+      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
      "optional": true
    },
    "@esbuild/darwin-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.1.tgz",
-      "integrity": "sha512-D3h3wBQmeS/vp93O4B+SWsXB8HvRDwMyhTNhBd8yMbh5wN/2pPWRW5o/hM3EKgk9bdKd9594lMGoTCTiglQGRQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
+      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
      "optional": true
    },
    "@esbuild/freebsd-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.1.tgz",
-      "integrity": "sha512-/uVdqqpNKXIxT6TyS/oSK4XE4xWOqp6fh4B5tgAwozkyWdylcX+W4YF2v6SKsL4wCQ5h1bnaSNjWPXG/2hp8AQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
+      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
      "optional": true
    },
    "@esbuild/freebsd-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.1.tgz",
-      "integrity": "sha512-paAkKN1n1jJitw+dAoR27TdCzxRl1FOEITx3h201R6NoXUojpMzgMLdkXVgCvaCSCqwYkeGLoe9UVNRDKSvQgw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
+      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
      "optional": true
    },
    "@esbuild/linux-arm": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.1.tgz",
-      "integrity": "sha512-tRHnxWJnvNnDpNVnsyDhr1DIQZUfCXlHSCDohbXFqmg9W4kKR7g8LmA3kzcwbuxbRMKeit8ladnCabU5f2traA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
+      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
      "optional": true
    },
    "@esbuild/linux-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.1.tgz",
-      "integrity": "sha512-G65d08YoH00TL7Xg4LaL3gLV21bpoAhQ+r31NUu013YB7KK0fyXIt05VbsJtpqh/6wWxoLJZOvQHYnodRrnbUQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
+      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
      "optional": true
    },
    "@esbuild/linux-ia32": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.1.tgz",
-      "integrity": "sha512-tt/54LqNNAqCz++QhxoqB9+XqdsaZOtFD/srEhHYwBd3ZUOepmR1Eeot8bS+Q7BiEvy9vvKbtpHf+r6q8hF5UA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
+      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
      "optional": true
    },
    "@esbuild/linux-loong64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.1.tgz",
-      "integrity": "sha512-MhNalK6r0nZD0q8VzUBPwheHzXPr9wronqmZrewLfP7ui9Fv1tdPmg6e7A8lmg0ziQCziSDHxh3cyRt4YMhGnQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
+      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
      "optional": true
    },
    "@esbuild/linux-mips64el": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.1.tgz",
-      "integrity": "sha512-YCKVY7Zen5rwZV+nZczOhFmHaeIxR4Zn3jcmNH53LbgF6IKRwmrMywqDrg4SiSNApEefkAbPSIzN39FC8VsxPg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
+      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
      "optional": true
    },
    "@esbuild/linux-ppc64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.1.tgz",
-      "integrity": "sha512-bw7bcQ+270IOzDV4mcsKAnDtAFqKO0jVv3IgRSd8iM0ac3L8amvCrujRVt1ajBTJcpDaFhIX+lCNRKteoDSLig==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
+      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
      "optional": true
    },
    "@esbuild/linux-riscv64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.1.tgz",
-      "integrity": "sha512-ARmDRNkcOGOm1AqUBSwRVDfDeD9hGYRfkudP2QdoonBz1ucWVnfBPfy7H4JPI14eYtZruRSczJxyu7SRYDVOcg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
+      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
      "optional": true
    },
    "@esbuild/linux-s390x": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.1.tgz",
-      "integrity": "sha512-o73TcUNMuoTZlhwFdsgr8SfQtmMV58sbgq6gQq9G1xUiYnHMTmJbwq65RzMx89l0iya69lR4bxBgtWiiOyDQZA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
+      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
      "optional": true
    },
    "@esbuild/linux-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.1.tgz",
-      "integrity": "sha512-da4/1mBJwwgJkbj4fMH7SOXq2zapgTo0LKXX1VUZ0Dxr+e8N0WbS80nSZ5+zf3lvpf8qxrkZdqkOqFfm57gXwA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
      "optional": true
    },
    "@esbuild/netbsd-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.1.tgz",
-      "integrity": "sha512-CPWs0HTFe5woTJN5eKPvgraUoRHrCtzlYIAv9wBC+FAyagBSaf+UdZrjwYyTGnwPGkThV4OCI7XibZOnPvONVw==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
      "optional": true
    },
    "@esbuild/openbsd-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.1.tgz",
-      "integrity": "sha512-xxhTm5QtzNLc24R0hEkcH+zCx/o49AsdFZ0Cy5zSd/5tOj4X2g3/2AJB625NoadUuc4A8B3TenLJoYdWYOYCew==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
+      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
      "optional": true
    },
    "@esbuild/sunos-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.1.tgz",
-      "integrity": "sha512-CWibXszpWys1pYmbr9UiKAkX6x+Sxw8HWtw1dRESK1dLW5fFJ6rMDVw0o8MbadusvVQx1a8xuOxnHXT941Hp1A==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
+      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
      "optional": true
    },
    "@esbuild/win32-arm64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.1.tgz",
-      "integrity": "sha512-jb5B4k+xkytGbGUS4T+Z89cQJ9DJ4lozGRSV+hhfmCPpfJ3880O31Q1srPCimm+V6UCbnigqD10EgDNgjvjerQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
+      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
      "optional": true
    },
    "@esbuild/win32-ia32": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.1.tgz",
-      "integrity": "sha512-PgyFvjJhXqHn1uxPhyN1wZ6dIomKjiLUQh1LjFvjiV1JmnkZ/oMPrfeEAZg5R/1ftz4LZWZr02kefNIQ5SKREQ==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
+      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
      "optional": true
    },
    "@esbuild/win32-x64": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.1.tgz",
-      "integrity": "sha512-W9NttRZQR5ehAiqHGDnvfDaGmQOm6Fi4vSlce8mjM75x//XKuVAByohlEX6N17yZnVXxQFuh4fDRunP8ca6bfA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
+      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
      "optional": true
    },
    "@eslint-community/eslint-utils": {
@@ -22635,11 +22635,11 @@
      }
    },
    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
      "requires": {
-        "fill-range": "^7.1.1"
+        "fill-range": "^7.0.1"
      }
    },
    "brorand": {
@@ -24111,9 +24111,9 @@
      "peer": true
    },
    "cypress": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.12.0.tgz",
-      "integrity": "sha512-udzS2JilmI9ApO/UuqurEwOvThclin5ntz7K0BtnHBs+tg2Bl9QShLISXpSEMDv/u8b6mqdoAdyKeZiSqKWL8g==",
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.0.tgz",
+      "integrity": "sha512-UimjRSJJYdTlvkChcdcfywKJ6tUYuwYuk/n1uMMglrvi+ZthNhoRYcxnWgTqUtkl17fXrPAsD5XT2rcQYN1xKA==",
      "optional": true,
      "requires": {
        "@cypress/request": "^3.0.0",
@@ -25031,33 +25031,33 @@
      }
    },
    "esbuild": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.1.tgz",
-      "integrity": "sha512-GPqx+FX7mdqulCeQ4TsGZQ3djBJkx5k7zBGtqt9ycVlWNg8llJ4RO9n2vciu8BN2zAEs6lPbPl0asZsAh7oWzg==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
      "requires": {
-        "@esbuild/aix-ppc64": "0.21.1",
-        "@esbuild/android-arm": "0.21.1",
-        "@esbuild/android-arm64": "0.21.1",
-        "@esbuild/android-x64": "0.21.1",
-        "@esbuild/darwin-arm64": "0.21.1",
-        "@esbuild/darwin-x64": "0.21.1",
-        "@esbuild/freebsd-arm64": "0.21.1",
-        "@esbuild/freebsd-x64": "0.21.1",
-        "@esbuild/linux-arm": "0.21.1",
-        "@esbuild/linux-arm64": "0.21.1",
-        "@esbuild/linux-ia32": "0.21.1",
-        "@esbuild/linux-loong64": "0.21.1",
-        "@esbuild/linux-mips64el": "0.21.1",
-        "@esbuild/linux-ppc64": "0.21.1",
-        "@esbuild/linux-riscv64": "0.21.1",
-        "@esbuild/linux-s390x": "0.21.1",
-        "@esbuild/linux-x64": "0.21.1",
-        "@esbuild/netbsd-x64": "0.21.1",
-        "@esbuild/openbsd-x64": "0.21.1",
-        "@esbuild/sunos-x64": "0.21.1",
-        "@esbuild/win32-arm64": "0.21.1",
-        "@esbuild/win32-ia32": "0.21.1",
-        "@esbuild/win32-x64": "0.21.1"
+        "@esbuild/aix-ppc64": "0.20.2",
+        "@esbuild/android-arm": "0.20.2",
+        "@esbuild/android-arm64": "0.20.2",
+        "@esbuild/android-x64": "0.20.2",
+        "@esbuild/darwin-arm64": "0.20.2",
+        "@esbuild/darwin-x64": "0.20.2",
+        "@esbuild/freebsd-arm64": "0.20.2",
+        "@esbuild/freebsd-x64": "0.20.2",
+        "@esbuild/linux-arm": "0.20.2",
+        "@esbuild/linux-arm64": "0.20.2",
+        "@esbuild/linux-ia32": "0.20.2",
+        "@esbuild/linux-loong64": "0.20.2",
+        "@esbuild/linux-mips64el": "0.20.2",
+        "@esbuild/linux-ppc64": "0.20.2",
+        "@esbuild/linux-riscv64": "0.20.2",
+        "@esbuild/linux-s390x": "0.20.2",
+        "@esbuild/linux-x64": "0.20.2",
+        "@esbuild/netbsd-x64": "0.20.2",
+        "@esbuild/openbsd-x64": "0.20.2",
+        "@esbuild/sunos-x64": "0.20.2",
+        "@esbuild/win32-arm64": "0.20.2",
+        "@esbuild/win32-ia32": "0.20.2",
+        "@esbuild/win32-x64": "0.20.2"
      }
    },
    "esbuild-wasm": {
@@ -25756,9 +25756,9 @@
      }
    },
    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
      "requires": {
        "to-regex-range": "^5.0.1"
      }
@@ -28068,9 +28068,9 @@
      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
    },
    "ngx-echarts": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/ngx-echarts/-/ngx-echarts-17.2.0.tgz",
-      "integrity": "sha512-i3XDE9d53zmJH4bp8RQ/271oPlhBkczO1M3VtWk8nCXdxQq9qx8UckjWEQ7oV1AbSDLGK5sRiFu5EaY5hvdWPA==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/ngx-echarts/-/ngx-echarts-17.1.0.tgz",
+      "integrity": "sha512-DSNF/aKmJSxJWb9UwPUgNtY8Ma9SmViDBRacvAwpakc/5mJerunxndDgoBQkYk5JFKAjXX6bp4ZWLRKL3/5AGA==",
      "requires": {
        "tslib": "^2.3.0"
      }
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -50,16 +50,16 @@
    "dev:ssr": "npm run generate-config && ng run mempool:serve-ssr",
    "serve:ssr": "npm run generate-config && node server.run.js",
    "build:ssr": "npm run build && ng run mempool:server:production && ./node_modules/typescript/bin/tsc server.run.ts",
-    "config:defaults:mempool": "node update-config.js TESTNET_ENABLED=true TESTNET4_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=mempool BLOCK_WEIGHT_UNITS=4000000 && npm run generate-config",
-    "config:defaults:liquid": "node update-config.js TESTNET_ENABLED=true TESTNET4_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=liquid BLOCK_WEIGHT_UNITS=300000 && npm run generate-config",
+    "config:defaults:mempool": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=mempool BLOCK_WEIGHT_UNITS=4000000 && npm run generate-config",
+    "config:defaults:liquid": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true LIQUID_TESTNET_ENABLED=true ITEMS_PER_PAGE=25 BASE_MODULE=liquid BLOCK_WEIGHT_UNITS=300000 && npm run generate-config",
    "prerender": "npm run ng -- run mempool:prerender",
    "cypress:open": "cypress open",
    "cypress:run": "cypress run",
    "cypress:run:record": "cypress run --record",
-    "cypress:open:ci": "node update-config.js TESTNET_ENABLED=true TESTNET4_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:open",
-    "cypress:run:ci": "node update-config.js TESTNET_ENABLED=true TESTNET4_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record",
-    "cypress:open:ci:staging": "node update-config.js TESTNET_ENABLED=true TESTNET4_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:open",
-    "cypress:run:ci:staging": "node update-config.js TESTNET_ENABLED=true TESTNET4_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:run:record"
+    "cypress:open:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:open",
+    "cypress:run:ci": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-prod 4200 cypress:run:record",
+    "cypress:open:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:open",
+    "cypress:run:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:run:record"
  },
  "dependencies": {
    "@angular-devkit/build-angular": "^17.3.1",
@@ -88,11 +88,11 @@
    "domino": "^2.1.6",
    "echarts": "~5.5.0",
    "lightweight-charts": "~3.8.0",
-    "ngx-echarts": "~17.2.0",
+    "ngx-echarts": "~17.1.0",
    "ngx-infinite-scroll": "^17.0.0",
    "qrcode": "1.5.1",
    "rxjs": "~7.8.1",
-    "esbuild": "^0.21.1",
+    "esbuild": "^0.20.2",
    "tinyify": "^4.0.0",
    "tlite": "^0.1.9",
    "tslib": "~2.6.0",
@@ -115,7 +115,7 @@
  "optionalDependencies": {
    "@cypress/schematic": "^2.5.0",
    "@types/cypress": "^1.1.3",
-    "cypress": "^13.12.0",
+    "cypress": "^13.7.0",
    "cypress-fail-on-console-error": "~5.1.0",
    "cypress-wait-until": "^2.0.1",
    "mock-socket": "~9.3.1",
--- a/frontend/proxy.conf.js
+++ b/frontend/proxy.conf.js
@@ -24,7 +24,7 @@ PROXY_CONFIG = [
        '/api/**', '!/api/v1/ws',
        '!/liquid', '!/liquid/**', '!/liquid/',
        '!/liquidtestnet', '!/liquidtestnet/**', '!/liquidtestnet/',
-        '/testnet/api/**', '/signet/api/**', '/testnet4/api/**'
+        '/testnet/api/**', '/signet/api/**'
        ],
        target: "https://mempool.space",
        ws: true,
--- a/frontend/proxy.conf.local-esplora.js
+++ b/frontend/proxy.conf.local-esplora.js
@@ -78,18 +78,6 @@ PROXY_CONFIG.push(...[
        "^/testnet": ""
    },
  },
-  /* Optional proxy to route dev to official acceleration services
-  {
-    context: ['/api/v1/services/accelerator/**'],
-    target: `https://mempool.space/api/v1/services/accelerator/`,
-    secure: false,
-    changeOrigin: true,
-    proxyTimeout: 30000,
-    pathRewrite: {
-      "^/api/v1/services/accelerator": ""
-    },
-  },
-  */
  {
    context: ['/api/v1/services/**'],
    target: `http://localhost:9000`,
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -53,44 +53,6 @@ let routes: Routes = [
      },
    ]
  },
-  {
-    path: 'testnet4',
-    children: [
-      {
-        path: '',
-        pathMatch: 'full',
-        loadChildren: () => import('./bitcoin-graphs.module').then(m => m.BitcoinGraphsModule),
-        data: { preload: true },
-      },
-      {
-        path: '',
-        loadChildren: () => import('./master-page.module').then(m => m.MasterPageModule),
-        data: { preload: true },
-      },
-      {
-        path: 'wallet',
-        children: [],
-        component: AddressGroupComponent,
-        data: {
-          networkSpecific: true,
-        }
-      },
-      {
-        path: 'status',
-        data: { networks: ['bitcoin', 'liquid'] },
-        component: StatusViewComponent
-      },
-      {
-        path: '',
-        loadChildren: () => import('./bitcoin-graphs.module').then(m => m.BitcoinGraphsModule),
-        data: { preload: true },
-      },
-      {
-        path: '**',
-        redirectTo: '/testnet4'
-      },
-    ]
-  },
  {
    path: 'signet',
    children: [
@@ -168,10 +130,6 @@ let routes: Routes = [
        path: 'testnet',
        loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
      },
-      {
-        path: 'testnet4',
-        loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
-      },
      {
        path: 'signet',
        loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
--- a/frontend/src/app/app.constants.ts
+++ b/frontend/src/app/app.constants.ts
@@ -189,22 +189,22 @@ export const specialBlocks = {
  '0': {
    labelEvent: 'Genesis',
    labelEventCompleted: 'The Genesis of Bitcoin',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '210000': {
    labelEvent: 'Bitcoin\'s 1st Halving',
    labelEventCompleted: 'Block Subsidy has halved to 25 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '420000': {
    labelEvent: 'Bitcoin\'s 2nd Halving',
    labelEventCompleted: 'Block Subsidy has halved to 12.5 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '630000': {
    labelEvent: 'Bitcoin\'s 3rd Halving',
    labelEventCompleted: 'Block Subsidy has halved to 6.25 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '709632': {
    labelEvent: 'Taproot 🌱 activation',
@@ -214,62 +214,62 @@ export const specialBlocks = {
  '840000': {
    labelEvent: 'Bitcoin\'s 4th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 3.125 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '1050000': {
    labelEvent: 'Bitcoin\'s 5th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 1.5625 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '1260000': {
    labelEvent: 'Bitcoin\'s 6th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.78125 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '1470000': {
    labelEvent: 'Bitcoin\'s 7th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.390625 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '1680000': {
    labelEvent: 'Bitcoin\'s 8th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.1953125 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '1890000': {
    labelEvent: 'Bitcoin\'s 9th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.09765625 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '2100000': {
    labelEvent: 'Bitcoin\'s 10th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.04882812 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '2310000': {
    labelEvent: 'Bitcoin\'s 11th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.02441406 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '2520000': {
    labelEvent: 'Bitcoin\'s 12th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.01220703 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '2730000': {
    labelEvent: 'Bitcoin\'s 13th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.00610351 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '2940000': {
    labelEvent: 'Bitcoin\'s 14th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.00305175 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  },
  '3150000': {
    labelEvent: 'Bitcoin\'s 15th Halving',
    labelEventCompleted: 'Block Subsidy has halved to 0.00152587 BTC per block',
-    networks: ['mainnet', 'testnet', 'testnet4'],
+    networks: ['mainnet', 'testnet'],
  }
 };

--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -12,7 +12,6 @@ import { PriceService } from './services/price.service';
 import { EnterpriseService } from './services/enterprise.service';
 import { WebsocketService } from './services/websocket.service';
 import { AudioService } from './services/audio.service';
-import { PreloadService } from './services/preload.service';
 import { SeoService } from './services/seo.service';
 import { OpenGraphService } from './services/opengraph.service';
 import { ZoneService } from './services/zone-shim.service';
@@ -27,7 +26,6 @@ import { ShortenStringPipe } from './shared/pipes/shorten-string-pipe/shorten-st
 import { CapAddressPipe } from './shared/pipes/cap-address-pipe/cap-address-pipe';
 import { AppPreloadingStrategy } from './app.preloading-strategy';
 import { ServicesApiServices } from './services/services-api.service';
-import { DatePipe } from '@angular/common';

 const providers = [
  ElectrsApiService,
@@ -46,10 +44,8 @@ const providers = [
  FiatShortenerPipe,
  FiatCurrencyPipe,
  CapAddressPipe,
-  DatePipe,
  AppPreloadingStrategy,
  ServicesApiServices,
-  PreloadService,
  { provide: HTTP_INTERCEPTORS, useClass: HttpCacheInterceptor, multi: true },
  { provide: ZONE_SERVICE, useClass: ZoneService },
 ];
--- a/frontend/src/app/bitcoin.utils.ts
+++ b/frontend/src/app/bitcoin.utils.ts
@@ -1,5 +1,4 @@
 import { Transaction, Vin } from './interfaces/electrs.interface';
-import { Hash } from './shared/sha256';

 const P2SH_P2WPKH_COST = 21 * 4; // the WU cost for the non-witness part of P2SH-P2WPKH
 const P2SH_P2WSH_COST  = 35 * 4; // the WU cost for the non-witness part of P2SH-P2WSH
@@ -267,11 +266,6 @@ const featureActivation = {
    segwit: 872730,
    taproot: 2032291,
  },
-  testnet4: {
-    rbf: 0,
-    segwit: 0,
-    taproot: 0,
-  },
  signet: {
    rbf: 0,
    segwit: 0,
@@ -293,8 +287,8 @@ export async function calcScriptHash$(script: string): Promise<string> {
    throw new Error('script is not a valid hex string');
  }
  const buf = Uint8Array.from(script.match(/.{2}/g).map((byte) => parseInt(byte, 16)));
-  const hash = new Hash().update(buf).digest();
-  const hashArray = Array.from(new Uint8Array(hash));
+  const hashBuffer = await crypto.subtle.digest('SHA-256', buf);
+  const hashArray = Array.from(new Uint8Array(hashBuffer));
  return hashArray
    .map((bytes) => bytes.toString(16).padStart(2, '0'))
    .join('');
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -53,26 +53,13 @@
        <span>Spiral</span>
      </a>
      <a href="https://foundrydigital.com/" target="_blank" title="Foundry">
-        <svg xmlns="http://www.w3.org/2000/svg" id="b" data-name="Layer 2" style="zoom: 1;" width="32" height="76" viewBox="0 0 32 76">
-          <defs>
-            <style>
-              .d {
-                fill: #fff;
-              }
-
-              .e {
-                fill: #ff8200;
-              }
-            </style>
-          </defs>
-          <g id="c" data-name="b">
-            <circle class="e" cx="24" cy="32" r="8" />
-            <circle class="e" cx="24" cy="56" r="8" />
-            <circle class="e" cx="8" cy="68" r="8" />
-            <g>
-              <circle class="d" cx="24" cy="8" r="8" />
-              <circle class="d" cx="8" cy="20" r="8" />
-              <circle class="d" cx="8" cy="44" r="8" />
+        <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-10 -10 100 100" class="image">
+          <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+            <g transform="translate(-186.000000, -2316.000000)">
+              <g transform="translate(186.000000, 2316.000000)">
+                <rect id="" fill="#023D32" x="-10" y="-10" width="100" height="100" rx="8"></rect>
+                <path d="M61.6666667,9.16666667 L61.6666667,17.0041667 L46.2625,17.0041667 C46.2625,17.0041667 44.1666667,16.6666667 44.1666667,18.3333333 L44.1666667,25.8025 L61.6666667,25.8025 L61.6666667,34.7391667 L44.1666667,34.7391667 L44.1666667,70.5575 L31.7825,70.5575 L31.7825,35 L19.1666667,35 L19.1666667,25.595 L31.6666667,25.595 L31.6666667,17.5 C31.6666667,17.5 32.5,9.16666667 40.4166667,9.16666667 L61.6666667,9.16666667 Z" id="Fill-1" fill="#86E2A0"></path>
+              </g>
            </g>
          </g>
        </svg>
@@ -201,8 +188,8 @@
        <div class="wrapper">
          <ng-container>
            <ng-template ngFor let-sponsor [ngForOf]="profiles.whales">
-              <a [href]="'https://x.com/' + sponsor.username" target="_blank" rel="sponsored" [title]="sponsor.username">
-                <img class="image" [src]="'/api/v1/services/account/images/' + sponsor.username + '/md5=' + sponsor.imageMd5" onError="this.src = '/resources/profile/grumpy.svg'; this.className = 'image unknown'"/>
+              <a [href]="'https://twitter.com/' + sponsor.username" target="_blank" rel="sponsored" [title]="sponsor.username">
+                <img class="image" [src]="'/api/v1/services/account/images/' + sponsor.username + '?md5=' + sponsor.imageMd5" onError="this.src = '/resources/profile/unknown.svg'; this.className = 'image unknown'"/>
              </a>
            </ng-template>
          </ng-container>
@@ -213,8 +200,8 @@
        <h3 i18n="about.sponsors.withHeart">Chad Sponsors</h3>
        <div class="wrapper">
          <ng-template ngFor let-sponsor [ngForOf]="profiles.chads">
-            <a [href]="'https://x.com/' + sponsor.username" target="_blank" rel="sponsored" [title]="sponsor.username">
-              <img class="image" [src]="'/api/v1/services/account/images/' + sponsor.username + '/md5=' + sponsor.imageMd5" onError="this.src = '/resources/profile/grumpy.svg'; this.className = 'image unknown'"/>
+            <a [href]="'https://twitter.com/' + sponsor.username" target="_blank" rel="sponsored" [title]="sponsor.username">
+              <img class="image" [src]="'/api/v1/services/account/images/' + sponsor.username + '?md5=' + sponsor.imageMd5" onError="this.src = '/resources/profile/unknown.svg'; this.className = 'image unknown'"/>
            </a>
          </ng-template>
        </div>
@@ -226,8 +213,8 @@
    <h3 i18n="about.sponsors.withHeart">OG Sponsors ❤️</h3>
    <div class="wrapper">
      <ng-container *ngIf="ogs$ | async as ogs; else loadingSponsors">
-        <a *ngFor="let ogSponsor of ogs" [href]="'https://x.com/' + ogSponsor.handle" target="_blank" rel="sponsored" [title]="ogSponsor.handle">
-          <img class="image" [src]="'/api/v1/donations/images/' + ogSponsor.handle" onError="this.src = '/resources/profile/grumpy.svg'; this.className = 'image unknown'"/>
+        <a *ngFor="let ogSponsor of ogs" [href]="'https://twitter.com/' + ogSponsor.handle" target="_blank" rel="sponsored" [title]="ogSponsor.handle">
+          <img class="image" [src]="'/api/v1/donations/images/' + ogSponsor.handle" onError="this.src = '/resources/profile/unknown.svg'; this.className = 'image unknown'"/>
        </a>
      </ng-container>
    </div>
@@ -272,10 +259,22 @@
        <img class="image" src="/resources/profile/bisq_network.png" />
        <span>Bisq</span>
      </a>
+      <a href="https://github.com/BlueWallet/BlueWallet" target="_blank" title="BlueWallet">
+        <img class="image" src="/resources/profile/bluewallet.png" />
+        <span>BlueWallet</span>
+      </a>
+      <a href="https://github.com/muun/apollo" target="_blank" title="Muun Wallet">
+        <img class="image" src="/resources/profile/muun.png" />
+        <span>Muun</span>
+      </a>
      <a href="https://github.com/spesmilo/electrum" target="_blank" title="Electrum Wallet">
        <img class="image" src="/resources/profile/electrum.png" />
        <span>Electrum</span>
      </a>
+      <a href="https://github.com/cryptoadvance/specter-desktop" target="_blank" title="Specter Wallet">
+        <img class="image" src="/resources/profile/specter.png" />
+        <span>Specter</span>
+      </a>
      <a href="https://github.com/sparrowwallet/sparrow" target="_blank" title="Sparrow Wallet">
        <img class="image" src="/resources/profile/sparrow.png" />
        <span>Sparrow</span>
@@ -284,37 +283,21 @@
        <img class="image not-rounded" src="/resources/profile/phoenix.svg" />
        <span>Phoenix</span>
      </a>
-      <a href="http://github.com/COLDCARD" target="_blank" title="COLDCARD">
-        <img class="image coldcard" src="/resources/profile/coldcard.png" />
-        <span>COLDCARD</span>
+      <a href="https://github.com/lnbits/lnbits-legend" target="_blank" title="LNbits">
+        <img class="image" src="/resources/profile/lnbits.svg" />
+        <span>LNBits</span>
      </a>
-      <a href="https://github.com/ZeusLN/zeus" target="_blank" title="ZEUS">
-        <img class="image" src="/resources/profile/zeus.png" />
-        <span>ZEUS</span>
-      </a>
-      <a href="https://github.com/MutinyWallet" target="_blank" title="Mutiny">
-        <img class="image not-rounded" src="/resources/profile/mutiny.svg" />
-        <span>Mutiny</span>
+      <a href="https://github.com/layer2tech/mercury-wallet" target="_blank" title="Mercury Wallet">
+        <img class="image" src="/resources/profile/mercury.svg" />
+        <span>Mercury</span>
      </a>
      <a href="https://github.com/hsjoberg/blixt-wallet" target="_blank" title="Blixt Wallet">
        <img class="image" src="/resources/profile/blixt.png" />
        <span>Blixt</span>
      </a>
-      <a href="https://github.com/nunchuk-io" target="_blank" title="Nunchuck">
-        <img class="image" src="/resources/profile/nunchuk.svg" />
-        <span>Nunchuk</span>
-      </a>
-      <a href="https://github.com/BlueWallet/BlueWallet" target="_blank" title="BlueWallet">
-        <img class="image" src="/resources/profile/bluewallet.png" />
-        <span>BlueWallet</span>
-      </a>
-      <a href="https://github.com/BoltzExchange" target="_blank" title="Boltz">
-        <img class="image" src="/resources/profile/boltz.svg" />
-        <span>Boltz</span>
-      </a>
-      <a href="https://github.com/lnbits/lnbits-legend" target="_blank" title="LNbits">
-        <img class="image" src="/resources/profile/lnbits.svg" />
-        <span>LNBits</span>
+      <a href="https://github.com/ZeusLN/zeus" target="_blank" title="ZEUS">
+        <img class="image" src="/resources/profile/zeus.png" />
+        <span>ZEUS</span>
      </a>
      <a href="https://github.com/vulpemventures/marina" target="_blank" title="Marina Wallet">
        <img class="image" src="/resources/profile/marina.svg" />
@@ -324,9 +307,13 @@
        <img class="image" src="/resources/profile/schildbach.svg" />
        <span>Schildbach</span>
      </a>
-      <a href="https://github.com/cryptoadvance/specter-desktop" target="_blank" title="Specter Wallet">
-        <img class="image" src="/resources/profile/specter.png" />
-        <span>Specter</span>
+      <a href="https://github.com/nunchuk-io" target="_blank" title="Nunchuck">
+        <img class="image" src="/resources/profile/nunchuk.svg" />
+        <span>Nunchuk</span>
+      </a>
+      <a href="https://github.com/bitcoin-s/bitcoin-s" target="_blank" title="bitcoin-s">
+        <img class="image" src="/resources/profile/bitcoin-s.svg" />
+        <span>bitcoin-s</span>
      </a>
      <a href="https://github.com/EdgeApp" target="_blank" title="Edge">
        <img class="image not-rounded" src="/resources/profile/edge.svg" />
@@ -336,13 +323,13 @@
        <img class="image" src="/resources/profile/galoy.svg" />
        <span>Galoy</span>
      </a>
-      <a href="https://github.com/muun/apollo" target="_blank" title="Muun Wallet">
-        <img class="image" src="/resources/profile/muun.png" />
-        <span>Muun</span>
+      <a href="https://github.com/BoltzExchange" target="_blank" title="Boltz">
+        <img class="image" src="/resources/profile/boltz.svg" />
+        <span>Boltz</span>
      </a>
-      <a href="https://github.com/bitcoin-s/bitcoin-s" target="_blank" title="bitcoin-s">
-        <img class="image" src="/resources/profile/bitcoin-s.svg" />
-        <span>bitcoin-s</span>
+      <a href="https://github.com/MutinyWallet" target="_blank" title="Mutiny">
+        <img class="image not-rounded" src="/resources/profile/mutiny.svg" />
+        <span>Mutiny</span>
      </a>
    </div>
  </div>
@@ -356,8 +343,8 @@
      <a href="https://opencrypto.org/" title="Coppa - Crypto Open Patent Alliance">
        <img class="copa" src="/resources/profile/copa.png" />
      </a>
-      <a href="https://bitcoin.gob.sv" title="Oficina Nacional del Bitcoin">
-        <img class="sv" src="/resources/profile/onbtc-full.svg" />
+      <a href="https://bisq.network/" title="Bisq Network">
+        <img class="bisq" src="/resources/profile/bisq.svg" />
      </a>
    </div>
  </div>
@@ -367,8 +354,8 @@
      <h3 i18n="about.translators">Project Translators</h3>
      <div class="wrapper">
        <ng-template ngFor let-translator [ngForOf]="translators">
-          <a [href]="'https://x.com/' + translator.value" target="_blank" [title]="translator.key">
-            <img class="image" [src]="'/api/v1/translators/images/' + translator.value" onError="this.src = '/resources/profile/grumpy.svg'; this.className = 'image unknown'"/>
+          <a [href]="'https://twitter.com/' + translator.value" target="_blank" [title]="translator.key">
+            <img class="image" [src]="'/api/v1/translators/images/' + translator.value" onError="this.src = '/resources/profile/unknown.svg'; this.className = 'image unknown'"/>
          </a>
        </ng-template>
      </div>
@@ -382,7 +369,7 @@
      <div class="wrapper">
        <ng-template ngFor let-contributor [ngForOf]="contributors.regular">
          <a [href]="'https://github.com/' + contributor.name" target="_blank" [title]="contributor.name">
-            <img class="image" [src]="'/api/v1/contributors/images/' + contributor.id" onError="this.src = '/resources/profile/grumpy.svg'; this.className = 'image unknown'"/>
+            <img class="image" [src]="'/api/v1/contributors/images/' + contributor.id" onError="this.src = '/resources/profile/unknown.svg'; this.className = 'image unknown'"/>
            <span>{{ contributor.name }}</span>
          </a>
        </ng-template>
@@ -394,7 +381,7 @@
      <div class="wrapper">
        <ng-template ngFor let-contributor [ngForOf]="contributors.core">
          <a [href]="'https://github.com/' + contributor.name" target="_blank" [title]="contributor.name" [class]="'project-member-avatar'">
-            <img class="image" [src]="'/api/v1/contributors/images/' + contributor.id" onError="this.src = '/resources/profile/grumpy.svg'; this.className = 'image unknown'"/>
+            <img class="image" [src]="'/api/v1/contributors/images/' + contributor.id" onError="this.src = '/resources/profile/unknown.svg'; this.className = 'image unknown'"/>
            <span>{{ contributor.name }}</span>
          </a>
        </ng-template>
@@ -405,11 +392,11 @@
  <div class="maintainers" id="project-maintainers">
    <h3 i18n="about.maintainers">Project Maintainers</h3>
    <div class="wrapper">
-        <a href="https://x.com/softsimon_" target="_blank" title="softsimon">
+        <a href="https://twitter.com/softsimon_" target="_blank" title="softsimon">
          <img class="image" src="/resources/profile/softsimon.jpg" />
          <span>softsimon</span>
        </a>
-        <a href="https://x.com/wiz" target="_blank" title="wiz">
+        <a href="https://twitter.com/wiz" target="_blank" title="wiz">
          <img class="image" src="/resources/profile/wiz.png" />
          <span>wiz</span>
        </a>
--- a/frontend/src/app/components/about/about.component.scss
+++ b/frontend/src/app/components/about/about.component.scss
@@ -10,6 +10,9 @@
    margin: 25px;
    line-height: 32px;
  }
+  .unknown {
+    border: 1px solid #b4b4b4;
+  }

  .image.not-rounded {
    border-radius: 0;
@@ -126,9 +129,8 @@
      position: relative;
      width: 300px;
    }
-    .sv {
-      height: 85px;
-      width: auto;
+    .bisq {
+      top: 3px;
      position: relative;
    }
  }
@@ -156,12 +158,6 @@
        }
        img, svg {
          margin: 40px 29px 10px;
-          &.image.coldcard {
-            border-radius: 0;
-            width: auto;
-            max-height: 50px;
-            margin: 40px 29px 14px 29px;
-          }
        }
      }
    }
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -21,9 +21,9 @@
            <input type="radio" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)">
            <label class="form-check-label d-flex flex-column" for="accelerate">
              <span class="font-weight-bold">Accelerate</span>
-              <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
+              <span style="color: rgb(186, 186, 186); font-size: 14px;">Settlement expected in ~1 hour or less<br>
                @if (!calculating) {
-                  <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+                  <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats|sats">sats</span></span>)
                } @else {
                  <span class="estimating">Calculating cost...</span>
                }
@@ -38,13 +38,7 @@
            <input type="radio" class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)">
            <label class="form-check-label d-flex flex-column" for="wait">
              <span class="font-weight-bold">Wait</span>
-              @if (eta) {
-                <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="eta" [fastRender]="false" [fixedRender]="true"></app-time></span>
-              } @else {
-                <span style="color: rgb(186, 186, 186); font-size: 14px;">
-                  <span>Settlement expected within several hours</span>
-                </span>
-              }
+              <span style="color: rgb(186, 186, 186); font-size: 14px;">Settlement expected to occur <app-time kind="within" [time]="eta" [fastRender]="false" [fixedRender]="true"></app-time></span>
            </label>
          </div>
        </div>
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -1,11 +1,9 @@
 import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges } from '@angular/core';
-import { Subscription, tap, of, catchError, Observable } from 'rxjs';
+import { Subscription, tap, of, catchError } from 'rxjs';
 import { ServicesApiServices } from '../../services/services-api.service';
 import { nextRoundNumber } from '../../shared/common.utils';
 import { StateService } from '../../services/state.service';
 import { AudioService } from '../../services/audio.service';
-import { AccelerationEstimate } from '../accelerate-preview/accelerate-preview.component';
-import { EtaService } from '../../services/eta.service';

@Component({
  selector: 'app-accelerate-checkout',
@@ -13,7 +11,7 @@ import { EtaService } from '../../services/eta.service';
  styleUrls: ['./accelerate-checkout.component.scss']
 })
 export class AccelerateCheckout implements OnInit, OnDestroy {
-  @Input() eta: number | null = null;
+  @Input() eta: number = Date.now() + 123456789;
  @Input() txid: string = '70c18d76cdb285a1b5bd87fdaae165880afa189809c30b4083ff7c0e69ee09ad';
  @Input() scrollEvent: boolean;
  @Output() close = new EventEmitter<null>();
@@ -26,10 +24,8 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  square: { appId: string, locationId: string};
  accelerationUUID: string;
  estimateSubscription: Subscription;
-  estimate: AccelerationEstimate;
  maxBidBoost: number; // sats
  cost: number; // sats
-  etaInfo$: Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }>;

  // square
  loadingCashapp = false;
@@ -43,7 +39,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  constructor(
    private servicesApiService: ServicesApiServices,
    private stateService: StateService,
-    private etaService: EtaService,
    private audioService: AudioService,
    private cd: ChangeDetectorRef
  ) {
@@ -64,7 +59,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
        locationId: ids.squareLocationId
      };
      if (this.step === 'cta') {
-        this.fetchEstimate();
+        this.estimate();
      }
    });
  }
@@ -104,7 +99,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  /**
   * Accelerator
   */
-  fetchEstimate() {
+  estimate() {
    if (this.estimateSubscription) {
      this.estimateSubscription.unsubscribe();
    }
@@ -115,17 +110,16 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
        if (response.status === 204) {
          this.error = `cannot_accelerate_tx`;
        } else {
-          this.estimate = response.body;
-          if (!this.estimate) {
+          const estimation = response.body;
+          if (!estimation) {
            this.error = `cannot_accelerate_tx`;
            return;
          }
          // Make min extra fee at least 50% of the current tx fee
-          const minExtraBoost = nextRoundNumber(Math.max(this.estimate.cost * 2, this.estimate.txSummary.effectiveFee));
-          const DEFAULT_BID_RATIO = 1.5;
+          const minExtraBoost = nextRoundNumber(Math.max(estimation.cost * 2, estimation.txSummary.effectiveFee));
+          const DEFAULT_BID_RATIO = 2;
          this.maxBidBoost = minExtraBoost * DEFAULT_BID_RATIO;
-          this.cost = this.maxBidBoost + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
-          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate);
+          this.cost = this.maxBidBoost + estimation.mempoolBaseFee + estimation.vsizeFee;
        }
      }),

--- a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
+++ b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
@@ -4,12 +4,13 @@
  width: 120px;
  margin-left: 4em;
  margin-right: 1.5em;
+  padding-bottom: 63px;

  .column {
    width: 100%;
    height: 100%;
    position: relative;
-    background: var(--stat-box-bg);
+    background: #181b2d;

    .bar {
      position: absolute;
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -32,56 +32,43 @@
        <div class="alert alert-mempool">You are currently on the waitlist</div>
      </div>

-      <ng-template [ngIf]="showDetails">
-        <h5 i18n="accelerator.your-transaction">Your transaction</h5>
-        <div class="row">
-          <div class="col">
-            <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
-              <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
-            </small>
-            <table class="table table-borderless table-border table-dark table-background table-accelerator">
-              <tbody>
-                <tr class="group-first">
-                  <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
-                  <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
-                </tr>
-                <tr class="info">
-                  <td class="info" colspan=3>
-                    <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
-                  </td>
-                </tr>
-                <tr>
-                  <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
-                  <td style="text-align: end;">
-                    {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
-                  </td>
-                </tr>
-                <tr class="info group-last">
-                  <td class="info" colspan=3>
-                    <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-        <br>
-      </ng-template>
-      <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
+      <h5 i18n="accelerator.your-transaction">Your transaction</h5>
      <div class="row">
        <div class="col">
-          <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
-            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
-            <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
-          </ng-container>
-        </div>
-        <div class="col pie">
-          <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
+          <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
+            <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
+          </small>
+          <table class="table table-borderless table-border table-dark table-accelerator">
+            <tbody>
+              <tr class="group-first">
+                <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
+                <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
+              </tr>
+              <tr class="info">
+                <td class="info" colspan=3>
+                  <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
+                </td>
+              </tr>
+              <tr>
+                <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
+                <td style="text-align: end;">
+                  {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
+                </td>
+              </tr>
+              <tr class="info group-last">
+                <td class="info" colspan=3>
+                  <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
+                </td>
+              </tr>
+            </tbody>
+          </table>
        </div>
      </div>
-
+      <br>
+      <h5 i18n="accelerator.pay-how-much">How much more are you willing to pay?</h5>
      <div class="row">
        <div class="col">
+          <small class="form-text text-muted mb-2" i18n="accelerator.transaction-fee-description">Choose the maximum extra transaction fee you're willing to pay to get into the next block.</small>
          <div class="form-group">
            <div class="fee-card">
              <div class="d-flex mb-0">
@@ -97,13 +84,13 @@
        </div>
      </div>
  
-      <h5>Summary</h5>
-      <div class="row">
+      <h5>Acceleration summary</h5>
+      <div class="row mb-3">
        <div class="col">
-          <table class="table table-borderless table-border table-dark table-background table-accelerator">
+          <table class="table table-borderless table-border table-dark table-accelerator">
            <tbody>
              <!-- ESTIMATED FEE -->
-              <ng-template [ngIf]="showDetails">
+              <ng-container>
                <tr class="group-first">
                  <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
                  <td class="amt" style="font-size: 16px">
@@ -123,24 +110,25 @@
                    <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
                  </td>
                </tr>
-                
-                <!-- MEMPOOL BASE FEE -->
-                <tr>
-                  <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
-                </tr>
-                <tr class="info" [class.group-last]="!estimate.vsizeFee" [class.dashed-bottom]="!estimate.vsizeFee">
-                  <td class="info">
-                    <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
-                  </td>
-                  <td class="amt">
-                    +{{ estimate.mempoolBaseFee | number }}
-                  </td>
-                  <td class="units">
-                    <span class="symbol" i18n="shared.sats">sats</span>
-                    <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
-                  </td>
-                </tr>
-              <tr class="info group-last dashed-bottom" *ngIf="estimate.vsizeFee">
+              </ng-container>
+  
+              <!-- MEMPOOL BASE FEE -->
+              <tr>
+                <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
+              </tr>
+              <tr class="info">
+                <td class="info">
+                  <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
+                </td>
+                <td class="amt">
+                  +{{ estimate.mempoolBaseFee | number }}
+                </td>
+                <td class="units">
+                  <span class="symbol" i18n="shared.sats">sats</span>
+                  <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
+                </td>
+              </tr>
+              <tr class="info group-last">
                <td class="info">
                  <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
                </td>
@@ -152,13 +140,13 @@
                  <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
                </td>
              </tr>
-            </ng-template>
+
              
              <!-- NEXT BLOCK ESTIMATE -->
              <ng-container>
-                <tr class="group-first">
+                <tr class="group-first" style="border-top: 1px dashed grey; border-collapse: collapse;">
                  <td class="item">
-                    <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b> ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
+                    <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b>
                  </td>
                  <td class="amt">
                    <span style="background-color: #5E35B1" class="p-1 pl-0">
@@ -170,13 +158,18 @@
                    <span class="fiat ml-1"><app-fiat [value]="estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee"></app-fiat></span>
                  </td>
                </tr>
+                <tr class="info group-last" style="border-bottom: 1px solid lightgrey">
+                  <td class="info" colspan=3>
+                    <i><small><ng-container *ngTemplateOutlet="acceleratedTo; context: {$implicit: estimate.targetFeeRate }"></ng-container></small></i>
+                  </td>
+                </tr>
              </ng-container>

              <!-- MAX COST -->
              <ng-container>
-                <tr class="group-first" [class.group-last]="!isLoggedIn() || estimate.userBalance >= maxCost">
+                <tr class="group-first">
                  <td class="item">
-                    <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b> 
+                    <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b>
                  </td>
                  <td class="amt">
                    <span style="background-color: var(--primary)" class="p-1 pl-0">
@@ -186,15 +179,20 @@
                  <td class="units">
                    <span class="symbol" i18n="shared.sats">sats</span>
                    <span class="fiat ml-1">
-                      <app-fiat [value]="maxCost" [colorClass]="isLoggedIn() && estimate.userBalance < maxCost ? 'red-color' : 'green-color'"></app-fiat>
+                      <app-fiat [value]="maxCost" [colorClass]="estimate.userBalance < maxCost ? 'red-color' : 'green-color'"></app-fiat>
                    </span>
                  </td>
                </tr>
+                <tr class="info group-last">
+                  <td class="info" colspan=3>
+                    <i><small><ng-container *ngTemplateOutlet="acceleratedTo; context: {$implicit: (estimate.txSummary.effectiveFee + userBid) / estimate.txSummary.effectiveVsize }"></ng-container></small></i>
+                  </td>
+                </tr>
              </ng-container>
  
              <!-- USER BALANCE -->
              <ng-container *ngIf="isLoggedIn() && estimate.userBalance < maxCost">
-                <tr class="group-first group-last dashed-top">
+                <tr class="group-first group-last" style="border-top: 1px dashed grey">
                  <td class="item" i18n="accelerator.available-balance">Available balance</td>
                  <td class="amt">
                    {{ estimate.userBalance | number }}
@@ -207,21 +205,23 @@
                  </td>
                </tr>
              </ng-container>
-              <ng-container *ngIf="user && estimate?.hasAccess || !isLoggedIn()">
+
+              <!-- LOGIN CTA -->
+              <ng-container *ngIf="stateService.isMempoolSpaceBuild && !isLoggedIn()">
                <tr class="group-first group-last" style="border-top: 1px dashed grey">
                  <td class="item"></td>
-                  <td colspan="2">
-                    <div class="d-flex">
-                      @if (isLoggedIn()) {
-                        @if (user && estimate.hasAccess) {
-                          <button class="btn btn-sm btn-primary btn-success flex-grow-1" style="width: 150px" (click)="accelerate()" i18n="transaction.accelerate|Accelerate button label">Accelerate</button>
-                        }
-                      } @else if (stateService.isMempoolSpaceBuild) {
-                        <a [routerLink]="['/login']" [queryParams]="{redirectTo: '/tx/' + tx.txid + '#accelerate'}" class="btn btn-purple flex-grow-1" i18n="shared.sign-in">Sign In</a>
-                      } @else {
-                        <a [href]="'https://mempool.space/tx/' + tx.txid + '#accelerate'" class="btn btn-purple flex-grow-1" i18n="accelerator.accelerate-on-mempoolspace">Accelerate on mempool.space</a>
-                      }
-                    </div>
+                  <td class="amt"></td>
+                  <td class="units d-flex">
+                    <a [routerLink]="['/login']" [queryParams]="{redirectTo: '/tx/' + tx.txid + '#accelerate'}" class="btn btn-purple flex-grow-1" i18n="shared.sign-in">Sign In</a>
+                  </td>
+                </tr>
+              </ng-container>
+              <ng-container *ngIf="!stateService.isMempoolSpaceBuild">
+                <tr class="group-first group-last" style="border-top: 1px dashed grey">
+                  <td class="item"></td>
+                  <td class="amt"></td>
+                  <td class="units d-flex">
+                    <a [href]="'https://mempool.space/tx/' + tx.txid + '#accelerate'" class="btn btn-purple flex-grow-1" i18n="accelerator.accelerate-on-mempoolspace">Accelerate on mempool.space</a>
                  </td>
                </tr>
              </ng-container>
@@ -229,6 +229,15 @@
          </table>
        </div>
      </div>
+  
+      <div class="row mb-3" *ngIf="isLoggedIn()">
+        <div class="col">
+          <div class="d-flex justify-content-end" *ngIf="user && estimate.hasAccess">
+            <button class="btn btn-sm btn-primary btn-success" style="width: 150px" (click)="accelerate()" i18n="transaction.accelerate|Accelerate button label">Accelerate</button>
+          </div>
+        </div>
+      </div>
+  
    </div>
  </ng-container>
 </div>
@@ -236,4 +245,6 @@
 <ng-template #loadingEstimate>
  <div class="skeleton-loader"></div>
  <br>
-</ng-template>
+</ng-template>
+
+<ng-template #acceleratedTo let-i i18n="accelerator.accelerated-to-description">If your tx is accelerated to ~{{ i | number : '1.0-0' }} sat/vB</ng-template>
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
@@ -72,17 +72,11 @@
        padding-top: 0.75rem;
      }
    }
-    &.group-last, &:last-child {
+    &.group-last {
      td {
        padding-bottom: 0.75rem;
      }
    }
-    &.dashed-top {
-      border-top: 1px dashed grey;
-    }
-    &.dashed-bottom {
-      border-bottom: 1px dashed grey
-    }
  }
  td {
    &:first-child {
@@ -113,20 +107,6 @@
  margin-top: 1em;
 }

-.col.pie {
-  flex-grow: 0;
-  padding: 0 1em;
-}
-
 .item {
  white-space: initial;
 }
-
-.table-background {
-  background-color: var(--bg);
-}
-
-.col.pie {
-  position: relative;
-  top: -15px;
-}
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
@@ -1,13 +1,11 @@
 import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChanges, HostListener, ChangeDetectorRef } from '@angular/core';
-import { Observable, Subscription, catchError, of, tap } from 'rxjs';
+import { Subscription, catchError, of, tap } from 'rxjs';
 import { StorageService } from '../../services/storage.service';
 import { Transaction } from '../../interfaces/electrs.interface';
 import { nextRoundNumber } from '../../shared/common.utils';
 import { ServicesApiServices } from '../../services/services-api.service';
 import { AudioService } from '../../services/audio.service';
 import { StateService } from '../../services/state.service';
-import { MiningStats } from '../../services/mining.service';
-import { EtaService } from '../../services/eta.service';

 export type AccelerationEstimate = {
  txSummary: TxSummary;
@@ -18,7 +16,6 @@ export type AccelerationEstimate = {
  cost: number;
  mempoolBaseFee: number;
  vsizeFee: number;
-  pools: number[]
 }
 export type TxSummary = {
  txid: string; // txid of the current transaction
@@ -43,19 +40,15 @@ export const MAX_BID_RATIO = 4;
  styleUrls: ['accelerate-preview.component.scss']
 })
 export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges {
-  @Input() tx: Transaction;
-  @Input() miningStats: MiningStats;
+  @Input() tx: Transaction | undefined;
  @Input() scrollEvent: boolean;
-  @Input() showDetails: boolean;

  math = Math;
  error = '';
  showSuccess = false;
  estimateSubscription: Subscription;
  accelerationSubscription: Subscription;
-  difficultySubscription: Subscription;
  estimate: any;
-  etaInfo$: Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }>;
  hasAncestors: boolean = false;
  minExtraCost = 0;
  minBidAllowed = 0;
@@ -74,7 +67,6 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
    public stateService: StateService,
    private servicesApiService: ServicesApiServices,
    private storageService: StorageService,
-    private etaService: EtaService,
    private audioService: AudioService,
    private cd: ChangeDetectorRef
  ) {
@@ -86,7 +78,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
    }
  }

-  ngOnInit(): void {
+  ngOnInit() {
    this.accelerationUUID = window.crypto.randomUUID();
  }

@@ -96,7 +88,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
    }
  }

-  ngAfterViewInit(): void {
+  ngAfterViewInit() {
    this.user = this.storageService.getAuth()?.user ?? null;

    this.estimateSubscription = this.servicesApiService.estimate$(this.tx.txid).pipe(
@@ -121,8 +113,6 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
            }
          }

-          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate, this.miningStats);
-
          this.hasAncestors = this.estimate.txSummary.ancestorCount > 1;
          
          // Make min extra fee at least 50% of the current tx fee
@@ -170,7 +160,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
  /**
   * User changed his bid
   */
-  setUserBid({ fee, index }: { fee: number, index: number}): void {
+  setUserBid({ fee, index }: { fee: number, index: number}) {
    if (this.estimate) {
      this.selectFeeRateIndex = index;
      this.userBid = Math.max(0, fee);
@@ -181,12 +171,12 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
  /**
   * Scroll to element id with or without setTimeout
   */
-  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition): void {
+  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition) {
    setTimeout(() => {
      this.scrollToPreview(id, position);
    }, 100);
  }
-  scrollToPreview(id: string, position: ScrollLogicalPosition): void {
+  scrollToPreview(id: string, position: ScrollLogicalPosition) {
    const acceleratePreviewAnchor = document.getElementById(id);
    if (acceleratePreviewAnchor) {
      this.cd.markForCheck();
@@ -201,7 +191,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
  /**
   * Send acceleration request
   */
-  accelerate(): void {
+  accelerate() {
    if (this.accelerationSubscription) {
      this.accelerationSubscription.unsubscribe();
    }
@@ -227,7 +217,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
    });
  }

-  isLoggedIn(): boolean {
+  isLoggedIn() {
    const auth = this.storageService.getAuth();
    return auth !== null;
  }
@@ -239,7 +229,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges


  @HostListener('window:scroll', ['$event']) // for window scroll events
-  onScroll(): void {
+  onScroll() {
    if (this.estimate) {
      setTimeout(() => {
        this.onScroll();
--- a/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.html
+++ b/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.html
@@ -10,7 +10,7 @@
    </div>  

    <form [formGroup]="radioGroupForm" class="formRadioGroup" *ngIf="daysAvailable">
-      <div class="btn-group btn-group-toggle" name="radioBasic">
+      <div class="btn-group btn-group-toggle" name="radioBasic" [class]="{'disabled': isLoading}">
        <label class="btn btn-primary btn-sm" [class.active]="radioGroupForm.get('dateSpan').value === '24h'">
          <input type="radio" [value]="'24h'" fragment="24h" [routerLink]="['/graphs/acceleration/fees' | relativeUrl]" formControlName="dateSpan"> 24H
        </label>
@@ -46,7 +46,7 @@
  </div>

  <div [class.chart]="!widget" [class.chart-widget]="widget" *browserOnly [style]="{ height: widget ? ((height + 20) + 'px') : null}" echarts [initOpts]="chartInitOptions" [options]="chartOptions"
-    (chartInit)="onChartInit($event)" [style]="{opacity: isLoading ? 0.5 : 1}">
+    (chartInit)="onChartInit($event)">
  </div>
  <div class="text-center loadingGraphs" *ngIf="!stateService.isBrowser || isLoading">
    <div class="spinner-border text-light"></div>
--- a/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.scss
+++ b/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.scss
@@ -11,8 +11,7 @@

 .main-title {
  position: relative;
-  color: var(--fg);
-  opacity: var(--opacity);
+  color: #ffffff91;
  margin-top: -13px;
  font-size: 10px;
  text-transform: uppercase;
@@ -65,3 +64,8 @@ h5 {
  font-size: 1rem;
  color: var(--title-fg);
 }
+
+.disabled {
+  pointer-events: none;
+  opacity: 0.5;
+}
--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html
@@ -35,7 +35,7 @@
              {{ (acceleration.feeDelta) | number }} <span class="symbol" i18n="shared.sat|sat">sat</span>
            </td>
            <td class="time text-right">
-              <app-time kind="since" [time]="acceleration.added" [fastRender]="true" [showTooltip]="true"></app-time>
+              <app-time kind="since" [time]="acceleration.added" [fastRender]="true"></app-time>
            </td>
          </ng-container>
          <ng-container *ngIf="!pending">
@@ -55,7 +55,7 @@
              <span *ngIf="acceleration.status.includes('failed')" class="badge badge-danger" i18n="accelerator.canceled">Failed <span *ngIf="acceleration.status === 'failed_provisional'">🔄</span></span>
            </td>
            <td class="date text-right" *ngIf="!this.widget">
-              <app-time kind="since" [time]="acceleration.added" [fastRender]="true" [showTooltip]="true"></app-time>
+              <app-time kind="since" [time]="acceleration.added" [fastRender]="true"></app-time>
            </td>
          </ng-container>
        </tr>
--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
@@ -1,11 +1,9 @@
-import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnDestroy, Inject, LOCALE_ID } from '@angular/core';
-import { BehaviorSubject, Observable, Subscription, catchError, of, switchMap, tap, throttleTime } from 'rxjs';
+import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef } from '@angular/core';
+import { combineLatest, BehaviorSubject, Observable, catchError, of, switchMap, tap } from 'rxjs';
 import { Acceleration, BlockExtended } from '../../../interfaces/node-api.interface';
 import { StateService } from '../../../services/state.service';
 import { WebsocketService } from '../../../services/websocket.service';
 import { ServicesApiServices } from '../../../services/services-api.service';
-import { SeoService } from '../../../services/seo.service';
-import { ActivatedRoute, Router } from '@angular/router';

@Component({
  selector: 'app-accelerations-list',
@@ -13,7 +11,7 @@ import { ActivatedRoute, Router } from '@angular/router';
  styleUrls: ['./accelerations-list.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AccelerationsListComponent implements OnInit, OnDestroy {
+export class AccelerationsListComponent implements OnInit {
  @Input() widget: boolean = false;
  @Input() pending: boolean = false;
  @Input() accelerations$: Observable<Acceleration[]>;
@@ -27,48 +25,26 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
  maxSize = window.innerWidth <= 767.98 ? 3 : 5;
  skeletonLines: number[] = [];
  pageSubject: BehaviorSubject<number> = new BehaviorSubject(this.page);
-  keyNavigationSubscription: Subscription;
-  dir: 'rtl' | 'ltr' = 'ltr';
-  paramSubscription: Subscription;

  constructor(
    private servicesApiService: ServicesApiServices,
    private websocketService: WebsocketService,
    public stateService: StateService,
    private cd: ChangeDetectorRef,
-    private seoService: SeoService,
-    private route: ActivatedRoute,
-    private router: Router,
-    @Inject(LOCALE_ID) private locale: string,
  ) {
-    if (this.locale.startsWith('ar') || this.locale.startsWith('fa') || this.locale.startsWith('he')) {
-      this.dir = 'rtl';
-    }
  }

  ngOnInit(): void {
    if (!this.widget) {
      this.websocketService.want(['blocks']);
-      this.seoService.setTitle($localize`:@@02573b6980a2d611b4361a2595a4447e390058cd:Accelerations`);
    }

    this.skeletonLines = this.widget === true ? [...Array(6).keys()] : [...Array(15).keys()];
    this.paginationMaxSize = window.matchMedia('(max-width: 670px)').matches ? 3 : 5;
    
-    this.paramSubscription = this.route.params.pipe(
-      tap(params => {
-        this.page = +params['page'] || 1;
-        this.pageSubject.next(this.page);
-      })
-    ).subscribe();
-
    this.accelerationList$ = this.pageSubject.pipe(
      switchMap((page) => {
-        this.isLoading = true;
-        const accelerationObservable$ = this.accelerations$ || (this.pending ? this.stateService.liveAccelerations$ : this.servicesApiService.getAccelerationHistoryObserveResponse$({ page: page }));
-        if (!this.accelerations$ && this.pending) {
-          this.websocketService.ensureTrackAccelerations();
-        }
+        const accelerationObservable$ = this.accelerations$ || (this.pending ? this.servicesApiService.getAccelerations$() : this.servicesApiService.getAccelerationHistoryObserveResponse$({ page: page }));
        return accelerationObservable$.pipe(
          switchMap(response => {
            let accelerations = response;
@@ -100,39 +76,13 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
        );
      })
    );
-
-    this.keyNavigationSubscription = this.stateService.keyNavigation$.pipe(
-      tap((event) => {
-        const prevKey = this.dir === 'ltr' ? 'ArrowLeft' : 'ArrowRight';
-        const nextKey = this.dir === 'ltr' ? 'ArrowRight' : 'ArrowLeft';
-        if (event.key === prevKey && this.page > 1) {
-          this.page--;
-          this.isLoading = true;
-          this.cd.markForCheck();
-        }
-        if (event.key === nextKey && this.page * 15 < this.accelerationCount) {
-          this.page++;
-          this.isLoading = true;
-          this.cd.markForCheck();
-        }
-      }),
-      throttleTime(1000, undefined, { leading: true, trailing: true }),
-    ).subscribe(() => {
-      this.pageChange(this.page);
-    });
  }

  pageChange(page: number): void {
-    this.router.navigate(['acceleration', 'list', page]);
+    this.pageSubject.next(page);
  }

  trackByBlock(index: number, block: BlockExtended): number {
    return block.height;
  }
-
-  ngOnDestroy(): void {
-    this.websocketService.stopTrackAccelerations();
-    this.paramSubscription?.unsubscribe();
-    this.keyNavigationSubscription?.unsubscribe();
-  }
 }
--- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.scss
+++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.scss
@@ -60,8 +60,7 @@

 .main-title {
  position: relative;
-  color: var(--fg);
-  opacity: var(--opacity);
+  color: #ffffff91;
  margin-top: -13px;
  font-size: 10px;
  text-transform: uppercase;
--- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts
+++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts
@@ -1,10 +1,10 @@
-import { ChangeDetectionStrategy, Component, HostListener, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostListener, Inject, OnInit, PLATFORM_ID } from '@angular/core';
 import { SeoService } from '../../../services/seo.service';
 import { OpenGraphService } from '../../../services/opengraph.service';
 import { WebsocketService } from '../../../services/websocket.service';
 import { Acceleration, BlockExtended } from '../../../interfaces/node-api.interface';
 import { StateService } from '../../../services/state.service';
-import { Observable, Subscription, catchError, combineLatest, distinctUntilChanged, map, of, share, switchMap, tap } from 'rxjs';
+import { Observable, catchError, combineLatest, distinctUntilChanged, interval, map, of, share, startWith, switchMap, tap } from 'rxjs';
 import { Color } from '../../block-overview-graph/sprite-types';
 import { hexToColor } from '../../block-overview-graph/utils';
 import TxView from '../../block-overview-graph/tx-view';
@@ -28,7 +28,7 @@ interface AccelerationBlock extends BlockExtended {
  styleUrls: ['./accelerator-dashboard.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
+export class AcceleratorDashboardComponent implements OnInit {
  blocks$: Observable<AccelerationBlock[]>;
  accelerations$: Observable<Acceleration[]>;
  pendingAccelerations$: Observable<Acceleration[]>;
@@ -39,8 +39,6 @@ export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
  firstLoad = true;
  timespan: '3d' | '1w' | '1m' = '1w';

-  accelerationDeltaSubscription: Subscription;
-
  graphHeight: number = 300;
  theme: ThemeService;

@@ -61,28 +59,27 @@ export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
  ngOnInit(): void {
    this.onResize();
    this.websocketService.want(['blocks', 'mempool-blocks', 'stats']);
-    this.websocketService.startTrackAccelerations();

-    this.pendingAccelerations$ = this.stateService.liveAccelerations$.pipe(
-      share(),
-    );
-    this.accelerationDeltaSubscription = this.stateService.accelerations$.subscribe((delta) => {
-      if (!delta.reset) {
-        let hasNewAcceleration = false;
-        for (const acc of delta.added) {
-          if (!this.seen.has(acc.txid)) {
-            hasNewAcceleration = true;
-          }
-          this.seen.add(acc.txid);
-        }
-        for (const txid of delta.removed) {
-          this.seen.delete(txid);
-        }
-        if (hasNewAcceleration) {
+    this.pendingAccelerations$ = (this.stateService.isBrowser ? interval(30000) : of(null)).pipe(
+      startWith(true),
+      switchMap(() => {
+        return this.serviceApiServices.getAccelerations$().pipe(
+          catchError(() => {
+            return of([]);
+          }),
+        );
+      }),
+      tap(accelerations => {
+        if (!this.firstLoad && accelerations.some(acc => !this.seen.has(acc.txid))) {
          this.audioService.playSound('bright-harmony');
        }
-      }
-    });
+        for(const acc of accelerations) {
+          this.seen.add(acc.txid);
+        }
+        this.firstLoad = false;
+      }),
+      share(),
+    );

    this.accelerations$ = this.stateService.chainTip$.pipe(
      distinctUntilChanged(),
@@ -96,16 +93,10 @@ export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
      share(),
    );

-    this.minedAccelerations$ = this.stateService.chainTip$.pipe(
-      distinctUntilChanged(),
-      switchMap(() => {
-        return this.serviceApiServices.getAccelerationHistory$({ status: 'completed', pageLength: 6 }).pipe(
-          catchError(() => {
-            return of([]);
-          }),
-        );
-      }),
-      share(),
+    this.minedAccelerations$ = this.accelerations$.pipe(
+      map(accelerations => {
+        return accelerations.filter(acc => ['completed_provisional', 'completed'].includes(acc.status));
+      })
    );

    this.blocks$ = combineLatest([
@@ -154,7 +145,7 @@ export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
    } else {
      const rate = tx.fee / tx.vsize; // color by simple single-tx fee rate
      const feeLevelIndex = feeLevels.findIndex((feeLvl) => Math.max(1, rate) < feeLvl) - 1;
-      return this.theme.theme === 'contrast' || this.theme.theme === 'bukele' ? contrastColors[feeLevelIndex] || contrastColors[contrastColors.length - 1] : normalColors[feeLevelIndex] || normalColors[normalColors.length - 1];
+      return this.theme.theme === 'contrast' ? contrastColors[feeLevelIndex] || contrastColors[contrastColors.length - 1] : normalColors[feeLevelIndex] || normalColors[normalColors.length - 1];
    }
  }

@@ -163,11 +154,6 @@ export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
    return false;
  }

-  ngOnDestroy(): void {
-    this.accelerationDeltaSubscription.unsubscribe();
-    this.websocketService.stopTrackAccelerations();
-  }
-
  @HostListener('window:resize', ['$event'])
  onResize(): void {
    if (window.innerWidth >= 992) {
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
@@ -1,52 +0,0 @@
-@if (chartOnly) {
-  <ng-container *ngTemplateOutlet="pieChart"></ng-container>
-} @else {
-<table>
-  <tbody>
-    <tr>
-      <td class="td-width field-label" [class]="chartPositionLeft ? 'chart-left' : ''" i18n="transaction.accelerated-to-feerate|Accelerated to feerate">Accelerated to</td>
-      <td class="pie-chart" rowspan="2" *ngIf="chartPositionLeft">
-        <ng-container *ngTemplateOutlet="pieChart"></ng-container>
-      </td>
-      <td class="field-value" [class]="chartPositionLeft ? 'chart-left' : ''">
-        <div class="effective-fee-container">
-          @if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize)) {
-            <app-fee-rate [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
-          } @else {
-            <app-fee-rate [fee]="tx.effectiveFeePerVsize"></app-fee-rate>
-          }
-        </div>
-      </td>
-      <td class="pie-chart" rowspan="2" *ngIf="!chartPositionLeft">
-        <ng-container *ngTemplateOutlet="pieChart"></ng-container>
-      </td>
-    </tr>
-    <tr>
-      <td class="td-width field-label" i18n="transaction.accelerated-by-hashrate|Accelerated to hashrate">Accelerated by</td>
-      <td class="field-value" *ngIf="acceleratedByPercentage">
-        {{ acceleratedByPercentage }} <span class="symbol hashrate-label">of hashrate</span>
-      </td>
-    </tr>
-  </tbody>
-</table>
-}
-
-<ng-template #pieChart>
-  <div class="chart-container">
-    @if (chartOptions && miningStats) {
-      <div
-        echarts
-        *browserOnly
-        class="chart"
-        [initOpts]="chartInitOptions"
-        [options]="chartOptions"
-        style="height: 72px; width: 72px;"
-        (chartInit)="onChartInit($event)"
-      ></div>
-    } @else {
-      <div class="chart-loading">
-        <div class="spinner-border text-light"></div>
-      </div>
-    }
-  </div>
-</ng-template>
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
@@ -1,64 +0,0 @@
-.td-width {
-  width: 150px;
-  min-width: 150px;
-
-  @media (max-width: 768px) {
-    width: 175px;
-    min-width: 175px;
-  }
-}
-
-.field-label {
-  @media (max-width: 849px) {
-    text-align: left;    
-  }
-  @media (max-width: 649px) {
-    width: auto;
-    min-width: auto;
-  }
-  &.chart-left {
-    width: 100%;
-  }
-}
-
-.field-value {
-  @media (max-width: 849px) {
-    width: 100%;
-  }
-
-  &.chart-left {
-    width: auto;
-  }
-
-  .hashrate-label {
-    @media (max-width: 420px) {
-      display: none;
-    }
-  }
-}
-
-.pie-chart {
-  width: 100%;
-  vertical-align: middle;
-  text-align: center;
-
-  .chart-container {
-    width: 72px;
-    height: 100%;
-    margin-left: auto;
-  }
-
-  @media (max-width: 850px) {
-    width: 150px;
-  }
-  @media (max-width: 420px) {
-    padding-left: 0;
-  }
-}
-
-::ng-deep .chart {
-  overflow: visible;
-  & > div, & > div > svg {
-    overflow: visible !important;
-  }
-}
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
@@ -1,136 +0,0 @@
-import { Component, ChangeDetectionStrategy, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { Transaction } from '../../../interfaces/electrs.interface';
-import { Acceleration, SinglePoolStats } from '../../../interfaces/node-api.interface';
-import { EChartsOption, PieSeriesOption } from '../../../graphs/echarts';
-import { MiningStats } from '../../../services/mining.service';
-
-function lighten(color, p): { r, g, b } {
-  return {
-    r: color.r + ((255 - color.r) * p),
-    g: color.g + ((255 - color.g) * p),
-    b: color.b + ((255 - color.b) * p),
-  };
-}
-
-function toRGB({r,g,b}): string {
-  return `rgb(${r},${g},${b})`;
-}
-
-@Component({
-  selector: 'app-active-acceleration-box',
-  templateUrl: './active-acceleration-box.component.html',
-  styleUrls: ['./active-acceleration-box.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class ActiveAccelerationBox implements OnChanges {
-  @Input() tx: Transaction;
-  @Input() accelerationInfo: Acceleration;
-  @Input() miningStats: MiningStats;
-  @Input() pools: number[];
-  @Input() chartOnly: boolean = false;
-  @Input() chartPositionLeft: boolean = false;
-
-  acceleratedByPercentage: string = '';
-
-  chartOptions: EChartsOption;
-  chartInitOptions = {
-    renderer: 'svg',
-  };
-  timespan = '';
-  chartInstance: any = undefined;
-
-  constructor() {}
-
-  ngOnChanges(changes: SimpleChanges): void {
-    const pools = this.pools || this.accelerationInfo?.pools || this.tx.acceleratedBy;
-    if (pools && this.miningStats) {
-      this.prepareChartOptions(pools);
-    }
-  }
-
-  getChartData(poolList: number[]) {
-    const data: object[] = [];
-    const pools: { [id: number]: SinglePoolStats } = {};
-    for (const pool of this.miningStats.pools) {
-      pools[pool.poolUniqueId] = pool;
-    }
-
-    const getDataItem = (value, color, tooltip, emphasis) => ({
-      value,
-      name: tooltip,
-      itemStyle: {
-        color,
-      },
-    });
-
-    const acceleratingPools = (poolList || []).filter(id => pools[id]).sort((a,b) => pools[a].lastEstimatedHashrate - pools[b].lastEstimatedHashrate);
-    const totalAcceleratedHashrate = acceleratingPools.reduce((total, pool) => total + pools[pool].lastEstimatedHashrate, 0);
-    acceleratingPools.forEach((poolId, index) => {
-      const pool = pools[poolId];
-      const poolShare = ((pool.lastEstimatedHashrate / this.miningStats.lastEstimatedHashrate) * 100).toFixed(1);
-      data.push(getDataItem(
-        pool.lastEstimatedHashrate,
-        toRGB(lighten({ r: 147, g: 57, b: 244 }, index * .08)),
-        `<b style="color: white">${pool.name} (${poolShare}%)</b>`,
-        true,
-      ) as PieSeriesOption);
-    })
-    this.acceleratedByPercentage = ((totalAcceleratedHashrate / this.miningStats.lastEstimatedHashrate) * 100).toFixed(1) + '%';
-    const notAcceleratedByPercentage = ((1 - (totalAcceleratedHashrate / this.miningStats.lastEstimatedHashrate)) * 100).toFixed(1) + '%';
-    data.push(getDataItem(
-      (this.miningStats.lastEstimatedHashrate - totalAcceleratedHashrate),
-      'rgba(127, 127, 127, 0.3)',
-      `not accelerating (${notAcceleratedByPercentage})`,
-      false,
-    ) as PieSeriesOption);
-
-    return data;
-  }
-
-  prepareChartOptions(pools: number[]) {
-    this.chartOptions = {
-      animation: false,
-      grid: {
-        top: 0,
-        right: 0,
-        bottom: 0,
-        left: 0,
-      },
-      tooltip: {
-        show: true,
-        trigger: 'item',
-        backgroundColor: 'rgba(17, 19, 31, 1)',
-        borderRadius: 4,
-        shadowColor: 'rgba(0, 0, 0, 0.5)',
-        textStyle: {
-          color: 'var(--tooltip-grey)',
-        },
-        borderColor: '#000',
-        formatter: (item) => {
-          return item.name;
-        }
-      },
-      series: [
-        {
-          type: 'pie',
-          radius: '100%',
-          label: {
-            show: false
-          },
-          labelLine: {
-            show: false
-          },
-          animationDuration: 0,
-          data: this.getChartData(pools),
-        }
-      ]
-    };
-  }
-
-  onChartInit(ec) {
-    if (this.chartInstance !== undefined) {
-      return;
-    }
-    this.chartInstance = ec;
-  }
-}
--- a/frontend/src/app/components/acceleration/pending-stats/pending-stats.component.ts
+++ b/frontend/src/app/components/acceleration/pending-stats/pending-stats.component.ts
@@ -2,8 +2,7 @@ import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { Acceleration } from '../../../interfaces/node-api.interface';
-import { StateService } from '../../../services/state.service';
-import { WebsocketService } from '../../../services/websocket.service';
+import { ServicesApiServices } from '../../../services/services-api.service';

@Component({
  selector: 'app-pending-stats',
@@ -16,12 +15,11 @@ export class PendingStatsComponent implements OnInit {
  public accelerationStats$: Observable<any>;

  constructor(
-    private stateService: StateService,
-    private websocketService: WebsocketService,
+    private servicesApiService: ServicesApiServices,
  ) { }

  ngOnInit(): void {
-    this.accelerationStats$ = (this.accelerations$ || this.stateService.liveAccelerations$).pipe(
+    this.accelerationStats$ = (this.accelerations$ || this.servicesApiService.getAccelerations$()).pipe(
      switchMap(accelerations => {
        let totalAccelerations = 0;
        let totalFeeDelta = 0;
--- a/frontend/src/app/components/address-graph/address-graph.component.html
+++ b/frontend/src/app/components/address-graph/address-graph.component.html
@@ -1,8 +1,14 @@
-<app-indexing-progress *ngIf="!widget"></app-indexing-progress>
+<app-indexing-progress></app-indexing-progress>
+
+<div class="full-container">
+  <div class="card-header mb-0 mb-md-2">
+    <div class="d-flex d-md-block align-items-baseline">
+      <span i18n="address.balance-history">Balance History</span>
+    </div>  
+    </div>

-<div [class.full-container]="!widget">
  <ng-container *ngIf="!error">
-    <div [class]="!widget ? 'chart' : 'chart-widget'" *browserOnly [style]="{ height: widget ? ((height + 20) + 'px') : null, paddingBottom: !widget && !allowZoom ? '10px' : null}" echarts [initOpts]="chartInitOptions" [options]="chartOptions"
+    <div class="chart" *browserOnly echarts [initOpts]="chartInitOptions" [options]="chartOptions"
      (chartInit)="onChartInit($event)">
    </div>
    <div class="text-center loadingGraphs" *ngIf="isLoading">
@@ -14,8 +20,4 @@
      <p class="error">{{ error }}</p>
    </div>
  </ng-container>
-
-  <div class="text-center loadingGraphs" *ngIf="!stateService.isBrowser || isLoading">
-    <div class="spinner-border text-light"></div>
-  </div>
 </div>
--- a/frontend/src/app/components/address-graph/address-graph.component.scss
+++ b/frontend/src/app/components/address-graph/address-graph.component.scss
@@ -11,8 +11,7 @@

 .main-title {
  position: relative;
-  color: var(--fg);
-  opacity: var(--opacity);
+  color: #ffffff91;
  margin-top: -13px;
  font-size: 10px;
  text-transform: uppercase;
@@ -46,11 +45,28 @@
  display: flex;
  flex: 1;
  width: 100%;
+  padding-bottom: 20px;
  padding-right: 10px;
+  @media (max-width: 992px) {
+    padding-bottom: 25px;
+  }
+  @media (max-width: 829px) {
+    padding-bottom: 50px;
+  }
+  @media (max-width: 767px) {
+    padding-bottom: 25px;
+  }
+  @media (max-width: 629px) {
+    padding-bottom: 55px;
+  }
+  @media (max-width: 567px) {
+    padding-bottom: 55px;
+  }
 }
 .chart-widget {
  width: 100%;
  height: 100%;
+  max-height: 270px;
 }

 .disabled {
--- a/frontend/src/app/components/address-graph/address-graph.component.ts
+++ b/frontend/src/app/components/address-graph/address-graph.component.ts
@@ -1,25 +1,12 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, NgZone, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, OnChanges, SimpleChanges } from '@angular/core';
 import { echarts, EChartsOption } from '../../graphs/echarts';
-import { BehaviorSubject, Observable, Subscription, combineLatest, of } from 'rxjs';
-import { catchError, map, switchMap, tap } from 'rxjs/operators';
-import { AddressTxSummary, ChainStats } from '../../interfaces/electrs.interface';
+import { of } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { ChainStats } from '../../interfaces/electrs.interface';
 import { ElectrsApiService } from '../../services/electrs-api.service';
 import { AmountShortenerPipe } from '../../shared/pipes/amount-shortener.pipe';
 import { Router } from '@angular/router';
 import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
-import { StateService } from '../../services/state.service';
-import { PriceService } from '../../services/price.service';
-import { FiatCurrencyPipe } from '../../shared/pipes/fiat-currency.pipe';
-import { FiatShortenerPipe } from '../../shared/pipes/fiat-shortener.pipe';
-
-const periodSeconds = {
-  '1d': (60 * 60 * 24),
-  '3d': (60 * 60 * 24 * 3),
-  '1w': (60 * 60 * 24 * 7),
-  '1m': (60 * 60 * 24 * 30),
-  '6m': (60 * 60 * 24 * 180),
-  '1y': (60 * 60 * 24 * 365),
-};

@Component({
  selector: 'app-address-graph',
@@ -35,28 +22,15 @@ const periodSeconds = {
  `],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class AddressGraphComponent implements OnChanges, OnDestroy {
+export class AddressGraphComponent implements OnChanges {
  @Input() address: string;
  @Input() isPubkey: boolean = false;
  @Input() stats: ChainStats;
-  @Input() addressSummary$: Observable<AddressTxSummary[]> | null;
-  @Input() period: '1d' | '3d' | '1w' | '1m' | '6m' | '1y' | 'all' = 'all';
-  @Input() height: number = 200;
  @Input() right: number | string = 10;
  @Input() left: number | string = 70;
-  @Input() widget: boolean = false;

  data: any[] = [];
-  fiatData: any[] = [];
  hoverData: any[] = [];
-  conversions: any;
-  allowZoom: boolean = false;
-  initialRight = this.right;
-  initialLeft = this.left;
-  selected = { [$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`]: true, 'Fiat': false };
-
-  subscription: Subscription;
-  redraw$: BehaviorSubject<boolean> = new BehaviorSubject(false);

  chartOptions: EChartsOption = {};
  chartInitOptions = {
@@ -69,114 +43,41 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {

  constructor(
    @Inject(LOCALE_ID) public locale: string,
-    public stateService: StateService,
    private electrsApiService: ElectrsApiService,
    private router: Router,
    private amountShortenerPipe: AmountShortenerPipe,
    private cd: ChangeDetectorRef,
    private relativeUrlPipe: RelativeUrlPipe,
-    private priceService: PriceService,
-    private fiatCurrencyPipe: FiatCurrencyPipe,
-    private fiatShortenerPipe: FiatShortenerPipe,
-    private zone: NgZone,
  ) {}

  ngOnChanges(changes: SimpleChanges): void {
    this.isLoading = true;
-    if (!this.address || !this.stats) {
-      return;
-    }
-    if (changes.address || changes.isPubkey || changes.addressSummary$ || changes.stats) {
-      if (this.subscription) {
-        this.subscription.unsubscribe();
+    (this.isPubkey
+      ? this.electrsApiService.getScriptHashSummary$((this.address.length === 66 ? '21' : '41') + this.address + 'ac')
+      : this.electrsApiService.getAddressSummary$(this.address)).pipe(
+      catchError(e => {
+        this.error = `Failed to fetch address balance history: ${e?.status || ''} ${e?.statusText || 'unknown error'}`;
+        return of(null);
+      }),
+    ).subscribe(addressSummary => {
+      if (addressSummary) {
+        this.error = null;
+        this.prepareChartOptions(addressSummary);
      }
-      this.subscription = combineLatest([
-        this.redraw$,
-        (this.addressSummary$ || (this.isPubkey
-          ? this.electrsApiService.getScriptHashSummary$((this.address.length === 66 ? '21' : '41') + this.address + 'ac')
-          : this.electrsApiService.getAddressSummary$(this.address)).pipe(
-          catchError(e => {
-            this.error = `Failed to fetch address balance history: ${e?.status || ''} ${e?.statusText || 'unknown error'}`;
-            return of(null);
-          }),
-        )),
-        this.stateService.conversions$
-      ]).pipe(
-        switchMap(([redraw, addressSummary, conversions]) => {
-          this.conversions = conversions;
-          if (addressSummary) {
-            let extendedSummary = this.extendSummary(addressSummary);
-            return this.priceService.getPriceByBulk$(extendedSummary.map(d => d.time), 'USD').pipe(
-              tap((prices) => {
-                if (prices.length !== extendedSummary.length) {
-                  extendedSummary = extendedSummary.map(item => ({ ...item, price: 0 }));
-                } else {
-                  extendedSummary = extendedSummary.map((item, index) => {
-                    let price = 0;
-                    if (prices[index].price) {
-                      price = prices[index].price['USD'];
-                    } else if (this.conversions && this.conversions['USD']) {
-                      price = this.conversions['USD'];
-                    }
-                    return { ...item, price: price }
-                  });
-                }
-              }),
-              map(() => [redraw, extendedSummary, conversions])
-            )
-          } else {
-            return of([redraw, addressSummary, conversions]);
-          }
-        })
-      ).subscribe(([redraw, addressSummary, conversions]) => {
-        if (addressSummary) {
-          this.error = null;
-          this.allowZoom = addressSummary.length > 100 && !this.widget;
-          this.prepareChartOptions(addressSummary);
-        }
-        this.isLoading = false;
-        this.cd.markForCheck();
-      });
-    } else {
-      // re-trigger subscription
-      this.redraw$.next(true);
-    }
+      this.isLoading = false;
+      this.cd.markForCheck();
+    });
  }

-  prepareChartOptions(summary: AddressTxSummary[]) {
-    if (!summary || !this.stats) {
-      return;
-    }
-    
-    let total = (this.stats.funded_txo_sum - this.stats.spent_txo_sum);
-    const processData = summary.map(d => {
-        const balance = total;
-        const fiatBalance = total * d.price / 100_000_000;
-        total -= d.value;
-        return {
-            time: d.time * 1000,
-            balance,
-            fiatBalance,
-            d
-        };
+  prepareChartOptions(summary): void {
+    let total = (this.stats.funded_txo_sum - this.stats.spent_txo_sum); // + (summary[0]?.value || 0);
+    this.data = summary.map(d => {
+      const balance = total;
+      total -= d.value;
+      return [d.time * 1000, balance, d];
    }).reverse();
-    
-    this.data = processData.filter(({ d }) => d.txid !== undefined).map(({ time, balance, d }) => [time, balance, d]);
-    this.fiatData = processData.map(({ time, fiatBalance, balance, d }) => [time, fiatBalance, d, balance]);

-    const now = Date.now();
-    if (this.period !== 'all') {
-      const start = now - (periodSeconds[this.period] * 1000);
-      this.data = this.data.filter(d => d[0] >= start);
-      const startFiat = this.data[0]?.[0] ?? start; // Make sure USD data starts at the same time as BTC data
-      this.fiatData = this.fiatData.filter(d => d[0] >= startFiat);
-    }
-    this.data.push(
-      {value: [now, this.stats.funded_txo_sum - this.stats.spent_txo_sum], symbol: 'none', tooltip: { show: false }}
-    );
-
-    const maxValue = this.data.reduce((acc, d) => Math.max(acc, Math.abs(d[1] ?? d.value[1])), 0);
-    const minValue = this.data.reduce((acc, d) => Math.min(acc, Math.abs(d[1] ?? d.value[1])), maxValue);
+    const maxValue = this.data.reduce((acc, d) => Math.max(acc, Math.abs(d[1])), 0);

    this.chartOptions = {
      color: [
@@ -184,42 +85,14 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
          { offset: 0, color: '#FDD835' },
          { offset: 1, color: '#FB8C00' },
        ]),
-        new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-          { offset: 0, color: '#4CAF50' },
-          { offset: 1, color: '#1B5E20' },
-        ]),
      ],
      animation: false,
      grid: {
        top: 20,
-        bottom: this.allowZoom ? 65 : 20,
+        bottom: 20,
        right: this.right,
        left: this.left,
      },
-      legend: !this.stateService.isAnyTestnet() ? {
-        data: [
-          {
-            name: $localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`,
-            inactiveColor: 'var(--grey)',
-            textStyle: {
-              color: 'white',
-            },
-            icon: 'roundRect',
-          },
-          {
-            name: 'Fiat',
-            inactiveColor: 'var(--grey)',
-            textStyle: {
-              color: 'white',
-            },
-            icon: 'roundRect',
-          }
-        ],
-        selected: this.selected,
-        formatter: function (name) {
-          return name === 'Fiat' ? 'USD' : 'BTC';
-        }
-      } : undefined,
      tooltip: {
        show: !this.isMobile(),
        trigger: 'axis',
@@ -234,64 +107,24 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
          align: 'left',
        },
        borderColor: '#000',
-        formatter: function (data) {
-          const btcData = data.filter(d => d.seriesName !== 'Fiat');
-          const fiatData = data.filter(d => d.seriesName === 'Fiat');
-          data = btcData.length ? btcData : fiatData;
-          if ((!btcData.length || !btcData[0]?.data?.[2]?.txid) && !fiatData.length) {
-            return '';
-          }
-          let tooltip = '<div>';
-
-          const hasTx = data[0].data[2].txid;
-          if (hasTx) {
-            const header = data.length === 1
+        formatter: function (data): string {
+          const header = data.length === 1
            ? `${data[0].data[2].txid.slice(0, 6)}...${data[0].data[2].txid.slice(-6)}`
            : `${data.length} transactions`;
-            tooltip += `<span><b>${header}</b></span>`;
-          }
-          
          const date = new Date(data[0].data[0]).toLocaleTimeString(this.locale, { year: 'numeric', month: 'short', day: 'numeric' });
-          
-          tooltip += `<div>
-            <div style="text-align: right;">`;
-          
-          const formatBTC = (val, decimal) => (val / 100_000_000).toFixed(decimal);
-          const formatFiat = (val) => this.fiatCurrencyPipe.transform(val, null, 'USD');
-          
-          const btcVal = btcData.reduce((total, d) => total + d.data[2].value, 0);
-          const fiatVal = fiatData.reduce((total, d) => total + d.data[2].value * d.data[2].price / 100_000_000, 0);
-          const btcColor = btcVal === 0 ? '' : (btcVal > 0 ? 'var(--green)' : 'var(--red)');
-          const fiatColor = fiatVal === 0 ? '' : (fiatVal > 0 ? 'var(--green)' : 'var(--red)');
-          const btcSymbol = btcVal > 0 ? '+' : '';
-          const fiatSymbol = fiatVal > 0 ? '+' : '';
-
-          if (btcData.length && fiatData.length) {
-            tooltip += `<div style="display: flex; justify-content: space-between; color: ${btcColor}">
-              <span style="text-align: left; margin-right: 10px;">${btcSymbol} ${formatBTC(btcVal, 4)} BTC</span>
-              <span style="text-align: right;">${fiatSymbol} ${formatFiat(fiatVal)}</span>
+          const val = data.reduce((total, d) => total + d.data[2].value, 0);
+          const color = val === 0 ? '' : (val > 0 ? 'var(--green)' : 'var(--red)');
+          const symbol = val > 0 ? '+' : '';
+          return `
+            <div>
+              <span><b>${header}</b></span>
+              <div style="text-align: right;">
+                <span style="color: ${color}">${symbol} ${(val / 100_000_000).toFixed(8)} BTC</span><br>
+                <span>${(data[0].data[1] / 100_000_000).toFixed(8)} BTC</span>
+              </div>
+              <span>${date}</span>
            </div>
-            <div style="display: flex; justify-content: space-between;">
-              <span style="text-align: left; margin-right: 10px;">${formatBTC(btcData[0].data[1], 4)} BTC</span>
-              <span style="text-align: right;">${formatFiat(fiatData[0].data[1])}</span>
-            </div>`;
-          } else if (btcData.length) {
-            tooltip += `<span style="color: ${btcColor}">${btcSymbol} ${formatBTC(btcVal, 8)} BTC</span><br>
-              <span>${formatBTC(data[0].data[1], 8)} BTC</span>`;
-          } else {
-            if (this.selected[$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`]) {
-              tooltip += `<div style="display: flex; justify-content: space-between;">
-                <span style="text-align: left; margin-right: 10px;">${formatBTC(data[0].data[3], 4)} BTC</span>
-                <span style="text-align: right;">${formatFiat(data[0].data[1])}</span>
-              </div>`;
-            } else {
-              tooltip += `${hasTx ? `<span style="color: ${fiatColor}">${fiatSymbol} ${formatFiat(fiatVal)}</span><br>` : ''}
-              <span>${formatFiat(data[0].data[1])}</span>`;
-            }
-          }
-
-          tooltip += `</div><span>${date}</span></div>`;
-          return tooltip;
+          `;
        }.bind(this)
      },
      xAxis: {
@@ -308,17 +141,13 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
          axisLabel: {
            color: 'rgb(110, 112, 121)',
            formatter: (val): string => {
-              let valSpan = maxValue - (this.period === 'all' ? 0 : minValue);
-              if (valSpan > 100_000_000_000) {
+              if (maxValue > 1_000_000_000) {
                return `${this.amountShortenerPipe.transform(Math.round(val / 100_000_000), 0)} BTC`;
-              }
-              else if (valSpan > 1_000_000_000) {
-                return `${this.amountShortenerPipe.transform(Math.round(val / 100_000_000), 2)} BTC`;
-              } else if (valSpan > 100_000_000) {
+              } else if (maxValue > 100_000_000) {
                return `${(val / 100_000_000).toFixed(1)} BTC`;
-              } else if (valSpan > 10_000_000) {
+              } else if (maxValue > 10_000_000) {
                return `${(val / 100_000_000).toFixed(2)} BTC`;
-              } else if (valSpan > 1_000_000) {
+              } else if (maxValue > 1_000_000) {
                return `${(val / 100_000_000).toFixed(3)} BTC`;
              } else {
                return `${this.amountShortenerPipe.transform(val, 0)} sats`;
@@ -328,26 +157,11 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
          splitLine: {
            show: false,
          },
-          min: this.period === 'all' ? 0 : 'dataMin'
-        },
-        {
-          type: 'value',
-          axisLabel: {
-            color: 'rgb(110, 112, 121)',
-            formatter: function(val) {
-              return this.fiatShortenerPipe.transform(val, null, 'USD');
-            }.bind(this)
-          },
-          splitLine: {
-            show: false,
-          },
-          min: this.period === 'all' ? 0 : 'dataMin'
        },
      ],
      series: [
        {
          name: $localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`,
-          yAxisIndex: 0,
          showSymbol: false,
          symbol: 'circle',
          symbolSize: 8,
@@ -359,58 +173,14 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
          type: 'line',
          smooth: false,
          step: 'end'
-        }, !this.stateService.isAnyTestnet() ?
-        {
-          name: 'Fiat',
-          yAxisIndex: 1,
-          showSymbol: false,
-          symbol: 'circle',
-          symbolSize: 8,
-          data: this.fiatData,
-          areaStyle: {
-            opacity: 0.5,
-          },
-          triggerLineEvent: true,
-          type: 'line',
-          smooth: false,
-          step: 'end'
-        } : undefined
+        }
      ],
-      dataZoom: this.allowZoom ? [{
-        type: 'inside',
-        realtime: true,
-        zoomLock: true,
-        maxSpan: 100,
-        minSpan: 5,
-        moveOnMouseMove: false,
-      }, {
-        showDetail: false,
-        show: true,
-        type: 'slider',
-        brushSelect: false,
-        realtime: true,
-        left: this.left,
-        right: this.right,
-        selectedDataBackground: {
-          lineStyle: {
-            color: '#fff',
-            opacity: 0.45,
-          },
-        },
-      }] : undefined
    };
  }

  onChartClick(e) {
    if (this.hoverData?.length && this.hoverData[0]?.[2]?.txid) {
-      this.zone.run(() => { 
-        const url = this.relativeUrlPipe.transform(`/tx/${this.hoverData[0][2].txid}`);
-        if (e.event.event.shiftKey || e.event.event.ctrlKey || e.event.event.metaKey) {
-          window.open(url);
-        } else {
-          this.router.navigate([url]);
-        }
-      });
+      this.router.navigate([this.relativeUrlPipe.transform('/tx/'), this.hoverData[0][2].txid]);
    }
  }

@@ -418,70 +188,13 @@ export class AddressGraphComponent implements OnChanges, OnDestroy {
    this.hoverData = (e?.dataByCoordSys?.[0]?.dataByAxis?.[0]?.seriesDataIndices || []).map(indices => this.data[indices.dataIndex]);
  }

-  onLegendSelectChanged(e) {
-    this.selected = e.selected;
-    this.right = this.selected['Fiat'] ? +this.initialRight + 40 : this.initialRight;
-    this.left = this.selected[$localize`:@@7e69426bd97a606d8ae6026762858e6e7c86a1fd:Balance`] ? this.initialLeft : +this.initialLeft - 40;
-
-    this.chartOptions = {
-      grid: {
-        right: this.right,
-        left: this.left,
-      },
-      legend: {
-        selected: this.selected,
-      },
-      dataZoom: this.allowZoom ? [{
-        left: this.left,
-        right: this.right,
-      }, {
-        left: this.left,
-        right: this.right,
-      }] : undefined
-    };
-    
-    if (this.chartInstance) {
-      this.chartInstance.setOption(this.chartOptions);
-    }
-  }
-
  onChartInit(ec) {
    this.chartInstance = ec;
    this.chartInstance.on('showTip', this.onTooltip.bind(this));
    this.chartInstance.on('click', 'series', this.onChartClick.bind(this));
-    this.chartInstance.on('legendselectchanged', this.onLegendSelectChanged.bind(this));
-  }
-
-  ngOnDestroy(): void {
-    if (this.subscription) {
-      this.subscription.unsubscribe();
-    }
  }

  isMobile() {
    return (window.innerWidth <= 767.98);
  }
-
-  extendSummary(summary) {
-    let extendedSummary = summary.slice();
-
-    // Add a point at today's date to make the graph end at the current time
-    extendedSummary.unshift({ time: Date.now() / 1000, value: 0 });
-    extendedSummary.reverse();
-    
-    let oneHour = 60 * 60;
-    // Fill gaps longer than interval
-    for (let i = 0; i < extendedSummary.length - 1; i++) {
-      let hours = Math.floor((extendedSummary[i + 1].time - extendedSummary[i].time) / oneHour);      
-      if (hours > 1) {
-        for (let j = 1; j < hours; j++) {
-          let newTime = extendedSummary[i].time + oneHour * j;
-          extendedSummary.splice(i + j, 0, { time: newTime, value: 0 });
-        }
-        i += hours - 1;
-      }
-    }
-  
-    return extendedSummary.reverse();
-  }
 }
--- a/frontend/src/app/components/address-group/address-group.component.scss
+++ b/frontend/src/app/components/address-group/address-group.component.scss
@@ -1,6 +1,6 @@
 .frame {
  position: relative;
-  background: var(--box-bg);
+  background: #24273e;
  padding: 0.5rem;
  height: calc(100% + 60px);
 }
@@ -62,7 +62,7 @@
      }
    }
    &:nth-child(even) {
-      background: var(--stat-box-bg);
+      background: #181b2d;
    }
  }

--- a/frontend/src/app/components/address-labels/address-labels.component.html
+++ b/frontend/src/app/components/address-labels/address-labels.component.html
@@ -4,7 +4,7 @@
      <a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">
        <span 
          *ngIf="label"
-          class="badge badge-pill badge-warning {{ class }}"
+          class="badge badge-pill badge-warning"
        >{{ label }}</span>
      </a>
    </div>
@@ -15,6 +15,6 @@
 <ng-template #default>
  <span
    *ngIf="label"
-    class="badge badge-pill badge-warning {{ class }}"
+    class="badge badge-pill badge-warning"
  >{{ label }}</span>
 </ng-template>
--- a/frontend/src/app/components/address-labels/address-labels.component.ts
+++ b/frontend/src/app/components/address-labels/address-labels.component.ts
@@ -1,7 +1,7 @@
 import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
 import { Vin, Vout } from '../../interfaces/electrs.interface';
 import { StateService } from '../../services/state.service';
-import { AddressType, AddressTypeInfo } from '../../shared/address-utils';
+import { parseMultisigScript } from '../../bitcoin.utils';

@Component({
  selector: 'app-address-labels',
@@ -12,11 +12,9 @@ import { AddressType, AddressTypeInfo } from '../../shared/address-utils';
 export class AddressLabelsComponent implements OnChanges {
  network = '';

-  @Input() address: AddressTypeInfo;
  @Input() vin: Vin;
  @Input() vout: Vout;
  @Input() channel: any;
-  @Input() class: string = '';

  label?: string;

@@ -29,10 +27,10 @@ export class AddressLabelsComponent implements OnChanges {
  ngOnChanges() {
    if (this.channel) {
      this.handleChannel();
-    } else if (this.address) {
-      this.handleAddress();
    } else if (this.vin) {
      this.handleVin();
+    } else if (this.vout) {
+      this.handleVout();
    }
  }

@@ -43,22 +41,74 @@ export class AddressLabelsComponent implements OnChanges {
    this.label = `Channel ${type}: ${leftNodeName} <> ${rightNodeName}`;
  }

-  handleAddress() {
-    if (this.address?.scripts.size) {
-      const script = this.address?.scripts.values().next().value;
-      if (script.template?.label) {
-        this.label = script.template.label;
+  handleVin() {
+    if (this.vin.inner_witnessscript_asm) {
+      if (this.vin.inner_witnessscript_asm.indexOf('OP_DEPTH OP_PUSHNUM_12 OP_EQUAL OP_IF OP_PUSHNUM_11') === 0 || this.vin.inner_witnessscript_asm.indexOf('OP_PUSHNUM_15 OP_CHECKMULTISIG OP_IFDUP OP_NOTIF OP_PUSHBYTES_2') === 1259) {
+        if (this.vin.witness.length > 11) {
+          this.label = 'Liquid Peg Out';
+        } else {
+          this.label = 'Emergency Liquid Peg Out';
+        }
+        return;
      }
+
+      const topElement = this.vin.witness[this.vin.witness.length - 2];
+      if (/^OP_IF OP_PUSHBYTES_33 \w{66} OP_ELSE OP_PUSH(NUM_\d+|BYTES_(1 \w{2}|2 \w{4})) OP_CSV OP_DROP OP_PUSHBYTES_33 \w{66} OP_ENDIF OP_CHECKSIG$/.test(this.vin.inner_witnessscript_asm)) {
+        // https://github.com/lightning/bolts/blob/master/03-transactions.md#commitment-transaction-outputs
+        if (topElement === '01') {
+          // top element is '01' to get in the revocation path
+          this.label = 'Revoked Lightning Force Close';
+        } else {
+          // top element is '', this is a delayed to_local output
+          this.label = 'Lightning Force Close';
+        }
+        return;
+      } else if (
+        /^OP_DUP OP_HASH160 OP_PUSHBYTES_20 \w{40} OP_EQUAL OP_IF OP_CHECKSIG OP_ELSE OP_PUSHBYTES_33 \w{66} OP_SWAP OP_SIZE OP_PUSHBYTES_1 20 OP_EQUAL OP_NOTIF OP_DROP OP_PUSHNUM_2 OP_SWAP OP_PUSHBYTES_33 \w{66} OP_PUSHNUM_2 OP_CHECKMULTISIG OP_ELSE OP_HASH160 OP_PUSHBYTES_20 \w{40} OP_EQUALVERIFY OP_CHECKSIG OP_ENDIF (OP_PUSHNUM_1 OP_CSV OP_DROP |)OP_ENDIF$/.test(this.vin.inner_witnessscript_asm) ||
+        /^OP_DUP OP_HASH160 OP_PUSHBYTES_20 \w{40} OP_EQUAL OP_IF OP_CHECKSIG OP_ELSE OP_PUSHBYTES_33 \w{66} OP_SWAP OP_SIZE OP_PUSHBYTES_1 20 OP_EQUAL OP_IF OP_HASH160 OP_PUSHBYTES_20 \w{40} OP_EQUALVERIFY OP_PUSHNUM_2 OP_SWAP OP_PUSHBYTES_33 \w{66} OP_PUSHNUM_2 OP_CHECKMULTISIG OP_ELSE OP_DROP OP_PUSHBYTES_3 \w{6} OP_CLTV OP_DROP OP_CHECKSIG OP_ENDIF (OP_PUSHNUM_1 OP_CSV OP_DROP |)OP_ENDIF$/.test(this.vin.inner_witnessscript_asm)
+      ) {
+        // https://github.com/lightning/bolts/blob/master/03-transactions.md#offered-htlc-outputs
+        // https://github.com/lightning/bolts/blob/master/03-transactions.md#received-htlc-outputs
+        if (topElement.length === 66) {
+          // top element is a public key
+          this.label = 'Revoked Lightning HTLC';
+        } else if (topElement) {
+          // top element is a preimage
+          this.label = 'Lightning HTLC';
+        } else {
+          // top element is '' to get in the expiry of the script
+          this.label = 'Expired Lightning HTLC';
+        }
+        return;
+      } else if (/^OP_PUSHBYTES_33 \w{66} OP_CHECKSIG OP_IFDUP OP_NOTIF OP_PUSHNUM_16 OP_CSV OP_ENDIF$/.test(this.vin.inner_witnessscript_asm)) {
+        // https://github.com/lightning/bolts/blob/master/03-transactions.md#to_local_anchor-and-to_remote_anchor-output-option_anchors
+        if (topElement) {
+          // top element is a signature
+          this.label = 'Lightning Anchor';
+        } else {
+          // top element is '', it has been swept after 16 blocks
+          this.label = 'Swept Lightning Anchor';
+        }
+        return;
+      }
+
+      this.detectMultisig(this.vin.inner_witnessscript_asm);
+    }
+
+    this.detectMultisig(this.vin.inner_redeemscript_asm);
+
+    this.detectMultisig(this.vin.prevout.scriptpubkey_asm);
+  }
+
+  detectMultisig(script: string) {
+    const ms = parseMultisigScript(script);
+
+    if (ms) {
+      this.label = $localize`:@@address-label.multisig:Multisig ${ms.m}:multisigM: of ${ms.n}:multisigN:`;
    }
  }

-  handleVin() {
-    const address = new AddressTypeInfo(this.network || 'mainnet', this.vin.prevout?.scriptpubkey_address, this.vin.prevout?.scriptpubkey_type as AddressType, [this.vin])
-    if (address?.scripts.size) {
-      const script = address?.scripts.values().next().value;
-      if (script.template?.label) {
-        this.label = script.template.label;
-      }
-    }
+  handleVout() {
+    this.detectMultisig(this.vout.scriptpubkey_asm);
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
natsoni	af7e5fa498	Liquid audit re-indexing	2024-04-18 12:13:57 +02:00
natsoni	ac62e28656	Merge branch 'natsoni/fix-liquid-db-migration' into natsoni/fix-liquid-expired-txos	2024-04-18 11:56:27 +02:00
natsoni	1c55eef276	Move table re-index to own migrations	2024-04-16 22:43:13 +02:00
natsoni	13aa62878e	Revert commits `abdb27af` and `727208ff`	2024-04-16 16:12:31 +02:00
natsoni	2c676ae06e	Fix gradient colors in Liquid federation utxos table	2024-04-16 12:15:45 +02:00
natsoni	f897679ed6	Fix Liquid expired utxos flagging mechanism	2024-04-16 12:15:14 +02:00