Add explanatory tooltips in incoming txs widget

Slightly lift up blockchain toggle button
Fix widget mining graphs
2024-05-27 15:56:42 +02:00 · 2024-05-27 11:53:58 +02:00 · 2024-05-27 11:50:11 +02:00
347 changed files with 38832 additions and 80557 deletions
--- a/12
+++ b/12
@@ -1,5 +1,5 @@
 The Mempool Open Source Project®
-Copyright (c) 2019-2024 Mempool Space K.K. and other shadowy super-coders
+Copyright (c) 2019-2023 Mempool Space K.K. and other shadowy super-coders

 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU Affero General Public License as published by the Free
@@ -12,12 +12,10 @@ or any other contributor to The Mempool Open Source Project.

 The Mempool Open Source Project®, Mempool Accelerator™, Mempool Enterprise®, 
 Mempool Liquidity™, mempool.space®, Be your own explorer™, Explore the full 
-Bitcoin ecosystem™, Mempool Goggles™, the mempool Logo, the mempool Square Logo, 
-the mempool block visualization Logo, the mempool Blocks Logo, the mempool 
-transaction Logo, the mempool Blocks 3 | 2 Logo, the mempool research Logo, 
-the mempool.space Vertical Logo, and the mempool.space Horizontal Logo are 
-registered trademarks or trademarks of Mempool Space K.K in Japan, 
-the United States, and/or other countries.
+Bitcoin ecosystem™, Mempool Goggles™, the mempool Logo, the mempool Square logo, 
+the mempool Blocks logo, the mempool Blocks 3 | 2 logo, the mempool.space Vertical 
+Logo, and the mempool.space Horizontal logo are registered trademarks or trademarks 
+of Mempool Space K.K in Japan, the United States, and/or other countries.

 See our full Trademark Policy and Guidelines for more details, published on 
 <https://mempool.space/trademark-policy>.
--- a/backend/.eslintrc
+++ b/backend/.eslintrc
@@ -34,7 +34,6 @@
    "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
   ```
@@ -229,13 +229,13 @@ Generate block at regular interval (every 10 seconds in this example):

 ### Mining pools update

-By default, mining pools will be not automatically updated regularly (`config.MEMPOOL.AUTOMATIC_POOLS_UPDATE` is set to `false`). 
+By default, mining pools will be not automatically updated regularly (`config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING` is set to `false`). 

 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_POOLS_UPDATE` 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, pool assignments for all relevant blocks (tagged to that pool or the `unknown` mining pool, starting from height 130635) are updated using the new criteria.
+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
@@ -24,11 +24,11 @@
    "EXTERNAL_RETRY_INTERVAL": 0,
    "USER_AGENT": "mempool",
    "STDOUT_LOG_MIN_PRIORITY": "debug",
-    "AUTOMATIC_POOLS_UPDATE": false,
+    "AUTOMATIC_BLOCK_REINDEXING": false,
    "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json",
    "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master",
    "AUDIT": false,
-    "RUST_GBT": true,
+    "RUST_GBT": false,
    "LIMIT_GBT": false,
    "CPFP_INDEXING": false,
    "DISK_CACHE_BLOCK_INTERVAL": 6,
@@ -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",
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mempool-backend",
-  "version": "3.0.1",
+  "version": "3.0.0-dev",
  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
  "license": "GNU Affero General Public License v3.0",
  "homepage": "https://mempool.space",
@@ -39,7 +39,7 @@
    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
  },
  "dependencies": {
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.24.0",
    "@mempool/electrum-client": "1.1.9",
    "@types/node": "^18.15.3",
    "axios": "~1.7.2",
@@ -47,16 +47,16 @@
    "crypto-js": "~4.2.0",
    "express": "~4.19.2",
    "maxmind": "~4.3.11",
-    "mysql2": "~3.11.0",
+    "mysql2": "~3.9.7",
    "rust-gbt": "file:./rust-gbt",
-    "redis": "^4.7.0",
+    "redis": "^4.6.6",
    "socks-proxy-agent": "~7.0.0",
    "typescript": "~4.9.3",
-    "ws": "~8.18.0"
+    "ws": "~8.17.0"
  },
  "devDependencies": {
    "@babel/code-frame": "^7.18.6",
-    "@babel/core": "^7.25.2",
+    "@babel/core": "^7.24.0",
    "@types/compression": "^1.7.2",
    "@types/crypto-js": "^4.1.1",
    "@types/express": "^4.17.17",
--- a/backend/src/fixtures/mempool-config.template.json
+++ b/backend/src/fixtures/mempool-config.template.json
@@ -10,7 +10,7 @@
    "UNIX_SOCKET_PATH": "/mempool/socket/mempool-bitcoin-mainnet",
    "SPAWN_CLUSTER_PROCS": 2,
    "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__",
-    "AUTOMATIC_POOLS_UPDATE": false,
+    "AUTOMATIC_BLOCK_REINDEXING": false,
    "POLL_RATE_MS": 3,
    "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
    "CACHE_ENABLED": true,
@@ -60,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__",
--- 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,328 +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
-        }
-    },
-    {
-        "txid": "b10c0000004da5a9d1d9b4ae32e09f0b3e62d21a5cce5428d4ad714fb444eb5d",
-        "version": 1,
-        "locktime": 1231006505,
-        "vin": [
-            {
-                "txid": "d46a24962c1d7bd6e87d80570c6a53413eaf30d7fde7f52347f13645ae53969b",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "41049434a2dd7c5b82df88f578f8d7fd14e8d36513aaa9c003eb5bd6cb56065e44b7e0227139e8a8e68e7de0a4ed32b8c90edc9673b8a7ea541b52f2a22196f7b8cfac",
-                    "scriptpubkey_asm": "OP_PUSHBYTES_65 049434a2dd7c5b82df88f578f8d7fd14e8d36513aaa9c003eb5bd6cb56065e44b7e0227139e8a8e68e7de0a4ed32b8c90edc9673b8a7ea541b52f2a22196f7b8cf OP_CHECKSIG",
-                    "scriptpubkey_type": "p2pk",
-                    "value": 6102
-                },
-                "scriptsig": "473044022004f027ae0b19bb7a7aa8fcdf135f1da769d087342020359ef4099a9f0f0ba4ec02206a83a9b78df3fed89a3b6052e69963e1fb08d8f6d17d945e43b51b5214aa41e601",
-                "scriptsig_asm": "OP_PUSHBYTES_71 3044022004f027ae0b19bb7a7aa8fcdf135f1da769d087342020359ef4099a9f0f0ba4ec02206a83a9b78df3fed89a3b6052e69963e1fb08d8f6d17d945e43b51b5214aa41e601",
-                "is_coinbase": false,
-                "sequence": 20090103
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "76a914bbb1f7d0f7e15ac088af9bafe25aaac1a59832d088ac",
-                    "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 bbb1f7d0f7e15ac088af9bafe25aaac1a59832d0 OP_EQUALVERIFY OP_CHECKSIG",
-                    "scriptpubkey_type": "p2pkh",
-                    "scriptpubkey_address": "1J7SZJry7CX4zWdH3P8E8UJjZrhcLEjJ39",
-                    "value": 1913
-                },
-                "scriptsig": "46304302204dc2939be89ab6626457fff40aec2cc4e6213e64bcb4d2c43bf6b49358ff638c021f33d2f8fdf6d54a2c82bb7cddc62becc2cbbaca6fd7f3ec927ea975f29ad8510221028b98707adfd6f468d56c1a6067a6f0c7fef43afbacad45384017f8be93a18d40",
-                "scriptsig_asm": "OP_PUSHBYTES_70 304302204dc2939be89ab6626457fff40aec2cc4e6213e64bcb4d2c43bf6b49358ff638c021f33d2f8fdf6d54a2c82bb7cddc62becc2cbbaca6fd7f3ec927ea975f29ad85102 OP_PUSHBYTES_33 028b98707adfd6f468d56c1a6067a6f0c7fef43afbacad45384017f8be93a18d40",
-                "is_coinbase": false,
-                "sequence": 20081031
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 1,
-                "prevout": {
-                    "scriptpubkey": "52210304e708d258a632ffb128a62ecf5eebd1904e505497d031619513afc8bca7858f2102b9dc03f1133e7cbc7eb311631acc2dbda908fb0f0fae095da2f4dd427f51308a4104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f53ae",
-                    "scriptpubkey_asm": "OP_PUSHNUM_2 OP_PUSHBYTES_33 0304e708d258a632ffb128a62ecf5eebd1904e505497d031619513afc8bca7858f OP_PUSHBYTES_33 02b9dc03f1133e7cbc7eb311631acc2dbda908fb0f0fae095da2f4dd427f51308a OP_PUSHBYTES_65 04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f OP_PUSHNUM_3 OP_CHECKMULTISIG",
-                    "scriptpubkey_type": "multisig",
-                    "value": 1971
-                },
-                "scriptsig": "00453042021e4f6ff73d7b304a5cbf3bb7738abb5f81a4af6335962134ce27a1cc45fec702201b95e3acb7db93257b20651cdcb79af66bf0bb86a8ae5b4e0a5df4e3f86787e2033b303802153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021f34793e2878497561e7616291ebdda3024b681cdacc8b863b5b0804cd30c2a481",
-                "scriptsig_asm": "OP_0 OP_PUSHBYTES_69 3042021e4f6ff73d7b304a5cbf3bb7738abb5f81a4af6335962134ce27a1cc45fec702201b95e3acb7db93257b20651cdcb79af66bf0bb86a8ae5b4e0a5df4e3f86787e203 OP_PUSHBYTES_59 303802153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021f34793e2878497561e7616291ebdda3024b681cdacc8b863b5b0804cd30c2a481",
-                "is_coinbase": false,
-                "sequence": 19750504
-            },
-            {
-                "txid": "45e1cb33599acb071810ccc801b71bd7610865f5b899492946ab1bfbcb61cad6",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "a91419f0b86f61606c6eb51b217698ca7e8bff1e398b87",
-                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 19f0b86f61606c6eb51b217698ca7e8bff1e398b OP_EQUAL",
-                    "scriptpubkey_type": "p2sh",
-                    "scriptpubkey_address": "344BBtYkhaCXgA7oYSXASUfh4bFieiponG",
-                    "value": 2140
-                },
-                "scriptsig": "00443041021d1313459a48bd1d0628eec635495f793e970729684394f9b814d2b24012022050be6d9918444e283da0136884f8311ec465d0fed2f8d24b75a8485ebdc13aea013a303702153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021e78644ba72eab69fefb5fe50700671bfb91dda699f72ffbb325edc6a3c4ef8239303602153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021d2c2db104e70720c39af43b6ba3edd930c26e0818aa59ff9c886281d8ba834ced532103e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc2103cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd421027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a34104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c55ae",
-                "scriptsig_asm": "OP_0 OP_PUSHBYTES_68 3041021d1313459a48bd1d0628eec635495f793e970729684394f9b814d2b24012022050be6d9918444e283da0136884f8311ec465d0fed2f8d24b75a8485ebdc13aea01 OP_PUSHBYTES_58 303702153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021e78644ba72eab69fefb5fe50700671bfb91dda699f72ffbb325edc6a3c4ef82 OP_PUSHBYTES_57 303602153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021d2c2db104e70720c39af43b6ba3edd930c26e0818aa59ff9c886281d8ba83 OP_PUSHDATA1 532103e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc2103cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd421027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a34104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c55ae",
-                "is_coinbase": false,
-                "sequence": 16,
-                "inner_redeemscript_asm": "OP_PUSHNUM_3 OP_PUSHBYTES_33 03e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc OP_PUSHBYTES_33 03cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd4 OP_PUSHBYTES_33 027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906 OP_PUSHBYTES_65 0411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3 OP_PUSHBYTES_65 04ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c OP_PUSHNUM_5 OP_CHECKMULTISIG"
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 2,
-                "prevout": {
-                    "scriptpubkey": "a9143b13a1f71c20c799d86bb624b3898c826d6c82da87",
-                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 3b13a1f71c20c799d86bb624b3898c826d6c82da OP_EQUAL",
-                    "scriptpubkey_type": "p2sh",
-                    "scriptpubkey_address": "375PJxsKRtAq4WoS6u82jvgZW94R8Wx3iH",
-                    "value": 5139
-                },
-                "scriptsig": "1600149b27f072e4b972927c445d1946162a550b0914d8",
-                "scriptsig_asm": "OP_PUSHBYTES_22 00149b27f072e4b972927c445d1946162a550b0914d8",
-                "witness": [
-                    "3040021c23902a01d4c5cff2c33c8bdb778a5aadea78a9a0d6d4db60aaa0fba1022069237d9dbf2db8cff9c260ba71250493682d01a746f4a45c5c7ea386e56d2bc902",
-                    "0240187acd3e2fd3d8e1acffefa85907b6550730c24f78dfd3301c829fc4daf3cc"
-                ],
-                "is_coinbase": false,
-                "sequence": 141,
-                "inner_redeemscript_asm": "OP_0 OP_PUSHBYTES_20 9b27f072e4b972927c445d1946162a550b0914d8"
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 3,
-                "prevout": {
-                    "scriptpubkey": "a914a3c0698f2300c7b2e8107d4c9c988e642110039087",
-                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 a3c0698f2300c7b2e8107d4c9c988e6421100390 OP_EQUAL",
-                    "scriptpubkey_type": "p2sh",
-                    "scriptpubkey_address": "3GcrZrbUuvE4UtUdSbKTXcRnTqmfMdyMAC",
-                    "value": 3220
-                },
-                "scriptsig": "220020a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
-                "scriptsig_asm": "OP_PUSHBYTES_34 0020a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
-                "witness": [
-                    "303f021c65aee6696e80be6e14545cfd64b44f17b0514c150eefdb090c0f0bd9021f3fef4aa95c252a225622aba99e4d5af5a6fe40d177acd593e64cf2f8557ccc03",
-                    "03b55c6f0749e0f3e2caeca05f68e3699f1b3c62a550730f704985a6a9aae437a1",
-                    "76a914db865fd920959506111079995f1e4017b489bfe38763ac6721024d560f7f5d28aae5e1a8aa2b7ba615d7fc48e4ea27e5d27336e6a8f5fa0f5c8c7c820120876475527c2103443e8834fa7d79d7b5e95e0e9d0847f6b03ac3ea977979858b4104947fca87ca52ae67a91446c3747322b220fdb925c9802f0e949c1feab99988ac6868"
-                ],
-                "is_coinbase": false,
-                "sequence": 3735928559,
-                "inner_redeemscript_asm": "OP_0 OP_PUSHBYTES_32 a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
-                "inner_witnessscript_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 db865fd920959506111079995f1e4017b489bfe3 OP_EQUAL OP_IF OP_CHECKSIG OP_ELSE OP_PUSHBYTES_33 024d560f7f5d28aae5e1a8aa2b7ba615d7fc48e4ea27e5d27336e6a8f5fa0f5c8c OP_SWAP OP_SIZE OP_PUSHBYTES_1 20 OP_EQUAL OP_NOTIF OP_DROP OP_PUSHNUM_2 OP_SWAP OP_PUSHBYTES_33 03443e8834fa7d79d7b5e95e0e9d0847f6b03ac3ea977979858b4104947fca87ca OP_PUSHNUM_2 OP_CHECKMULTISIG OP_ELSE OP_HASH160 OP_PUSHBYTES_20 46c3747322b220fdb925c9802f0e949c1feab999 OP_EQUALVERIFY OP_CHECKSIG OP_ENDIF OP_ENDIF"
-            },
-            {
-                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
-                "vout": 4,
-                "prevout": {
-                    "scriptpubkey": "0014c0ca6e754e65d3ba59112d7abc33e500c00ecfa7",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 c0ca6e754e65d3ba59112d7abc33e500c00ecfa7",
-                    "scriptpubkey_type": "v0_p2wpkh",
-                    "scriptpubkey_address": "bc1qcr9xua2wvhfm5kg394atcvl9qrqqana8rrmy8h",
-                    "value": 17144
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "303e021c11f60486afd0f5d6573603fb2076ef2f676455b92ada257d2f25558a021e317719c946f951d49bf4df4285a618629cd9e554fcbf787c319a0c4dd22601",
-                    "032467f24cc31664f0cf34ff8d5cbb590888ddc1dcfec724a32ae3dd5338b8508e"
-                ],
-                "is_coinbase": false,
-                "sequence": 21000000
-            },
-            {
-                "txid": "637db3928a8fb1b22b81f92dc738ee7637e5b172d650363d0b327429578bd001",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "0020a9530a167fcada672c142ee636dcd171796e69ef8e37aa1f77f35c58edd7a357",
-                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_32 a9530a167fcada672c142ee636dcd171796e69ef8e37aa1f77f35c58edd7a357",
-                    "scriptpubkey_type": "v0_p2wsh",
-                    "scriptpubkey_address": "bc1q49fs59nletdxwtq59mnrdhx3w9uku6003cm658mh7dw93mwh5dts2w2kht",
-                    "value": 8149
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "303d021c32f9454db85cb1a4ca63a9883d4347c5e13f3654e884ae44e9efa3c8021d62f07fe452c06b084bc3e09afd3aac4039136549a465533bc1ca66967902",
-                    "01",
-                    "632102fd6db4de50399b2aa086edb23f8e140bbc823d6651e024a0eb871288068789cd67012ab27521034134a2bb35c3f83dab2489d96160741888b8b5589bb694dea6e7bc24486e9c6f68ac"
-                ],
-                "is_coinbase": false,
-                "sequence": 4190024921,
-                "inner_witnessscript_asm": "OP_IF OP_PUSHBYTES_33 02fd6db4de50399b2aa086edb23f8e140bbc823d6651e024a0eb871288068789cd OP_ELSE OP_PUSHBYTES_1 2a OP_CSV OP_DROP OP_PUSHBYTES_33 034134a2bb35c3f83dab2489d96160741888b8b5589bb694dea6e7bc24486e9c6f OP_ENDIF OP_CHECKSIG"
-            },
-            {
-                "txid": "0020db02df125062ebae5bacd189ebff22577b2817c1872be79a0d3ba3982c41",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "512071212ded0ff4c9b1b0c505d8012772e2dbe98a3cae7168377b950fb6b866a849",
-                    "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 71212ded0ff4c9b1b0c505d8012772e2dbe98a3cae7168377b950fb6b866a849",
-                    "scriptpubkey_type": "v1_p2tr",
-                    "scriptpubkey_address": "bc1pwysjmmg07nymrvx9qhvqzfmjutd7nz3u4ecksdmmj58mdwrx4pysq6m68g",
-                    "value": 9001
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "d822f203827852998cad370232e8c57294540a5da51107fa26cf466bdd2b8b0b3d161999cc80aed8de7386a2bd5d5313aea159a231cc26fa53aaa702b7fa21ed"
-                ],
-                "is_coinbase": false,
-                "sequence": 341
-            },
-            {
-                "txid": "795741ecf9c431b14b1c8d2dd017d3978fd4f6452e91edf416f31ef9971206b4",
-                "vout": 0,
-                "prevout": {
-                    "scriptpubkey": "512089ac120a490eee88db5588112f95f88093284c814f07c3ad943a7faefba2271a",
-                    "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 89ac120a490eee88db5588112f95f88093284c814f07c3ad943a7faefba2271a",
-                    "scriptpubkey_type": "v1_p2tr",
-                    "scriptpubkey_address": "bc1p3xkpyzjfpmhg3k643qgjl90cszfjsnypfuru8tv58fl6a7azyudqkcu66k",
-                    "value": 19953
-                },
-                "scriptsig": "",
-                "scriptsig_asm": "",
-                "witness": [
-                    "fe6eb715dceffefc067fdc787d250a9a9116682d216f6356ea38fc1f112bd74995faa90315e81981d2c2260b7eaca3c41a16b280362980f0d8faf4c05ebb82c5",
-                    "e34ad0ad33885a473831f8ba8d9339123cb19d0e642e156d8e0d6e2ab2691aedb30e55a35637a806927225e1aa72223d41e59f92c6579b819e7d331a7ada9d2e01",
-                    "2a4861fb4cb951c791bf6c93859ef65abccd90034f91b9b77abb918e13b6fce75d5fa3e2d2f6eeeae105315178c2cb9db2ef238fe89b282f691c06db43bc71ca02",
-                    "fc97bb2be673c3bf388aaf58178ef14d354caf83c92aca8ef1831d619b8511e928f4f5fdea3962067b11e7cecfe094cd0f66a4ea9af9ec836d70d18f2b37df0281",
-                    "a5781a0adaa80ab7f7f164172dd1a1cb127e523daa0d6949aba074a15c589f12dfb8183182afec9230cb7947b7422a4abc1bb78173550d66274ea19f6c9dd92c82",
-                    "",
-                    "",
-                    "205f4237bd7dae576b34abc8a9c6fa4f0e4787c04234ca963e9e96c8f9b67b56d1ac205f4237bd7f93c69403a30c6b641f27ccf5201090152fcf1596474221307831c3ba205ac8ff25ce63564963d1148b84627f614af1f3c77d7caa23adc61264fa5e4996ba20b210c83e6f5b3f866837112d023d9ae8da2a6412168d54968ab87860ab970690ba20d3ee3b7a8b8149122b3c886330b3241538ba4b935c4040f4a73ddab917241bc5ba20cdfabb9d0e5c8f09a83f19e36e100d8f5e882f1b60aa60dacd9e6d072c117bc0ba20aab038c238e95fb54cdd0a6705dc1b1f8d135a9e9b20ab9c7ff96eef0e9bf545ba559c",
-                    "c0b1674191a88ec5cdd733e4240a81803105dc412d6c6708d53ab94fc248f4f5534a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33bf4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e166f7cf9580f1c2dfb3c4d5d043cdbb128c640e3f20161245aa7372e9666168516a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48dd5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb46829a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf54e48e5f5c656b26c3bca14a8c95aa583d07ebe84dde3b7dd4a78f4e4186e713d29c9c0e8e4d2a9790922af73f0b8d51f0bd4bb19940d9cf910ead8fbe85bc9bbb41a757f405890fb0f5856228e23b715702d714d59bf2b1feb70d8b2b4e3e089fdbcf0ef9d8d00f66e47917f67cc5d78aec1ac786e2abb8d2facb4e4790aad6cc455ae816e6cdafdb58d54e35d4f46d860047458eacf1c7405dc634631c570d8d31992805518fd62daa3bdd2a5c4fd2cd3054c9b3dca1d78055e9528cff6adc8f907925d2ebe48765103e6845c06f1f2bb77c6adc1cc002865865eb5cfd5c1cb10c007c60e14f9d087e0291d4d0c7869697c6681d979c6639dbd960792b4d4133e794d097969002ee05d336686fc03c9e15a597c1b9827669460fac9879903637777defed8717c581b4c0509329550e344bdc14ac38f71fc050096887e535c8fd456524104a6674693c29946543f8a0befccce5a352bda55ec8559fc630f5f37393096d97bfee8660f4100ffd61874d62f9a65de9fb6acf740c4c386990ef7373be398c4bdc43709db7398106609eea2a7841aaf3a4fa2000dc18184faa2a7eb5a2af5845a8d3796308ff9840e567b14cf6bb158ff26c999e6f9a1f5448f9aa"
-                ],
-                "is_coinbase": false,
-                "sequence": 342,
-                "inner_witnessscript_asm": "OP_PUSHBYTES_32 5f4237bd7dae576b34abc8a9c6fa4f0e4787c04234ca963e9e96c8f9b67b56d1 OP_CHECKSIG OP_PUSHBYTES_32 5f4237bd7f93c69403a30c6b641f27ccf5201090152fcf1596474221307831c3 OP_CHECKSIGADD OP_PUSHBYTES_32 5ac8ff25ce63564963d1148b84627f614af1f3c77d7caa23adc61264fa5e4996 OP_CHECKSIGADD OP_PUSHBYTES_32 b210c83e6f5b3f866837112d023d9ae8da2a6412168d54968ab87860ab970690 OP_CHECKSIGADD OP_PUSHBYTES_32 d3ee3b7a8b8149122b3c886330b3241538ba4b935c4040f4a73ddab917241bc5 OP_CHECKSIGADD OP_PUSHBYTES_32 cdfabb9d0e5c8f09a83f19e36e100d8f5e882f1b60aa60dacd9e6d072c117bc0 OP_CHECKSIGADD OP_PUSHBYTES_32 aab038c238e95fb54cdd0a6705dc1b1f8d135a9e9b20ab9c7ff96eef0e9bf545 OP_CHECKSIGADD OP_PUSHNUM_5 OP_NUMEQUAL"
-            }
-        ],
-        "vout": [
-            {
-                "scriptpubkey": "210261542eb020b36c1da48e2e607b90a8c1f2ccdbd06eaf5fb4bb0d7cc34293d32aac",
-                "scriptpubkey_asm": "OP_PUSHBYTES_33 0261542eb020b36c1da48e2e607b90a8c1f2ccdbd06eaf5fb4bb0d7cc34293d32a OP_CHECKSIG",
-                "scriptpubkey_type": "p2pk",
-                "value": 576
-            },
-            {
-                "scriptpubkey": "76a9140240539af6c68431e4ce9cc5ef464f12c1741b3c88ac",
-                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 0240539af6c68431e4ce9cc5ef464f12c1741b3c OP_EQUALVERIFY OP_CHECKSIG",
-                "scriptpubkey_type": "p2pkh",
-                "scriptpubkey_address": "1CuQsdrcgcmPvugo3NqEwh1kDcpeEnuFC",
-                "value": 546
-            },
-            {
-                "scriptpubkey": "5121028b45a50f795be0413680036665d17a3eca099648ea80637bc3a70a7d2b52ae2851ae",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_33 028b45a50f795be0413680036665d17a3eca099648ea80637bc3a70a7d2b52ae28 OP_PUSHNUM_1 OP_CHECKMULTISIG",
-                "scriptpubkey_type": "multisig",
-                "value": 582
-            },
-            {
-                "scriptpubkey": "a91449ed2c96e33b6134408af8484508bcc3248c8dbd87",
-                "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 49ed2c96e33b6134408af8484508bcc3248c8dbd OP_EQUAL",
-                "scriptpubkey_type": "p2sh",
-                "scriptpubkey_address": "38RuNhSiZiftB6WVnStu5aUz6jXtCDXQZk",
-                "value": 540
-            },
-            {
-                "scriptpubkey": "0014c8e51cf6891c0a2101aecea8cd5ce9bbbfaf7bba",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 c8e51cf6891c0a2101aecea8cd5ce9bbbfaf7bba",
-                "scriptpubkey_type": "v0_p2wpkh",
-                "scriptpubkey_address": "bc1qerj3ea5frs9zzqdwe65v6h8fhwl677a6s0hxhf",
-                "value": 294
-            },
-            {
-                "scriptpubkey": "0020c485bbb80c4be276e77eac3a983a391cc8b1a1b5f160995a36c3dff18296385a",
-                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_32 c485bbb80c4be276e77eac3a983a391cc8b1a1b5f160995a36c3dff18296385a",
-                "scriptpubkey_type": "v0_p2wsh",
-                "scriptpubkey_address": "bc1qcjzmhwqvf038dem74safsw3ernytrgd479sfjk3kc00lrq5k8pdqczl83q",
-                "value": 330
-            },
-            {
-                "scriptpubkey": "5120a7a42b268957a06c9de4d7260f1df392ce4d6e7b743f5adc27415ce2afceb3b9",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 a7a42b268957a06c9de4d7260f1df392ce4d6e7b743f5adc27415ce2afceb3b9",
-                "scriptpubkey_type": "v1_p2tr",
-                "scriptpubkey_address": "bc1p57jzkf5f27sxe80y6unq780njt8y6mnmwsl44hp8g9ww9t7wkwusv7av76",
-                "value": 330
-            },
-            {
-                "scriptpubkey": "51024e73",
-                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_2 4e73",
-                "scriptpubkey_type": "unknown",
-                "scriptpubkey_address": "bc1pfeessrawgf",
-                "value": 240
-            },
-            {
-                "scriptpubkey": "6a224e6f7420796f757220696e707574732c206e6f7420796f7572206f7574707574732e005152535455565758595a5b5c5d5e5f60",
-                "scriptpubkey_asm": "OP_RETURN OP_PUSHBYTES_34 4e6f7420796f757220696e707574732c206e6f7420796f7572206f7574707574732e OP_0 OP_PUSHNUM_1 OP_PUSHNUM_2 OP_PUSHNUM_3 OP_PUSHNUM_4 OP_PUSHNUM_5 OP_PUSHNUM_6 OP_PUSHNUM_7 OP_PUSHNUM_8 OP_PUSHNUM_9 OP_PUSHNUM_10 OP_PUSHNUM_11 OP_PUSHNUM_12 OP_PUSHNUM_13 OP_PUSHNUM_14 OP_PUSHNUM_15 OP_PUSHNUM_16",
-                "scriptpubkey_type": "op_return",
-                "value": 0
-            }
-        ],
-        "size": 3500,
-        "weight": 8186,
-        "sigops": 115,
-        "fee": 71294,
-        "status": {
-            "confirmed": true,
-            "block_height": 850000,
-            "block_hash": "00000000000000000002a0b5db2a7f8d9087464c2586b546be7bce8eb53b8187",
-            "block_time": 1719689674
-        }
    }
 ]
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -23,7 +23,7 @@ describe('Mempool Backend Config', () => {
        UNIX_SOCKET_PATH: '',
        SPAWN_CLUSTER_PROCS: 0,
        API_URL_PREFIX: '/api/v1/',
-        AUTOMATIC_POOLS_UPDATE: false,
+        AUTOMATIC_BLOCK_REINDEXING: false,
        POLL_RATE_MS: 2000,
        CACHE_DIR: './cache',
        CACHE_ENABLED: true,
@@ -63,7 +63,6 @@ describe('Mempool Backend Config', () => {
        REQUEST_TIMEOUT: 10000,
        FALLBACK_TIMEOUT: 5000,
        FALLBACK: [],
-        MAX_BEHIND_TIP: 2,
       });

      expect(config.CORE_RPC).toStrictEqual({
--- 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/about.routes.ts
+++ b/backend/src/api/about.routes.ts
@@ -70,7 +70,7 @@ class AboutRoutes {
          res.status(500).end();
        }
      })
-      .get(config.MEMPOOL.API_URL_PREFIX + 'services/account/images/:username/:md5', async (req, res) => {
+      .get(config.MEMPOOL.API_URL_PREFIX + 'services/account/images/:username', async (req, res) => {
        const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
        try {
          const response = await axios.get(url, { responseType: 'stream', timeout: 10000 });
--- 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/acceleration/acceleration.ts
+++ b/backend/src/api/acceleration/acceleration.ts
@@ -1,14 +1,15 @@
 import logger from '../../logger';
 import { MempoolTransactionExtended } from '../../mempool.interfaces';
-import { GraphTx, getSameBlockRelatives, initializeRelatives, makeBlockTemplate, mempoolComparator, removeAncestors, setAncestorScores } from '../mini-miner';
+import { IEsploraApi } from '../bitcoin/esplora-api.interface';

 const BLOCK_WEIGHT_UNITS = 4_000_000;
+const BLOCK_SIGOPS = 80_000;
 const MAX_RELATIVE_GRAPH_SIZE = 200;
 const BID_BOOST_WINDOW = 40_000;
 const BID_BOOST_MIN_OFFSET = 10_000;
 const BID_BOOST_MAX_OFFSET = 400_000;

-export type Acceleration = {
+type Acceleration = {
  txid: string;
  max_bid: number;
 };
@@ -27,6 +28,31 @@ export interface AccelerationInfo {
  cost: number; // additional cost to accelerate ((cost + txSummary.effectiveFee) / txSummary.effectiveVsize) >= targetFeeRate
 }

+interface GraphTx {
+  txid: string;
+  vsize: number;
+  weight: number;
+  fees: {
+    base: number; // in sats
+  };
+  depends: string[];
+  spentby: string[];
+}
+
+interface MempoolTx extends GraphTx {
+  ancestorcount: number;
+  ancestorsize: number;
+  fees: { // in sats
+    base: number;
+    ancestor: number;
+  };
+
+  ancestors: Map<string, MempoolTx>,
+  ancestorRate: number;
+  individualRate: number;
+  score: number;
+}
+
 class AccelerationCosts {
  /**
   * Takes a list of accelerations and verbose block data
@@ -35,7 +61,7 @@ class AccelerationCosts {
   * @param accelerationsx
   * @param verboseBlock
   */
-  public calculateBoostRate(accelerations: Acceleration[], blockTxs: MempoolTransactionExtended[]): number {
+  public calculateBoostRate(accelerations: Acceleration[], blockTxs: IEsploraApi.Transaction[]): number {
    // Run GBT ourselves to calculate accurate effective fee rates
    // the list of transactions comes from a mined block, so we already know everything fits within consensus limits
    const template = makeBlockTemplate(blockTxs, accelerations, 1, Infinity, Infinity);
@@ -144,28 +170,108 @@ class AccelerationCosts {
  /**
   * Takes an accelerated mined txid and a target rate
   * Returns the total vsize, fees and acceleration cost (in sats) of the tx and all same-block ancestors
-   *
-   * @param txid
-   * @param medianFeeRate
+   * 
+   * @param txid 
+   * @param medianFeeRate 
   */
  public getAccelerationInfo(tx: MempoolTransactionExtended, targetFeeRate: number, transactions: MempoolTransactionExtended[]): AccelerationInfo {
    // Get same-block transaction ancestors
-    const allRelatives = getSameBlockRelatives(tx, transactions);
-    const relativesMap = initializeRelatives(allRelatives);
-    const rootTx = relativesMap.get(tx.txid) as GraphTx;
+    const allRelatives = this.getSameBlockRelatives(tx, transactions);
+    const relativesMap = this.initializeRelatives(allRelatives);
+    const rootTx = relativesMap.get(tx.txid) as MempoolTx;

    // Calculate cost to boost
    return this.calculateAccelerationAncestors(rootTx, relativesMap, targetFeeRate);
  }

+  /**
+   * Takes a raw transaction, and builds a graph of same-block relatives,
+   * and returns as a MempoolTx
+   * 
+   * @param tx 
+   */
+  private getSameBlockRelatives(tx: MempoolTransactionExtended, transactions: MempoolTransactionExtended[]): Map<string, GraphTx> {
+    const blockTxs = new Map<string, MempoolTransactionExtended>(); // map of txs in this block
+    const spendMap = new Map<string, string>(); // map of outpoints to spending txids
+    for (const tx of transactions) {
+      blockTxs.set(tx.txid, tx);
+      for (const vin of tx.vin) {
+        spendMap.set(`${vin.txid}:${vin.vout}`, tx.txid);
+      }
+    }
+
+    const relatives: Map<string, GraphTx> = new Map();
+    const stack: string[] = [tx.txid];
+
+    // build set of same-block ancestors
+    while (stack.length > 0) {
+      const nextTxid = stack.pop();
+      const nextTx = nextTxid ? blockTxs.get(nextTxid) : null;
+      if (!nextTx || relatives.has(nextTx.txid)) {
+        continue;
+      }
+
+      const mempoolTx = this.convertToGraphTx(nextTx);
+
+      mempoolTx.fees.base = nextTx.fee || 0;
+      mempoolTx.depends = nextTx.vin.map(vin => vin.txid).filter(inTxid => inTxid && blockTxs.has(inTxid)) as string[];
+      mempoolTx.spentby = nextTx.vout.map((vout, index) => spendMap.get(`${nextTx.txid}:${index}`)).filter(outTxid => outTxid && blockTxs.has(outTxid)) as string[];
+
+      for (const txid of [...mempoolTx.depends, ...mempoolTx.spentby]) {
+        if (txid) {
+          stack.push(txid);
+        }
+      }
+
+      relatives.set(mempoolTx.txid, mempoolTx);
+    }
+
+    return relatives;
+  }
+
+  /**
+   * Takes a raw transaction and converts it to MempoolTx format
+   * fee and ancestor data is initialized with dummy/null values
+   * 
+   * @param tx 
+   */
+  private convertToGraphTx(tx: MempoolTransactionExtended): GraphTx {
+    return {
+      txid: tx.txid,
+      vsize: Math.ceil(tx.weight / 4),
+      weight: tx.weight,
+      fees: {
+        base: 0, // dummy
+      },
+      depends: [], // dummy
+      spentby: [], //dummy
+    };
+  }
+
+  private convertGraphToMempoolTx(tx: GraphTx): MempoolTx {
+    return {
+      ...tx,
+      fees: {
+        base: tx.fees.base,
+        ancestor: tx.fees.base,
+      },
+      ancestorcount: 1,
+      ancestorsize: Math.ceil(tx.weight / 4),
+      ancestors: new Map<string, MempoolTx>(),
+      ancestorRate: 0,
+      individualRate: 0,
+      score: 0,
+    };
+  }
+
  /**
   * Given a root transaction, a list of in-mempool ancestors, and a target fee rate,
   * Calculate the minimum set of transactions to fee-bump, their total vsize + fees
-   *
+   * 
   * @param tx
   * @param ancestors
   */
-  private calculateAccelerationAncestors(tx: GraphTx, relatives: Map<string, GraphTx>, targetFeeRate: number): AccelerationInfo {
+  private calculateAccelerationAncestors(tx: MempoolTx, relatives: Map<string, MempoolTx>, targetFeeRate: number): AccelerationInfo {
    // add root tx to the ancestor map
    relatives.set(tx.txid, tx);

@@ -177,12 +283,12 @@ class AccelerationCosts {
    });

    // Initialize individual & ancestor fee rates
-    relatives.forEach(entry => setAncestorScores(entry));
+    relatives.forEach(entry => this.setAncestorScores(entry));

    // Sort by descending ancestor score
-    let sortedRelatives = Array.from(relatives.values()).sort(mempoolComparator);
+    let sortedRelatives = Array.from(relatives.values()).sort(this.mempoolComparator);

-    let includedInCluster: Map<string, GraphTx> | null = null;
+    let includedInCluster: Map<string, MempoolTx> | null = null;

    // While highest score >= targetFeeRate
    let maxIterations = MAX_RELATIVE_GRAPH_SIZE;
@@ -191,17 +297,17 @@ class AccelerationCosts {
      // Grab the highest scoring entry
      const best = sortedRelatives.shift();
      if (best) {
-        const cluster = new Map<string, GraphTx>(best.ancestors?.entries() || []);
+        const cluster = new Map<string, MempoolTx>(best.ancestors?.entries() || []);
        if (best.ancestors.has(tx.txid)) {
          includedInCluster = cluster;
        }
        cluster.set(best.txid, best);
        // Remove this cluster (it already pays over the target rate, so doesn't need to be boosted)
        // and update scores, ancestor totals and dependencies for the survivors
-        removeAncestors(cluster, relatives);
+        this.removeAncestors(cluster, relatives);

        // re-sort
-        sortedRelatives = Array.from(relatives.values()).sort(mempoolComparator);
+        sortedRelatives = Array.from(relatives.values()).sort(this.mempoolComparator);
      }
    }

@@ -239,6 +345,394 @@ class AccelerationCosts {
      nextBlockFee: Math.ceil(tx.ancestorsize * targetFeeRate),
    };
  }
+
+  /**
+   * Recursively traverses an in-mempool dependency graph, and sets a Map of in-mempool ancestors
+   * for each transaction.
+   * 
+   * @param tx 
+   * @param all 
+   */
+  private setAncestors(tx: MempoolTx, all: Map<string, MempoolTx>, visited: Map<string, Map<string, MempoolTx>>, depth: number = 0): Map<string, MempoolTx> {
+    // sanity check for infinite recursion / too many ancestors (should never happen)
+    if (depth >= 100) {
+      logger.warn('acceleration dependency calculation failed: setAncestors reached depth of 100, unable to proceed', `Accelerator`);
+      throw new Error('invalid_tx_dependencies');
+    }
+    
+    // initialize the ancestor map for this tx
+    tx.ancestors = new Map<string, MempoolTx>();
+    tx.depends.forEach(parentId => {
+      const parent = all.get(parentId);
+      if (parent) {
+        // add the parent
+        tx.ancestors?.set(parentId, parent);
+        // check for a cached copy of this parent's ancestors
+        let ancestors = visited.get(parent.txid);
+        if (!ancestors) {
+          // recursively fetch the parent's ancestors
+          ancestors = this.setAncestors(parent, all, visited, depth + 1);
+        }
+        // and add to this tx's map
+        ancestors.forEach((ancestor, ancestorId) => {
+          tx.ancestors?.set(ancestorId, ancestor);
+        });
+      }
+    });
+    visited.set(tx.txid, tx.ancestors);
+
+    return tx.ancestors;
+  }
+
+  /**
+   * Efficiently sets a Map of in-mempool ancestors for each member of an expanded relative graph
+   * by running setAncestors on each leaf, and caching intermediate results.
+   * then initializes ancestor data for each transaction
+   * 
+   * @param all 
+   */
+  private initializeRelatives(all: Map<string, GraphTx>): Map<string, MempoolTx> {
+    const mempoolTxs = new Map<string, MempoolTx>();
+    all.forEach(entry => {
+      mempoolTxs.set(entry.txid, this.convertGraphToMempoolTx(entry));
+    });
+    const visited: Map<string, Map<string, MempoolTx>> = new Map();
+    const leaves: MempoolTx[] = Array.from(mempoolTxs.values()).filter(entry => entry.spentby.length === 0);
+    for (const leaf of leaves) {
+      this.setAncestors(leaf, mempoolTxs, visited);
+    }
+    mempoolTxs.forEach(entry => {
+      entry.ancestors?.forEach(ancestor => {
+        entry.ancestorcount++;
+        entry.ancestorsize += ancestor.vsize;
+        entry.fees.ancestor += ancestor.fees.base;
+      });
+      this.setAncestorScores(entry);
+    });
+    return mempoolTxs;
+  }
+
+  /**
+   * Remove a cluster of transactions from an in-mempool dependency graph
+   * and update the survivors' scores and ancestors
+   * 
+   * @param cluster 
+   * @param ancestors 
+   */
+  private removeAncestors(cluster: Map<string, MempoolTx>, all: Map<string, MempoolTx>): void {
+    // remove
+    cluster.forEach(tx => {
+      all.delete(tx.txid);
+    });
+
+    // update survivors
+    all.forEach(tx => {
+      cluster.forEach(remove => {
+        if (tx.ancestors?.has(remove.txid)) {
+          // remove as dependency
+          tx.ancestors.delete(remove.txid);
+          tx.depends = tx.depends.filter(parent => parent !== remove.txid);
+          // update ancestor sizes and fees
+          tx.ancestorsize -= remove.vsize;
+          tx.fees.ancestor -= remove.fees.base;
+        }
+      });
+      // recalculate fee rates
+      this.setAncestorScores(tx);
+    });
+  }
+
+  /**
+   * Take a mempool transaction, and set the fee rates and ancestor score
+   * 
+   * @param tx 
+   */
+  private setAncestorScores(tx: MempoolTx): void {
+    tx.individualRate = tx.fees.base / tx.vsize;
+    tx.ancestorRate = tx.fees.ancestor / tx.ancestorsize;
+    tx.score = Math.min(tx.individualRate, tx.ancestorRate);
+  }
+
+  // Sort by descending score
+  private mempoolComparator(a, b): number {
+    return b.score - a.score;
+  }
 }

-export default new AccelerationCosts;
+export default new AccelerationCosts;
+
+interface TemplateTransaction {
+  txid: string;
+  order: number;
+  weight: number;
+  adjustedVsize: number; // sigop-adjusted vsize, rounded up to the nearest integer
+  sigops: number;
+  fee: number;
+  feeDelta: number;
+  ancestors: string[];
+  cluster: string[];
+  effectiveFeePerVsize: number;
+}
+
+interface MinerTransaction extends TemplateTransaction {
+  inputs: string[];
+  feePerVsize: number;
+  relativesSet: boolean;
+  ancestorMap: Map<string, MinerTransaction>;
+  children: Set<MinerTransaction>;
+  ancestorFee: number;
+  ancestorVsize: number;
+  ancestorSigops: number;
+  score: number;
+  used: boolean;
+  modified: boolean;
+  dependencyRate: number;
+}
+
+/*
+* Build a block using an approximation of the transaction selection algorithm from Bitcoin Core
+* (see BlockAssembler in https://github.com/bitcoin/bitcoin/blob/master/src/node/miner.cpp)
+*/
+export function makeBlockTemplate(candidates: IEsploraApi.Transaction[], accelerations: Acceleration[], maxBlocks: number = 8, weightLimit: number = BLOCK_WEIGHT_UNITS, sigopLimit: number = BLOCK_SIGOPS): TemplateTransaction[] {
+  const auditPool: Map<string, MinerTransaction> = new Map();
+  const mempoolArray: MinerTransaction[] = [];
+  
+  candidates.forEach(tx => {
+    // initializing everything up front helps V8 optimize property access later
+    const adjustedVsize = Math.ceil(Math.max(tx.weight / 4, 5 * (tx.sigops || 0)));
+    const feePerVsize = (tx.fee / adjustedVsize);
+    auditPool.set(tx.txid, {
+      txid: tx.txid,
+      order: txidToOrdering(tx.txid),
+      fee: tx.fee,
+      feeDelta: 0,
+      weight: tx.weight,
+      adjustedVsize,
+      feePerVsize: feePerVsize,
+      effectiveFeePerVsize: feePerVsize,
+      dependencyRate: feePerVsize,
+      sigops: tx.sigops || 0,
+      inputs: (tx.vin?.map(vin => vin.txid) || []) as string[],
+      relativesSet: false,
+      ancestors: [],
+      cluster: [],
+      ancestorMap: new Map<string, MinerTransaction>(),
+      children: new Set<MinerTransaction>(),
+      ancestorFee: 0,
+      ancestorVsize: 0,
+      ancestorSigops: 0,
+      score: 0,
+      used: false,
+      modified: false,
+    });
+    mempoolArray.push(auditPool.get(tx.txid) as MinerTransaction);
+  });
+
+  // set accelerated effective fee
+  for (const acceleration of accelerations) {
+    const tx = auditPool.get(acceleration.txid);
+    if (tx) {
+      tx.feeDelta = acceleration.max_bid;
+      tx.feePerVsize = ((tx.fee + tx.feeDelta) / tx.adjustedVsize);
+      tx.effectiveFeePerVsize = tx.feePerVsize;
+      tx.dependencyRate = tx.feePerVsize;
+    }
+  }
+
+  // Build relatives graph & calculate ancestor scores
+  for (const tx of mempoolArray) {
+    if (!tx.relativesSet) {
+      setRelatives(tx, auditPool);
+    }
+  }
+
+  // Sort by descending ancestor score
+  mempoolArray.sort(priorityComparator);
+
+  // Build blocks by greedily choosing the highest feerate package
+  // (i.e. the package rooted in the transaction with the best ancestor score)
+  const blocks: number[][] = [];
+  let blockWeight = 0;
+  let blockSigops = 0;
+  const transactions: MinerTransaction[] = [];
+  let modified: MinerTransaction[] = [];
+  const overflow: MinerTransaction[] = [];
+  let failures = 0;
+  while (mempoolArray.length || modified.length) {
+    // skip invalid transactions
+    while (mempoolArray[0].used || mempoolArray[0].modified) {
+      mempoolArray.shift();
+    }
+
+    // Select best next package
+    let nextTx;
+    const nextPoolTx = mempoolArray[0];
+    const nextModifiedTx = modified[0];
+    if (nextPoolTx && (!nextModifiedTx || (nextPoolTx.score || 0) > (nextModifiedTx.score || 0))) {
+      nextTx = nextPoolTx;
+      mempoolArray.shift();
+    } else {
+      modified.shift();
+      if (nextModifiedTx) {
+        nextTx = nextModifiedTx;
+      }
+    }
+
+    if (nextTx && !nextTx?.used) {
+      // Check if the package fits into this block
+      if (blocks.length >= (maxBlocks - 1) || ((blockWeight + (4 * nextTx.ancestorVsize) < weightLimit) && (blockSigops + nextTx.ancestorSigops <= sigopLimit))) {
+        const ancestors: MinerTransaction[] = Array.from(nextTx.ancestorMap.values());
+        // sort ancestors by dependency graph (equivalent to sorting by ascending ancestor count)
+        const sortedTxSet = [...ancestors.sort((a, b) => { return (a.ancestorMap.size || 0) - (b.ancestorMap.size || 0); }), nextTx];
+        const clusterTxids = sortedTxSet.map(tx => tx.txid);
+        const effectiveFeeRate = Math.min(nextTx.dependencyRate || Infinity, nextTx.ancestorFee / nextTx.ancestorVsize);
+        const used: MinerTransaction[] = [];
+        while (sortedTxSet.length) {
+          const ancestor = sortedTxSet.pop();
+          if (!ancestor) {
+            continue;
+          }
+          ancestor.used = true;
+          ancestor.usedBy = nextTx.txid;
+          // update this tx with effective fee rate & relatives data
+          if (ancestor.effectiveFeePerVsize !== effectiveFeeRate) {
+            ancestor.effectiveFeePerVsize = effectiveFeeRate;
+          }
+          ancestor.cluster = clusterTxids;
+          transactions.push(ancestor);
+          blockWeight += ancestor.weight;
+          blockSigops += ancestor.sigops;
+          used.push(ancestor);
+        }
+
+        // remove these as valid package ancestors for any descendants remaining in the mempool
+        if (used.length) {
+          used.forEach(tx => {
+            modified = updateDescendants(tx, auditPool, modified, effectiveFeeRate);
+          });
+        }
+
+        failures = 0;
+      } else {
+        // hold this package in an overflow list while we check for smaller options
+        overflow.push(nextTx);
+        failures++;
+      }
+    }
+
+    // this block is full
+    const exceededPackageTries = failures > 1000 && blockWeight > (weightLimit - 4000);
+    const queueEmpty = !mempoolArray.length && !modified.length;
+
+    if (exceededPackageTries || queueEmpty) {
+      break;
+    }
+  }
+
+  for (const tx of transactions) {
+    tx.ancestors = Object.values(tx.ancestorMap);
+  }
+
+  return transactions;
+}
+
+// traverse in-mempool ancestors
+// recursion unavoidable, but should be limited to depth < 25 by mempool policy
+function setRelatives(
+  tx: MinerTransaction,
+  mempool: Map<string, MinerTransaction>,
+): void {
+  for (const parent of tx.inputs) {
+    const parentTx = mempool.get(parent);
+    if (parentTx && !tx.ancestorMap?.has(parent)) {
+      tx.ancestorMap.set(parent, parentTx);
+      parentTx.children.add(tx);
+      // visit each node only once
+      if (!parentTx.relativesSet) {
+        setRelatives(parentTx, mempool);
+      }
+      parentTx.ancestorMap.forEach((ancestor) => {
+        tx.ancestorMap.set(ancestor.txid, ancestor);
+      });
+    }
+  };
+  tx.ancestorFee = (tx.fee + tx.feeDelta);
+  tx.ancestorVsize = tx.adjustedVsize || 0;
+  tx.ancestorSigops = tx.sigops || 0;
+  tx.ancestorMap.forEach((ancestor) => {
+    tx.ancestorFee += (ancestor.fee + ancestor.feeDelta);
+    tx.ancestorVsize += ancestor.adjustedVsize;
+    tx.ancestorSigops += ancestor.sigops;
+  });
+  tx.score = tx.ancestorFee / tx.ancestorVsize;
+  tx.relativesSet = true;
+}
+
+// iterate over remaining descendants, removing the root as a valid ancestor & updating the ancestor score
+// avoids recursion to limit call stack depth
+function updateDescendants(
+  rootTx: MinerTransaction,
+  mempool: Map<string, MinerTransaction>,
+  modified: MinerTransaction[],
+  clusterRate: number,
+): MinerTransaction[] {
+  const descendantSet: Set<MinerTransaction> = new Set();
+  // stack of nodes left to visit
+  const descendants: MinerTransaction[] = [];
+  let descendantTx: MinerTransaction | undefined;
+  rootTx.children.forEach(childTx => {
+    if (!descendantSet.has(childTx)) {
+      descendants.push(childTx);
+      descendantSet.add(childTx);
+    }
+  });
+  while (descendants.length) {
+    descendantTx = descendants.pop();
+    if (descendantTx && descendantTx.ancestorMap && descendantTx.ancestorMap.has(rootTx.txid)) {
+      // remove tx as ancestor
+      descendantTx.ancestorMap.delete(rootTx.txid);
+      descendantTx.ancestorFee -= (rootTx.fee + rootTx.feeDelta);
+      descendantTx.ancestorVsize -= rootTx.adjustedVsize;
+      descendantTx.ancestorSigops -= rootTx.sigops;
+      descendantTx.score = descendantTx.ancestorFee / descendantTx.ancestorVsize;
+      descendantTx.dependencyRate = descendantTx.dependencyRate ? Math.min(descendantTx.dependencyRate, clusterRate) : clusterRate;
+
+      if (!descendantTx.modified) {
+        descendantTx.modified = true;
+        modified.push(descendantTx);
+      }
+
+      // add this node's children to the stack
+      descendantTx.children.forEach(childTx => {
+        // visit each node only once
+        if (!descendantSet.has(childTx)) {
+          descendants.push(childTx);
+          descendantSet.add(childTx);
+        }
+      });
+    }
+  }
+  // return new, resorted modified list
+  return modified.sort(priorityComparator);
+}
+
+// Used to sort an array of MinerTransactions by descending ancestor score
+function priorityComparator(a: MinerTransaction, b: MinerTransaction): number {
+  if (b.score === a.score) {
+    // tie-break by txid for stability
+    return a.order - b.order;
+  } else {
+    return b.score - a.score;
+  }
+}
+
+// returns the most significant 4 bytes of the txid as an integer
+function txidToOrdering(txid: string): number {
+  return parseInt(
+    txid.substring(62, 64) +
+      txid.substring(60, 62) +
+      txid.substring(58, 60) +
+      txid.substring(56, 58),
+    16
+  );
+}
--- a/backend/src/api/audit.ts
+++ b/backend/src/api/audit.ts
@@ -6,22 +6,20 @@ import rbfCache from './rbf-cache';
 const PROPAGATION_MARGIN = 180; // in seconds, time since a transaction is first seen after which it is assumed to have propagated to all miners

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

    const matches: string[] = []; // present in both mined block and template
    const added: string[] = []; // present in mined block, not in template
-    const unseen: string[] = []; // present in the mined block, not in our mempool
-    const prioritized: string[] = []; // higher in the block than would be expected by in-band feerate alone
+    const prioritized: string[] = [] // present in the mined block, not in the template, but further down in the mempool
    const fresh: string[] = []; // missing, but firstSeen or lastBoosted within PROPAGATION_MARGIN
    const rbf: string[] = []; // either missing or present, and either part of a full-rbf replacement, or a conflict with the mined block
    const accelerated: string[] = []; // prioritized by the mempool accelerator
    const isCensored = {}; // missing, without excuse
    const isDisplaced = {};
-    const isAccelerated = {};
    let displacedWeight = 0;
    let matchedWeight = 0;
    let projectedWeight = 0;
@@ -34,7 +32,6 @@ class Audit {
      inBlock[tx.txid] = tx;
      if (mempool[tx.txid] && mempool[tx.txid].acceleration) {
        accelerated.push(tx.txid);
-        isAccelerated[tx.txid] = true;
      }
    }
    // coinbase is always expected
@@ -116,16 +113,11 @@ class Audit {
      } else {
        if (rbfCache.has(tx.txid)) {
          rbf.push(tx.txid);
-          if (!mempool[tx.txid] && !rbfCache.getReplacedBy(tx.txid)) {
-            unseen.push(tx.txid);
-          }
-        } else {
+        } else if (!isDisplaced[tx.txid]) {
          if (mempool[tx.txid]) {
-            if (isDisplaced[tx.txid]) {
-              added.push(tx.txid);
-            }
+            prioritized.push(tx.txid);
          } else {
-            unseen.push(tx.txid);
+            added.push(tx.txid);
          }
        }
        overflowWeight += tx.weight;
@@ -133,24 +125,6 @@ class Audit {
      totalWeight += tx.weight;
    }

-
-    // identify "prioritized" transactions
-    let lastEffectiveRate = 0;
-    // Iterate over the mined template from bottom to top (excluding the coinbase)
-    // Transactions should appear in ascending order of mining priority.
-    for (let i = transactions.length - 1; i > 0; i--) {
-      const blockTx = transactions[i];
-      // If a tx has a lower in-band effective fee rate than the previous tx,
-      // it must have been prioritized out-of-band (in order to have a higher mining priority)
-      // so exclude from the analysis.
-      if ((blockTx.effectiveFeePerVsize || 0) < lastEffectiveRate) {
-        prioritized.push(blockTx.txid);
-        // accelerated txs may or may not have their prioritized fee rate applied, so don't use them as a reference
-      } else if (!isAccelerated[blockTx.txid]) {
-        lastEffectiveRate = blockTx.effectiveFeePerVsize || 0;
-      }
-    }
-
    // transactions missing from near the end of our template are probably not being censored
    let overflowWeightRemaining = overflowWeight - (config.MEMPOOL.BLOCK_WEIGHT_UNITS - totalWeight);
    let maxOverflowRate = 0;
@@ -191,7 +165,6 @@ class Audit {
    const similarity = projectedWeight ? matchedWeight / projectedWeight : 1;

    return {
-      unseen,
      censored: Object.keys(isCensored),
      added,
      prioritized,
--- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
+++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
@@ -28,7 +28,6 @@ export interface AbstractBitcoinApi {
  $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.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -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);
  }
@@ -246,11 +232,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
@@ -19,7 +19,7 @@ import bitcoinClient from './bitcoin-client';
 import difficultyAdjustment from '../difficulty-adjustment';
 import transactionRepository from '../../repositories/TransactionRepository';
 import rbfCache from '../rbf-cache';
-import { calculateMempoolTxCpfp } from '../cpfp';
+import { calculateCpfp } from '../cpfp';

 class BitcoinRoutes {
  public initRoutes(app: Application) {
@@ -42,7 +42,6 @@ class BitcoinRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash', this.getBlock)
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/summary', this.getStrippedBlockTransactions)
      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/audit-summary', this.getBlockAuditSummary)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'block/:hash/tx/:txid/audit', this.$getBlockTxAuditSummary)
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks/tip/height', this.getBlockTipHeight)
      .post(config.MEMPOOL.API_URL_PREFIX + 'psbt/addparents', this.postPsbtCompletion)
      .get(config.MEMPOOL.API_URL_PREFIX + 'blocks-bulk/:from', this.getBlocksByBulk.bind(this))
@@ -160,17 +159,13 @@ class BitcoinRoutes {
          descendants: tx.descendants || null,
          effectiveFeePerVsize: tx.effectiveFeePerVsize || null,
          sigops: tx.sigops,
-          fee: tx.fee,
          adjustedVsize: tx.adjustedVsize,
-          acceleration: tx.acceleration,
-          acceleratedBy: tx.acceleratedBy || undefined,
-          acceleratedAt: tx.acceleratedAt || undefined,
-          feeDelta: tx.feeDelta || undefined,
+          acceleration: tx.acceleration
        });
        return;
      }

-      const cpfpInfo = calculateMempoolTxCpfp(tx, mempool.getMempool());
+      const cpfpInfo = calculateCpfp(tx, mempool.getMempool());

      res.json(cpfpInfo);
      return;
@@ -364,20 +359,6 @@ class BitcoinRoutes {
    }
  }

-  private async $getBlockTxAuditSummary(req: Request, res: Response) {
-    try {
-      const auditSummary = await blocks.$getBlockTxAuditSummary(req.params.hash, req.params.txid);
-      if (auditSummary) {
-        res.setHeader('Expires', new Date(Date.now() + 1000 * 3600 * 24 * 30).toUTCString());
-        res.json(auditSummary);
-      } else {
-        return res.status(404).send(`transaction audit not available`);
-      }
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
  private async getBlocks(req: Request, res: Response) {
    try {
      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) { // Bitcoin
--- 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
@@ -25,7 +25,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 +93,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 +126,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 +184,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 +195,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 {
@@ -352,11 +352,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
@@ -2,7 +2,7 @@ import config from '../config';
 import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory';
 import logger from '../logger';
 import memPool from './mempool';
-import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified, BlockAudit, TransactionAudit } from '../mempool.interfaces';
+import { BlockExtended, BlockExtension, BlockSummary, PoolTag, TransactionExtended, TransactionMinerInfo, CpfpSummary, MempoolTransactionExtended, TransactionClassified, BlockAudit } from '../mempool.interfaces';
 import { Common } from './common';
 import diskCache from './disk-cache';
 import transactionUtils from './transaction-utils';
@@ -30,10 +30,6 @@ import redisCache from './redis-cache';
 import rbfCache from './rbf-cache';
 import { calcBitsDifference } from './difficulty-adjustment';
 import AccelerationRepository from '../repositories/AccelerationRepository';
-import { calculateFastBlockCpfp, calculateGoodBlockCpfp } from './cpfp';
-import mempool from './mempool';
-import CpfpRepository from '../repositories/CpfpRepository';
-import accelerationApi from './services/acceleration';

 class Blocks {
  private blocks: BlockExtended[] = [];
@@ -299,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;
    }
@@ -376,7 +370,8 @@ class Blocks {
      }
    }

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

    let pools: PoolTag[] = [];
    if (config.DATABASE.ENABLED === true) {
@@ -385,9 +380,26 @@ class Blocks {
      pools = poolsParser.miningPools;
    }

-    const pool = poolsParser.matchBlockMiner(txMinerInfo.vin[0].scriptsig, addresses || [], pools);
-    if (pool) {
-      return pool;
+    for (let i = 0; i < pools.length; ++i) {
+      if (addresses.length) {
+        const poolAddresses: string[] = typeof pools[i].addresses === 'string' ?
+          JSON.parse(pools[i].addresses) : pools[i].addresses;
+        for (let y = 0; y < poolAddresses.length; y++) {
+          if (addresses.indexOf(poolAddresses[y]) !== -1) {
+            return pools[i];
+          }
+        }
+      }
+
+      const regexes: string[] = typeof pools[i].regexes === 'string' ?
+        JSON.parse(pools[i].regexes) : pools[i].regexes;
+      for (let y = 0; y < regexes.length; ++y) {
+        const regex = new RegExp(regexes[y], 'i');
+        const match = asciiScriptSig.match(regex);
+        if (match !== null) {
+          return pools[i];
+        }
+      }
    }

    if (config.DATABASE.ENABLED === true) {
@@ -440,7 +452,7 @@ class Blocks {


        if (config.MEMPOOL.BACKEND === 'esplora') {
-          const txs = (await bitcoinApi.$getTxsForBlock(block.hash)).map(tx => transactionUtils.extendMempoolTransaction(tx));
+          const txs = (await bitcoinApi.$getTxsForBlock(block.hash)).map(tx => transactionUtils.extendTransaction(tx));
          const cpfpSummary = await this.$indexCPFP(block.hash, block.height, txs);
          if (cpfpSummary) {
            await this.$getStrippedBlockTransactions(block.hash, true, true, cpfpSummary, block.height); // This will index the block summary
@@ -571,11 +583,8 @@ class Blocks {
    const blockchainInfo = await bitcoinClient.getBlockchainInfo();
    const currentBlockHeight = blockchainInfo.blocks;

-    const targetSummaryVersion: number = 1;
-    const targetTemplateVersion: number = 1;
-
-    const unclassifiedBlocksList = await BlocksSummariesRepository.$getSummariesBelowVersion(targetSummaryVersion);
-    const unclassifiedTemplatesList = await BlocksSummariesRepository.$getTemplatesBelowVersion(targetTemplateVersion);
+    const unclassifiedBlocksList = await BlocksSummariesRepository.$getSummariesWithVersion(0);
+    const unclassifiedTemplatesList = await BlocksSummariesRepository.$getTemplatesWithVersion(0);

    // nothing to do
    if (!unclassifiedBlocksList?.length && !unclassifiedTemplatesList?.length) {
@@ -608,24 +617,16 @@ class Blocks {

    for (let height = currentBlockHeight; height >= 0; height--) {
      try {
-        let txs: MempoolTransactionExtended[] | null = null;
+        let txs: TransactionExtended[] | null = null;
        if (unclassifiedBlocks[height]) {
          const blockHash = unclassifiedBlocks[height];
          // fetch transactions
-          txs = (await bitcoinApi.$getTxsForBlock(blockHash)).map(tx => transactionUtils.extendMempoolTransaction(tx)) || [];
+          txs = (await bitcoinApi.$getTxsForBlock(blockHash)).map(tx => transactionUtils.extendTransaction(tx)) || [];
          // add CPFP
-          const cpfpSummary = calculateGoodBlockCpfp(height, txs, []);
+          const cpfpSummary = Common.calculateCpfp(height, txs, true);
          // classify
          const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, cpfpSummary.transactions);
-          await BlocksSummariesRepository.$saveTransactions(height, blockHash, classifiedTxs, 2);
-          if (unclassifiedBlocks[height].version < 2 && targetSummaryVersion === 2) {
-            const cpfpClusters = await CpfpRepository.$getClustersAt(height);
-            if (!cpfpRepository.compareClusters(cpfpClusters, cpfpSummary.clusters)) {
-              // CPFP clusters changed - update the compact_cpfp tables
-              await CpfpRepository.$deleteClustersAt(height);
-              await this.$saveCpfp(blockHash, height, cpfpSummary);
-            }
-          }
+          await BlocksSummariesRepository.$saveTransactions(height, blockHash, classifiedTxs, 1);
          await Common.sleep$(250);
        }
        if (unclassifiedTemplates[height]) {
@@ -651,7 +652,7 @@ class Blocks {
              }
              templateTxs.push(tx || templateTx);
            }
-            const cpfpSummary = calculateGoodBlockCpfp(height, templateTxs?.filter(tx => tx['effectiveFeePerVsize'] != null) as MempoolTransactionExtended[], []);
+            const cpfpSummary = Common.calculateCpfp(height, templateTxs?.filter(tx => tx['effectiveFeePerVsize'] != null) as TransactionExtended[], true);
            // classify
            const { transactions: classifiedTxs } = this.summarizeBlockTransactions(blockHash, cpfpSummary.transactions);
            const classifiedTxMap: { [txid: string]: TransactionClassified } = {};
@@ -689,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
   */
@@ -905,12 +860,7 @@ class Blocks {
        }
      }

-      let accelerations = Object.values(mempool.getAccelerations());
-      if (accelerations?.length > 0) {
-        const pool = await this.$findBlockMiner(transactionUtils.stripCoinbaseTransaction(transactions[0]));
-        accelerations = accelerations.filter(a => a.pools.includes(pool.uniqueId));
-      }
-      const cpfpSummary: CpfpSummary = calculateGoodBlockCpfp(block.height, transactions, accelerations.map(a => ({ txid: a.txid, max_bid: a.feeDelta })));
+      const cpfpSummary: CpfpSummary = Common.calculateCpfp(block.height, transactions);
      const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions);
      const blockSummary: BlockSummary = this.summarizeBlockTransactions(block.id, cpfpSummary.transactions);
      this.updateTimerProgress(timer, `got block data for ${this.currentBlockHeight}`);
@@ -933,12 +883,12 @@ class Blocks {
              const newBlock = await this.$indexBlock(lastBlock.height - i);
              this.blocks.push(newBlock);
              this.updateTimerProgress(timer, `reindexed block`);
-              let newCpfpSummary;
+              let cpfpSummary;
              if (config.MEMPOOL.CPFP_INDEXING) {
-                newCpfpSummary = await this.$indexCPFP(newBlock.id, lastBlock.height - i);
+                cpfpSummary = await this.$indexCPFP(newBlock.id, lastBlock.height - i);
                this.updateTimerProgress(timer, `reindexed block cpfp`);
              }
-              await this.$getStrippedBlockTransactions(newBlock.id, true, true, newCpfpSummary, newBlock.height);
+              await this.$getStrippedBlockTransactions(newBlock.id, true, true, cpfpSummary, newBlock.height);
              this.updateTimerProgress(timer, `reindexed block summary`);
            }
            await mining.$indexDifficultyAdjustments();
@@ -987,7 +937,7 @@ class Blocks {

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

      if (block.height % 2016 === 0) {
        if (Common.indexingEnabled()) {
@@ -1169,7 +1119,7 @@ class Blocks {
        transactions: cpfpSummary.transactions.map(tx => {
          let flags: number = 0;
          try {
-            flags = Common.getTransactionFlags(tx);
+            flags = tx.flags || Common.getTransactionFlags(tx);
          } catch (e) {
            logger.warn('Failed to classify transaction: ' + (e instanceof Error ? e.message : e));
          }
@@ -1184,7 +1134,7 @@ class Blocks {
          };
        }),
      };
-      summaryVersion = cpfpSummary.version;
+      summaryVersion = 1;
    } else {
      if (config.MEMPOOL.BACKEND === 'esplora') {
        const txs = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
@@ -1309,7 +1259,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,
@@ -1379,14 +1328,6 @@ class Blocks {
    }
  }

-  public async $getBlockTxAuditSummary(hash: string, txid: string): Promise<TransactionAudit | null> {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
-      return BlocksAuditsRepository.$getBlockTxAudit(hash, txid);
-    } else {
-      return null;
-    }
-  }
-
  public getLastDifficultyAdjustmentTime(): number {
    return this.lastDifficultyAdjustmentTime;
  }
@@ -1403,11 +1344,11 @@ class Blocks {
    return this.currentBlockHeight;
  }

-  public async $indexCPFP(hash: string, height: number, txs?: MempoolTransactionExtended[]): Promise<CpfpSummary | null> {
+  public async $indexCPFP(hash: string, height: number, txs?: TransactionExtended[]): Promise<CpfpSummary | null> {
    let transactions = txs;
    if (!transactions) {
      if (config.MEMPOOL.BACKEND === 'esplora') {
-        transactions = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendMempoolTransaction(tx));
+        transactions = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
      }
      if (!transactions) {
        const block = await bitcoinClient.getBlock(hash, 2);
@@ -1419,7 +1360,7 @@ class Blocks {
    }

    if (transactions?.length != null) {
-      const summary = calculateFastBlockCpfp(height, transactions);
+      const summary = Common.calculateCpfp(height, transactions as TransactionExtended[]);

      await this.$saveCpfp(hash, height, summary);

--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -1,6 +1,6 @@
 import * as bitcoinjs from 'bitcoinjs-lib';
 import { Request } from 'express';
-import { EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats, TransactionClassified, TransactionFlags } from '../mempool.interfaces';
+import { CpfpInfo, CpfpSummary, CpfpCluster, EffectiveFeeStats, MempoolBlockWithTransactions, TransactionExtended, MempoolTransactionExtended, TransactionStripped, WorkingEffectiveFeeStats, TransactionClassified, TransactionFlags } from '../mempool.interfaces';
 import config from '../config';
 import { NodeSocket } from '../repositories/NodesSocketsRepository';
 import { isIP } from 'net';
@@ -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
@@ -292,7 +286,7 @@ export class Common {
        dustSize += getVarIntLength(dustSize);
        // add value size
        dustSize += 8;
-        if (Common.isWitnessProgram(vout.scriptpubkey)) {
+        if (['v0_p2wpkh', 'v0_p2wsh', 'v1_p2tr'].includes(vout.scriptpubkey_type)) {
          dustSize += 67;
        } else {
          dustSize += 148;
@@ -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;
@@ -419,15 +392,12 @@ export class Common {
    let flags = tx.flags ? BigInt(tx.flags) : 0n;

    // Update variable flags (CPFP, RBF)
-    flags &= ~TransactionFlags.cpfp_child;
    if (tx.ancestors?.length) {
      flags |= TransactionFlags.cpfp_child;
    }
-    flags &= ~TransactionFlags.cpfp_parent;
    if (tx.descendants?.length) {
      flags |= TransactionFlags.cpfp_parent;
    }
-    flags &= ~TransactionFlags.replacement;
    if (tx.replacement) {
      flags |= TransactionFlags.replacement;
    }
@@ -463,10 +433,11 @@ export class Common {
          case 'v0_p2wpkh': flags |= TransactionFlags.p2wpkh; break;
          case 'v0_p2wsh': flags |= TransactionFlags.p2wsh; break;
          case 'v1_p2tr': {
-            flags |= TransactionFlags.p2tr;
-            if (vin.witness?.length) {
-              flags = Common.isInscription(vin, flags);
+            if (!vin.witness?.length) {
+              throw new Error('Taproot input missing witness data');
            }
+            flags |= TransactionFlags.p2tr;
+            flags = Common.isInscription(vin, flags);
          } break;
        }
      } else {
@@ -809,6 +780,96 @@ export class Common {
    }
  }

+  static calculateCpfp(height: number, transactions: TransactionExtended[], saveRelatives: boolean = false): CpfpSummary {
+    const clusters: CpfpCluster[] = []; // list of all cpfp clusters in this block
+    const clusterMap: { [txid: string]: CpfpCluster } = {}; // map transactions to their cpfp cluster
+    let clusterTxs: TransactionExtended[] = []; // working list of elements of the current cluster
+    let ancestors: { [txid: string]: boolean } = {}; // working set of ancestors of the current cluster root
+    const txMap: { [txid: string]: TransactionExtended } = {};
+    // initialize the txMap
+    for (const tx of transactions) {
+      txMap[tx.txid] = tx;
+    }
+    // reverse pass to identify CPFP clusters
+    for (let i = transactions.length - 1; i >= 0; i--) {
+      const tx = transactions[i];
+      if (!ancestors[tx.txid]) {
+        let totalFee = 0;
+        let totalVSize = 0;
+        clusterTxs.forEach(tx => {
+          totalFee += tx?.fee || 0;
+          totalVSize += (tx.weight / 4);
+        });
+        const effectiveFeePerVsize = totalFee / totalVSize;
+        let cluster: CpfpCluster;
+        if (clusterTxs.length > 1) {
+          cluster = {
+            root: clusterTxs[0].txid,
+            height,
+            txs: clusterTxs.map(tx => { return { txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }; }),
+            effectiveFeePerVsize,
+          };
+          clusters.push(cluster);
+        }
+        clusterTxs.forEach(tx => {
+          txMap[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
+          if (cluster) {
+            clusterMap[tx.txid] = cluster;
+          }
+        });
+        // reset working vars
+        clusterTxs = [];
+        ancestors = {};
+      }
+      clusterTxs.push(tx);
+      tx.vin.forEach(vin => {
+        ancestors[vin.txid] = true;
+      });
+    }
+    // forward pass to enforce ancestor rate caps
+    for (const tx of transactions) {
+      let minAncestorRate = tx.effectiveFeePerVsize;
+      for (const vin of tx.vin) {
+        if (txMap[vin.txid]?.effectiveFeePerVsize) {
+          minAncestorRate = Math.min(minAncestorRate, txMap[vin.txid].effectiveFeePerVsize);
+        }
+      }
+      // check rounded values to skip cases with almost identical fees
+      const roundedMinAncestorRate = Math.ceil(minAncestorRate);
+      const roundedEffectiveFeeRate = Math.floor(tx.effectiveFeePerVsize);
+      if (roundedMinAncestorRate < roundedEffectiveFeeRate) {
+        tx.effectiveFeePerVsize = minAncestorRate;
+        if (!clusterMap[tx.txid]) {
+          // add a single-tx cluster to record the dependent rate
+          const cluster = {
+            root: tx.txid,
+            height,
+            txs: [{ txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }],
+            effectiveFeePerVsize: minAncestorRate,
+          };
+          clusterMap[tx.txid] = cluster;
+          clusters.push(cluster);
+        } else {
+          // update the existing cluster with the dependent rate
+          clusterMap[tx.txid].effectiveFeePerVsize = minAncestorRate;
+        }
+      }
+    }
+    if (saveRelatives) {
+      for (const cluster of clusters) {
+        cluster.txs.forEach((member, index) => {
+          txMap[member.txid].descendants = cluster.txs.slice(0, index).reverse();
+          txMap[member.txid].ancestors = cluster.txs.slice(index + 1).reverse();
+          txMap[member.txid].effectiveFeePerVsize = cluster.effectiveFeePerVsize;
+        });
+      }
+    }
+    return {
+      transactions,
+      clusters,
+    };
+  }
+
  static calcEffectiveFeeStatistics(transactions: { weight: number, fee: number, effectiveFeePerVsize?: number, txid: string, acceleration?: boolean }[]): EffectiveFeeStats {
    const sortedTxs = transactions.map(tx => { return { txid: tx.txid, weight: tx.weight, rate: tx.effectiveFeePerVsize || ((tx.fee || 0) / (tx.weight / 4)) }; }).sort((a, b) => a.rate - b.rate);

@@ -816,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;
--- a/backend/src/api/cpfp.ts
+++ b/backend/src/api/cpfp.ts
@@ -1,174 +1,29 @@
-import { Ancestor, CpfpCluster, CpfpInfo, CpfpSummary, MempoolTransactionExtended, TransactionExtended } from '../mempool.interfaces';
-import { GraphTx, convertToGraphTx, expandRelativesGraph, initializeRelatives, makeBlockTemplate, mempoolComparator, removeAncestors, setAncestorScores } from './mini-miner';
+import { CpfpInfo, MempoolTransactionExtended } from '../mempool.interfaces';
 import memPool from './mempool';
-import { Acceleration } from './acceleration/acceleration';

 const CPFP_UPDATE_INTERVAL = 60_000; // update CPFP info at most once per 60s per transaction
-const MAX_CLUSTER_ITERATIONS = 100;
+const MAX_GRAPH_SIZE = 50; // the maximum number of in-mempool relatives to consider

-export function calculateFastBlockCpfp(height: number, transactions: MempoolTransactionExtended[], saveRelatives: boolean = false): CpfpSummary {
-  const clusters: CpfpCluster[] = []; // list of all cpfp clusters in this block
-  const clusterMap: { [txid: string]: CpfpCluster } = {}; // map transactions to their cpfp cluster
-  let clusterTxs: TransactionExtended[] = []; // working list of elements of the current cluster
-  let ancestors: { [txid: string]: boolean } = {}; // working set of ancestors of the current cluster root
-  const txMap: { [txid: string]: TransactionExtended } = {};
-  // initialize the txMap
-  for (const tx of transactions) {
-    txMap[tx.txid] = tx;
-  }
-  // reverse pass to identify CPFP clusters
-  for (let i = transactions.length - 1; i >= 0; i--) {
-    const tx = transactions[i];
-    if (!ancestors[tx.txid]) {
-      let totalFee = 0;
-      let totalVSize = 0;
-      clusterTxs.forEach(tx => {
-        totalFee += tx?.fee || 0;
-        totalVSize += (tx.weight / 4);
-      });
-      const effectiveFeePerVsize = totalFee / totalVSize;
-      let cluster: CpfpCluster;
-      if (clusterTxs.length > 1) {
-        cluster = {
-          root: clusterTxs[0].txid,
-          height,
-          txs: clusterTxs.map(tx => { return { txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }; }),
-          effectiveFeePerVsize,
-        };
-        clusters.push(cluster);
-      }
-      clusterTxs.forEach(tx => {
-        txMap[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
-        if (cluster) {
-          clusterMap[tx.txid] = cluster;
-        }
-      });
-      // reset working vars
-      clusterTxs = [];
-      ancestors = {};
-    }
-    clusterTxs.push(tx);
-    tx.vin.forEach(vin => {
-      ancestors[vin.txid] = true;
-    });
-  }
-  // forward pass to enforce ancestor rate caps
-  for (const tx of transactions) {
-    let minAncestorRate = tx.effectiveFeePerVsize;
-    for (const vin of tx.vin) {
-      if (txMap[vin.txid]?.effectiveFeePerVsize) {
-        minAncestorRate = Math.min(minAncestorRate, txMap[vin.txid].effectiveFeePerVsize);
-      }
-    }
-    // check rounded values to skip cases with almost identical fees
-    const roundedMinAncestorRate = Math.ceil(minAncestorRate);
-    const roundedEffectiveFeeRate = Math.floor(tx.effectiveFeePerVsize);
-    if (roundedMinAncestorRate < roundedEffectiveFeeRate) {
-      tx.effectiveFeePerVsize = minAncestorRate;
-      if (!clusterMap[tx.txid]) {
-        // add a single-tx cluster to record the dependent rate
-        const cluster = {
-          root: tx.txid,
-          height,
-          txs: [{ txid: tx.txid, weight: tx.weight, fee: tx.fee || 0 }],
-          effectiveFeePerVsize: minAncestorRate,
-        };
-        clusterMap[tx.txid] = cluster;
-        clusters.push(cluster);
-      } else {
-        // update the existing cluster with the dependent rate
-        clusterMap[tx.txid].effectiveFeePerVsize = minAncestorRate;
-      }
-    }
-  }
-  if (saveRelatives) {
-    for (const cluster of clusters) {
-      cluster.txs.forEach((member, index) => {
-        txMap[member.txid].descendants = cluster.txs.slice(0, index).reverse();
-        txMap[member.txid].ancestors = cluster.txs.slice(index + 1).reverse();
-        txMap[member.txid].effectiveFeePerVsize = cluster.effectiveFeePerVsize;
-      });
-    }
-  }
-  return {
-    transactions,
-    clusters,
-    version: 1,
-  };
-}
-
-export function calculateGoodBlockCpfp(height: number, transactions: MempoolTransactionExtended[], accelerations: Acceleration[]): CpfpSummary {
-  const txMap: { [txid: string]: MempoolTransactionExtended } = {};
-  for (const tx of transactions) {
-    txMap[tx.txid] = tx;
-  }
-  const template = makeBlockTemplate(transactions, accelerations, 1, Infinity, Infinity);
-  const clusters = new Map<string, string[]>();
-  for (const tx of template) {
-    const cluster = tx.cluster || [];
-    const root = cluster.length ? cluster[cluster.length - 1] : null;
-    if (cluster.length > 1 && root && !clusters.has(root)) {
-      clusters.set(root, cluster);
-    }
-    txMap[tx.txid].effectiveFeePerVsize = tx.effectiveFeePerVsize;
-  }
-
-  const clusterArray: CpfpCluster[] = [];
-
-  for (const cluster of clusters.values()) {
-    for (const txid of cluster) {
-      const mempoolTx = txMap[txid];
-      if (mempoolTx) {
-        const ancestors: Ancestor[] = [];
-        const descendants: Ancestor[] = [];
-        let matched = false;
-        cluster.forEach(relativeTxid => {
-          if (relativeTxid === txid) {
-            matched = true;
-          } else {
-            const relative = {
-              txid: relativeTxid,
-              fee: txMap[relativeTxid].fee,
-              weight: (txMap[relativeTxid].adjustedVsize * 4) || txMap[relativeTxid].weight,
-            };
-            if (matched) {
-              descendants.push(relative);
-            } else {
-              ancestors.push(relative);
-            }
-          }
-        });
-        if (mempoolTx.ancestors?.length !== ancestors.length || mempoolTx.descendants?.length !== descendants.length) {
-          mempoolTx.cpfpDirty = true;
-        }
-        Object.assign(mempoolTx, { ancestors, descendants, bestDescendant: null, cpfpChecked: true });
-      }
-    }
-    const root = cluster[cluster.length - 1];
-    clusterArray.push({
-      root: root,
-      height,
-      txs: cluster.reverse().map(txid => ({
-        txid,
-        fee: txMap[txid].fee,
-        weight: (txMap[txid].adjustedVsize * 4) || txMap[txid].weight,
-      })),
-      effectiveFeePerVsize: txMap[root].effectiveFeePerVsize,
-    });
-  }
-
-  return {
-    transactions: transactions.map(tx => txMap[tx.txid]),
-    clusters: clusterArray,
-    version: 2,
+interface GraphTx extends MempoolTransactionExtended {
+  depends: string[];
+  spentby: string[];
+  ancestorMap: Map<string, GraphTx>;
+  fees: {
+    base: number;
+    ancestor: number;
  };
+  ancestorcount: number;
+  ancestorsize: number;
+  ancestorRate: number;
+  individualRate: number;
+  score: number;
 }

 /**
 * Takes a mempool transaction and a copy of the current mempool, and calculates the CPFP data for
 * that transaction (and all others in the same cluster)
 */
-export function calculateMempoolTxCpfp(tx: MempoolTransactionExtended, mempool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
+export function calculateCpfp(tx: MempoolTransactionExtended, mempool: { [txid: string]: MempoolTransactionExtended }): CpfpInfo {
  if (tx.cpfpUpdated && Date.now() < (tx.cpfpUpdated + CPFP_UPDATE_INTERVAL)) {
    tx.cpfpDirty = false;
    return {
@@ -177,31 +32,30 @@ export function calculateMempoolTxCpfp(tx: MempoolTransactionExtended, mempool:
      descendants: tx.descendants || [],
      effectiveFeePerVsize: tx.effectiveFeePerVsize || tx.adjustedFeePerVsize || tx.feePerVsize,
      sigops: tx.sigops,
-      fee: tx.fee,
      adjustedVsize: tx.adjustedVsize,
      acceleration: tx.acceleration
    };
  }

  const ancestorMap = new Map<string, GraphTx>();
-  const graphTx = convertToGraphTx(tx, memPool.getSpendMap());
+  const graphTx = mempoolToGraphTx(tx);
  ancestorMap.set(tx.txid, graphTx);

-  const allRelatives = expandRelativesGraph(mempool, ancestorMap, memPool.getSpendMap());
+  const allRelatives = expandRelativesGraph(mempool, ancestorMap);
  const relativesMap = initializeRelatives(allRelatives);
  const cluster = calculateCpfpCluster(tx.txid, relativesMap);

  let totalVsize = 0;
  let totalFee = 0;
  for (const tx of cluster.values()) {
-    totalVsize += tx.vsize;
-    totalFee += tx.fees.base;
+    totalVsize += tx.adjustedVsize;
+    totalFee += tx.fee;
  }
  const effectiveFeePerVsize = totalFee / totalVsize;
  for (const tx of cluster.values()) {
    mempool[tx.txid].effectiveFeePerVsize = effectiveFeePerVsize;
-    mempool[tx.txid].ancestors = Array.from(tx.ancestors.values()).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fees.base }));
-    mempool[tx.txid].descendants = Array.from(cluster.values()).filter(entry => entry.txid !== tx.txid && !tx.ancestors.has(entry.txid)).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fees.base }));
+    mempool[tx.txid].ancestors = Array.from(tx.ancestorMap.values()).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fee }));
+    mempool[tx.txid].descendants = Array.from(cluster.values()).filter(entry => entry.txid !== tx.txid && !tx.ancestorMap.has(entry.txid)).map(tx => ({ txid: tx.txid, weight: tx.weight, fee: tx.fee }));
    mempool[tx.txid].bestDescendant = null;
    mempool[tx.txid].cpfpChecked = true;
    mempool[tx.txid].cpfpDirty = true;
@@ -216,12 +70,88 @@ export function calculateMempoolTxCpfp(tx: MempoolTransactionExtended, mempool:
    descendants: tx.descendants || [],
    effectiveFeePerVsize: tx.effectiveFeePerVsize || tx.adjustedFeePerVsize || tx.feePerVsize,
    sigops: tx.sigops,
-    fee: tx.fee,
    adjustedVsize: tx.adjustedVsize,
    acceleration: tx.acceleration
  };
 }

+function mempoolToGraphTx(tx: MempoolTransactionExtended): GraphTx {
+  return {
+    ...tx,
+    depends: tx.vin.map(v => v.txid),
+    spentby: tx.vout.map((v, i) => memPool.getFromSpendMap(tx.txid, i)).map(tx => tx?.txid).filter(txid => txid != null) as string[],
+    ancestorMap: new Map(),
+    fees: {
+      base: tx.fee,
+      ancestor: tx.fee,
+    },
+    ancestorcount: 1,
+    ancestorsize: tx.adjustedVsize,
+    ancestorRate: 0,
+    individualRate: 0,
+    score: 0,
+  };
+}
+
+/**
+ * Takes a map of transaction ancestors, and expands it into a full graph of up to MAX_GRAPH_SIZE in-mempool relatives
+ */
+function expandRelativesGraph(mempool: { [txid: string]: MempoolTransactionExtended }, ancestors: Map<string, GraphTx>): Map<string, GraphTx> {
+  const relatives: Map<string, GraphTx> = new Map();
+  const stack: GraphTx[] = Array.from(ancestors.values());
+  while (stack.length > 0) {
+    if (relatives.size > MAX_GRAPH_SIZE) {
+      return relatives;
+    }
+
+    const nextTx = stack.pop();
+    if (!nextTx) {
+      continue;
+    }
+    relatives.set(nextTx.txid, nextTx);
+
+    for (const relativeTxid of [...nextTx.depends, ...nextTx.spentby]) {
+      if (relatives.has(relativeTxid)) {
+        // already processed this tx
+        continue;
+      }
+      let mempoolTx = ancestors.get(relativeTxid);
+      if (!mempoolTx && mempool[relativeTxid]) {
+        mempoolTx = mempoolToGraphTx(mempool[relativeTxid]);
+      }
+      if (mempoolTx) {
+        stack.push(mempoolTx);
+      }
+    }
+  }
+
+  return relatives;
+}
+
+ /**
+   * Efficiently sets a Map of in-mempool ancestors for each member of an expanded relative graph
+   * by running setAncestors on each leaf, and caching intermediate results.
+   * then initializes ancestor data for each transaction
+   * 
+   * @param all 
+   */
+ function initializeRelatives(mempoolTxs: Map<string, GraphTx>): Map<string, GraphTx> {
+  const visited: Map<string, Map<string, GraphTx>> = new Map();
+  const leaves: GraphTx[] = Array.from(mempoolTxs.values()).filter(entry => entry.spentby.length === 0);
+  for (const leaf of leaves) {
+    setAncestors(leaf, mempoolTxs, visited);
+  }
+  mempoolTxs.forEach(entry => {
+    entry.ancestorMap?.forEach(ancestor => {
+      entry.ancestorcount++;
+      entry.ancestorsize += ancestor.adjustedVsize;
+      entry.fees.ancestor += ancestor.fees.base;
+    });
+    setAncestorScores(entry);
+  });
+  return mempoolTxs;
+}
+
 /**
   * Given a root transaction and a list of in-mempool ancestors,
   * Calculate the CPFP cluster
@@ -242,10 +172,10 @@ function calculateCpfpCluster(txid: string, graph: Map<string, GraphTx>): Map<st
  let sortedRelatives = Array.from(graph.values()).sort(mempoolComparator);

  // Iterate until we reach a cluster that includes our target tx
-  let maxIterations = MAX_CLUSTER_ITERATIONS;
+  let maxIterations = MAX_GRAPH_SIZE;
  let best = sortedRelatives.shift();
-  let bestCluster = new Map<string, GraphTx>(best?.ancestors?.entries() || []);
-  while (sortedRelatives.length && best && (best.txid !== tx.txid && !best.ancestors.has(tx.txid)) && maxIterations > 0) {
+  let bestCluster = new Map<string, GraphTx>(best?.ancestorMap?.entries() || []);
+  while (sortedRelatives.length && best && (best.txid !== tx.txid && !best.ancestorMap.has(tx.txid)) && maxIterations > 0) {
    maxIterations--;
    if ((best && best.txid === tx.txid) || (bestCluster && bestCluster.has(tx.txid))) {
      break;
@@ -260,7 +190,7 @@ function calculateCpfpCluster(txid: string, graph: Map<string, GraphTx>): Map<st
      // Grab the next highest scoring entry
      best = sortedRelatives.shift();
      if (best) {
-        bestCluster = new Map<string, GraphTx>(best?.ancestors?.entries() || []);
+        bestCluster = new Map<string, GraphTx>(best?.ancestorMap?.entries() || []);
        bestCluster.set(best?.txid, best);
      }
    }
@@ -269,4 +199,88 @@ function calculateCpfpCluster(txid: string, graph: Map<string, GraphTx>): Map<st
  bestCluster.set(tx.txid, tx);

  return bestCluster;
+}
+
+ /**
+   * Remove a cluster of transactions from an in-mempool dependency graph
+   * and update the survivors' scores and ancestors
+   * 
+   * @param cluster 
+   * @param ancestors 
+   */
+ function removeAncestors(cluster: Map<string, GraphTx>, all: Map<string, GraphTx>): void {
+  // remove
+  cluster.forEach(tx => {
+    all.delete(tx.txid);
+  });
+
+  // update survivors
+  all.forEach(tx => {
+    cluster.forEach(remove => {
+      if (tx.ancestorMap?.has(remove.txid)) {
+        // remove as dependency
+        tx.ancestorMap.delete(remove.txid);
+        tx.depends = tx.depends.filter(parent => parent !== remove.txid);
+        // update ancestor sizes and fees
+        tx.ancestorsize -= remove.adjustedVsize;
+        tx.fees.ancestor -= remove.fees.base;
+      }
+    });
+    // recalculate fee rates
+    setAncestorScores(tx);
+  });
+}
+
+/**
+   * Recursively traverses an in-mempool dependency graph, and sets a Map of in-mempool ancestors
+   * for each transaction.
+   * 
+   * @param tx 
+   * @param all 
+   */
+function setAncestors(tx: GraphTx, all: Map<string, GraphTx>, visited: Map<string, Map<string, GraphTx>>, depth: number = 0): Map<string, GraphTx> {
+  // sanity check for infinite recursion / too many ancestors (should never happen)
+  if (depth > MAX_GRAPH_SIZE) {
+    return tx.ancestorMap;
+  }
+  
+  // initialize the ancestor map for this tx
+  tx.ancestorMap = new Map<string, GraphTx>();
+  tx.depends.forEach(parentId => {
+    const parent = all.get(parentId);
+    if (parent) {
+      // add the parent
+      tx.ancestorMap?.set(parentId, parent);
+      // check for a cached copy of this parent's ancestors
+      let ancestors = visited.get(parent.txid);
+      if (!ancestors) {
+        // recursively fetch the parent's ancestors
+        ancestors = setAncestors(parent, all, visited, depth + 1);
+      }
+      // and add to this tx's map
+      ancestors.forEach((ancestor, ancestorId) => {
+        tx.ancestorMap?.set(ancestorId, ancestor);
+      });
+    }
+  });
+  visited.set(tx.txid, tx.ancestorMap);
+
+  return tx.ancestorMap;
+}
+
+/**
+   * Take a mempool transaction, and set the fee rates and ancestor score
+   * 
+   * @param tx 
+   */
+function setAncestorScores(tx: GraphTx): GraphTx {
+  tx.individualRate = (tx.fees.base * 100_000_000) / tx.adjustedVsize;
+  tx.ancestorRate = (tx.fees.ancestor * 100_000_000) / tx.ancestorsize;
+  tx.score = Math.min(tx.individualRate, tx.ancestorRate);
+  return tx;
+}
+
+// Sort by descending score
+function mempoolComparator(a: GraphTx, b: GraphTx): number {
+  return b.score - a.score;
 }
--- 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 = 81;
+  private static currentVersion = 79;
  private queryTimeout = 3600_000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -653,11 +653,9 @@ class DatabaseMigration {
      await this.$executeQuery('ALTER TABLE `prices` ADD `TRY` float DEFAULT "-1"');
      await this.$executeQuery('ALTER TABLE `prices` ADD `ZAR` float DEFAULT "-1"');

-      if (isBitcoin === true) {
-        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.$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);
    }
@@ -688,18 +686,6 @@ class DatabaseMigration {
      `);
      await this.updateToSchemaVersion(79);
    }
-
-    if (databaseSchemaVersion < 80) {
-      await this.$executeQuery('ALTER TABLE `blocks` ADD coinbase_addresses JSON DEFAULT NULL');
-      await this.updateToSchemaVersion(80);
-    }
-
-    if (databaseSchemaVersion < 81 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD version INT NOT NULL DEFAULT 0');
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD INDEX `version` (`version`)');
-      await this.$executeQuery('ALTER TABLE `blocks_audits` ADD unseen_txs JSON DEFAULT "[]"');
-      await this.updateToSchemaVersion(81);
-    }
  }

  /**
--- 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,13 +333,10 @@ 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;
-        mempool[txid].ancestors = [];
-        mempool[txid].descendants = [];
-        mempool[txid].bestDescendant = null;
      }
    }
    for (const [txid, rate] of rates) {
@@ -415,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
@@ -446,23 +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;
-            mempoolTx.acceleratedAt = acceleration?.added;
-            mempoolTx.feeDelta = acceleration?.feeDelta;
            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;
-              mempool[ancestor.txid].acceleratedAt = mempoolTx.acceleratedAt;
-              mempool[ancestor.txid].feeDelta = mempoolTx.feeDelta;
-              isAcceleratedBy[ancestor.txid] = mempoolTx.acceleratedBy;
+              isAccelerated[ancestor.txid] = true;
            }
          } else {
            if (mempoolTx.acceleration) {
@@ -500,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;
@@ -647,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;
@@ -396,6 +395,10 @@ class Mempool {
  }

  public $updateAccelerations(newAccelerations: Acceleration[]): string[] {
+    if (!config.MEMPOOL_SERVICES.ACCELERATIONS) {
+      return [];
+    }
+
    try {
      const changed: string[] = [];

@@ -511,14 +514,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/mini-miner.ts
+++ b/backend/src/api/mini-miner.ts
@@ -1,515 +0,0 @@
-import { Acceleration } from './acceleration/acceleration';
-import { MempoolTransactionExtended } from '../mempool.interfaces';
-import logger from '../logger';
-
-const BLOCK_WEIGHT_UNITS = 4_000_000;
-const BLOCK_SIGOPS = 80_000;
-const MAX_RELATIVE_GRAPH_SIZE = 100;
-
-export interface GraphTx {
-  txid: string;
-  vsize: number;
-  weight: number;
-  depends: string[];
-  spentby: string[];
-
-  ancestorcount: number;
-  ancestorsize: number;
-  fees: { // in sats
-    base: number;
-    ancestor: number;
-  };
-
-  ancestors: Map<string, GraphTx>,
-  ancestorRate: number;
-  individualRate: number;
-  score: number;
-}
-
-interface TemplateTransaction {
-  txid: string;
-  order: number;
-  weight: number;
-  adjustedVsize: number; // sigop-adjusted vsize, rounded up to the nearest integer
-  sigops: number;
-  fee: number;
-  feeDelta: number;
-  ancestors: string[];
-  cluster: string[];
-  effectiveFeePerVsize: number;
-}
-
-interface MinerTransaction extends TemplateTransaction {
-  inputs: string[];
-  feePerVsize: number;
-  relativesSet: boolean;
-  ancestorMap: Map<string, MinerTransaction>;
-  children: Set<MinerTransaction>;
-  ancestorFee: number;
-  ancestorVsize: number;
-  ancestorSigops: number;
-  score: number;
-  used: boolean;
-  modified: boolean;
-  dependencyRate: number;
-}
-
-/**
- * Takes a raw transaction, and builds a graph of same-block relatives,
- * and returns as a GraphTx
- *
- * @param tx
- */
-export function getSameBlockRelatives(tx: MempoolTransactionExtended, transactions: MempoolTransactionExtended[]): Map<string, GraphTx> {
-  const blockTxs = new Map<string, MempoolTransactionExtended>(); // map of txs in this block
-  const spendMap = new Map<string, string>(); // map of outpoints to spending txids
-  for (const tx of transactions) {
-    blockTxs.set(tx.txid, tx);
-    for (const vin of tx.vin) {
-      spendMap.set(`${vin.txid}:${vin.vout}`, tx.txid);
-    }
-  }
-
-  const relatives: Map<string, GraphTx> = new Map();
-  const stack: string[] = [tx.txid];
-
-  // build set of same-block ancestors
-  while (stack.length > 0) {
-    const nextTxid = stack.pop();
-    const nextTx = nextTxid ? blockTxs.get(nextTxid) : null;
-    if (!nextTx || relatives.has(nextTx.txid)) {
-      continue;
-    }
-
-    const mempoolTx = convertToGraphTx(nextTx, spendMap);
-
-    for (const txid of [...mempoolTx.depends, ...mempoolTx.spentby]) {
-      if (txid) {
-        stack.push(txid);
-      }
-    }
-
-    relatives.set(mempoolTx.txid, mempoolTx);
-  }
-
-  return relatives;
-}
-
-/**
- * Takes a raw transaction and converts it to GraphTx format
- * fee and ancestor data is initialized with dummy/null values
- *
- * @param tx
- */
-export function convertToGraphTx(tx: MempoolTransactionExtended, spendMap?: Map<string, MempoolTransactionExtended | string>): GraphTx {
-  return {
-    txid: tx.txid,
-    vsize: Math.max(tx.sigops * 5, Math.ceil(tx.weight / 4)),
-    weight: tx.weight,
-    fees: {
-      base: tx.fee || 0,
-      ancestor: tx.fee || 0,
-    },
-    depends: (tx.vin.map(vin => vin.txid).filter(depend => depend) as string[]),
-    spentby: spendMap ? (tx.vout.map((vout, index) => { const spend = spendMap.get(`${tx.txid}:${index}`); return (spend?.['txid'] || spend); }).filter(spent => spent) as string[]) : [],
-
-    ancestorcount: 1,
-    ancestorsize: Math.max(tx.sigops * 5, Math.ceil(tx.weight / 4)),
-    ancestors: new Map<string, GraphTx>(),
-    ancestorRate: 0,
-    individualRate: 0,
-    score: 0,
-  };
-}
-
-/**
- * Takes a map of transaction ancestors, and expands it into a full graph of up to MAX_GRAPH_SIZE in-mempool relatives
- */
-export function expandRelativesGraph(mempool: { [txid: string]: MempoolTransactionExtended }, ancestors: Map<string, GraphTx>, spendMap: Map<string, MempoolTransactionExtended>): Map<string, GraphTx> {
-  const relatives: Map<string, GraphTx> = new Map();
-  const stack: GraphTx[] = Array.from(ancestors.values());
-  while (stack.length > 0) {
-    if (relatives.size > MAX_RELATIVE_GRAPH_SIZE) {
-      return relatives;
-    }
-
-    const nextTx = stack.pop();
-    if (!nextTx) {
-      continue;
-    }
-    relatives.set(nextTx.txid, nextTx);
-
-    for (const relativeTxid of [...nextTx.depends, ...nextTx.spentby]) {
-      if (relatives.has(relativeTxid)) {
-        // already processed this tx
-        continue;
-      }
-      let ancestorTx = ancestors.get(relativeTxid);
-      if (!ancestorTx && relativeTxid in mempool) {
-        const mempoolTx = mempool[relativeTxid];
-        ancestorTx = convertToGraphTx(mempoolTx, spendMap);
-      }
-      if (ancestorTx) {
-        stack.push(ancestorTx);
-      }
-    }
-  }
-
-  return relatives;
-}
-
-/**
- * Recursively traverses an in-mempool dependency graph, and sets a Map of in-mempool ancestors
- * for each transaction.
- *
- * @param tx
- * @param all
- */
-function setAncestors(tx: GraphTx, all: Map<string, GraphTx>, visited: Map<string, Map<string, GraphTx>>, depth: number = 0): Map<string, GraphTx> {
-  // sanity check for infinite recursion / too many ancestors (should never happen)
-  if (depth > MAX_RELATIVE_GRAPH_SIZE) {
-    logger.warn('cpfp dependency calculation failed: setAncestors reached depth of 100, unable to proceed');
-    return tx.ancestors;
-  }
-
-  // initialize the ancestor map for this tx
-  tx.ancestors = new Map<string, GraphTx>();
-  tx.depends.forEach(parentId => {
-    const parent = all.get(parentId);
-    if (parent) {
-      // add the parent
-      tx.ancestors?.set(parentId, parent);
-      // check for a cached copy of this parent's ancestors
-      let ancestors = visited.get(parent.txid);
-      if (!ancestors) {
-        // recursively fetch the parent's ancestors
-        ancestors = setAncestors(parent, all, visited, depth + 1);
-      }
-      // and add to this tx's map
-      ancestors.forEach((ancestor, ancestorId) => {
-        tx.ancestors?.set(ancestorId, ancestor);
-      });
-    }
-  });
-  visited.set(tx.txid, tx.ancestors);
-
-  return tx.ancestors;
-}
-
-/**
-   * Efficiently sets a Map of in-mempool ancestors for each member of an expanded relative graph
-   * by running setAncestors on each leaf, and caching intermediate results.
-   * then initializes ancestor data for each transaction
-   *
-   * @param all
-   */
-export function initializeRelatives(mempoolTxs: Map<string, GraphTx>): Map<string, GraphTx> {
-  const visited: Map<string, Map<string, GraphTx>> = new Map();
-  const leaves: GraphTx[] = Array.from(mempoolTxs.values()).filter(entry => entry.spentby.length === 0);
-  for (const leaf of leaves) {
-    setAncestors(leaf, mempoolTxs, visited);
-  }
-  mempoolTxs.forEach(entry => {
-    entry.ancestors?.forEach(ancestor => {
-      entry.ancestorcount++;
-      entry.ancestorsize += ancestor.vsize;
-      entry.fees.ancestor += ancestor.fees.base;
-    });
-    setAncestorScores(entry);
-  });
-  return mempoolTxs;
-}
-
-/**
- * Remove a cluster of transactions from an in-mempool dependency graph
- * and update the survivors' scores and ancestors
- *
- * @param cluster
- * @param ancestors
- */
-export function removeAncestors(cluster: Map<string, GraphTx>, all: Map<string, GraphTx>): void {
-  // remove
-  cluster.forEach(tx => {
-    all.delete(tx.txid);
-  });
-
-  // update survivors
-  all.forEach(tx => {
-    cluster.forEach(remove => {
-      if (tx.ancestors?.has(remove.txid)) {
-        // remove as dependency
-        tx.ancestors.delete(remove.txid);
-        tx.depends = tx.depends.filter(parent => parent !== remove.txid);
-        // update ancestor sizes and fees
-        tx.ancestorsize -= remove.vsize;
-        tx.fees.ancestor -= remove.fees.base;
-      }
-    });
-    // recalculate fee rates
-    setAncestorScores(tx);
-  });
-}
-
-/**
- * Take a mempool transaction, and set the fee rates and ancestor score
- *
- * @param tx
- */
-export function setAncestorScores(tx: GraphTx): void {
-  tx.individualRate = tx.fees.base / tx.vsize;
-  tx.ancestorRate = tx.fees.ancestor / tx.ancestorsize;
-  tx.score = Math.min(tx.individualRate, tx.ancestorRate);
-}
-
-// Sort by descending score
-export function mempoolComparator(a: GraphTx, b: GraphTx): number {
-  return b.score - a.score;
-}
-
-/*
-* Build a block using an approximation of the transaction selection algorithm from Bitcoin Core
-* (see BlockAssembler in https://github.com/bitcoin/bitcoin/blob/master/src/node/miner.cpp)
-*/
-export function makeBlockTemplate(candidates: MempoolTransactionExtended[], accelerations: Acceleration[], maxBlocks: number = 8, weightLimit: number = BLOCK_WEIGHT_UNITS, sigopLimit: number = BLOCK_SIGOPS): TemplateTransaction[] {
-  const auditPool: Map<string, MinerTransaction> = new Map();
-  const mempoolArray: MinerTransaction[] = [];
-
-  candidates.forEach(tx => {
-    // initializing everything up front helps V8 optimize property access later
-    const adjustedVsize = Math.ceil(Math.max(tx.weight / 4, 5 * (tx.sigops || 0)));
-    const feePerVsize = (tx.fee / adjustedVsize);
-    auditPool.set(tx.txid, {
-      txid: tx.txid,
-      order: txidToOrdering(tx.txid),
-      fee: tx.fee,
-      feeDelta: 0,
-      weight: tx.weight,
-      adjustedVsize,
-      feePerVsize: feePerVsize,
-      effectiveFeePerVsize: feePerVsize,
-      dependencyRate: feePerVsize,
-      sigops: tx.sigops || 0,
-      inputs: (tx.vin?.map(vin => vin.txid) || []) as string[],
-      relativesSet: false,
-      ancestors: [],
-      cluster: [],
-      ancestorMap: new Map<string, MinerTransaction>(),
-      children: new Set<MinerTransaction>(),
-      ancestorFee: 0,
-      ancestorVsize: 0,
-      ancestorSigops: 0,
-      score: 0,
-      used: false,
-      modified: false,
-    });
-    mempoolArray.push(auditPool.get(tx.txid) as MinerTransaction);
-  });
-
-  // set accelerated effective fee
-  for (const acceleration of accelerations) {
-    const tx = auditPool.get(acceleration.txid);
-    if (tx) {
-      tx.feeDelta = acceleration.max_bid;
-      tx.feePerVsize = ((tx.fee + tx.feeDelta) / tx.adjustedVsize);
-      tx.effectiveFeePerVsize = tx.feePerVsize;
-      tx.dependencyRate = tx.feePerVsize;
-    }
-  }
-
-  // Build relatives graph & calculate ancestor scores
-  for (const tx of mempoolArray) {
-    if (!tx.relativesSet) {
-      setRelatives(tx, auditPool);
-    }
-  }
-
-  // Sort by descending ancestor score
-  mempoolArray.sort(priorityComparator);
-
-  // Build blocks by greedily choosing the highest feerate package
-  // (i.e. the package rooted in the transaction with the best ancestor score)
-  const blocks: number[][] = [];
-  let blockWeight = 0;
-  let blockSigops = 0;
-  const transactions: MinerTransaction[] = [];
-  let modified: MinerTransaction[] = [];
-  const overflow: MinerTransaction[] = [];
-  let failures = 0;
-  while (mempoolArray.length || modified.length) {
-    // skip invalid transactions
-    while (mempoolArray[0]?.used || mempoolArray[0]?.modified) {
-      mempoolArray.shift();
-    }
-
-    // Select best next package
-    let nextTx;
-    const nextPoolTx = mempoolArray[0];
-    const nextModifiedTx = modified[0];
-    if (nextPoolTx && (!nextModifiedTx || (nextPoolTx.score || 0) > (nextModifiedTx.score || 0))) {
-      nextTx = nextPoolTx;
-      mempoolArray.shift();
-    } else {
-      modified.shift();
-      if (nextModifiedTx) {
-        nextTx = nextModifiedTx;
-      }
-    }
-
-    if (nextTx && !nextTx?.used) {
-      // Check if the package fits into this block
-      if (blocks.length >= (maxBlocks - 1) || ((blockWeight + (4 * nextTx.ancestorVsize) < weightLimit) && (blockSigops + nextTx.ancestorSigops <= sigopLimit))) {
-        const ancestors: MinerTransaction[] = Array.from(nextTx.ancestorMap.values());
-        // sort ancestors by dependency graph (equivalent to sorting by ascending ancestor count)
-        const sortedTxSet = [...ancestors.sort((a, b) => { return (a.ancestorMap.size || 0) - (b.ancestorMap.size || 0); }), nextTx];
-        const clusterTxids = sortedTxSet.map(tx => tx.txid);
-        const effectiveFeeRate = Math.min(nextTx.dependencyRate || Infinity, nextTx.ancestorFee / nextTx.ancestorVsize);
-        const used: MinerTransaction[] = [];
-        while (sortedTxSet.length) {
-          const ancestor = sortedTxSet.pop();
-          if (!ancestor) {
-            continue;
-          }
-          ancestor.used = true;
-          ancestor.usedBy = nextTx.txid;
-          // update this tx with effective fee rate & relatives data
-          if (ancestor.effectiveFeePerVsize !== effectiveFeeRate) {
-            ancestor.effectiveFeePerVsize = effectiveFeeRate;
-          }
-          ancestor.cluster = clusterTxids;
-          transactions.push(ancestor);
-          blockWeight += ancestor.weight;
-          blockSigops += ancestor.sigops;
-          used.push(ancestor);
-        }
-
-        // remove these as valid package ancestors for any descendants remaining in the mempool
-        if (used.length) {
-          used.forEach(tx => {
-            modified = updateDescendants(tx, auditPool, modified, effectiveFeeRate);
-          });
-        }
-
-        failures = 0;
-      } else {
-        // hold this package in an overflow list while we check for smaller options
-        overflow.push(nextTx);
-        failures++;
-      }
-    }
-
-    // this block is full
-    const exceededPackageTries = failures > 1000 && blockWeight > (weightLimit - 4000);
-    const queueEmpty = !mempoolArray.length && !modified.length;
-
-    if (exceededPackageTries || queueEmpty) {
-      break;
-    }
-  }
-
-  for (const tx of transactions) {
-    tx.ancestors = Object.values(tx.ancestorMap);
-  }
-
-  return transactions;
-}
-
-// traverse in-mempool ancestors
-// recursion unavoidable, but should be limited to depth < 25 by mempool policy
-function setRelatives(
-  tx: MinerTransaction,
-  mempool: Map<string, MinerTransaction>,
-): void {
-  for (const parent of tx.inputs) {
-    const parentTx = mempool.get(parent);
-    if (parentTx && !tx.ancestorMap?.has(parent)) {
-      tx.ancestorMap.set(parent, parentTx);
-      parentTx.children.add(tx);
-      // visit each node only once
-      if (!parentTx.relativesSet) {
-        setRelatives(parentTx, mempool);
-      }
-      parentTx.ancestorMap.forEach((ancestor) => {
-        tx.ancestorMap.set(ancestor.txid, ancestor);
-      });
-    }
-  };
-  tx.ancestorFee = (tx.fee + tx.feeDelta);
-  tx.ancestorVsize = tx.adjustedVsize || 0;
-  tx.ancestorSigops = tx.sigops || 0;
-  tx.ancestorMap.forEach((ancestor) => {
-    tx.ancestorFee += (ancestor.fee + ancestor.feeDelta);
-    tx.ancestorVsize += ancestor.adjustedVsize;
-    tx.ancestorSigops += ancestor.sigops;
-  });
-  tx.score = tx.ancestorFee / tx.ancestorVsize;
-  tx.relativesSet = true;
-}
-
-// iterate over remaining descendants, removing the root as a valid ancestor & updating the ancestor score
-// avoids recursion to limit call stack depth
-function updateDescendants(
-  rootTx: MinerTransaction,
-  mempool: Map<string, MinerTransaction>,
-  modified: MinerTransaction[],
-  clusterRate: number,
-): MinerTransaction[] {
-  const descendantSet: Set<MinerTransaction> = new Set();
-  // stack of nodes left to visit
-  const descendants: MinerTransaction[] = [];
-  let descendantTx: MinerTransaction | undefined;
-  rootTx.children.forEach(childTx => {
-    if (!descendantSet.has(childTx)) {
-      descendants.push(childTx);
-      descendantSet.add(childTx);
-    }
-  });
-  while (descendants.length) {
-    descendantTx = descendants.pop();
-    if (descendantTx && descendantTx.ancestorMap && descendantTx.ancestorMap.has(rootTx.txid)) {
-      // remove tx as ancestor
-      descendantTx.ancestorMap.delete(rootTx.txid);
-      descendantTx.ancestorFee -= (rootTx.fee + rootTx.feeDelta);
-      descendantTx.ancestorVsize -= rootTx.adjustedVsize;
-      descendantTx.ancestorSigops -= rootTx.sigops;
-      descendantTx.score = descendantTx.ancestorFee / descendantTx.ancestorVsize;
-      descendantTx.dependencyRate = descendantTx.dependencyRate ? Math.min(descendantTx.dependencyRate, clusterRate) : clusterRate;
-
-      if (!descendantTx.modified) {
-        descendantTx.modified = true;
-        modified.push(descendantTx);
-      }
-
-      // add this node's children to the stack
-      descendantTx.children.forEach(childTx => {
-        // visit each node only once
-        if (!descendantSet.has(childTx)) {
-          descendants.push(childTx);
-          descendantSet.add(childTx);
-        }
-      });
-    }
-  }
-  // return new, resorted modified list
-  return modified.sort(priorityComparator);
-}
-
-// Used to sort an array of MinerTransactions by descending ancestor score
-function priorityComparator(a: MinerTransaction, b: MinerTransaction): number {
-  if (b.score === a.score) {
-    // tie-break by txid for stability
-    return a.order - b.order;
-  } else {
-    return b.score - a.score;
-  }
-}
-
-// returns the most significant 4 bytes of the txid as an integer
-function txidToOrdering(txid: string): number {
-  return parseInt(
-    txid.substring(62, 64) +
-      txid.substring(60, 62) +
-      txid.substring(58, 60) +
-      txid.substring(56, 58),
-    16
-  );
-}
--- a/backend/src/api/mining/mining-routes.ts
+++ b/backend/src/api/mining/mining-routes.ts
@@ -9,7 +9,6 @@ import bitcoinClient from '../bitcoin/bitcoin-client';
 import mining from "./mining";
 import PricesRepository from '../../repositories/PricesRepository';
 import AccelerationRepository from '../../repositories/AccelerationRepository';
-import accelerationApi from '../services/acceleration';

 class MiningRoutes {
  public initRoutes(app: Application) {
@@ -42,8 +41,6 @@ class MiningRoutes {
      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/block/:height', this.$getAccelerationsByHeight)
      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/recent/:interval', this.$getRecentAccelerations)
      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations/total', this.$getAccelerationTotals)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'accelerations', this.$getActiveAccelerations)
-      .post(config.MEMPOOL.API_URL_PREFIX + 'acceleration/request/:txid', this.$requestAcceleration)
    ;
  }

@@ -230,8 +227,10 @@ class MiningRoutes {
        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));
+      const blockCount = await BlocksRepository.$blockCount(null, null);
      res.header('Pragma', 'public');
      res.header('Cache-control', 'public');
+      res.header('X-total-count', blockCount.toString());
      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
      res.json(blockFees);
    } catch (e) {
@@ -448,33 +447,6 @@ class MiningRoutes {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
  }
-
-  private async $getActiveAccelerations(req: Request, res: Response): Promise<void> {
-    try {
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      if (!config.MEMPOOL_SERVICES.ACCELERATIONS || ['testnet', 'signet', 'liquidtestnet', 'liquid'].includes(config.MEMPOOL.NETWORK)) {
-        res.status(400).send('Acceleration data is not available.');
-        return;
-      }
-      res.status(200).send(accelerationApi.accelerations || []);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $requestAcceleration(req: Request, res: Response): Promise<void> {
-    res.setHeader('Pragma', 'no-cache');
-    res.setHeader('Cache-control', 'private, no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0');
-    res.setHeader('expires', -1);
-    try {
-      accelerationApi.accelerationRequested(req.params.txid);
-      res.status(200).send();
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
 }

 export default new MiningRoutes();
--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -5,9 +5,6 @@ import PoolsRepository from '../repositories/PoolsRepository';
 import { PoolTag } from '../mempool.interfaces';
 import diskCache from './disk-cache';
 import mining from './mining/mining';
-import transactionUtils from './transaction-utils';
-import BlocksRepository from '../repositories/BlocksRepository';
-import redisCache from './redis-cache';

 class PoolsParser {
  miningPools: any[] = [];
@@ -40,18 +37,15 @@ class PoolsParser {

  /**
   * Populate our db with updated mining pool definition
-   * @param pools
+   * @param pools 
   */
  public async migratePoolsJson(): Promise<void> {
    // We also need to wipe the backend cache to make sure we don't serve blocks with
    // the wrong mining pool (usually happen with unknown blocks)
    diskCache.setIgnoreBlocksCache();
-    redisCache.setIgnoreBlocksCache();

    await this.$insertUnknownPool();

-    let reindexUnknown = false;
-
    for (const pool of this.miningPools) {
      if (!pool.id) {
        logger.info(`Mining pool ${pool.name} has no unique 'id' defined. Skipping.`);
@@ -63,22 +57,22 @@ class PoolsParser {
        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) {
@@ -86,7 +80,7 @@ class PoolsParser {
        const slug = pool.name.replace(/[^a-z0-9]/gi, '').toLowerCase();
        logger.debug(`Inserting new mining pool ${pool.name}`);
        await PoolsRepository.$insertNewMiningPool(pool, slug);
-        reindexUnknown = true;
+        await this.$deleteUnknownBlocks();
      } else {
        if (poolDB.name !== pool.name) {
          // Pool has been renamed
@@ -104,45 +98,7 @@ class PoolsParser {
          // Pool addresses changed or coinbase tags changed
          logger.notice(`Updating addresses and/or coinbase tags for ${pool.name} mining pool.`);
          await PoolsRepository.$updateMiningPoolTags(poolDB.id, pool.addresses, pool.regexes);
-          reindexUnknown = true;
-          await this.$reindexBlocksForPool(poolDB.id);
-        }
-      }
-    }
-
-    if (reindexUnknown) {
-      logger.notice(`Updating addresses and/or coinbase tags for unknown mining pool.`);
-      let unknownPool;
-      if (config.DATABASE.ENABLED === true) {
-        unknownPool = await PoolsRepository.$getUnknownPool();
-      } else {
-        unknownPool = this.unknownPool;
-      }
-      await this.$reindexBlocksForPool(unknownPool.id);
-    }
-  }
-
-  public matchBlockMiner(scriptsig: string, addresses: string[], pools: PoolTag[]): PoolTag | undefined {
-    const asciiScriptSig = transactionUtils.hex2ascii(scriptsig);
-
-    for (let i = 0; i < pools.length; ++i) {
-      if (addresses.length) {
-        const poolAddresses: string[] = typeof pools[i].addresses === 'string' ?
-          JSON.parse(pools[i].addresses) : pools[i].addresses;
-        for (let y = 0; y < poolAddresses.length; y++) {
-          if (addresses.indexOf(poolAddresses[y]) !== -1) {
-            return pools[i];
-          }
-        }
-      }
-
-      const regexes: string[] = typeof pools[i].regexes === 'string' ?
-        JSON.parse(pools[i].regexes) : pools[i].regexes;
-      for (let y = 0; y < regexes.length; ++y) {
-        const regex = new RegExp(regexes[y], 'i');
-        const match = asciiScriptSig.match(regex);
-        if (match !== null) {
-          return pools[i];
+          await this.$deleteBlocksForPool(poolDB);
        }
      }
    }
@@ -178,11 +134,22 @@ class PoolsParser {
  }

  /**
-   * re-index pool assignment for blocks previously associated with pool
-   *
-   * @param pool local id of existing pool to reindex
+   * Delete indexed blocks for an updated mining pool
+   * 
+   * @param pool 
   */
-  private async $reindexBlocksForPool(poolId: number): Promise<void> {
+  private async $deleteBlocksForPool(pool: PoolTag): Promise<void> {
+    // Get oldest blocks mined by the pool and assume pools-v2.json updates only concern most recent years
+    // Ignore early days of Bitcoin as there were no mining pool yet
+    const [oldestPoolBlock]: any[] = await DB.query(`
+      SELECT height
+      FROM blocks
+      WHERE pool_id = ?
+      ORDER BY height
+      LIMIT 1`,
+      [pool.id]
+    );
+
    let firstKnownBlockPool = 130635; // https://mempool.space/block/0000000000000a067d94ff753eec72830f1205ad3a4c216a08a80c832e551a52
    if (config.MEMPOOL.NETWORK === 'testnet') {
      firstKnownBlockPool = 21106; // https://mempool.space/testnet/block/0000000070b701a5b6a1b965f6a38e0472e70b2bb31b973e4638dec400877581
@@ -190,35 +157,45 @@ class PoolsParser {
      firstKnownBlockPool = 0;
    }

-    const [blocks]: any[] = await DB.query(`
-      SELECT height, hash, coinbase_raw, coinbase_addresses
-      FROM blocks
-      WHERE pool_id = ?
-      AND height >= ?
-      ORDER BY height DESC
-    `, [poolId, firstKnownBlockPool]);
-
-    let pools: PoolTag[] = [];
-    if (config.DATABASE.ENABLED === true) {
-      pools = await PoolsRepository.$getPools();
-    } else {
-      pools = this.miningPools;
-    }
-
-    let changed = 0;
-    for (const block of blocks) {
-      const addresses = JSON.parse(block.coinbase_addresses) || [];
-      const newPool = this.matchBlockMiner(block.coinbase_raw, addresses, pools);
-      if (newPool && newPool.id !== poolId) {
-        changed++;
-        await BlocksRepository.$savePool(block.hash, newPool.id);
-      }
-    }
-
-    logger.info(`${changed} blocks assigned to a new pool`, logger.tags.mining);
+    const oldestBlockHeight = oldestPoolBlock.length ?? 0 > 0 ? oldestPoolBlock[0].height : firstKnownBlockPool;
+    const [unknownPool] = await DB.query(`SELECT id from pools where slug = "unknown"`);
+    this.uniqueLog(logger.notice, `Deleting blocks with unknown mining pool from height ${oldestBlockHeight} for re-indexing`);
+    await DB.query(`
+      DELETE FROM blocks
+      WHERE pool_id = ? AND height >= ${oldestBlockHeight}`,
+      [unknownPool[0].id]
+    );
+    logger.notice(`Deleting blocks from ${pool.name} mining pool for re-indexing`);
+    await DB.query(`
+      DELETE FROM blocks
+      WHERE pool_id = ?`,
+      [pool.id]
+    );

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

--- a/backend/src/api/redis-cache.ts
+++ b/backend/src/api/redis-cache.ts
@@ -27,7 +27,6 @@ class RedisCache {
  private rbfCacheQueue: { type: string, txid: string, value: any }[] = [];
  private rbfRemoveQueue: { type: string, txid: string }[] = [];
  private txFlushLimit: number = 10000;
-  private ignoreBlocksCache = false;

  constructor() {
    if (config.REDIS.ENABLED) {
@@ -156,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;
@@ -342,7 +341,9 @@ class RedisCache {
      return;
    }
    logger.info('Restoring mempool and blocks data from Redis cache');
-
+    // Load block data
+    const loadedBlocks = await this.$getBlocks();
+    const loadedBlockSummaries = await this.$getBlockSummaries();
    // Load mempool
    const loadedMempool = await this.$getMempool();
    this.inflateLoadedTxs(loadedMempool);
@@ -351,14 +352,9 @@ class RedisCache {
    const rbfTrees = await this.$getRbfEntries('tree');
    const rbfExpirations = await this.$getRbfEntries('exp');

-    // Load & set block data
-    if (!this.ignoreBlocksCache) {
-      const loadedBlocks = await this.$getBlocks();
-      const loadedBlockSummaries = await this.$getBlockSummaries();
-      blocks.setBlocks(loadedBlocks || []);
-      blocks.setBlockSummaries(loadedBlockSummaries || []);
-    }
-    // Set other data
+    // Set loaded data
+    blocks.setBlocks(loadedBlocks || []);
+    blocks.setBlockSummaries(loadedBlockSummaries || []);
    await memPool.$setMempool(loadedMempool);
    await rbfCache.load({
      txs: rbfTxs,
@@ -415,10 +411,6 @@ class RedisCache {
    }
    return result;
  }
-
-  public setIgnoreBlocksCache(): void {
-    this.ignoreBlocksCache = true;
-  }
 }

 export default new RedisCache();
--- a/backend/src/api/services/acceleration.ts
+++ b/backend/src/api/services/acceleration.ts
@@ -1,10 +1,8 @@
 import config from '../../config';
 import logger from '../../logger';
-import { BlockExtended } from '../../mempool.interfaces';
+import { BlockExtended, PoolTag } from '../../mempool.interfaces';
 import axios from 'axios';

-type MyAccelerationStatus = 'requested' | 'accelerating' | 'done';
-
 export interface Acceleration {
  txid: string,
  added: number,
@@ -12,12 +10,6 @@ export interface Acceleration {
  effectiveFee: number,
  feeDelta: number,
  pools: number[],
-  positions?: {
-    [pool: number]: {
-      block: number,
-      vbytes: number,
-    },
-  },
 };

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

 class AccelerationApi {
-  private onDemandPollingEnabled = !config.MEMPOOL_SERVICES.ACCELERATIONS;
-  private apiPath = config.MEMPOOL.OFFICIAL ? (config.MEMPOOL_SERVICES.API + '/accelerator/accelerations') : (config.EXTERNAL_DATA_SERVER.MEMPOOL_API + '/accelerations');
-  private _accelerations: Acceleration[] | null = null;
-  private lastPoll = 0;
-  private forcePoll = false;
-  private myAccelerations: Record<string, { status: MyAccelerationStatus, added: number, acceleration?: Acceleration }> = {};
-
-  public get accelerations(): Acceleration[] | null {
-    return this._accelerations;
-  }
-
-  public countMyAccelerationsWithStatus(filter: MyAccelerationStatus): number {
-    return Object.values(this.myAccelerations).reduce((count, {status}) => { return count + (status === filter ? 1 : 0); }, 0);
-  }
-
-  public accelerationRequested(txid: string): void {
-    if (this.onDemandPollingEnabled) {
-      this.myAccelerations[txid] = { status: 'requested', added: Date.now() };
-    }
-  }
-
-  public accelerationConfirmed(): void {
-    this.forcePoll = true;
-  }
-
-  private async $fetchAccelerations(): Promise<Acceleration[] | null> {
-    try {
-      const response = await axios.get(this.apiPath, { responseType: 'json', timeout: 10000 });
-      return response?.data || [];
-    } catch (e) {
-      logger.warn('Failed to fetch current accelerations from the mempool services backend: ' + (e instanceof Error ? e.message : e));
-      return null;
-    }
-  }
-
-  public async $updateAccelerations(): Promise<Acceleration[] | null> {
-    if (!this.onDemandPollingEnabled) {
-      const accelerations = await this.$fetchAccelerations();
-      if (accelerations) {
-        this._accelerations = accelerations;
-        return this._accelerations;
+  public async $fetchAccelerations(): Promise<Acceleration[] | null> {
+    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
+      try {
+        const response = await axios.get(`${config.MEMPOOL_SERVICES.API}/accelerator/accelerations`, { responseType: 'json', timeout: 10000 });
+        return response.data as Acceleration[];
+      } catch (e) {
+        logger.warn('Failed to fetch current accelerations from the mempool services backend: ' + (e instanceof Error ? e.message : e));
+        return null;
      }
    } else {
-      return this.$updateAccelerationsOnDemand();
+      return [];
    }
-    return null;
-  }
-
-  private async $updateAccelerationsOnDemand(): Promise<Acceleration[] | null> {
-    const shouldUpdate = this.forcePoll
-      || this.countMyAccelerationsWithStatus('requested') > 0
-      || (this.countMyAccelerationsWithStatus('accelerating') > 0 && this.lastPoll < (Date.now() - (10 * 60 * 1000)));
-
-    // update accelerations if necessary
-    if (shouldUpdate) {
-      const accelerations = await this.$fetchAccelerations();
-      this.lastPoll = Date.now();
-      this.forcePoll = false;
-      if (accelerations) {
-        const latestAccelerations: Record<string, Acceleration> = {};
-        // set relevant accelerations to 'accelerating'
-        for (const acc of accelerations) {
-          if (this.myAccelerations[acc.txid]) {
-            latestAccelerations[acc.txid] = acc;
-            this.myAccelerations[acc.txid] = { status: 'accelerating', added: Date.now(), acceleration: acc };
-          }
-        }
-        // txs that are no longer accelerating are either confirmed or canceled, so mark for expiry
-        for (const [txid, { status, acceleration }] of Object.entries(this.myAccelerations)) {
-          if (status === 'accelerating' && !latestAccelerations[txid]) {
-            this.myAccelerations[txid] = { status: 'done', added: Date.now(), acceleration };
-          }
-        }
-      }
-    }
-
-    // clear expired accelerations (confirmed / failed / not accepted) after 10 minutes
-    for (const [txid, { status, added }] of Object.entries(this.myAccelerations)) {
-      if (['requested', 'done'].includes(status) && added < (Date.now() - (1000 * 60 * 10))) {
-        delete this.myAccelerations[txid];
-      }
-    }
-
-    this._accelerations = Object.values(this.myAccelerations).map(({ acceleration }) => acceleration).filter(acc => acc) as Acceleration[];
-    return this._accelerations;
  }

  public async $fetchAccelerationHistory(page?: number, status?: string): Promise<AccelerationHistory[] | null> {
--- a/backend/src/api/transaction-utils.ts
+++ b/backend/src/api/transaction-utils.ts
@@ -103,7 +103,7 @@ class TransactionUtils {
    }
    const feePerVbytes = (transaction.fee || 0) / (transaction.weight / 4);
    const transactionExtended: TransactionExtended = Object.assign({
-      vsize: transaction.weight / 4,
+      vsize: Math.round(transaction.weight / 4),
      feePerVsize: feePerVbytes,
      effectiveFeePerVsize: feePerVbytes,
    }, transaction);
@@ -123,7 +123,7 @@ class TransactionUtils {
    const adjustedFeePerVsize = (transaction.fee || 0) / adjustedVsize;
    const transactionExtended: MempoolTransactionExtended = Object.assign(transaction, {
      order: this.txidToOrdering(transaction.txid),
-      vsize,
+      vsize: Math.round(transaction.weight / 4),
      adjustedVsize,
      sigops,
      feePerVsize: feePerVbytes,
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -3,7 +3,7 @@ import * as WebSocket from 'ws';
 import {
  BlockExtended, TransactionExtended, MempoolTransactionExtended, WebsocketResponse,
  OptimizedStatistic, ILoadingIndicators, GbtCandidates, TxTrackingInfo,
-  MempoolDelta, MempoolDeltaTxids
+  MempoolBlockDelta, MempoolDelta, MempoolDeltaTxids
 } from '../mempool.interfaces';
 import blocks from './blocks';
 import memPool from './mempool';
@@ -33,7 +33,7 @@ interface AddressTransactions {
  removed: MempoolTransactionExtended[],
 }
 import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
-import { calculateMempoolTxCpfp } from './cpfp';
+import { calculateCpfp } from './cpfp';

 // valid 'want' subscriptions
 const wantable = [
@@ -206,8 +206,7 @@ class WebsocketHandler {
                }
                response['txPosition'] = JSON.stringify({
                  txid: trackTxid,
-                  position,
-                  accelerationPositions: memPool.getAccelerationPositions(tx.txid),
+                  position
                });
              }
            } else {
@@ -538,9 +537,9 @@ class WebsocketHandler {
    }

    if (config.MEMPOOL.RUST_GBT) {
-      await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, newMempool, added, removed, candidates, true);
+      await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, newMempool, added, removed, candidates, config.MEMPOOL_SERVICES.ACCELERATIONS);
    } else {
-      await mempoolBlocks.$updateBlockTemplates(transactionIds, newMempool, added, removed, candidates, accelerationDelta, true, true);
+      await mempoolBlocks.$updateBlockTemplates(transactionIds, newMempool, added, removed, candidates, accelerationDelta, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
    }

    const mBlocks = mempoolBlocks.getMempoolBlocks();
@@ -821,14 +820,10 @@ class WebsocketHandler {
            position: {
              ...mempoolTx.position,
              accelerated: mempoolTx.acceleration || undefined,
-              acceleratedBy: mempoolTx.acceleratedBy || undefined,
-              acceleratedAt: mempoolTx.acceleratedAt || undefined,
-              feeDelta: mempoolTx.feeDelta || undefined,
-            },
-            accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
+            }
          };
          if (!mempoolTx.cpfpChecked && !mempoolTx.acceleration) {
-            calculateMempoolTxCpfp(mempoolTx, newMempool);
+            calculateCpfp(mempoolTx, newMempool);
          }
          if (mempoolTx.cpfpDirty) {
            positionData['cpfp'] = {
@@ -838,7 +833,7 @@ class WebsocketHandler {
              effectiveFeePerVsize: mempoolTx.effectiveFeePerVsize || null,
              sigops: mempoolTx.sigops,
              adjustedVsize: mempoolTx.adjustedVsize,
-              acceleration: mempoolTx.acceleration,
+              acceleration: mempoolTx.acceleration
            };
          }
          response['txPosition'] = JSON.stringify(positionData);
@@ -863,12 +858,9 @@ class WebsocketHandler {
            txInfo.position = {
              ...mempoolTx.position,
              accelerated: mempoolTx.acceleration || undefined,
-              acceleratedBy: mempoolTx.acceleratedBy || undefined,
-              acceleratedAt: mempoolTx.acceleratedAt || undefined,
-              feeDelta: mempoolTx.feeDelta || undefined,
            };
            if (!mempoolTx.cpfpChecked) {
-              calculateMempoolTxCpfp(mempoolTx, newMempool);
+              calculateCpfp(mempoolTx, newMempool);
            }
            if (mempoolTx.cpfpDirty) {
              txInfo.cpfp = {
@@ -933,8 +925,6 @@ class WebsocketHandler {
      throw new Error('No WebSocket.Server have been set');
    }

-    const blockTransactions = structuredClone(transactions);
-
    this.printLogs();
    await statistics.runStatistics();

@@ -944,7 +934,7 @@ class WebsocketHandler {
    let transactionIds: string[] = (memPool.limitGBT) ? Object.keys(candidates?.txs || {}) : Object.keys(_memPool);

    const accelerations = Object.values(mempool.getAccelerations());
-    await accelerationRepository.$indexAccelerationsForBlock(block, accelerations, structuredClone(transactions));
+    await accelerationRepository.$indexAccelerationsForBlock(block, accelerations, transactions);

    const rbfTransactions = Common.findMinedRbfTransactions(transactions, memPool.getSpendMap());
    memPool.handleMinedRbfTransactions(rbfTransactions);
@@ -953,18 +943,22 @@ class WebsocketHandler {
    if (config.MEMPOOL.AUDIT && memPool.isInSync()) {
      let projectedBlocks;
      const auditMempool = _memPool;
-      const isAccelerated = accelerationApi.isAcceleratedBlock(block, Object.values(mempool.getAccelerations()));
+      const isAccelerated = config.MEMPOOL_SERVICES.ACCELERATIONS && accelerationApi.isAcceleratedBlock(block, Object.values(mempool.getAccelerations()));

-      if (config.MEMPOOL.RUST_GBT) {
-        const added = memPool.limitGBT ? (candidates?.added || []) : [];
-        const removed = memPool.limitGBT ? (candidates?.removed || []) : [];
-        projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, auditMempool, added, removed, candidates, isAccelerated, block.extras.pool.id);
+      if ((config.MEMPOOL_SERVICES.ACCELERATIONS)) {
+        if (config.MEMPOOL.RUST_GBT) {
+          const added = memPool.limitGBT ? (candidates?.added || []) : [];
+          const removed = memPool.limitGBT ? (candidates?.removed || []) : [];
+          projectedBlocks = await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, auditMempool, added, removed, candidates, isAccelerated, block.extras.pool.id);
+        } else {
+          projectedBlocks = await mempoolBlocks.$makeBlockTemplates(transactionIds, auditMempool, candidates, false, isAccelerated, block.extras.pool.id);
+        }
      } else {
-        projectedBlocks = await mempoolBlocks.$makeBlockTemplates(transactionIds, auditMempool, candidates, false, isAccelerated, block.extras.pool.id);
+        projectedBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
      }

      if (Common.indexingEnabled()) {
-        const { unseen, censored, added, prioritized, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(block.height, blockTransactions, projectedBlocks, auditMempool);
+        const { censored, added, prioritized, fresh, sigop, fullrbf, accelerated, score, similarity } = Audit.auditBlock(transactions, projectedBlocks, auditMempool);
        const matchRate = Math.round(score * 100 * 100) / 100;

        const stripped = projectedBlocks[0]?.transactions ? projectedBlocks[0].transactions : [];
@@ -986,11 +980,9 @@ class WebsocketHandler {
        });

        BlocksAuditsRepository.$saveAudit({
-          version: 1,
          time: block.timestamp,
          height: block.height,
          hash: block.id,
-          unseenTxs: unseen,
          addedTxs: added,
          prioritizedTxs: prioritized,
          missingTxs: censored,
@@ -1042,7 +1034,7 @@ class WebsocketHandler {
      const removed = memPool.limitGBT ? (candidates?.removed || []) : transactions;
      await mempoolBlocks.$rustUpdateBlockTemplates(transactionIds, _memPool, added, removed, candidates, true);
    } else {
-      await mempoolBlocks.$makeBlockTemplates(transactionIds, _memPool, candidates, true, true);
+      await mempoolBlocks.$makeBlockTemplates(transactionIds, _memPool, candidates, true, config.MEMPOOL_SERVICES.ACCELERATIONS);
    }
    const mBlocks = mempoolBlocks.getMempoolBlocks();
    const mBlockDeltas = mempoolBlocks.getMempoolBlockDeltas();
@@ -1142,11 +1134,7 @@ class WebsocketHandler {
              position: {
                ...mempoolTx.position,
                accelerated: mempoolTx.acceleration || undefined,
-                acceleratedBy: mempoolTx.acceleratedBy || undefined,
-                acceleratedAt: mempoolTx.acceleratedAt || undefined,
-                feeDelta: mempoolTx.feeDelta || undefined,
-              },
-              accelerationPositions: memPool.getAccelerationPositions(mempoolTx.txid),
+              }
            });
          }
        }
@@ -1165,9 +1153,6 @@ class WebsocketHandler {
                  ...mempoolTx.position,
                },
                accelerated: mempoolTx.acceleration || undefined,
-                acceleratedBy: mempoolTx.acceleratedBy || undefined,
-                acceleratedAt: mempoolTx.acceleratedAt || undefined,
-                feeDelta: mempoolTx.feeDelta || undefined,
              };
            }
          }
@@ -1308,7 +1293,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
@@ -29,7 +29,7 @@ interface IConfig {
    EXTERNAL_RETRY_INTERVAL: number;
    USER_AGENT: string;
    STDOUT_LOG_MIN_PRIORITY: 'emerg' | 'alert' | 'crit' | 'err' | 'warn' | 'notice' | 'info' | 'debug';
-    AUTOMATIC_POOLS_UPDATE: boolean;
+    AUTOMATIC_BLOCK_REINDEXING: boolean;
    POOLS_JSON_URL: string,
    POOLS_JSON_TREE_URL: string,
    AUDIT: boolean;
@@ -51,7 +51,6 @@ interface IConfig {
    REQUEST_TIMEOUT: number;
    FALLBACK_TIMEOUT: number;
    FALLBACK: string[];
-    MAX_BEHIND_TIP: number;
  };
  LIGHTNING: {
    ENABLED: boolean;
@@ -189,11 +188,11 @@ const defaults: IConfig = {
    'EXTERNAL_RETRY_INTERVAL': 0,
    'USER_AGENT': 'mempool',
    'STDOUT_LOG_MIN_PRIORITY': 'debug',
-    'AUTOMATIC_POOLS_UPDATE': false,
+    'AUTOMATIC_BLOCK_REINDEXING': false,
    'POOLS_JSON_URL': 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json',
    'POOLS_JSON_TREE_URL': 'https://api.github.com/repos/mempool/mining-pools/git/trees/master',
    'AUDIT': false,
-    'RUST_GBT': true,
+    'RUST_GBT': false,
    'LIMIT_GBT': false,
    'CPFP_INDEXING': false,
    'MAX_BLOCKS_BULK_QUERY': 0,
@@ -211,7 +210,6 @@ const defaults: IConfig = {
    'REQUEST_TIMEOUT': 10000,
    'FALLBACK_TIMEOUT': 5000,
    'FALLBACK': [],
-    'MAX_BEHIND_TIP': 2,
  },
  'ELECTRUM': {
    'HOST': '127.0.0.1',
--- 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;
@@ -150,7 +149,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();
@@ -229,7 +227,7 @@ class Server {
      const newMempool = await bitcoinApi.$getRawMempool();
      const minFeeMempool = memPool.limitGBT ? await bitcoinSecondClient.getRawMemPool() : null;
      const minFeeTip = memPool.limitGBT ? await bitcoinSecondClient.getBlockCount() : -1;
-      const newAccelerations = await accelerationApi.$updateAccelerations();
+      const newAccelerations = await accelerationApi.$fetchAccelerations();
      const numHandledBlocks = await blocks.$updateBlocks();
      const pollRate = config.MEMPOOL.POLL_RATE_MS * (indexer.indexerIsRunning() ? 10 : 1);
      if (numHandledBlocks === 0) {
@@ -333,9 +331,7 @@ class Server {
    if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
      accelerationRoutes.initRoutes(this.app);
    }
-    if (!config.MEMPOOL.OFFICIAL) {
-      aboutRoutes.initRoutes(this.app);
-    }
+    aboutRoutes.initRoutes(this.app);
  }

  healthCheck(): void {
--- a/backend/src/indexer.ts
+++ b/backend/src/indexer.ts
@@ -10,7 +10,6 @@ import config from './config';
 import auditReplicator from './replication/AuditReplication';
 import statisticsReplicator from './replication/StatisticsReplication';
 import AccelerationRepository from './repositories/AccelerationRepository';
-import BlocksAuditsRepository from './repositories/BlocksAuditsRepository';

 export interface CoreIndex {
  name: string;
@@ -183,7 +182,6 @@ class Indexer {
      }

      this.runSingleTask('blocksPrices');
-      await blocks.$indexCoinbaseAddresses();
      await mining.$indexDifficultyAdjustments();
      await mining.$generateNetworkHashrateHistory();
      await mining.$generatePoolHashrateHistory();
@@ -193,7 +191,6 @@ class Indexer {
      await auditReplicator.$sync();
      await statisticsReplicator.$sync();
      await AccelerationRepository.$indexPastAccelerations();
-      await BlocksAuditsRepository.$migrateAuditsV0toV1();
      // do not wait for classify blocks to finish
      blocks.$classifyBlocks();
    } catch (e) {
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -29,11 +29,9 @@ export interface PoolStats extends PoolInfo {
 }

 export interface BlockAudit {
-  version: number,
  time: number,
  height: number,
  hash: string,
-  unseenTxs: string[],
  missingTxs: string[],
  freshTxs: string[],
  sigopTxs: string[],
@@ -44,19 +42,6 @@ export interface BlockAudit {
  matchRate: number,
  expectedFees?: number,
  expectedWeight?: number,
-  template?: any[];
-}
-
-export interface TransactionAudit {
-  seen?: boolean;
-  expected?: boolean;
-  added?: boolean;
-  prioritized?: boolean;
-  delayed?: number;
-  accelerated?: boolean;
-  conflict?: boolean;
-  coinbase?: boolean;
-  firstSeen?: number;
 }

 export interface AuditScore {
@@ -126,9 +111,6 @@ export interface TransactionExtended extends IEsploraApi.Transaction {
    vsize: number,
  };
  acceleration?: boolean;
-  acceleratedBy?: number[];
-  acceleratedAt?: number;
-  feeDelta?: number;
  replacement?: boolean;
  uid?: number;
  flags?: number;
@@ -226,7 +208,6 @@ export interface CpfpInfo {
  sigops?: number;
  adjustedVsize?: number,
  acceleration?: boolean,
-  fee?: number;
 }

 export interface TransactionStripped {
@@ -305,7 +286,6 @@ export interface BlockExtension {
  coinbaseRaw: string;
  orphans: OrphanedBlock[] | null;
  coinbaseAddress: string | null;
-  coinbaseAddresses: string[] | null;
  coinbaseSignature: string | null;
  coinbaseSignatureAscii: string | null;
  virtualSize: number;
@@ -385,9 +365,8 @@ export interface CpfpCluster {
 }

 export interface CpfpSummary {
-  transactions: MempoolTransactionExtended[];
+  transactions: TransactionExtended[];
  clusters: CpfpCluster[];
-  version: number;
 }

 export interface Statistic {
@@ -453,7 +432,7 @@ export interface OptimizedStatistic {

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

--- a/backend/src/replication/AuditReplication.ts
+++ b/backend/src/replication/AuditReplication.ts
@@ -31,11 +31,11 @@ class AuditReplication {
    const missingAudits = await this.$getMissingAuditBlocks();

    logger.debug(`Fetching missing audit data for ${missingAudits.length} blocks from trusted servers`, 'Replication');
-
+    
    let totalSynced = 0;
    let totalMissed = 0;
    let loggerTimer = Date.now();
-    // process missing audits in batches of BATCH_SIZE
+    // process missing audits in batches of 
    for (let i = 0; i < missingAudits.length; i += BATCH_SIZE) {
      const slice = missingAudits.slice(i, i + BATCH_SIZE);
      const results = await Promise.all(slice.map(hash => this.$syncAudit(hash)));
@@ -109,11 +109,9 @@ class AuditReplication {
      version: 1,
    });
    await blocksAuditsRepository.$saveAudit({
-      version: auditSummary.version || 0,
      hash: blockHash,
      height: auditSummary.height,
      time: auditSummary.timestamp || auditSummary.time,
-      unseenTxs: auditSummary.unseenTxs || [],
      missingTxs: auditSummary.missingTxs || [],
      addedTxs: auditSummary.addedTxs || [],
      prioritizedTxs: auditSummary.prioritizedTxs || [],
--- a/backend/src/replication/StatisticsReplication.ts
+++ b/backend/src/replication/StatisticsReplication.ts
@@ -123,7 +123,7 @@ class StatisticsReplication {
      };

      const intervals = [              // [start,               end,                 label ]
-                                          [now - day + 600,     now - 60,            '24h']       , // from 24 hours ago to now = 1 minute granularity
+                                          [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
@@ -170,24 +170,15 @@ class StatisticsReplication {
        return new Set<number>();
      }
      
-      const roundedTimesAlreadyHere: number[] = Array.from(new Set(rows.map(row => this.roundToNearestStep(row.added, step))));
-
-      const missingTimes = timeSteps.filter(time => !roundedTimesAlreadyHere.includes(time)).filter((time, i, arr) => {
-        // Remove outsiders
-        if (i === 0) {
-          return arr[i + 1] === time + step
-        } else if (i === arr.length - 1) {
-          return arr[i - 1] === time - step;
-        }
-        return (arr[i + 1] === time + step) && (arr[i - 1] === time - step)
-      });
+      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.length < timeSteps.length * 0.01) {
+      if (missingTimes.size < timeSteps.length * 0.005) {
        return new Set();
      }

-      return new Set(missingTimes);
+      return missingTimes;
    } catch (e: any) {
      logger.err(`Cannot fetch missing statistics times from db. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
--- a/backend/src/repositories/AccelerationRepository.ts
+++ b/backend/src/repositories/AccelerationRepository.ts
@@ -1,4 +1,4 @@
-import { AccelerationInfo } from '../api/acceleration/acceleration';
+import { AccelerationInfo, makeBlockTemplate } from '../api/acceleration/acceleration';
 import { RowDataPacket } from 'mysql2';
 import DB from '../database';
 import logger from '../logger';
@@ -11,7 +11,6 @@ import accelerationCosts from '../api/acceleration/acceleration';
 import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
 import transactionUtils from '../api/transaction-utils';
 import { BlockExtended, MempoolTransactionExtended } from '../mempool.interfaces';
-import { makeBlockTemplate } from '../api/mini-miner';

 export interface PublicAcceleration {
  txid: string,
@@ -192,7 +191,6 @@ class AccelerationRepository {
    }
  }

-  // modifies block transactions
  public async $indexAccelerationsForBlock(block: BlockExtended, accelerations: Acceleration[], transactions: MempoolTransactionExtended[]): Promise<void> {
    const blockTxs: { [txid: string]: MempoolTransactionExtended } = {};
    for (const tx of transactions) {
@@ -214,15 +212,6 @@ class AccelerationRepository {
        this.$saveAcceleration(accelerationInfo, block, block.extras.pool.id, successfulAccelerations);
      }
    }
-    let anyConfirmed = false;
-    for (const acc of accelerations) {
-      if (blockTxs[acc.txid]) {
-        anyConfirmed = true;
-      }
-    }
-    if (anyConfirmed) {
-      accelerationApi.accelerationConfirmed();
-    }
    const lastSyncedHeight = await this.$getLastSyncedHeight();
    // if we've missed any blocks, let the indexer catch up from the last synced height on the next run
    if (block.height === lastSyncedHeight + 1) {
@@ -319,10 +308,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] && acc.pools.some(pool => pool.pool_unique_id === block.extras.pool.id)) {
            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/BlocksAuditsRepository.ts
+++ b/backend/src/repositories/BlocksAuditsRepository.ts
@@ -1,24 +1,13 @@
+import blocks from '../api/blocks';
 import DB from '../database';
 import logger from '../logger';
-import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
-import { BlockAudit, AuditScore, TransactionAudit, TransactionStripped } from '../mempool.interfaces';
-
-interface MigrationAudit {
-  version: number,
-  height: number,
-  id: string,
-  timestamp: number,
-  prioritizedTxs: string[],
-  acceleratedTxs: string[],
-  template: TransactionStripped[],
-  transactions: TransactionStripped[],
-}
+import { BlockAudit, AuditScore } from '../mempool.interfaces';

 class BlocksAuditRepositories {
  public async $saveAudit(audit: BlockAudit): Promise<void> {
    try {
-      await DB.query(`INSERT INTO blocks_audits(version, time, height, hash, unseen_txs, missing_txs, added_txs, prioritized_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight)
-        VALUE (?, FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.version, audit.time, audit.height, audit.hash, JSON.stringify(audit.unseenTxs), JSON.stringify(audit.missingTxs),
+      await DB.query(`INSERT INTO blocks_audits(time, height, hash, missing_txs, added_txs, prioritized_txs, fresh_txs, sigop_txs, fullrbf_txs, accelerated_txs, match_rate, expected_fees, expected_weight)
+        VALUE (FROM_UNIXTIME(?), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, [audit.time, audit.height, audit.hash, JSON.stringify(audit.missingTxs),
          JSON.stringify(audit.addedTxs), JSON.stringify(audit.prioritizedTxs), JSON.stringify(audit.freshTxs), JSON.stringify(audit.sigopTxs), JSON.stringify(audit.fullrbfTxs), JSON.stringify(audit.acceleratedTxs), audit.matchRate, audit.expectedFees, audit.expectedWeight]);
    } catch (e: any) {
      if (e.errno === 1062) { // ER_DUP_ENTRY - This scenario is possible upon node backend restart
@@ -73,30 +62,24 @@ class BlocksAuditRepositories {
  public async $getBlockAudit(hash: string): Promise<BlockAudit | null> {
    try {
      const [rows]: any[] = await DB.query(
-        `SELECT
-          blocks_audits.version,
-          blocks_audits.height,
-          blocks_audits.hash as id,
-          UNIX_TIMESTAMP(blocks_audits.time) as timestamp,
-          template,
-          unseen_txs as unseenTxs,
-          missing_txs as missingTxs,
-          added_txs as addedTxs,
-          prioritized_txs as prioritizedTxs,
-          fresh_txs as freshTxs,
-          sigop_txs as sigopTxs,
-          fullrbf_txs as fullrbfTxs,
-          accelerated_txs as acceleratedTxs,
-          match_rate as matchRate,
-          expected_fees as expectedFees,
-          expected_weight as expectedWeight
+        `SELECT blocks_audits.height, blocks_audits.hash as id, UNIX_TIMESTAMP(blocks_audits.time) as timestamp,
+        template,
+        missing_txs as missingTxs,
+        added_txs as addedTxs,
+        prioritized_txs as prioritizedTxs,
+        fresh_txs as freshTxs,
+        sigop_txs as sigopTxs,
+        fullrbf_txs as fullrbfTxs,
+        accelerated_txs as acceleratedTxs,
+        match_rate as matchRate,
+        expected_fees as expectedFees,
+        expected_weight as expectedWeight
        FROM blocks_audits
        JOIN blocks_templates ON blocks_templates.id = blocks_audits.hash
        WHERE blocks_audits.hash = ?
      `, [hash]);
      
      if (rows.length) {
-        rows[0].unseenTxs = JSON.parse(rows[0].unseenTxs);
        rows[0].missingTxs = JSON.parse(rows[0].missingTxs);
        rows[0].addedTxs = JSON.parse(rows[0].addedTxs);
        rows[0].prioritizedTxs = JSON.parse(rows[0].prioritizedTxs);
@@ -115,42 +98,6 @@ class BlocksAuditRepositories {
    }
  }

-  public async $getBlockTxAudit(hash: string, txid: string): Promise<TransactionAudit | null> {
-    try {
-      const blockAudit = await this.$getBlockAudit(hash);
-
-      if (blockAudit) {
-        const isAdded = blockAudit.addedTxs.includes(txid);
-        const isPrioritized = blockAudit.prioritizedTxs.includes(txid);
-        const isAccelerated = blockAudit.acceleratedTxs.includes(txid);
-        const isConflict = blockAudit.fullrbfTxs.includes(txid);
-        let isExpected = false;
-        let firstSeen = undefined;
-        blockAudit.template?.forEach(tx => {
-          if (tx.txid === txid) {
-            isExpected = true;
-            firstSeen = tx.time;
-          }
-        });
-        const wasSeen = blockAudit.version === 1 ? !blockAudit.unseenTxs.includes(txid) : (isExpected || isPrioritized || isAccelerated);
-
-        return {
-          seen: wasSeen,
-          expected: isExpected,
-          added: isAdded && (blockAudit.version === 0 || !wasSeen),
-          prioritized: isPrioritized,
-          conflict: isConflict,
-          accelerated: isAccelerated,
-          firstSeen,
-        };
-      }
-      return null;
-    } catch (e: any) {
-      logger.err(`Cannot fetch block transaction audit from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
  public async $getBlockAuditScore(hash: string): Promise<AuditScore> {
    try {
      const [rows]: any[] = await DB.query(
@@ -204,96 +151,6 @@ class BlocksAuditRepositories {
      throw e;
    }
  }
-
-  /**
-   * [INDEXING] Migrate audits from v0 to v1
-   */
-  public async $migrateAuditsV0toV1(): Promise<void> {
-    try {
-      let done = false;
-      let processed = 0;
-      let lastHeight;
-      while (!done) {
-        const [toMigrate]: MigrationAudit[][] = await DB.query(
-          `SELECT
-            blocks_audits.height as height,
-            blocks_audits.hash as id,
-            UNIX_TIMESTAMP(blocks_audits.time) as timestamp,
-            blocks_summaries.transactions as transactions,
-            blocks_templates.template as template,
-            blocks_audits.prioritized_txs as prioritizedTxs,
-            blocks_audits.accelerated_txs as acceleratedTxs
-          FROM blocks_audits
-          JOIN blocks_summaries ON blocks_summaries.id = blocks_audits.hash
-          JOIN blocks_templates ON blocks_templates.id = blocks_audits.hash
-          WHERE blocks_audits.version = 0
-          AND blocks_summaries.version = 2
-          ORDER BY blocks_audits.height DESC
-          LIMIT 100
-        `) as any[];
-
-        if (toMigrate.length <= 0 || lastHeight === toMigrate[0].height) {
-          done = true;
-          break;
-        }
-        lastHeight = toMigrate[0].height;
-
-        logger.info(`migrating ${toMigrate.length} audits to version 1`);
-
-        for (const audit of toMigrate) {
-          // unpack JSON-serialized transaction lists
-          audit.transactions = JSON.parse((audit.transactions as any as string) || '[]');
-          audit.template = JSON.parse((audit.template as any as string) || '[]');
-
-          // we know transactions in the template, or marked "prioritized" or "accelerated"
-          // were seen in our mempool before the block was mined.
-          const isSeen = new Set<string>();
-          for (const tx of audit.template) {
-            isSeen.add(tx.txid);
-          }
-          for (const txid of audit.prioritizedTxs) {
-            isSeen.add(txid);
-          }
-          for (const txid of audit.acceleratedTxs) {
-            isSeen.add(txid);
-          }
-          const unseenTxs = audit.transactions.slice(0).map(tx => tx.txid).filter(txid => !isSeen.has(txid));
-
-          // identify "prioritized" transactions
-          const prioritizedTxs: string[] = [];
-          let lastEffectiveRate = 0;
-          // Iterate over the mined template from bottom to top (excluding the coinbase)
-          // Transactions should appear in ascending order of mining priority.
-          for (let i = audit.transactions.length - 1; i > 0; i--) {
-            const blockTx = audit.transactions[i];
-            // If a tx has a lower in-band effective fee rate than the previous tx,
-            // it must have been prioritized out-of-band (in order to have a higher mining priority)
-            // so exclude from the analysis.
-            if ((blockTx.rate || 0) < lastEffectiveRate) {
-              prioritizedTxs.push(blockTx.txid);
-            } else {
-              lastEffectiveRate = blockTx.rate || 0;
-            }
-          }
-
-          // Update audit in the database
-          await DB.query(`
-            UPDATE blocks_audits SET
-              version = ?,
-              unseen_txs = ?,
-              prioritized_txs = ?
-            WHERE hash = ?
-          `, [1, JSON.stringify(unseenTxs), JSON.stringify(prioritizedTxs), audit.id]);
-        }
-
-        processed += toMigrate.length;
-      }
-
-      logger.info(`migrated ${processed} audits to version 1`);
-    } catch (e: any) {
-      logger.err(`Error while migrating audits from v0 to v1. Will try again later. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-  }
 }

 export default new BlocksAuditRepositories();
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -5,7 +5,7 @@ import logger from '../logger';
 import { Common } from '../api/common';
 import PoolsRepository from './PoolsRepository';
 import HashratesRepository from './HashratesRepository';
-import { RowDataPacket } from 'mysql2';
+import { RowDataPacket, escape } from 'mysql2';
 import BlocksSummariesRepository from './BlocksSummariesRepository';
 import DifficultyAdjustmentsRepository from './DifficultyAdjustmentsRepository';
 import bitcoinClient from '../api/bitcoin/bitcoin-client';
@@ -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,
@@ -532,7 +529,7 @@ class BlocksRepository {
        return null;
      }

-      return await this.formatDbBlockIntoExtendedBlock(rows[0] as DatabaseBlock);
+      return await this.formatDbBlockIntoExtendedBlock(rows[0] as DatabaseBlock);  
    } catch (e) {
      logger.err(`Cannot get indexed block ${height}. Reason: ` + (e instanceof Error ? e.message : e));
      throw e;
@@ -925,25 +922,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,44 +960,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;
-    }
-  }
-
-  /**
-   * Save pool
-   * 
-   * @param id
-   * @param poolId
-   */
-  public async $savePool(id: string, poolId: number): Promise<void> {
-    try {
-      await DB.query(`
-        UPDATE blocks SET pool_id = ?
-        WHERE hash = ?`,
-        [poolId, id]
-      );
-    } catch (e) {
-      logger.err(`Cannot update block pool. 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
@@ -1059,7 +999,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/repositories/BlocksSummariesRepository.ts
+++ b/backend/src/repositories/BlocksSummariesRepository.ts
@@ -114,43 +114,6 @@ class BlocksSummariesRepository {
    return [];
  }

-  public async $getSummariesBelowVersion(version: number): Promise<{ height: number, id: string, version: number }[]> {
-    try {
-      const [rows]: any[] = await DB.query(`
-        SELECT
-          height,
-          id,
-          version
-        FROM blocks_summaries
-        WHERE version < ?
-        ORDER BY height DESC;`, [version]);
-      return rows;
-    } catch (e) {
-      logger.err(`Cannot get block summaries below version. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-
-    return [];
-  }
-
-  public async $getTemplatesBelowVersion(version: number): Promise<{ height: number, id: string, version: number }[]> {
-    try {
-      const [rows]: any[] = await DB.query(`
-        SELECT
-          blocks_summaries.height as height,
-          blocks_templates.id as id,
-          blocks_templates.version as version
-        FROM blocks_templates
-        JOIN blocks_summaries ON blocks_templates.id = blocks_summaries.id
-        WHERE blocks_templates.version < ?
-        ORDER BY height DESC;`, [version]);
-      return rows;
-    } catch (e) {
-      logger.err(`Cannot get block summaries below version. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-
-    return [];
-  }
-
  /**
   * Get the fee percentiles if the block has already been indexed, [] otherwise
   * 
--- a/backend/src/repositories/CpfpRepository.ts
+++ b/backend/src/repositories/CpfpRepository.ts
@@ -91,26 +91,6 @@ class CpfpRepository {
    return;
  }

-  public async $getClustersAt(height: number): Promise<CpfpCluster[]> {
-    const [clusterRows]: any = await DB.query(
-      `
-        SELECT *
-        FROM compact_cpfp_clusters
-        WHERE height = ?
-      `,
-      [height]
-    );
-    return clusterRows.map(cluster => {
-      if (cluster?.txs) {
-        cluster.effectiveFeePerVsize = cluster.fee_rate;
-        cluster.txs = this.unpack(cluster.txs);
-        return cluster;
-      } else {
-        return null;
-      }
-    }).filter(cluster => cluster !== null);
-  }
-
  public async $deleteClustersFrom(height: number): Promise<void> {
    logger.info(`Delete newer cpfp clusters from height ${height} from the database`);
    try {
@@ -142,37 +122,6 @@ class CpfpRepository {
    }
  }

-  public async $deleteClustersAt(height: number): Promise<void> {
-    logger.info(`Delete cpfp clusters at height ${height} from the database`);
-    try {
-      const [rows] = await DB.query(
-        `
-          SELECT txs, height, root from compact_cpfp_clusters
-          WHERE height = ?
-        `,
-        [height]
-      ) as RowDataPacket[][];
-      if (rows?.length) {
-        for (const clusterToDelete of rows) {
-          const txs = this.unpack(clusterToDelete?.txs);
-          for (const tx of txs) {
-            await transactionRepository.$removeTransaction(tx.txid);
-          }
-        }
-      }
-      await DB.query(
-        `
-          DELETE from compact_cpfp_clusters
-          WHERE height = ?
-        `,
-        [height]
-      );
-    } catch (e: any) {
-      logger.err(`Cannot delete cpfp clusters from db. Reason: ` + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
  // insert a dummy row to mark that we've indexed as far as this block
  public async $insertProgressMarker(height: number): Promise<void> {
    try {
@@ -241,32 +190,6 @@ class CpfpRepository {
      return [];
    }
  }
-
-  // returns `true` if two sets of CPFP clusters are deeply identical
-  public compareClusters(clustersA: CpfpCluster[], clustersB: CpfpCluster[]): boolean {
-    if (clustersA.length !== clustersB.length) {
-      return false;
-    }
-
-    clustersA = clustersA.sort((a,b) => a.root.localeCompare(b.root));
-    clustersB = clustersB.sort((a,b) => a.root.localeCompare(b.root));
-
-    for (let i = 0; i < clustersA.length; i++) {
-      if (clustersA[i].root !== clustersB[i].root) {
-        return false;
-      }
-      if (clustersA[i].txs.length !== clustersB[i].txs.length) {
-        return false;
-      }
-      for (let j = 0; j < clustersA[i].txs.length; j++) {
-        if (clustersA[i].txs[j].txid !== clustersB[i].txs[j].txid) {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
 }

 export default new CpfpRepository();
--- a/backend/src/tasks/pools-updater.ts
+++ b/backend/src/tasks/pools-updater.ts
@@ -50,10 +50,10 @@ class PoolsUpdater {

      // See backend README for more details about the mining pools update process
      if (this.currentSha !== null && // If we don't have any mining pool, download it at least once
-        config.MEMPOOL.AUTOMATIC_POOLS_UPDATE !== true && // Automatic pools update is disabled
+        config.MEMPOOL.AUTOMATIC_BLOCK_REINDEXING !== true && // Automatic pools update is disabled
        !process.env.npm_config_update_pools // We're not manually updating mining pool
      ) {
-        logger.warn(`Updated mining pools data is available (${githubSha}) but AUTOMATIC_POOLS_UPDATE is disabled`);
+        logger.warn(`Updated mining pools data is available (${githubSha}) but AUTOMATIC_BLOCK_REINDEXING is disabled`);
        logger.info(`You can update your mining pools using the --update-pools command flag. You may want to clear your nginx cache as well if applicable`);
        return;
      }
--- 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/hans-crypto.txt
+++ b/contributors/hans-crypto.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 May 21, 2024.
-
-Signed: hans-crypto
--- a/contributors/jlopp.txt
+++ b/contributors/jlopp.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 July 12, 2024.
-
-Signed: jlopp
--- 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/contributors/svrgnty.txt
+++ b/contributors/svrgnty.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 July 9, 2024.
-
-Signed: svrgnty
--- a/docker/README.md
+++ b/docker/README.md
@@ -106,7 +106,7 @@ Below we list all settings from `mempool-config.json` and the corresponding over
    "EXTERNAL_ASSETS": [],
    "STDOUT_LOG_MIN_PRIORITY": "info",
    "INDEXING_BLOCKS_AMOUNT": false,
-    "AUTOMATIC_POOLS_UPDATE": false,
+    "AUTOMATIC_BLOCK_REINDEXING": false,
    "POOLS_JSON_URL": "https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json",
    "POOLS_JSON_TREE_URL": "https://api.github.com/repos/mempool/mining-pools/git/trees/master",
    "CPFP_INDEXING": false,
@@ -137,7 +137,7 @@ Corresponding `docker-compose.yml` overrides:
      MEMPOOL_EXTERNAL_ASSETS: ""
      MEMPOOL_STDOUT_LOG_MIN_PRIORITY: ""
      MEMPOOL_INDEXING_BLOCKS_AMOUNT: ""
-      MEMPOOL_AUTOMATIC_POOLS_UPDATE: ""
+      MEMPOOL_AUTOMATIC_BLOCK_REINDEXING: ""
      MEMPOOL_POOLS_JSON_URL: ""
      MEMPOOL_POOLS_JSON_TREE_URL: ""
      MEMPOOL_CPFP_INDEXING: ""
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.15.0-buster-slim AS builder
+FROM node:20.13.1-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.15.0-buster-slim
+FROM node:20.13.1-buster-slim

 WORKDIR /backend

--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -25,7 +25,7 @@
    "INDEXING_BLOCKS_AMOUNT": __MEMPOOL_INDEXING_BLOCKS_AMOUNT__,
    "BLOCKS_SUMMARIES_INDEXING": __MEMPOOL_BLOCKS_SUMMARIES_INDEXING__,
    "GOGGLES_INDEXING": __MEMPOOL_GOGGLES_INDEXING__,
-    "AUTOMATIC_POOLS_UPDATE": __MEMPOOL_AUTOMATIC_POOLS_UPDATE__,
+    "AUTOMATIC_BLOCK_REINDEXING": __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__,
    "AUDIT": __MEMPOOL_AUDIT__,
    "RUST_GBT": __MEMPOOL_RUST_GBT__,
    "LIMIT_GBT": __MEMPOOL_LIMIT_GBT__,
@@ -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__",
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -26,11 +26,11 @@ __MEMPOOL_EXTERNAL_MAX_RETRY__=${MEMPOOL_EXTERNAL_MAX_RETRY:=1}
 __MEMPOOL_EXTERNAL_RETRY_INTERVAL__=${MEMPOOL_EXTERNAL_RETRY_INTERVAL:=0}
 __MEMPOOL_USER_AGENT__=${MEMPOOL_USER_AGENT:=mempool}
 __MEMPOOL_STDOUT_LOG_MIN_PRIORITY__=${MEMPOOL_STDOUT_LOG_MIN_PRIORITY:=info}
-__MEMPOOL_AUTOMATIC_POOLS_UPDATE__=${MEMPOOL_AUTOMATIC_POOLS_UPDATE:=false}
+__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=false}
 __MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=https://raw.githubusercontent.com/mempool/mining-pools/master/pools-v2.json}
 __MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master}
 __MEMPOOL_AUDIT__=${MEMPOOL_AUDIT:=false}
-__MEMPOOL_RUST_GBT__=${MEMPOOL_RUST_GBT:=true}
+__MEMPOOL_RUST_GBT__=${MEMPOOL_RUST_GBT:=false}
 __MEMPOOL_LIMIT_GBT__=${MEMPOOL_LIMIT_GBT:=false}
 __MEMPOOL_CPFP_INDEXING__=${MEMPOOL_CPFP_INDEXING:=false}
 __MEMPOOL_MAX_BLOCKS_BULK_QUERY__=${MEMPOOL_MAX_BLOCKS_BULK_QUERY:=0}
@@ -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}
@@ -144,12 +143,12 @@ __REPLICATION_STATISTICS_START_TIME__=${REPLICATION_STATISTICS_START_TIME:=14819
 __REPLICATION_SERVERS__=${REPLICATION_SERVERS:=[]}

 # MEMPOOL_SERVICES
-__MEMPOOL_SERVICES_API__=${MEMPOOL_SERVICES_API:="https://mempool.space/api/v1/services"}
+__MEMPOOL_SERVICES_API__=${MEMPOOL_SERVICES_API:=""}
 __MEMPOOL_SERVICES_ACCELERATIONS__=${MEMPOOL_SERVICES_ACCELERATIONS:=false}

 # REDIS
 __REDIS_ENABLED__=${REDIS_ENABLED:=false}
-__REDIS_UNIX_SOCKET_PATH__=${REDIS_UNIX_SOCKET_PATH:=""}
+__REDIS_UNIX_SOCKET_PATH__=${REDIS_UNIX_SOCKET_PATH:=true}
 __REDIS_BATCH_QUERY_BASE_SIZE__=${REDIS_BATCH_QUERY_BASE_SIZE:=5000}

 # FIAT_PRICE
@@ -184,7 +183,7 @@ sed -i "s!__MEMPOOL_EXTERNAL_MAX_RETRY__!${__MEMPOOL_EXTERNAL_MAX_RETRY__}!g" me
 sed -i "s!__MEMPOOL_EXTERNAL_RETRY_INTERVAL__!${__MEMPOOL_EXTERNAL_RETRY_INTERVAL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_USER_AGENT__!${__MEMPOOL_USER_AGENT__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__!${__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_AUTOMATIC_POOLS_UPDATE__!${__MEMPOOL_AUTOMATIC_POOLS_UPDATE__}!g" mempool-config.json
+sed -i "s!__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__!${__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_POOLS_JSON_TREE_URL__!${__MEMPOOL_POOLS_JSON_TREE_URL__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_AUDIT__!${__MEMPOOL_AUDIT__}!g" mempool-config.json
@@ -217,7 +216,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
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.15.0-buster-slim AS builder
+FROM node:20.13.1-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.26.0-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}
@@ -40,16 +37,12 @@ __MAINNET_BLOCK_AUDIT_START_HEIGHT__=${MAINNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __TESTNET_BLOCK_AUDIT_START_HEIGHT__=${TESTNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __SIGNET_BLOCK_AUDIT_START_HEIGHT__=${SIGNET_BLOCK_AUDIT_START_HEIGHT:=0}
 __ACCELERATOR__=${ACCELERATOR:=false}
-__ACCELERATOR_BUTTON__=${ACCELERATOR_BUTTON:=true}
-__SERVICES_API__=${SERVICES_API:=https://mempool.space/api/v1/services}
 __PUBLIC_ACCELERATIONS__=${PUBLIC_ACCELERATIONS:=false}
 __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__
@@ -61,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__
@@ -71,8 +63,6 @@ export __MAINNET_BLOCK_AUDIT_START_HEIGHT__
 export __TESTNET_BLOCK_AUDIT_START_HEIGHT__
 export __SIGNET_BLOCK_AUDIT_START_HEIGHT__
 export __ACCELERATOR__
-export __ACCELERATOR_BUTTON__
-export __SERVICES_API__
 export __PUBLIC_ACCELERATIONS__
 export __HISTORICAL_PRICE__
 export __ADDITIONAL_CURRENCIES__
--- a/frontend/.eslintrc
+++ b/frontend/.eslintrc
@@ -35,7 +35,6 @@
    "quotes": [1, "single", { "allowTemplateLiterals": true }],
    "semi": 1,
    "curly": [1, "all"],
-    "eqeqeq": 1,
-    "no-trailing-spaces": 1
+    "eqeqeq": 1
  }
 }
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -54,10 +54,6 @@
            "translation": "src/locale/messages.fr.xlf",
            "baseHref": "/fr/"
          },
-          "hr": {
-            "translation": "src/locale/messages.hr.xlf",
-            "baseHref": "/hr/"
-          },
          "ja": {
            "translation": "src/locale/messages.ja.xlf",
            "baseHref": "/ja/"
--- a/frontend/cypress/e2e/liquid/liquid.spec.ts
+++ b/frontend/cypress/e2e/liquid/liquid.spec.ts
@@ -72,6 +72,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/mainnet/mainnet.spec.ts
+++ b/frontend/cypress/e2e/mainnet/mainnet.spec.ts
@@ -144,13 +144,13 @@ describe('Mainnet', () => {
        });
      });

-      ['BC1PQYQS', 'bc1PqYqS'].forEach((searchTerm) => {
+      ['BC1PQYQSZQ', 'bc1PqYqSzQ'].forEach((searchTerm) => {
        it(`allows searching for partial case insensitive bech32m addresses: ${searchTerm}`, () => {
          cy.visit('/');
          cy.get('.search-box-container > .form-control').type(searchTerm).then(() => {
-            cy.get('app-search-results button.dropdown-item').should('have.length', 10);
+            cy.get('app-search-results button.dropdown-item').should('have.length', 1);
            cy.get('app-search-results button.dropdown-item.active').click().then(() => {
-              cy.url().should('include', '/address/bc1pqyqs26fs4gnyw4aqttyjqa5ta7075zzfjftyz98qa8vdr49dh7fqm2zkv3');
+              cy.url().should('include', '/address/bc1pqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqszqgpqyqsyjer9e');
              cy.waitForSkeletonGone();
              cy.get('.text-center').should('not.have.text', 'Invalid Bitcoin address');
            });
@@ -158,13 +158,13 @@ describe('Mainnet', () => {
        });
      });

-      ['BC1Q0003', 'bC1q0003'].forEach((searchTerm) => {
+      ['BC1Q000375VXCU', 'bC1q000375vXcU'].forEach((searchTerm) => {
        it(`allows searching for partial case insensitive bech32 addresses: ${searchTerm}`, () => {
          cy.visit('/');
          cy.get('.search-box-container > .form-control').type(searchTerm).then(() => {
-            cy.get('app-search-results button.dropdown-item').should('have.length', 10);
+            cy.get('app-search-results button.dropdown-item').should('have.length', 1);
            cy.get('app-search-results button.dropdown-item.active').click().then(() => {
-              cy.url().should('include', '/address/bc1q000303cgr9zazthut63kdktwtatfe206um8nyh');
+              cy.url().should('include', '/address/bc1q000375vxcuf5v04lmwy22vy2thvhqkxghgq7dy');
              cy.waitForSkeletonGone();
              cy.get('.text-center').should('not.have.text', 'Invalid Bitcoin address');
            });
@@ -543,7 +543,16 @@ describe('Mainnet', () => {
          }
        });

-        cy.get('.alert-replaced').should('be.visible');
+        cy.get('.alert').should('be.visible');
+        cy.get('.alert').invoke('css', 'width').then((alertWidth) => {
+          cy.get('.container-xl > :nth-child(3)').invoke('css', 'width').should('equal', alertWidth);
+        });
+
+        cy.get('.btn-warning').then(getRectangle).then((rectA) => {
+          cy.get('.alert').then(getRectangle).then((rectB) => {
+            expect(areOverlapping(rectA, rectB), 'Confirmations box and RBF alert are overlapping').to.be.false;
+          });
+        });
      });

      it('shows RBF transactions properly (desktop)', () => {
--- a/frontend/cypress/fixtures/mainnet_mempoolInfo.json
+++ b/frontend/cypress/fixtures/mainnet_mempoolInfo.json
@@ -750,7 +750,7 @@
    },
    "backendInfo": {
      "hostname": "node205.tk7.mempool.space",
-      "version": "3.0.0",
+      "version": "3.0.0-dev",
      "gitCommit": "abbc8a134",
      "lightning": false
    },
--- a/frontend/mempool-frontend-config.sample.json
+++ b/frontend/mempool-frontend-config.sample.json
@@ -4,7 +4,6 @@
  "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 +12,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,
@@ -25,7 +23,5 @@
  "HISTORICAL_PRICE": true,
  "ADDITIONAL_CURRENCIES": false,
  "ACCELERATOR": false,
-  "ACCELERATOR_BUTTON": true,
-  "PUBLIC_ACCELERATIONS": false,
-  "SERVICES_API": "https://mempool.space/api/v1/services"
+  "PUBLIC_ACCELERATIONS": false
 }
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mempool-frontend",
-  "version": "3.0.1",
+  "version": "3.0.0-dev",
  "description": "Bitcoin mempool visualizer and blockchain explorer backend",
  "license": "GNU Affero General Public License v3.0",
  "homepage": "https://mempool.space",
@@ -76,9 +76,9 @@
    "@angular/router": "^17.3.1",
    "@angular/ssr": "^17.3.1",
    "@fortawesome/angular-fontawesome": "~0.14.1",
-    "@fortawesome/fontawesome-common-types": "~6.6.0",
-    "@fortawesome/fontawesome-svg-core": "~6.6.0",
-    "@fortawesome/free-solid-svg-icons": "~6.6.0",
+    "@fortawesome/fontawesome-common-types": "~6.5.1",
+    "@fortawesome/fontawesome-svg-core": "~6.5.1",
+    "@fortawesome/free-solid-svg-icons": "~6.5.1",
    "@mempool/mempool.js": "2.3.0",
    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
    "@types/qrcode": "~1.5.0",
@@ -92,7 +92,7 @@
    "ngx-infinite-scroll": "^17.0.0",
    "qrcode": "1.5.1",
    "rxjs": "~7.8.1",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.21.1",
    "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.13.0",
+    "cypress": "^13.10.0",
    "cypress-fail-on-console-error": "~5.1.0",
    "cypress-wait-until": "^2.0.1",
    "mock-socket": "~9.3.1",
--- 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
@@ -9,7 +9,6 @@ import { StatusViewComponent } from './components/status-view/status-view.compon
 import { AddressGroupComponent } from './components/address-group/address-group.component';
 import { TrackerComponent } from './components/tracker/tracker.component';
 import { AccelerateCheckout } from './components/accelerate-checkout/accelerate-checkout.component';
-import { TrackerGuard } from './route-guards';

 const browserWindow = window || {};
 // @ts-ignore
@@ -141,17 +140,15 @@ let routes: Routes = [
    loadChildren: () => import('./bitcoin-graphs.module').then(m => m.BitcoinGraphsModule),
    data: { preload: true },
  },
-  {
-    path: 'tx',
-    canMatch: [TrackerGuard],
-    runGuardsAndResolvers: 'always',
-    loadChildren: () => import('./components/tracker/tracker.module').then(m => m.TrackerModule),
-  },
  {
    path: '',
    loadChildren: () => import('./master-page.module').then(m => m.MasterPageModule),
    data: { preload: true },
  },
+  {
+    path: 'tracker/:id',
+    component: TrackerComponent,
+  },
  {
    path: 'wallet',
    children: [],
@@ -215,6 +212,10 @@ let routes: Routes = [
    loadChildren: () => import('./bitcoin-graphs.module').then(m => m.BitcoinGraphsModule),
    data: { preload: true },
  },
+  {
+    path: '**',
+    redirectTo: ''
+  },
 ];

 if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
@@ -299,16 +300,13 @@ if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
      loadChildren: () => import('./liquid/liquid-graphs.module').then(m => m.LiquidGraphsModule),
      data: { preload: true },
    },
+    {
+      path: '**',
+      redirectTo: ''
+    },
  ];
 }

-if (!window['isMempoolSpaceBuild']) {
-  routes.push({
-    path: '**',
-    redirectTo: ''
-  });
-}
-
@NgModule({
  imports: [RouterModule.forRoot(routes, {
    initialNavigation: 'enabledBlocking',
--- a/frontend/src/app/app.constants.ts
+++ b/frontend/src/app/app.constants.ts
@@ -151,7 +151,7 @@ export const languages: Language[] = [
   { code: 'fr', name: 'Français' },        // French
 // { code: 'gl', name: 'Galego' },          // Galician
   { code: 'ko', name: '한국어' },          // Korean
-   { code: 'hr', name: 'Hrvatski' },        // Croatian
+// { code: 'hr', name: 'Hrvatski' },        // Croatian
 // { code: 'id', name: 'Bahasa Indonesia' },// Indonesian
   { code: 'hi', name: 'हिन्दी' },             // Hindi
   { code: 'ne', name: 'नेपाली' },            // Nepalese
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -27,7 +27,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,7 +45,6 @@ const providers = [
  FiatShortenerPipe,
  FiatCurrencyPipe,
  CapAddressPipe,
-  DatePipe,
  AppPreloadingStrategy,
  ServicesApiServices,
  PreloadService,
--- 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
@@ -71,24 +70,19 @@ export function calcSegwitFeeGains(tx: Transaction) {
    }

    if (isP2tr) {
-      // every valid taproot input has at least one witness item, however transactions
-      // created before taproot activation don't need to have any witness data
-      // (see https://mempool.space/tx/b10c007c60e14f9d087e0291d4d0c7869697c6681d979c6639dbd960792b4d41)
-      if (vin.witness?.length) {
-        if (vin.witness.length === 1) {
-          // key path spend
-          // we don't know if this was a multisig or single sig (the goal of taproot :)),
-          // so calculate fee savings by comparing to the cheapest single sig input type: P2WPKH and say "saved at least ...%"
-          // the witness size of P2WPKH is 1 (stack size) + 1 (size) + 72 (low s signature) + 1 (size) + 33 (pubkey) = 108 WU
-          // the witness size of key path P2TR is 1 (stack size) + 1 (size) + 64 (signature) = 66 WU
-          realizedTaprootGains += 42;
-        } else {
-          // script path spend
-          // complex scripts with multiple spending paths can often be made around 2x to 3x smaller with the Taproot script tree
-          // because only the hash of the alternative spending path has the be in the witness data, not the entire script,
-          // but only assumptions can be made because the scripts themselves are unknown (again, the goal of taproot :))
-          // TODO maybe add some complex scripts that are specified somewhere, so that size is known, such as lightning scripts
-        }
+      if (vin.witness.length === 1) {
+        // key path spend
+        // we don't know if this was a multisig or single sig (the goal of taproot :)),
+        // so calculate fee savings by comparing to the cheapest single sig input type: P2WPKH and say "saved at least ...%"
+        // the witness size of P2WPKH is 1 (stack size) + 1 (size) + 72 (low s signature) + 1 (size) + 33 (pubkey) = 108 WU
+        // the witness size of key path P2TR is 1 (stack size) + 1 (size) + 64 (signature) = 66 WU
+        realizedTaprootGains += 42;
+      } else {
+        // script path spend
+        // complex scripts with multiple spending paths can often be made around 2x to 3x smaller with the Taproot script tree
+        // because only the hash of the alternative spending path has the be in the witness data, not the entire script,
+        // but only assumptions can be made because the scripts themselves are unknown (again, the goal of taproot :))
+        // TODO maybe add some complex scripts that are specified somewhere, so that size is known, such as lightning scripts
      }
    } else {
      const script = isP2shP2Wsh || isP2wsh ? vin.inner_witnessscript_asm : vin.inner_redeemscript_asm;
@@ -298,8 +292,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" class="image">
-          <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>
@@ -125,9 +112,7 @@
        <span>Blockstream</span>
      </a>
      <a href="https://unchained.com/" target="_blank" title="Unchained">
-        <svg id="Layer_1" width="78" height="78" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 156.68 156.68" class="image">
-          <defs><style>.cls-unchained-1{fill:#fff;}</style></defs><path class="cls-unchained-1" d="m78.34,0C35.07,0,0,35.07,0,78.34s35.07,78.34,78.34,78.34,78.34-35.07,78.34-78.34S121.6,0,78.34,0ZM20.23,109.5c-4.99-9.28-7.81-19.89-7.81-31.16C12.42,41.93,41.93,12.42,78.34,12.42c33.15,0,60.58,24.46,65.23,56.32h-37.48c-45.29,0-71.19,20.05-85.85,40.76Zm58.11,34.76c-12.42,0-24.04-3.44-33.96-9.41,3.94-8.85,9.11-18.7,15.84-28.9,20.99-31.8,52.2-31.19,76.49-31.19h7.45c.06,1.18.1,2.38.1,3.58,0,36.41-29.51,65.92-65.92,65.92Z"/><path class="cls-unchained-1" d="m91.98,42.4l-3.62-1.18c-3.94-1.29-7.03-4.38-8.32-8.32l-1.18-3.63c-.13-.39-.68-.39-.81,0l-1.18,3.63c-1.29,3.94-4.38,7.03-8.32,8.32l-3.62,1.18c-.39.13-.39.68,0,.81l3.62,1.18c3.94,1.29,7.03,4.38,8.32,8.32l1.18,3.63c.13.39.68.39.81,0l1.18-3.63c1.29-3.94,4.38-7.03,8.32-8.32l3.62-1.18c.39-.13.39-.68,0-.81Z"/>
-        </svg>
+        <svg id="Layer_1" width="78" height="78" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 156.68 156.68"><defs><style>.cls-unchained-1{fill:#fff;}</style></defs><path class="cls-unchained-1" d="m78.34,0C35.07,0,0,35.07,0,78.34s35.07,78.34,78.34,78.34,78.34-35.07,78.34-78.34S121.6,0,78.34,0ZM20.23,109.5c-4.99-9.28-7.81-19.89-7.81-31.16C12.42,41.93,41.93,12.42,78.34,12.42c33.15,0,60.58,24.46,65.23,56.32h-37.48c-45.29,0-71.19,20.05-85.85,40.76Zm58.11,34.76c-12.42,0-24.04-3.44-33.96-9.41,3.94-8.85,9.11-18.7,15.84-28.9,20.99-31.8,52.2-31.19,76.49-31.19h7.45c.06,1.18.1,2.38.1,3.58,0,36.41-29.51,65.92-65.92,65.92Z"/><path class="cls-unchained-1" d="m91.98,42.4l-3.62-1.18c-3.94-1.29-7.03-4.38-8.32-8.32l-1.18-3.63c-.13-.39-.68-.39-.81,0l-1.18,3.63c-1.29,3.94-4.38,7.03-8.32,8.32l-3.62,1.18c-.39.13-.39.68,0,.81l3.62,1.18c3.94,1.29,7.03,4.38,8.32,8.32l1.18,3.63c.13.39.68.39.81,0l1.18-3.63c1.29-3.94,4.38-7.03,8.32-8.32l3.62-1.18c.39-.13.39-.68,0-.81Z"/></svg>
        <span>Unchained</span>
      </a>
      <a href="https://gemini.com/" target="_blank" title="Gemini">
@@ -152,7 +137,7 @@
        <span>Bull Bitcoin</span>
      </a>
      <a href="https://exodus.com/" target="_blank" title="Exodus">
-        <svg width="80" height="80" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg" class="image">
+        <svg width="80" height="80" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
          <circle cx="250" cy="250" r="250" fill="#1F2033"/>
          <g clip-path="url(#clip0_2_14)">
            <path d="M411.042 178.303L271.79 87V138.048L361.121 196.097L350.612 229.351H271.79V271.648H350.612L361.121 304.903L271.79 362.952V414L411.042 322.989L388.271 250.646L411.042 178.303Z" fill="url(#paint0_linear_2_14)"/>
@@ -203,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>
@@ -215,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>
@@ -228,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>
@@ -274,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>
@@ -286,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" />
@@ -326,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" />
@@ -338,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>
@@ -369,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>
@@ -384,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>
@@ -396,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>
@@ -407,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>
@@ -437,7 +422,7 @@
      Trademark Notice<br>
    </div>
    <p>
-      The Mempool Open Source Project&reg;, Mempool Accelerator&trade;, Mempool Enterprise&reg;, Mempool Liquidity&trade;, mempool.space&reg;, Be your own explorer&trade;, Explore the full Bitcoin ecosystem&reg;, Mempool Goggles&trade;, the mempool Logo, the mempool Square Logo, the mempool block visualization Logo, the mempool Blocks Logo, the mempool transaction Logo, the mempool Blocks 3 | 2 Logo, the mempool research Logo, the mempool.space Vertical Logo, and the mempool.space Horizontal Logo are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
+      The Mempool Open Source Project&reg;, Mempool Accelerator&trade;, Mempool Enterprise&reg;, Mempool Liquidity&trade;, mempool.space&reg;, Be your own explorer&trade;, Explore the full Bitcoin ecosystem&reg;, Mempool Goggles&trade;, the mempool logo, the mempool Square logo, the mempool Blocks logo, the mempool Blocks 3 | 2 logo, the mempool.space Vertical Logo, and the mempool.space Horizontal logo are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
    </p>
    <p>
      While our software is available under an open source software license, the copyright license does not include an implied right or license to use our trademarks. See our <a href="https://mempool.space/trademark-policy">Trademark Policy and Guidelines</a> for more details, published on &lt;https://mempool.space/trademark-policy&gt;.
--- a/frontend/src/app/components/about/about.component.scss
+++ b/frontend/src/app/components/about/about.component.scss
@@ -10,9 +10,14 @@
    margin: 25px;
    line-height: 32px;
  }
+  .unknown {
+    border: 1px solid #b4b4b4;
+  }

  .image.not-rounded {
    border-radius: 0;
+    width: 60px;
+    height: 60px;
  }

  .intro {
@@ -154,11 +159,6 @@
        }
        img, svg {
          margin: 40px 29px 10px;
-          &.image.coldcard {
-            border-radius: 0;
-            height: auto;
-            margin: 20px 29px 20px;
-          }
        }
      }
    }
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -1,465 +1,90 @@
-<div class="box card w-100" style="background: var(--box-bg)" id=acceleratePreviewAnchor>
-  @if (accelerateError) {
-    <div class="row mb-1 text-center">
+<div class="container-md card w-100" style="padding: 1em; background: var(--box-bg)" id=acceleratePreviewAnchor>
+
+  @if (error) {
+    <div class="mt-2">
+      <app-mempool-error [error]="error"></app-mempool-error>
+    </div>
+  } 
+
+  @else if (step === 'cta') {
+    <!-- Show A/B CTAs -->
+    <div class="row mb-1">
      <div class="col-sm">
-        <h1 style="font-size: larger;" i18n="accelerator.sorry-error-title">Sorry, something went wrong!</h1>
-      </div>
-    </div>
-    <div class="row text-center mt-1">
-      <div class="col-sm">
-        <div class="d-flex flex-row justify-content-center align-items-center">
-          <span i18n="accelerator.error-failed-to-accelerate">We were not able to accelerate this transaction. Please try again later.</span>
-        </div>
-      </div>
-    </div>
-    <hr>
-    <div class="row mt-2 mb-2 text-center">
-      <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="closeModal()" i18n="close">Close</button>
-      </div>
-    </div>
-  } @else if (step === 'quote') {
-    <div class="accelerate-cols">
-      <ng-container *ngIf="!isMobile">
-        <app-accelerate-fee-graph
-          [tx]="tx"
-          [estimate]="estimate"
-          [showEstimate]="hasAccessToBalanceMode"
-          [maxRateOptions]="maxRateOptions"
-          [maxRateIndex]="selectFeeRateIndex"
-          (setUserBid)="setUserBid($event)"
-        ></app-accelerate-fee-graph>
-      </ng-container>
-
-      <ng-container *ngIf="estimate else loadingEstimate">
-        <div>
-          @if (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>
-          }
-          <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
-          <div class="row">
-            <div class="col">
-              <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
-                <small class="form-text checkout-text mb-2"><ng-container *ngTemplateOutlet="prioritizedBy; context: {$implicit:etaInfo.hashratePercentage}"></ng-container></small>
-                <small class="form-text checkout-text 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>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col">
-              <div class="form-group">
-                <div class="fee-card">
-                  <div class="d-flex mb-0">
-                    <ng-container *ngFor="let option of maxRateOptions">
-                      <button type="button" class="btn btn-primary flex-grow-1 btn-border btn-sm feerate" [class]="{active: selectFeeRateIndex === option.index}" (click)="setUserBid(option)">
-                        <span class="fee">{{ option.fee + estimate.mempoolBaseFee + estimate.vsizeFee | number }} <span class="symbol" i18n="shared.sats">sats</span></span>
-                        <span class="rate">~<app-fee-rate [fee]="option.rate" rounding="1.0-0"></app-fee-rate></span>
-                      </button>
-                    </ng-container>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <h5 i18n="accelerator.summary-title">Summary</h5>
-          <div class="row">
-            <div class="col">
-              <table class="table table-borderless table-border table-dark table-background table-accelerator">
-                <tbody>
-                  <!-- ESTIMATED FEE -->
-                  <ng-container *ngIf="showDetails">
-                    @if (hasAccessToBalanceMode) {
-                      <tr class="group-first">
-                        <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
-                        <td class="amt" style="font-size: 16px">
-                          {{ estimate.targetFeeRate | number : '1.0-0' }}
-                        </td>
-                        <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
-                      </tr>
-                      <tr class="info">
-                        <td class="info">
-                          <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
-                        </td>
-                        <td class="amt">
-                          {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
-                        </td>
-                      </tr>
-                    }
-                    @else {
-                      <!-- TARGET FEE -->
-                      <tr class="group-first">
-                        <td class="item" i18n="accelerator.target-rate">Target rate</td>
-                        <td class="amt" style="font-size: 16px">
-                          {{ maxRateOptions[selectFeeRateIndex].rate | number : '1.0-0' }}
-                        </td>
-                        <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
-                      </tr>
-                      <tr class="info">
-                        <td class="info">
-                          <i><small i18n="accelerator.extra-fee-required">Extra fee required</small></i>
-                        </td>
-                        <td class="amt">
-                          {{ maxRateOptions[selectFeeRateIndex].fee | number }}
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1"><app-fiat [value]="maxRateOptions[selectFeeRateIndex].fee"></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">
-                      <td class="info">
-                        <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
-                      </td>
-                      <td class="amt">
-                        +{{ estimate.vsizeFee | number }}
-                      </td>
-                      <td class="units">
-                        <span class="symbol" i18n="shared.sats">sats</span>
-                        <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
-                      </td>
-                    </tr>
-                  </ng-container>
-
-                  <!-- NEXT BLOCK ESTIMATE -->
-                  <ng-container *ngIf="hasAccessToBalanceMode">
-                    <tr class="group-first">
-                      <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
-                      </td>
-                      <td class="amt">
-                        <span style="background-color: #5E35B1" class="p-1 pl-0">
-                          {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }}
-                        </span>
-                      </td>
-                      <td class="units">
-                        <span class="symbol" i18n="shared.sats">sats</span>
-                        <span class="fiat ml-1"><app-fiat [value]="estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee"></app-fiat></span>
-                      </td>
-                    </tr>
-                  </ng-container>
-
-                  <!-- MAX COST -->
-                  <ng-container>
-                    <tr class="group-first group-last">
-                      <td class="item">
-                        @if (hasAccessToBalanceMode) {
-                          <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b>
-                        } @else {
-                          <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.cost">Acceleration cost</b>
-                        }
-                      </td>
-                      <td class="amt">
-                        <span style="background-color: var(--primary)" class="p-1 pl-0">
-                          {{ cost | number }}
-                        </span>
-                      </td>
-                      <td class="units">
-                        <span class="symbol" i18n="shared.sats">sats</span>
-                        <span class="fiat ml-1">
-                          <app-fiat [value]="cost" [colorClass]="hasAccessToBalanceMode && estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
-                        </span>
-                      </td>
-                    </tr>
-                  </ng-container>
-
-                  <!-- USER BALANCE -->
-                  <ng-container *ngIf="hasAccessToBalanceMode && estimate.userBalance < cost">
-                    <tr class="group-first group-last dashed-top">
-                      <td class="item" i18n="accelerator.available-balance">Available balance</td>
-                      <td class="amt">
-                        {{ estimate.userBalance | number }}
-                      </td>
-                      <td class="units">
-                        <span class="symbol" i18n="shared.sats">sats</span>
-                        <span class="fiat ml-1">
-                          <app-fiat [value]="estimate.userBalance" [colorClass]="estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
-                        </span>
-                      </td>
-                    </tr>
-                  </ng-container>
-
-                  <tr class="group-first group-last" style="border-top: 1px dashed grey">
-                    <td class="item"></td>
-                    <td colspan="2">
-                      <div class="d-flex">
-                        <ng-container *ngTemplateOutlet="accelerateButton"></ng-container>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-        </div>
-      </ng-container>
-    </div>
-
-    <hr>
-    <div class="row mt-2 mb-2 text-center">
-      <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')" i18n="go-back">Go back</button>
+        <h1 style="font-size: larger;">Accelerate your Bitcoin transaction?</h1>
      </div>
    </div>

-    <ng-template #loadingEstimate>
-      <div class="skeleton-loader"></div>
-      <br>
-    </ng-template>
-  }
-  @else if (step === 'summary') {
-    <ng-container *ngIf="estimate && (etaInfo$ | async) as etaInfo; else loadingSummary">
-      <!-- Show A/B CTAs -->
-      @if (!noCTA) {
-        <div class="row mb-1">
-          <div class="col-sm">
-            <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot" i18n="accelerator.accelerate-your-transaction">Accelerate your Bitcoin transaction?</span></h1>
-          </div>
-        </div>
-      }
-
-      @if (!advancedEnabled) {
-        <form>
-          <div class="row">
-            <div class="col-md">
-              <div class="form-group form-check mb-2">
-                <input type="radio" [checked]="selectedOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
-                <label class="form-check-label d-flex flex-column" for="wait">
-                  <span class="font-weight-bold" i18n="accelerator.wait">Wait</span>
-                  @if (eta.blocks < 7) {
-                    <span class="checkout-text"><ng-container i18n="accelerator.confirmation-expected">Confirmation expected</ng-container>&nbsp;<app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
-                  } @else {
-                    <span class="checkout-text">
-                      <span i18n="accelerator.confirmation-not-expected-soon">Confirmation not expected any time soon</span>
-                    </span>
-                  }
-                </label>
-              </div>
-              <div class="form-group form-check mb-2">
-                <input type="radio" [checked]="selectedOption === 'accel'"  class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
-                <label class="form-check-label d-flex flex-column" for="accel">
-                  <ng-container *ngTemplateOutlet="accelerateOption; context: {etaInfo}"></ng-container>
-                </label>
-              </div>
-            </div>
-          </div>
-          <div class="row mt-2 mb-2">
-            <div class="col-sm d-flex flex-row justify-content-center">
-              <ng-container *ngTemplateOutlet="accelerateButton"></ng-container>
-            </div>
-          </div>
-        </form>
-      } @else {
-        <div>
-          <div class="row summary-row">
-            <div>
-              <div class="mb-2">
-                <div class="d-flex flex-column" for="accel">
-                  <ng-container *ngTemplateOutlet="accelerateOption; context: {etaInfo}"></ng-container>
-                </div>
-              </div>
-            </div>
-            <div class="pie d-none d-lg-flex">
-              <small class="form-text checkout-text mb-2"><ng-container *ngTemplateOutlet="prioritizedBy; context: {$implicit:etaInfo.hashratePercentage}"></ng-container></small>
-              <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true" class="ml-2"></app-active-acceleration-box>
-            </div>
-            <ng-container *ngTemplateOutlet="accelerateButton"></ng-container>
-          </div>
-        </div>
-      }
-    </ng-container>
-    <ng-template #loadingSummary>
+    <form>
      <div class="row">
-        <div class="col-md">
-          <div class="d-flex flex-row justify-content-center align-items-center">
-            <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
-          </div>
-        </div>
-      </div>
-    </ng-template>
-  } @else if (step === 'checkout') {
-    <ng-container *ngIf="estimate && (etaInfo$ | async) as etaInfo; else loadingCheckout">
-      <div class="row">
-        <div class="col-md">
-          <div class="d-flex flex-column">
-            <span><ng-container *ngTemplateOutlet="accelerateTo; context: {$implicit:(userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize}"></ng-container></span>
-            <span class="checkout-text">
-              @if (!calculating) {
-                <ng-container i18n="accelerator.for-an-additional-cost">For an additional</ng-container> <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
-              } @else {
-                <span class="estimating">Calculating cost...</span>
-              }
-            </span>
-            <span class="checkout-text" *ngIf="(etaInfo$ | async) as etaInfo">
-              <ng-container i18n="accelerator.reducing-expected-confirmation-time">Reducing expected confirmation time to <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></ng-container>
-            </span>
-          </div>
-        </div>
-        <div class="col-md pie d-none d-md-flex" *ngIf="!forceMobile">
-          <small class="form-text checkout-text mb-2" *ngIf="(etaInfo$ | async) as etaInfo"><ng-container *ngTemplateOutlet="prioritizedBy; context: {$implicit:etaInfo.hashratePercentage}"></ng-container></small>
-          <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true" class="ml-2"></app-active-acceleration-box>
-        </div>
-      </div>
-      <div class="payment-area mt-2 p-2" style="font-size: 14px;">
-        <div class="row text-center justify-content-center mx-2">
-          <p i18n="accelerator.payment-to-mempool-space">Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank">{{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></p>
-        </div>
-        @if (canPayWithBalance || !(canPayWithBitcoin || canPayWithCashapp)) {
-          <div class="row">
-            <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
-              <p><ng-container i18n="accelerator.your-account-will-be-debited">Your account will be debited no more than</ng-container>&nbsp;<small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></p>
-              <div class="d-flex justify-content-center" [class.grayOut]="!canPayWithBalance || quoteError || accelerateError || showSuccess">
-                <ng-container *ngTemplateOutlet="accountPayButton"></ng-container>
-              </div>
-            </div>
-          </div>
-        } @else {
-          <div class="row">
-            @if (canPayWithBitcoin) {
-              <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
-                @if (invoice) {
-                  <p><ng-container i18n="transaction.pay|Pay button label">Pay</ng-container>&nbsp;<span><small style="font-family: monospace;">{{ ((invoice.btcDue * 100_000_000) || cost) | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
-                  <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [minimal]="true" (completed)="bitcoinPaymentCompleted()"></app-bitcoin-invoice>
-                } @else if (btcpayInvoiceFailed) {
-                  <p i18n="accelerator.failed-to-load-invoice">Failed to load invoice</p>
-                  <div class="d-flex flex-column align-items-center justify-content-center" style="width: 100%; height: 292px;">
-                    <fa-icon style="font-size: 24px; color: var(--red)" [icon]="['fas', 'circle-xmark']"></fa-icon>
-                  </div>
+        <div class="col-sm">
+          <div class="form-group form-check mb-2">
+            <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;">Confirmation expected within ~30 minutes<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>)
                } @else {
-                  <p i18n="accelerator.loading-invoice">Loading invoice...</p>
-                  <div class="d-flex align-items-center justify-content-center" style="width: 100%; height: 292px;">
-                    <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
-                  </div>
+                  <span class="estimating">Calculating cost...</span>
                }
-              </div>
-              @if (canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay) {
-                <div class="col-sm text-center flex-grow-0  d-flex flex-column justify-content-center align-items-center">
-                  <p class="text-nowrap">&mdash;<span i18n="or">OR</span>&mdash;</p>
-                </div>
-              }
-            }
-            @if (canPayWithCashapp || canPayWithApplePay || canPayWithGooglePay) {
-              <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
-                <p><ng-container i18n="transaction.pay|Pay button label">Pay</ng-container>&nbsp;<app-fiat [value]="cost"></app-fiat> with</p>
-                @if (canPayWithCashapp) {
-                  <img class="paymentMethod mx-2" style="width: 200px" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')">
-                }
-                @if (canPayWithApplePay) {
-                  @if (canPayWithCashapp) { <span class="mt-1 mb-1"></span> }
-                  <div class="paymentMethod mx-2" style="width: 200px; height: 55px" (click)="moveToStep('applepay')">
-                    <img src="/resources/apple-pay.png" height=37>
-                  </div>
-                }
-                @if (canPayWithGooglePay) {
-                  @if (canPayWithCashapp || canPayWithApplePay) { <span class="mt-1 mb-1"></span> }
-                  <div class="paymentMethod mx-2" style="width: 200px; height: 55px" (click)="moveToStep('googlepay')">
-                    <img src="/resources/google-pay.png" height=37>
-                  </div>
-                }
-              </div>
-            }
-          </div>
-        }
-      </div>
-    </ng-container>
-    <ng-template #loadingCheckout>
-      <div class="row">
-        <div class="col-md">
-          <div class="d-flex flex-row justify-content-center align-items-center">
-            <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
+              </span>
+            </label>
          </div>
        </div>
      </div>
-    </ng-template>
-
-    <hr>
-    <div class="row mt-2 mb-2 text-center">
-      <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')" i18n="go-back">Go back</button>
+      <div class="row">
+        <div class="col-sm">
+          <div class="form-group form-check mb-2">
+            <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>
+              }
+            </label>
+          </div>
+        </div>
      </div>
-    </div>
-  } @else if (step === 'cashapp' || step === 'applepay' || step === 'googlepay') {
+      <div class="row mt-2 mb-2" [style]="(choosenOption === 'wait' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
+        <div class="col-sm d-flex flex-row justify-content-center">
+          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="enableCheckoutPage()">
+            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+            <span>Accelerate</span>
+          </button>
+        </div>
+      </div>
+    </form>
+  }
+    
+  @else if (step === 'checkout') {
    <!-- Show checkout page -->
-    <div class="row mb-md-1 text-center" id="confirm-title">
-      <div class="col-sm" id="confirm-payment-title">
-        <h1 style="font-size: larger;"><ng-content select="[slot='checkout-title']"></ng-content><span class="default-slot" i18n="accelerator.confirm-your-payment">Confirm your payment</span></h1>
+    <div class="row mb-md-1 text-center">
+      <div class="col-sm">
+        <h1 style="font-size: larger;">Confirm your payment</h1>
      </div>
    </div>

    <div class="row text-center">
      <div class="col-sm">
        <div class="form-group w-100" style="font-size: 14px">
-          <ng-container i18n="accelerator.payment-to-mempool-space">Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank">{{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></ng-container>
+          Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + txid" target="_blank">{{ txid.substr(0, 10) }}..{{ txid.substr(-10) }}</a>
        </div>
      </div>
    </div>

-    @if (step === 'cashapp' && !loadingCashapp || step === 'applepay' && !loadingApplePay || step === 'googlepay' && !loadingGooglePay) {
+    @if (!loadingCashapp) {
      <div class="row text-center mt-1">
        <div class="col-sm">
          <div class="form-group w-100">
-            <span><u><strong i18n="accelerator.total-additional-cost">Total additional cost</strong></u><br>
+            <span><u><strong>Total additional cost</strong></u><br>
              <span style="font-size: 16px" class="d-block mt-2">
-                <ng-container i18n="transaction.pay|Pay button label">Pay</ng-container>
+                Pay
                <strong><app-fiat [value]="cost"></app-fiat></strong>
-                <ng-container i18n="accelerator.pay-with">with</ng-container>
+                with
              </span>
            </span>
          </div>
@@ -470,16 +95,10 @@
    <div class="row text-center mt-1">
      <div class="col-sm">
        <div class="form-group w-100">
-          @if (step === 'applepay') {
-            <div id="apple-pay-button" class="apple-pay-button apple-pay-button-black" style="height: 50px"  [style]="loadingApplePay ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
-          } @else if (step === 'cashapp') {          
-            <div id="cash-app-pay" class="d-inline-block" style="height: 50px" [style]="loadingCashapp ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
-          } @else if (step === 'googlepay') {
-            <div id="google-pay-button" class="d-inline-block" style="height: 50px" [style]="loadingGooglePay ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
-          }
-          @if (loadingCashapp || loadingApplePay || loadingGooglePay) {
+          <div id="cash-app-pay" class="d-inline-block" [style]="loadingCashapp ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
+          @if (loadingCashapp) {
          <div display="d-flex flex-row justify-content-center">
-            <span i18n="accelerator.loading-payment-method">Loading payment method...</span>
+            <span>Loading payment method...</span>
            <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
          </div>
          }
@@ -490,14 +109,16 @@
    <hr>
    <div class="row mt-2 mb-2 text-center">
      <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('checkout')" i18n="go-back">Go back</button>
+        <small>Changed your mind?</small>
+        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'cta'">Go Back</button>
      </div>
    </div>
  }
+
  @else if (step === 'processing') {
    <div class="row mb-1 text-center">
      <div class="col-sm">
-        <h1 style="font-size: larger;"><ng-content select="[slot='processing-title']"></ng-content><span class="default-slot" i18n="accelerator.confirming-your-payment">Confirming your payment</span></h1>
+        <h1 style="font-size: larger;">Confirm your payment</h1>
      </div>
    </div>

@@ -507,94 +128,12 @@
          <!-- Processing payment -->
          <div id="cash-app-pay" class="d-inline-block" [style]="'opacity: 0; width: 0px; height: 0px; pointer-events: none;'"></div>
          <div display="d-flex flex-row justify-content-center">
-            <span i18n="accelerator.payment-processing">We are processing your payment...</span>
+            <span>We are processing your payment...</span>
            <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
          </div>
        </div>
      </div>
    </div>
  }
-  @else if (step === 'paid') {
-    <div class="row mb-1 text-center">
-      <div class="col-sm">
-        <h1 style="font-size: larger;"><ng-content select="[slot='accelerating-title']"></ng-content><span class="default-slot" i18n="accelerator.accelerating-your-transaction">Accelerating your transaction</span></h1>
-      </div>
-    </div>
-
-    <div class="row text-center mt-1">
-      <div class="col-sm">
-        <div class="d-flex flex-row flex-column justify-content-center align-items-center">
-          <span i18n="accelerator.confirming-acceleration-with-miners">Confirming your acceleration with our mining pool partners...</span>
-          @if (timeSincePaid > 30000) {
-            <span i18n="accelerator.confirming-acceleration-with-miners">...sorry, this is taking longer than expected...</span>
-          }
-          <div class="m-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
-        </div>
-      </div>
-    </div>
-  } @else if (step === 'success') {
-    <div class="row mb-1 text-center">
-      <div class="col-sm">
-        <h1 style="font-size: larger;"><ng-content select="[slot='accelerated-title']"></ng-content><span class="default-slot" i18n="accelerator.success-message">Your transaction is being accelerated!</span></h1>
-      </div>
-    </div>
-    <div class="row text-center mt-1">
-      <div class="col-sm">
-        <div class="d-flex flex-row justify-content-center align-items-center">
-          <span i18n="accelerator.confirmed-acceleration-with-miners">Your transaction has been accepted for acceleration by our mining pool partners.</span>
-        </div>
-      </div>
-    </div>
-    <hr>
-    <div class="row mt-2 mb-2 text-center">
-      <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="closeModal()" i18n="close">Close</button>
-      </div>
-    </div>
-  }
+  
 </div>
-
-<ng-template #accelerateOption let-etaInfo="etaInfo">
-  <span><ng-container *ngTemplateOutlet="accelerateTo; context: {$implicit:(userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize}"></ng-container> <ng-container *ngTemplateOutlet="customizeButton"></ng-container></span>
-  <span class="checkout-text"><ng-container i18n="accelerator.confirmation-expected">Confirmation expected</ng-container>&nbsp;<app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
-    @if (!calculating) {
-      <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
-    } @else {
-      <span class="estimating" i18n="accelerator.calculating-cost">Calculating cost...</span>
-    }
-  </span>
-</ng-template>
-
-<ng-template #customizeButton>
-  <button type="button" *ngIf="advancedEnabled" class="btn btn-sm btn-outline-info btn-small-height ml-2" (click)="moveToStep('quote')" i18n="accelerator.customize">customize</button>
-</ng-template>
-
-<ng-template id="accelerate-to" #accelerateTo let-x i18n="accelerator.accelerate-to-x">Accelerate to ~{{ x | number : '1.0-0' }} sat/vB</ng-template>
-
-<ng-template #accelerateButton>
-  <div class="position-relative">
-    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.disabled]="!canPay || quoteError || cantPayReason || calculating || (!advancedEnabled && selectedOption !== 'accel')" style="width: 200px" (click)="moveToStep('checkout')">
-      <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-      <span i18n="transaction.accelerate|Accelerate button label">Accelerate</span>
-    </button>
-    @if (quoteError || cantPayReason) {
-      <div class="btn-error-wrapper"><span class="btn-error"><app-mempool-error [error]="quoteError || cantPayReason" [textOnly]="true" alertClass=""></app-mempool-error></span></div>
-    }
-  </div>
-</ng-template>
-
-<ng-template #accountPayButton>
-  @if (hasAccessToBalanceMode) {
-    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.disabled]="!canPay || calculating" style="width: 200px" (click)="accelerateWithMempoolAccount()">
-      <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-      <span i18n="transaction.pay|Pay button label">Pay</span>
-    </button>
-  } @else {
-    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center disabled" style="width: 200px">
-      <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-      <span>Coming soon</span>
-    </button>
-  }
-</ng-template>
-
-<ng-template #prioritizedBy let-i i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ i | number : '1.1-1' }}%</strong> of miners.</ng-template>
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -7,213 +7,3 @@
 .estimating {
  color: var(--green)
 }
-
-.paymentMethod {
-  padding: 10px;
-  background-color: var(--secondary);
-  border-radius: 10px;
-  cursor: pointer;
-}
-
-.default-slot:not(:only-child) {
-  display: none;
-}
-
-.pie {
-  display: flex;
-  align-items: center;
-  max-width: 330px;
-}
-
-.fee-card {
-  padding: 15px;
-  background-color: var(--bg);
-
-  .feerate {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    .rate {
-      font-size: 0.9em;
-      .symbol {
-        color: white;
-      }
-    }
-  }
-}
-
-.btn-border {
-  border: solid 1px black;
-  background-color: #0c4a87;
-}
-
-.feerate.active {
-  background-color: var(--primary) !important;
-  opacity: 1;
-  border: 1px solid #007fff !important;
-}
-.feerate:focus {
-  box-shadow: none !important;
-}
-
-.grayOut {
-  opacity: 0.5;
-}
-
-.disabled {
-  opacity: 0.5;
-  pointer-events: none;
-}
-
-.table-toggle {
-  width: 100%;
-  margin-top: 0.5em;
-}
-
-.tab {
-  &:first-child {
-    margin-right: 1px;
-  }
-  border: solid 1px black;
-  border-bottom: none;
-  background-color: #323655;
-  border-top-left-radius: 10px !important;
-  border-top-right-radius: 10px !important;
-}
-.tab.active {
-  background-color: #5d659d !important;
-  opacity: 1;
-}
-.tab:focus {
-  box-shadow: none !important;
-}
-
-.table-accelerator {
-  tr {
-    td {
-      padding-top: 0;
-      padding-bottom: 0;
-      vertical-align: baseline;
-    }
-
-    &.group-first {
-      td {
-        padding-top: 0.75rem;
-      }
-    }
-    &.group-last, &:last-child {
-      td {
-        padding-bottom: 0.75rem;
-      }
-    }
-    &.dashed-top {
-      border-top: 1px dashed grey;
-    }
-    &.dashed-bottom {
-      border-bottom: 1px dashed grey
-    }
-  }
-  td {
-    &:first-child {
-      width: 100vw;
-    }
-    &.info {
-      color: #6c757d;
-      white-space: initial;
-    }
-    &.amt {
-      text-align: right;
-      padding-right: 0.2em;
-    }
-    &.units {
-      padding-left: 0.2em;
-      white-space: nowrap;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-  }
-}
-
-.accelerate-cols {
-  display: flex;
-  flex-direction: row;
-  align-items: stretch;
-  margin-top: 1em;
-}
-
-.payment-area {
-  background: var(--bg);
-}
-
-.col.pie {
-  flex-grow: 0;
-  padding: 0 1em;
-  position: relative;
-  top: -15px;
-}
-
-.item {
-  white-space: initial;
-}
-
-.table-background {
-  background-color: var(--bg);
-}
-
-.checkout-text {
-  color: rgb(186, 186, 186);
-  font-size: 14px;
-}
-
-.btn-accelerate {
-  background-color: var(--tertiary);
-}
-
-.btn-small-height {
-	line-height: 1;
-}
-
-.summary-row {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0 2em;
-  flex-wrap: wrap;
-
-  @media (max-width: 640px) {
-    flex-direction: column;
-  }
-}
-
-.btn-error {
-  position: absolute;
-  right: 0;
-  font-size: 12px;
-  color: var(--red);
-  text-align: center;
-  width: 200px;
-  white-space: normal;
-}
-
-.btn-error-wrapper {
-  height: 26px;
-}
-
-.apple-pay-button {
-    display: inline-block;
-    -webkit-appearance: -apple-pay-button;
-    -apple-pay-button-type: plain; /* Use any supported button type. */
-}
-.apple-pay-button-black {
-    -apple-pay-button-style: black;
-}
-.apple-pay-button-white {
-    -apple-pay-button-style: white;
-}
-.apple-pay-button-white-with-line {
-    -apple-pay-button-style: white-outline;
-}
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -1,55 +1,9 @@
-/* eslint-disable no-console */
-import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges, HostListener } from '@angular/core';
-import { Subscription, tap, of, catchError, Observable, switchMap } from 'rxjs';
+import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges } from '@angular/core';
+import { Subscription, tap, of, catchError } from 'rxjs';
 import { ServicesApiServices } from '../../services/services-api.service';
-import { md5, insecureRandomUUID } from '../../shared/common.utils';
+import { nextRoundNumber } from '../../shared/common.utils';
 import { StateService } from '../../services/state.service';
 import { AudioService } from '../../services/audio.service';
-import { ETA, EtaService } from '../../services/eta.service';
-import { Transaction } from '../../interfaces/electrs.interface';
-import { MiningStats } from '../../services/mining.service';
-import { IAuth, AuthServiceMempool } from '../../services/auth.service';
-import { EnterpriseService } from '../../services/enterprise.service';
-import { ApiService } from '../../services/api.service';
-import { isDevMode } from '@angular/core';
-
-export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp' | 'applePay' | 'googlePay';
-
-export type AccelerationEstimate = {
-  hasAccess: boolean;
-  txSummary: TxSummary;
-  nextBlockFee: number;
-  targetFeeRate: number;
-  userBalance: number;
-  enoughBalance: boolean;
-  cost: number;
-  mempoolBaseFee: number;
-  vsizeFee: number;
-  pools: number[];
-  availablePaymentMethods: Record<PaymentMethod, {min: number, max: number}>;
-  unavailable?: boolean;
-  options: { // recommended bid options
-    fee: number; // recommended userBid in sats
-  }[];
-}
-export type TxSummary = {
-  txid: string; // txid of the current transaction
-  effectiveVsize: number; // Total vsize of the dependency tree
-  effectiveFee: number;  // Total fee of the dependency tree in sats
-  ancestorCount: number; // Number of ancestors
-}
-
-export interface RateOption {
-  fee: number;
-  rate: number;
-  index: number;
-}
-
-export const MIN_BID_RATIO = 1;
-export const DEFAULT_BID_RATIO = 2;
-export const MAX_BID_RATIO = 4;
-
-type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'applepay' | 'googlepay' | 'processing' | 'paid' | 'success';

@Component({
  selector: 'app-accelerate-checkout',
@@ -57,206 +11,80 @@ type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'applepay' |
  styleUrls: ['./accelerate-checkout.component.scss']
 })
 export class AccelerateCheckout implements OnInit, OnDestroy {
-  @Input() tx: Transaction;
-  @Input() accelerating: boolean = false;
-  @Input() miningStats: MiningStats;
-  @Input() eta: ETA;
+  @Input() eta: number | null = null;
+  @Input() txid: string = '70c18d76cdb285a1b5bd87fdaae165880afa189809c30b4083ff7c0e69ee09ad';
  @Input() scrollEvent: boolean;
-  @Input() cashappEnabled: boolean = true;
-  @Input() applePayEnabled: boolean = false;
-  @Input() googlePayEnabled: boolean = true;
-  @Input() advancedEnabled: boolean = false;
-  @Input() forceMobile: boolean = false;
-  @Input() showDetails: boolean = false;
-  @Input() noCTA: boolean = false;
-  @Output() unavailable = new EventEmitter<boolean>();
-  @Output() completed = new EventEmitter<boolean>();
-  @Output() hasDetails = new EventEmitter<boolean>();
-  @Output() changeMode = new EventEmitter<boolean>();
+  @Output() close = new EventEmitter<null>();

  calculating = true;
-  selectedOption: 'wait' | 'accel';
-  cantPayReason = '';
-  quoteError = ''; // error fetching estimate or initial data
-  accelerateError = ''; // error executing acceleration
-  btcpayInvoiceFailed = false;
-  timePaid: number = 0; // time acceleration requested
-  math = Math;
-  isMobile: boolean = window.innerWidth <= 767.98;
-  isProdDomain = ['mempool.space',
-    'mempool-staging.va1.mempool.space',
-    'mempool-staging.fmt.mempool.space',
-    'mempool-staging.fra.mempool.space',
-    'mempool-staging.tk7.mempool.space',
-    'mempool-staging.sg1.mempool.space'
-   ].indexOf(document.location.hostname) > -1;
-
-  private _step: CheckoutStep = 'summary';
-  simpleMode: boolean = true;
-  timeoutTimer: any;
-
-  authSubscription$: Subscription;
-  auth: IAuth | null = null;
+  choosenOption: 'wait' | 'accelerate' = 'wait';
+  error = '';

  // accelerator stuff
+  square: { appId: string, locationId: string};
  accelerationUUID: string;
-  accelerationSubscription: Subscription;
-  difficultySubscription: Subscription;
  estimateSubscription: Subscription;
-  estimate: AccelerationEstimate;
  maxBidBoost: number; // sats
  cost: number; // sats
-  etaInfo$: Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }>;
-  showSuccess = false;
-  hasAncestors: boolean = false;
-  minExtraCost = 0;
-  minBidAllowed = 0;
-  maxBidAllowed = 0;
-  defaultBid = 0;
-  userBid = 0;
-  selectFeeRateIndex = 1;
-  maxRateOptions: RateOption[] = [];

  // square
  loadingCashapp = false;
-  loadingApplePay = false;
-  loadingGooglePay = false;
+  cashappSubmit: any;
  payments: any;
  cashAppPay: any;
-  applePay: any;
-  googlePay: any;
+  cashAppSubscription: Subscription;
  conversionsSubscription: Subscription;
-  conversions: Record<string, number>;
-
-  // btcpay
-  loadingBtcpayInvoice = false;
-  invoice = undefined;
+  step: 'cta' | 'checkout' | 'processing' = 'cta';

  constructor(
-    public stateService: StateService,
-    private apiService: ApiService,
    private servicesApiService: ServicesApiServices,
-    private etaService: EtaService,
+    private stateService: StateService,
    private audioService: AudioService,
-    private cd: ChangeDetectorRef,
-    private authService: AuthServiceMempool,
-    private enterpriseService: EnterpriseService,
+    private cd: ChangeDetectorRef
  ) {
-    this.accelerationUUID = insecureRandomUUID();
-
-    // Check if Apple Pay available
-    // https://developer.apple.com/documentation/apple_pay_on_the_web/apple_pay_js_api/checking_for_apple_pay_availability#overview
-    if (window['ApplePaySession']) {
-      this.applePayEnabled = true;
-    }
+    this.accelerationUUID = window.crypto.randomUUID();
  }

-  ngOnInit(): void {
-    this.authSubscription$ = this.authService.getAuth$().subscribe((auth) => {
-      if (this.auth?.user?.userId !== auth?.user?.userId) {
-        this.auth = auth;
-        this.estimate = null;
-        this.quoteError = null;
-        this.accelerateError = null;
-        this.timePaid = 0;
-        this.btcpayInvoiceFailed = false;
-        this.moveToStep('summary');
-      } else {
-        this.auth = auth;
-      }
-    });
-    this.authService.refreshAuth$().subscribe();
-
+  ngOnInit() {
    const urlParams = new URLSearchParams(window.location.search);
    if (urlParams.get('cash_request_id')) { // Redirected from cashapp
-      this.moveToStep('processing');
      this.insertSquare();
      this.setupSquare();
-    } else {
-      this.moveToStep('summary');
+      this.step = 'processing';
    }

-    this.conversionsSubscription = this.stateService.conversions$.subscribe(
-      async (conversions) => {
-        this.conversions = conversions;
+    this.servicesApiService.setupSquare$().subscribe(ids => {
+      this.square = {
+        appId: ids.squareAppId,
+        locationId: ids.squareLocationId
+      };
+      if (this.step === 'cta') {
+        this.estimate();
      }
-    );
+    });
  }

-  ngOnDestroy(): void {
+  ngOnDestroy() {
    if (this.estimateSubscription) {
      this.estimateSubscription.unsubscribe();
    }
-    if (this.authSubscription$) {
-      this.authSubscription$.unsubscribe();
-    }
  }

  ngOnChanges(changes: SimpleChanges): void {
-    if (changes.scrollEvent && this.scrollEvent) {
-      this.scrollToElement('acceleratePreviewAnchor', 'start');
+    if (changes.scrollEvent) {
+      this.scrollToPreview('acceleratePreviewAnchor', 'start');
    }
-    if (changes.accelerating) {
-      if ((this.step === 'processing' || this.step === 'paid') && this.accelerating) {
-        this.moveToStep('success');
-      }
-    }
-  }
-
-  moveToStep(step: CheckoutStep): void {
-    this._step = step;
-    if (this.timeoutTimer) {
-      clearTimeout(this.timeoutTimer);
-    }
-    if (!this.estimate && ['quote', 'summary', 'checkout'].includes(this.step)) {
-      this.fetchEstimate();
-    }
-    if (this._step === 'checkout') {
-      this.insertSquare();
-      this.enterpriseService.goal(8);
-    }
-    if (this._step === 'checkout' && this.canPayWithBitcoin) {
-      this.btcpayInvoiceFailed = false;
-      this.loadingBtcpayInvoice = true;
-      this.invoice = null;
-      this.requestBTCPayInvoice();
-    } else if (this._step === 'cashapp' && this.cashappEnabled) {
-      this.loadingCashapp = true;
-      this.setupSquare();
-      this.scrollToElementWithTimeout('confirm-title', 'center', 100);
-    } else if (this._step === 'applepay' && this.applePayEnabled) {
-      this.loadingApplePay = true;
-      this.setupSquare();
-      this.scrollToElementWithTimeout('confirm-title', 'center', 100);
-    } else if (this._step === 'googlepay' && this.googlePayEnabled) {
-      this.loadingGooglePay = true;
-      this.setupSquare();
-      this.scrollToElementWithTimeout('confirm-title', 'center', 100);
-    } else if (this._step === 'paid') {
-      this.timePaid = Date.now();
-      this.timeoutTimer = setTimeout(() => {
-        if (this.step === 'paid') {
-          this.accelerateError = 'internal_server_error';
-        }
-      }, 120000);
-    }
-    this.hasDetails.emit(this._step === 'quote');
-  }
-
-  closeModal(): void {
-    this.completed.emit(true);
-    this.moveToStep('summary');
  }

  /**
-   * Scroll to element id with or without setTimeout
-   */
-  scrollToElementWithTimeout(id: string, position: ScrollLogicalPosition, timeout: number = 1000): void {
+  * Scroll to element id with or without setTimeout
+  */
+  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition) {
    setTimeout(() => {
-      this.scrollToElement(id, position);
-    }, timeout);
+      this.scrollToPreview(id, position);
+    }, 1000);
  }
-  scrollToElement(id: string, position: ScrollLogicalPosition): void {
+  scrollToPreview(id: string, position: ScrollLogicalPosition) {
    const acceleratePreviewAnchor = document.getElementById(id);
    if (acceleratePreviewAnchor) {
      this.cd.markForCheck();
@@ -271,386 +99,93 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
  /**
   * Accelerator
   */
-  fetchEstimate(): void {
+  estimate() {
    if (this.estimateSubscription) {
      this.estimateSubscription.unsubscribe();
    }
    this.calculating = true;
-    this.quoteError = null;
-    this.accelerateError = null;
-    this.estimateSubscription = this.servicesApiService.estimate$(this.tx.txid).pipe(
+    this.estimateSubscription = this.servicesApiService.estimate$(this.txid).pipe(
      tap((response) => {
+        this.calculating = false;
        if (response.status === 204) {
-          this.quoteError = `cannot_accelerate_tx`;
-          if (this.step === 'summary') {
-            this.unavailable.emit(true);
-          }
+          this.error = `cannot_accelerate_tx`;
        } else {
-          this.estimate = response.body;
-          if (!this.estimate) {
-            this.quoteError = `cannot_accelerate_tx`;
-            if (this.step === 'summary') {
-              this.unavailable.emit(true);
-            }
+          const estimation = response.body;
+          if (!estimation) {
+            this.error = `cannot_accelerate_tx`;
            return;
          }
-          if (this.estimate.hasAccess === true && this.estimate.userBalance <= 0) {
-            if (this.isLoggedIn()) {
-              this.quoteError = `not_enough_balance`;
-            }
-          }
-          if (this.estimate.unavailable) {
-            this.quoteError = `temporarily_unavailable`;
-          }
-          this.hasAncestors = this.estimate.txSummary.ancestorCount > 1;
-          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate, this.miningStats);
-
-          this.maxRateOptions = this.estimate.options.map((option, index) => ({
-            fee: option.fee,
-            rate: (this.estimate.txSummary.effectiveFee + option.fee) / this.estimate.txSummary.effectiveVsize,
-            index
-          }));
-
-          this.defaultBid = this.maxRateOptions[1].fee;
-          this.userBid = this.defaultBid;
-          this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
-
-          this.validateChoice();
-
-          if (!this.couldPay) {
-            this.quoteError = `cannot_accelerate_tx`;
-            if (this.step === 'summary') {
-              this.unavailable.emit(true);
-            }
-            return;
-          }
-
-          if (this.step === 'checkout' && this.canPayWithBitcoin && !this.loadingBtcpayInvoice) {
-            this.loadingBtcpayInvoice = true;
-            this.requestBTCPayInvoice();
-          }
-
-          this.calculating = false;
-          this.cd.markForCheck();
+          // Make min extra fee at least 50% of the current tx fee
+          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 + estimation.mempoolBaseFee + estimation.vsizeFee;
        }
      }),

-      catchError(() => {
-        this.estimate = undefined;
-        this.quoteError = `cannot_accelerate_tx`;
-        this.estimateSubscription.unsubscribe();
-        if (this.step === 'summary') {
-          this.unavailable.emit(true);
-        } else {
-          this.accelerateError = 'cannot_accelerate_tx';
-        }
+      catchError((response) => {
+        this.error = `cannot_accelerate_tx`;
        return of(null);
      })
    ).subscribe();
  }

-  validateChoice(): void {
-    if (!this.canPay) {
-      if (this.estimate?.availablePaymentMethods?.balance) {
-        if (this.cost >= this.estimate?.userBalance) {
-          this.cantPayReason = 'not_enough_balance';
-        }
-      } else {
-        this.cantPayReason = 'cannot_accelerate_tx';
-      }
-    } else {
-      this.cantPayReason = '';
-    }
-  }
-
-  /**
-   * User changed his bid
-   */
-  setUserBid({ fee, index }: { fee: number, index: number}): void {
-    if (this.estimate) {
-      this.selectFeeRateIndex = index;
-      this.userBid = Math.max(0, fee);
-      this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
-    }
-  }
-
-  /**
-   * Account-based acceleration request
-   */
-  accelerateWithMempoolAccount(): void {
-    if (!this.canPay || this.calculating) {
-      return;
-    }
-    if (this.accelerationSubscription) {
-      this.accelerationSubscription.unsubscribe();
-    }
-    this.accelerationSubscription = this.servicesApiService.accelerate$(
-      this.tx.txid,
-      this.userBid,
-      this.accelerationUUID
-    ).subscribe({
-      next: () => {
-        this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
-        this.audioService.playSound('ascend-chime-cartoon');
-        this.showSuccess = true;
-        this.estimateSubscription.unsubscribe();
-        this.moveToStep('paid');
-      },
-      error: (response) => {
-        this.accelerateError = response.error;
-      }
-    });
-  }
-
  /**
   * Square
   */
  insertSquare(): void {
-    if (!this.isProdDomain && !isDevMode()) {
-      return;
-    }
-    if (window['Square']) {
+    //@ts-ignore
+    if (window.Square) {
      return;
    }
    let statsUrl = 'https://sandbox.web.squarecdn.com/v1/square.js';
-    if (this.isProdDomain) {
-      statsUrl = '/square/v1/square.js';
+    if (document.location.hostname === 'mempool-staging.fmt.mempool.space' ||
+        document.location.hostname === 'mempool-staging.va1.mempool.space' ||
+        document.location.hostname === 'mempool-staging.fra.mempool.space' ||
+        document.location.hostname === 'mempool-staging.tk7.mempool.space' ||
+        document.location.hostname === 'mempool.space') {
+      statsUrl = 'https://web.squarecdn.com/v1/square.js';
    }

-    (function(): void {
+    (function() {
      const d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+      // @ts-ignore
      g.type='text/javascript'; g.src=statsUrl; s.parentNode.insertBefore(g, s);
    })();
  }
-  setupSquare(): void {
-    if (!this.isProdDomain && !isDevMode()) {
-      return;
-    }
-    const init = (): void => {
+  setupSquare() {
+    const init = () => {
      this.initSquare();
    };

-    if (!window['Square']) {
-      console.debug('Square.js failed to load properly. Retrying.');
-      setTimeout(this.setupSquare.bind(this), 100);
+    //@ts-ignore
+    if (!window.Square) {
+      console.debug('Square.js failed to load properly. Retrying in 1 second.');
+      setTimeout(init, 1000);
    } else {
      init();
    }
  }
  async initSquare(): Promise<void> {
    try {
-      this.servicesApiService.setupSquare$().subscribe({
-        next: async (ids) => {
-          this.payments = window['Square'].payments(ids.squareAppId, ids.squareLocationId);
-          const urlParams = new URLSearchParams(window.location.search);
-          if (this._step === 'cashapp' || urlParams.get('cash_request_id')) {
-            await this.requestCashAppPayment();
-          } else if (this._step === 'applepay') {
-            await this.requestApplePayPayment();
-          } else if (this._step === 'googlepay') {
-            await this.requestGooglePayPayment();
-          }
-        },
-        error: () => {
-          console.debug('Error loading Square Payments');
-          this.accelerateError = 'cannot_setup_square';
-        }
-      });
+      //@ts-ignore
+      this.payments = window.Square.payments(this.square.appId, this.square.locationId)
+      await this.requestCashAppPayment();
    } catch (e) {
      console.debug('Error loading Square Payments', e);
-      this.accelerateError = 'cannot_setup_square';
+      return;
    }
  }
-
-  /**
-   * APPLE PAY
-   */
-  async requestApplePayPayment(): Promise<void> {
+  async requestCashAppPayment() {
+    if (this.cashAppSubscription) {
+      this.cashAppSubscription.unsubscribe();
+    }
    if (this.conversionsSubscription) {
      this.conversionsSubscription.unsubscribe();
    }
-
+    
    this.conversionsSubscription = this.stateService.conversions$.subscribe(
      async (conversions) => {
-        this.conversions = conversions;
-        if (this.applePay) {
-          this.applePay.destroy();
-        }
-
-        const costUSD = this.cost / 100_000_000 * conversions.USD;
-        const paymentRequest = this.payments.paymentRequest({
-          countryCode: 'US',
-          currencyCode: 'USD',
-          total: {
-            amount: costUSD.toFixed(2),
-            label: 'Total',
-          },
-        });
-
-        try {
-          this.applePay = await this.payments.applePay(paymentRequest);
-          const applePayButton = document.getElementById('apple-pay-button');
-          if (!applePayButton) {
-            console.error(`Unable to find apple pay button id='apple-pay-button'`);
-            // Try again
-            setTimeout(this.requestApplePayPayment.bind(this), 500);
-            return;
-          }
-          this.loadingApplePay = false;
-          applePayButton.addEventListener('click', async event => {
-            event.preventDefault();
-            const tokenResult = await this.applePay.tokenize();
-            if (tokenResult?.status === 'OK') {
-              const card = tokenResult.details?.card;
-              if (!card || !card.brand || !card.expMonth || !card.expYear || !card.last4) {
-                console.error(`Cannot retreive payment card details`);
-                this.accelerateError = 'apple_pay_no_card_details';
-                return;
-              }
-              const cardTag = md5(`${card.brand}${card.expMonth}${card.expYear}${card.last4}`.toLowerCase());
-              this.servicesApiService.accelerateWithApplePay$(
-                this.tx.txid,
-                tokenResult.token,
-                cardTag,
-                `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
-                this.accelerationUUID
-              ).subscribe({
-                next: () => {
-                  this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
-                  this.audioService.playSound('ascend-chime-cartoon');
-                  if (this.applePay) {
-                    this.applePay.destroy();
-                  }
-                  setTimeout(() => {
-                    this.moveToStep('paid');
-                  }, 1000);
-                },
-                error: (response) => {
-                  this.accelerateError = response.error;
-                  if (!(response.status === 403 && response.error === 'not_available')) {
-                    setTimeout(() => {
-                      // Reset everything by reloading the page :D, can be improved
-                      const urlParams = new URLSearchParams(window.location.search);
-                      window.location.assign(window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ``));
-                    }, 3000);
-                  }
-                }
-              });
-            } else {
-              let errorMessage = `Tokenization failed with status: ${tokenResult.status}`;
-              if (tokenResult.errors) {
-                errorMessage += ` and errors: ${JSON.stringify(
-                  tokenResult.errors,
-                )}`;
-              }
-              throw new Error(errorMessage);
-            }
-          });
-        } catch (e) {
-          console.error(e);
-        }
-      }
-    );
-  }
-
-  /**
-   * GOOGLE PAY
-   */
-  async requestGooglePayPayment(): Promise<void> {
-    if (this.conversionsSubscription) {
-      this.conversionsSubscription.unsubscribe();
-    }
-
-    this.conversionsSubscription = this.stateService.conversions$.subscribe(
-      async (conversions) => {
-        this.conversions = conversions;
-        if (this.googlePay) {
-          this.googlePay.destroy();
-        }
-
-        const costUSD = this.cost / 100_000_000 * conversions.USD;
-        const paymentRequest = this.payments.paymentRequest({
-          countryCode: 'US',
-          currencyCode: 'USD',
-          total: {
-            amount: costUSD.toFixed(2),
-            label: 'Total'
-          }
-        });
-        this.googlePay = await this.payments.googlePay(paymentRequest , {
-          referenceId: `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
-        });
-
-        await this.googlePay.attach(`#google-pay-button`, {
-          buttonType: 'pay',
-          buttonSizeMode: 'fill',
-        });
-        this.loadingGooglePay = false;
-
-        document.getElementById('google-pay-button').addEventListener('click', async event => {
-          event.preventDefault();
-          const tokenResult = await this.googlePay.tokenize();
-          if (tokenResult?.status === 'OK') {
-            const card = tokenResult.details?.card;
-            if (!card || !card.brand || !card.expMonth || !card.expYear || !card.last4) {
-              console.error(`Cannot retreive payment card details`);
-              this.accelerateError = 'apple_pay_no_card_details';
-              return;
-            }
-            const cardTag = md5(`${card.brand}${card.expMonth}${card.expYear}${card.last4}`.toLowerCase());
-            this.servicesApiService.accelerateWithGooglePay$(
-              this.tx.txid,
-              tokenResult.token,
-              cardTag,
-              `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
-              this.accelerationUUID
-            ).subscribe({
-              next: () => {
-                this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
-                this.audioService.playSound('ascend-chime-cartoon');
-                if (this.googlePay) {
-                  this.googlePay.destroy();
-                }
-                setTimeout(() => {
-                  this.moveToStep('paid');
-                }, 1000);
-              },
-              error: (response) => {
-                this.accelerateError = response.error;
-                if (!(response.status === 403 && response.error === 'not_available')) {
-                  setTimeout(() => {
-                    // Reset everything by reloading the page :D, can be improved
-                    const urlParams = new URLSearchParams(window.location.search);
-                    window.location.assign(window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ``));
-                  }, 3000);
-                }
-              }
-            });
-          } else {
-            let errorMessage = `Tokenization failed with status: ${tokenResult.status}`;
-            if (tokenResult.errors) {
-              errorMessage += ` and errors: ${JSON.stringify(
-                tokenResult.errors,
-              )}`;
-            }
-            throw new Error(errorMessage);
-          }
-        });
-      }
-    );
-  }
-
-  /**
-   * CASHAPP
-   */
-  async requestCashAppPayment(): Promise<void> {
-    if (this.conversionsSubscription) {
-      this.conversionsSubscription.unsubscribe();
-    }
-
-    this.conversionsSubscription = this.stateService.conversions$.subscribe(
-      async (conversions) => {
-        this.conversions = conversions;
        if (this.cashAppPay) {
          this.cashAppPay.destroy();
        }
@@ -661,40 +196,44 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
          countryCode: 'US',
          currencyCode: 'USD',
          total: {
-            amount: costUSD.toFixed(2),
+            amount: costUSD.toString(),
            label: 'Total',
            pending: true,
-            productUrl: `${redirectHostname}/tx/${this.tx.txid}`,
-          }
+            productUrl: `${redirectHostname}/tracker/${this.txid}`,
+          },
+          button: { shape: 'semiround', size: 'small', theme: 'light'}
        });
        this.cashAppPay = await this.payments.cashAppPay(paymentRequest, {
-          redirectURL: `${redirectHostname}/tx/${this.tx.txid}`,
-          referenceId: `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`
+          redirectURL: `${redirectHostname}/tracker/${this.txid}`,
+          referenceId: `accelerator-${this.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
+          button: { shape: 'semiround', size: 'small', theme: 'light'}
        });

-        await this.cashAppPay.attach(`#cash-app-pay`, { theme: 'dark' });
+        if (this.step === 'checkout') {
+          await this.cashAppPay.attach(`#cash-app-pay`, { theme: 'light', size: 'small', shape: 'semiround' })
+        }
        this.loadingCashapp = false;

-        this.cashAppPay.addEventListener('ontokenization', event => {
+        const that = this;
+        this.cashAppPay.addEventListener('ontokenization', function (event) {
          const { tokenResult, error } = event.detail;
          if (error) {
-            this.accelerateError = error;
+            this.error = error;
          } else if (tokenResult.status === 'OK') {
-            this.servicesApiService.accelerateWithCashApp$(
-              this.tx.txid,
+            that.servicesApiService.accelerateWithCashApp$(
+              that.txid,
              tokenResult.token,
              tokenResult.details.cashAppPay.cashtag,
              tokenResult.details.cashAppPay.referenceId,
-              this.accelerationUUID
+              that.accelerationUUID
            ).subscribe({
              next: () => {
-                this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
-                this.audioService.playSound('ascend-chime-cartoon');
-                if (this.cashAppPay) {
-                  this.cashAppPay.destroy();
+                that.audioService.playSound('ascend-chime-cartoon');
+                if (that.cashAppPay) {
+                  that.cashAppPay.destroy();
                }
                setTimeout(() => {
-                  this.moveToStep('paid');
+                  that.closeModal();
                  if (window.history.replaceState) {
                    const urlParams = new URLSearchParams(window.location.search);
                    window.history.replaceState(null, null, window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ''));
@@ -702,8 +241,10 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
                }, 1000);
              },
              error: (response) => {
-                this.accelerateError = response.error;
-                if (!(response.status === 403 && response.error === 'not_available')) {
+                if (response.status === 403 && response.error === 'not_available') {
+                  that.error = 'waitlisted';
+                } else {
+                  that.error = response.error;
                  setTimeout(() => {
                    // Reset everything by reloading the page :D, can be improved
                    const urlParams = new URLSearchParams(window.location.search);
@@ -718,162 +259,19 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    );
  }

-  /**
-   * BTCPay
-   */
-  async requestBTCPayInvoice(): Promise<void> {
-    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid, this.userBid).pipe(
-      switchMap(response => {
-        return this.servicesApiService.retreiveInvoice$(response.btcpayInvoiceId);
-      }),
-      catchError(error => {
-        console.log(error);
-        this.btcpayInvoiceFailed = true;
-        return of(null);
-      })
-    ).subscribe((invoice) => {
-        this.invoice = invoice;
-        this.cd.markForCheck();
-    });
-  }
-
-  bitcoinPaymentCompleted(): void {
-    this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
-    this.audioService.playSound('ascend-chime-cartoon');
-    this.estimateSubscription.unsubscribe();
-    this.moveToStep('paid');
-  }
-
-  isLoggedIn(): boolean {
-    return this.auth !== null;
-  }
-
  /**
   * UI events
   */
-  selectedOptionChanged(event): void {
-    this.selectedOption = event.target.id;
+  enableCheckoutPage() {
+    this.step = 'checkout';
+    this.loadingCashapp = true;
+    this.insertSquare();
+    this.setupSquare();
  }
-
-  get step(): CheckoutStep {
-    return this._step;
+  selectedOptionChanged(event) {
+    this.choosenOption = event.target.id;
  }
-
-  get paymentMethods(): PaymentMethod[] {
-    return Object.keys(this.estimate?.availablePaymentMethods || {}) as PaymentMethod[];
-  }
-
-  get couldPayWithBitcoin(): boolean {
-    return !!this.estimate?.availablePaymentMethods?.bitcoin;
-  }
-
-  get couldPayWithCashapp(): boolean {
-    if (!this.cashappEnabled) {
-      return false;
-    }
-    return !!this.estimate?.availablePaymentMethods?.cashapp;
-  }
-
-  get couldPayWithApplePay(): boolean {
-    if (!this.applePayEnabled) {
-      return false;
-    }
-    return !!this.estimate?.availablePaymentMethods?.applePay;
-  }
-
-  get couldPayWithGooglePay(): boolean {
-    if (!this.googlePayEnabled) {
-      return false;
-    }
-    return !!this.estimate?.availablePaymentMethods?.googlePay;
-  }
-
-  get couldPayWithBalance(): boolean {
-    if (!this.hasAccessToBalanceMode) {
-      return false;
-    }
-    return !!this.estimate?.availablePaymentMethods?.balance;
-  }
-
-  get couldPay(): boolean {
-    return this.couldPayWithBalance || this.couldPayWithBitcoin || this.couldPayWithCashapp || this.couldPayWithApplePay || this.couldPayWithGooglePay;
-  }
-
-  get canPayWithBitcoin(): boolean {
-    const paymentMethod = this.estimate?.availablePaymentMethods?.bitcoin;
-    return paymentMethod && this.cost >= paymentMethod.min && this.cost <= paymentMethod.max;
-  }
-
-  get canPayWithCashapp(): boolean {
-    if (!this.cashappEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
-      return false;
-    }
-
-    const paymentMethod = this.estimate?.availablePaymentMethods?.cashapp;
-    if (paymentMethod) {
-      const costUSD = (this.cost / 100_000_000 * this.conversions.USD);
-      if (costUSD >= paymentMethod.min && costUSD <= paymentMethod.max) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  get canPayWithApplePay(): boolean {
-    if (!this.applePayEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
-      return false;
-    }
-
-    const paymentMethod = this.estimate?.availablePaymentMethods?.applePay;
-    if (paymentMethod) {
-      const costUSD = (this.cost / 100_000_000 * this.conversions.USD);
-      if (costUSD >= paymentMethod.min && costUSD <= paymentMethod.max) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  get canPayWithGooglePay(): boolean {
-    if (!this.googlePayEnabled || !this.conversions || (!this.isProdDomain && !isDevMode())) {
-      return false;
-    }
-
-    const paymentMethod = this.estimate?.availablePaymentMethods?.googlePay;
-    if (paymentMethod) {
-      const costUSD = (this.cost / 100_000_000 * this.conversions.USD);
-      if (costUSD >= paymentMethod.min && costUSD <= paymentMethod.max) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  get canPayWithBalance(): boolean {
-    if (!this.hasAccessToBalanceMode) {
-      return false;
-    }
-    const paymentMethod = this.estimate?.availablePaymentMethods?.balance;
-    return paymentMethod && this.cost >= paymentMethod.min && this.cost <= paymentMethod.max && this.cost <= this.estimate?.userBalance;
-  }
-
-  get canPay(): boolean {
-    return this.canPayWithBalance || this.canPayWithBitcoin || this.canPayWithCashapp || this.canPayWithApplePay || this.canPayWithGooglePay;
-  }
-
-  get hasAccessToBalanceMode(): boolean {
-    return this.isLoggedIn() && this.estimate?.hasAccess;
-  }
-
-  get timeSincePaid(): number {
-    return Date.now() - this.timePaid;
-  }
-
-  @HostListener('window:resize', ['$event'])
-  onResize(): void {
-    this.isMobile = window.innerWidth <= 767.98;
+  closeModal(): void {
+    this.close.emit();
  }
 }
--- a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
@@ -1,152 +0,0 @@
-import { Component, Input, Output, OnChanges, EventEmitter, HostListener, OnInit, ViewChild, ElementRef, AfterViewInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
-import { Transaction } from '../../interfaces/electrs.interface';
-import { AccelerationEstimate, RateOption } from './accelerate-checkout.component';
-
-interface GraphBar {
-  rate: number;
-  style?: Record<string,string>;
-  class: 'tx' | 'target' | 'max';
-  label: string;
-  active?: boolean;
-  rateIndex?: number;
-  fee?: number;
-  height?: number;
-}
-
-@Component({
-  selector: 'app-accelerate-fee-graph',
-  templateUrl: './accelerate-fee-graph.component.html',
-  styleUrls: ['./accelerate-fee-graph.component.scss'],
-})
-export class AccelerateFeeGraphComponent implements OnInit, AfterViewInit, OnChanges, OnDestroy {
-  @Input() tx: Transaction;
-  @Input() estimate: AccelerationEstimate;
-  @Input() showEstimate = false;
-  @Input() maxRateOptions: RateOption[] = [];
-  @Input() maxRateIndex: number = 0;
-  @Output() setUserBid = new EventEmitter<{ fee: number, index: number }>();
-
-  @ViewChild('feeGraph')
-  container: ElementRef<HTMLDivElement>;
-  height: number;
-  observer: ResizeObserver;
-  stopResizeLoop = false;
-
-  bars: GraphBar[] = [];
-  tooltipPosition = { x: 0, y: 0 };
-
-  constructor(
-    private cd: ChangeDetectorRef,
-  ) {}
-
-  ngOnInit(): void {
-    this.initGraph();
-  }
-
-  ngAfterViewInit(): void {
-    if (ResizeObserver) {
-      this.observer = new ResizeObserver(entries => {
-        for (const entry of entries) {
-          this.height = entry.contentRect.height;
-          this.initGraph();
-        }
-      });
-      this.observer.observe(this.container.nativeElement);
-    } else {
-      this.startResizeFallbackLoop();
-    }
-  }
-
-  ngOnChanges(): void {
-    this.initGraph();
-  }
-
-  initGraph(): void {
-    if (!this.tx || !this.estimate) {
-      return;
-    }
-    const hasNextBlockRate = (this.estimate.nextBlockFee > this.estimate.txSummary.effectiveFee);
-    const numBars = hasNextBlockRate ? 4 : 3;
-    const maxRate = Math.max(...this.maxRateOptions.map(option => option.rate));
-    const baseRate = this.estimate.txSummary.effectiveFee / this.estimate.txSummary.effectiveVsize;
-    let baseHeight = Math.max(this.height - (numBars * 30), this.height * (baseRate / maxRate));
-    const bars: GraphBar[] = [];
-    let lastHeight = 0;
-    if (hasNextBlockRate) {
-      lastHeight = Math.max(lastHeight + 30, (this.height * ((this.estimate.targetFeeRate - baseRate) / maxRate)));
-      bars.push({
-        rate: this.estimate.targetFeeRate,
-        height: lastHeight,
-        class: 'target',
-        label: $localize`:@@bdf0e930eb22431140a2eaeacd809cc5f8ebd38c:Next Block`.toLowerCase(),
-        fee: this.estimate.nextBlockFee - this.estimate.txSummary.effectiveFee
-      });
-    }
-    this.maxRateOptions.forEach((option, index) => {
-      lastHeight = Math.max(lastHeight + 30, (this.height * ((option.rate - baseRate) / maxRate)));
-      bars.push({
-        rate: option.rate,
-        height: lastHeight,
-        class: 'max',
-        label: this.showEstimate ? $localize`maximum` : $localize`accelerated`,
-        active: option.index === this.maxRateIndex,
-        rateIndex: option.index,
-        fee: option.fee,
-      })
-    })
-
-    bars.reverse();
-
-    baseHeight = this.height - lastHeight;
-
-    for (const bar of bars) {
-      bar.style = this.getStyle(bar.height, baseHeight);
-    }
-
-    bars.push({
-      rate: baseRate,
-      style: this.getStyle(baseHeight, 0),
-      height: baseHeight,
-      class: 'tx',
-      label: '',
-      fee: this.estimate.txSummary.effectiveFee,
-    });
-
-    this.bars = bars;
-    this.cd.detectChanges();
-  }
-
-  getStyle(height: number, base: number): Record<string,string> {
-    return {
-      height: `${height}px`,
-      bottom: base ? `${base}px` : '0',
-    }
-  }
-
-  onClick(event, bar): void {
-    if (bar.rateIndex != null) {
-      this.setUserBid.emit({ fee: bar.fee, index: bar.rateIndex });
-    }
-  }
-
-  @HostListener('pointermove', ['$event'])
-  onPointerMove(event) {
-    this.tooltipPosition = { x: event.offsetX, y: event.offsetY };
-  }
-
-  startResizeFallbackLoop(): void {
-    if (this.stopResizeLoop) {
-      return;
-    }
-    requestAnimationFrame(() => {
-      this.height = this.container?.nativeElement?.clientHeight || 0;
-      this.initGraph();
-      this.startResizeFallbackLoop();
-    });
-  }
-
-  ngOnDestroy(): void {
-    this.stopResizeLoop = true;
-    this.observer.disconnect();
-  }
-}
--- a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.html
@@ -1,4 +1,4 @@
-<div class="fee-graph" *ngIf="tx && estimate" #feeGraph>
+<div class="fee-graph" *ngIf="tx && estimate">
  <div class="column">
    <ng-container *ngFor="let bar of bars">
      <div class="bar {{ bar.class }}" [class.active]="bar.active" [style]="bar.style" (click)="onClick($event, bar);">
@@ -12,7 +12,7 @@
          </p>
        </div>
        <div class="spacer"></div>
-        <span class="fee">{{ bar.class === 'tx' ? '' : '+' }}{{ bar.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></span>
+        <span class="fee">{{ bar.class === 'tx' ? '' : '+' }} {{ bar.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></span>
        <div class="spacer"></div>
        <div class="spacer"></div>
      </div>
--- a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.scss
@@ -4,6 +4,7 @@
  width: 120px;
  margin-left: 4em;
  margin-right: 1.5em;
+  padding-bottom: 63px;

  .column {
    width: 100%;
--- a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.ts
+++ b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit, Input, Output, OnChanges, EventEmitter, HostListener, Inject, LOCALE_ID } from '@angular/core';
+import { StateService } from '../../services/state.service';
+import { Outspend, Transaction, Vin, Vout } from '../../interfaces/electrs.interface';
+import { Router } from '@angular/router';
+import { ReplaySubject, merge, Subscription, of } from 'rxjs';
+import { tap, switchMap } from 'rxjs/operators';
+import { ApiService } from '../../services/api.service';
+import { AccelerationEstimate, RateOption } from './accelerate-preview.component';
+
+interface GraphBar {
+  rate: number;
+  style: any;
+  class: 'tx' | 'target' | 'max';
+  label: string;
+  active?: boolean;
+  rateIndex?: number;
+  fee?: number;
+}
+
+@Component({
+  selector: 'app-accelerate-fee-graph',
+  templateUrl: './accelerate-fee-graph.component.html',
+  styleUrls: ['./accelerate-fee-graph.component.scss'],
+})
+export class AccelerateFeeGraphComponent implements OnInit, OnChanges {
+  @Input() tx: Transaction;
+  @Input() estimate: AccelerationEstimate;
+  @Input() maxRateOptions: RateOption[] = [];
+  @Input() maxRateIndex: number = 0;
+  @Output() setUserBid = new EventEmitter<{ fee: number, index: number }>();
+
+  bars: GraphBar[] = [];
+  tooltipPosition = { x: 0, y: 0 };
+
+  ngOnInit(): void {
+    this.initGraph();
+  }
+
+  ngOnChanges(): void {
+    this.initGraph();
+  }
+
+  initGraph(): void {
+    if (!this.tx || !this.estimate) {
+      return;
+    }
+    const maxRate = Math.max(...this.maxRateOptions.map(option => option.rate));
+    const baseRate = this.estimate.txSummary.effectiveFee / this.estimate.txSummary.effectiveVsize;
+    const baseHeight = baseRate / maxRate;
+    const bars: GraphBar[] = this.maxRateOptions.slice().reverse().map(option => {
+      return {
+        rate: option.rate,
+        style: this.getStyle(option.rate, maxRate, baseHeight),
+        class: 'max',
+        label: $localize`maximum`,
+        active: option.index === this.maxRateIndex,
+        rateIndex: option.index,
+        fee: option.fee,
+      }
+    });
+    if (this.estimate.nextBlockFee > this.estimate.txSummary.effectiveFee) {
+      bars.push({
+        rate: this.estimate.targetFeeRate,
+        style: this.getStyle(this.estimate.targetFeeRate, maxRate, baseHeight),
+        class: 'target',
+        label: $localize`:@@bdf0e930eb22431140a2eaeacd809cc5f8ebd38c:Next Block`.toLowerCase(),
+        fee: this.estimate.nextBlockFee - this.estimate.txSummary.effectiveFee
+      });
+    }
+    bars.push({
+      rate: baseRate,
+      style: this.getStyle(baseRate, maxRate, 0),
+      class: 'tx',
+      label: '',
+      fee: this.estimate.txSummary.effectiveFee,
+    });
+    this.bars = bars;
+  }
+
+  getStyle(rate, maxRate, base) {
+    const top = (rate / maxRate);
+    return {
+      height: `${(top - base) * 100}%`,
+      bottom: base ? `${base * 100}%` : '0',
+    }
+  }
+
+  onClick(event, bar): void {
+    if (bar.rateIndex != null) {
+      this.setUserBid.emit({ fee: bar.fee, index: bar.rateIndex });
+    }
+  }
+
+  @HostListener('pointermove', ['$event'])
+  onPointerMove(event) {
+    this.tooltipPosition = { x: event.offsetX, y: event.offsetY };
+  }
+}
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -0,0 +1,250 @@
+<span id="successAlert" class="m-0 p-0 d-block" style="height: 1px;"></span>
+<div class="row" *ngIf="showSuccess">
+  <div class="col">
+    <div class="alert alert-success">
+      Transaction has now been <a class="alert-link" routerLink="/services/accelerator/history">submitted</a> to mining pools for acceleration.
+    </div>
+  </div>
+</div>
+
+<span id="mempoolError" class="m-0 p-0 d-block" style="height: 1px;"></span>
+<div class="row" *ngIf="error">
+  <div class="col">
+    <app-mempool-error [error]="error" [alertClass]="error === 'waitlisted' ? 'alert-mempool' : 'alert-danger'"></app-mempool-error>
+  </div>
+</div>
+
+<div class="accelerate-cols">
+  <ng-container *ngIf="!isMobile">
+    <app-accelerate-fee-graph
+      [tx]="tx"
+      [estimate]="estimate"
+      [maxRateOptions]="maxRateOptions"
+      [maxRateIndex]="selectFeeRateIndex"
+      (setUserBid)="setUserBid($event)"
+    ></app-accelerate-fee-graph>
+  </ng-container>
+
+  <ng-container *ngIf="estimate else loadingEstimate">
+    <div [class]="{estimateDisabled: error || showSuccess }">
+
+      <div *ngIf="user && !estimate.hasAccess">
+        <div class="alert alert-mempool">You are currently on the waitlist</div>
+      </div>
+
+      <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>
+      <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">
+                <ng-container *ngFor="let option of maxRateOptions">
+                  <button type="button" class="btn btn-primary flex-grow-1 btn-border btn-sm feerate" [class]="{active: selectFeeRateIndex === option.index}" (click)="setUserBid(option)">
+                    <span class="fee">{{ option.fee + estimate.mempoolBaseFee + estimate.vsizeFee | number }} <span class="symbol" i18n="shared.sats">sats</span></span>
+                    <span class="rate">~<app-fee-rate [fee]="option.rate" rounding="1.0-0"></app-fee-rate></span>
+                  </button>
+                </ng-container>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+  
+      <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">
+            <tbody>
+              <!-- ESTIMATED FEE -->
+              <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">
+                    {{ estimate.targetFeeRate | number : '1.0-0' }}
+                  </td>
+                  <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
+                </tr>
+                <tr class="info">
+                  <td class="info">
+                    <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
+                  </td>
+                  <td class="amt">
+                    {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
+                  </td>
+                  <td class="units">
+                    <span class="symbol" i18n="shared.sats">sats</span>
+                    <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
+                  </td>
+                </tr>
+              </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>
+                <td class="amt">
+                  +{{ estimate.vsizeFee | number }}
+                </td>
+                <td class="units">
+                  <span class="symbol" i18n="shared.sats">sats</span>
+                  <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
+                </td>
+              </tr>
+
+              
+              <!-- NEXT BLOCK ESTIMATE -->
+              <ng-container>
+                <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>
+                  </td>
+                  <td class="amt">
+                    <span style="background-color: #5E35B1" class="p-1 pl-0">
+                      {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }}
+                    </span>
+                  </td>
+                  <td class="units">
+                    <span class="symbol" i18n="shared.sats">sats</span>
+                    <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">
+                  <td class="item">
+                    <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">
+                      {{ maxCost | number }}
+                    </span>
+                  </td>
+                  <td class="units">
+                    <span class="symbol" i18n="shared.sats">sats</span>
+                    <span class="fiat ml-1">
+                      <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" style="border-top: 1px dashed grey">
+                  <td class="item" i18n="accelerator.available-balance">Available balance</td>
+                  <td class="amt">
+                    {{ estimate.userBalance | number }}
+                  </td>
+                  <td class="units">
+                    <span class="symbol" i18n="shared.sats">sats</span>
+                    <span class="fiat ml-1">
+                      <app-fiat [value]="estimate.userBalance" [colorClass]="estimate.userBalance < maxCost ? 'red-color' : 'green-color'"></app-fiat>
+                    </span>
+                  </td>
+                </tr>
+              </ng-container>
+
+              <!-- 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 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>
+            </tbody>
+          </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>
+
+<ng-template #loadingEstimate>
+  <div class="skeleton-loader"></div>
+  <br>
+</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
@@ -0,0 +1,116 @@
+.fee-card {
+  padding: 15px;
+  background-color: var(--bg);
+
+  .feerate {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+    .rate {
+      font-size: 0.9em;
+      .symbol {
+        color: white;
+      }
+    }
+  }
+}
+
+.btn-border {
+  border: solid 1px black;
+  background-color: #0c4a87;
+}
+
+.feerate.active {
+  background-color: var(--primary) !important;
+  opacity: 1;
+  border: 1px solid #007fff !important;
+}
+.feerate:focus {
+  box-shadow: none !important;
+}
+
+.estimateDisabled {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+.table-toggle {
+  width: 100%;
+  margin-top: 0.5em;
+}
+
+.tab {
+  &:first-child {
+    margin-right: 1px;
+  }
+  border: solid 1px black;
+  border-bottom: none;
+  background-color: #323655;
+  border-top-left-radius: 10px !important;
+  border-top-right-radius: 10px !important;
+}
+.tab.active {
+  background-color: #5d659d !important;
+  opacity: 1;
+}
+.tab:focus {
+  box-shadow: none !important;
+}
+
+.table-accelerator {
+  tr {
+    td {
+      padding-top: 0;
+      padding-bottom: 0;
+      vertical-align: baseline;
+    }
+
+    &.group-first {
+      td {
+        padding-top: 0.75rem;
+      }
+    }
+    &.group-last {
+      td {
+        padding-bottom: 0.75rem;
+      }
+    }
+  }
+  td {
+    &:first-child {
+      width: 100vw;
+    }
+    &.info {
+      color: #6c757d;
+      white-space: initial;
+    }
+    &.amt {
+      text-align: right;
+      padding-right: 0.2em;
+    }
+    &.units {
+      padding-left: 0.2em;
+      white-space: nowrap;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+  }
+}
+
+.accelerate-cols {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  margin-top: 1em;
+}
+
+.item {
+  white-space: initial;
+}
+
+.table-background {
+  background-color: var(--bg);
+}
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
@@ -0,0 +1,240 @@
+import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChanges, HostListener, ChangeDetectorRef } from '@angular/core';
+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';
+
+export type AccelerationEstimate = {
+  txSummary: TxSummary;
+  nextBlockFee: number;
+  targetFeeRate: number;
+  userBalance: number;
+  enoughBalance: boolean;
+  cost: number;
+  mempoolBaseFee: number;
+  vsizeFee: number;
+}
+export type TxSummary = {
+  txid: string; // txid of the current transaction
+  effectiveVsize: number; // Total vsize of the dependency tree
+  effectiveFee: number;  // Total fee of the dependency tree in sats
+  ancestorCount: number; // Number of ancestors
+}
+
+export interface RateOption {
+  fee: number;
+  rate: number;
+  index: number;
+}
+
+export const MIN_BID_RATIO = 1;
+export const DEFAULT_BID_RATIO = 2;
+export const MAX_BID_RATIO = 4;
+
+@Component({
+  selector: 'app-accelerate-preview',
+  templateUrl: 'accelerate-preview.component.html',
+  styleUrls: ['accelerate-preview.component.scss']
+})
+export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges {
+  @Input() tx: Transaction | undefined;
+  @Input() scrollEvent: boolean;
+
+  math = Math;
+  error = '';
+  showSuccess = false;
+  estimateSubscription: Subscription;
+  accelerationSubscription: Subscription;
+  estimate: any;
+  hasAncestors: boolean = false;
+  minExtraCost = 0;
+  minBidAllowed = 0;
+  maxBidAllowed = 0;
+  defaultBid = 0;
+  maxCost = 0;
+  userBid = 0;
+  accelerationUUID: string;
+  selectFeeRateIndex = 1;
+  isMobile: boolean = window.innerWidth <= 767.98;
+  user: any = undefined;
+
+  maxRateOptions: RateOption[] = [];
+
+  constructor(
+    public stateService: StateService,
+    private servicesApiService: ServicesApiServices,
+    private storageService: StorageService,
+    private audioService: AudioService,
+    private cd: ChangeDetectorRef
+  ) {
+  }
+
+  ngOnDestroy(): void {
+    if (this.estimateSubscription) {
+      this.estimateSubscription.unsubscribe();
+    }
+  }
+
+  ngOnInit() {
+    this.accelerationUUID = window.crypto.randomUUID();
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.scrollEvent) {
+      this.scrollToPreview('acceleratePreviewAnchor', 'start');
+    }
+  }
+
+  ngAfterViewInit() {
+    this.user = this.storageService.getAuth()?.user ?? null;
+
+    this.estimateSubscription = this.servicesApiService.estimate$(this.tx.txid).pipe(
+      tap((response) => {
+        if (response.status === 204) {
+          this.estimate = undefined;
+          this.error = `cannot_accelerate_tx`;
+          this.scrollToPreviewWithTimeout('mempoolError', 'center');
+          this.estimateSubscription.unsubscribe();
+        } else {
+          this.estimate = response.body;
+          if (!this.estimate) {
+            this.error = `cannot_accelerate_tx`;
+            this.scrollToPreviewWithTimeout('mempoolError', 'center');
+            this.estimateSubscription.unsubscribe();
+          }
+
+          if (this.estimate.hasAccess === true && this.estimate.userBalance <= 0) {
+            if (this.isLoggedIn()) {
+              this.error = `not_enough_balance`;
+              this.scrollToPreviewWithTimeout('mempoolError', 'center');
+            }
+          }
+
+          this.hasAncestors = this.estimate.txSummary.ancestorCount > 1;
+          
+          // Make min extra fee at least 50% of the current tx fee
+          this.minExtraCost = nextRoundNumber(Math.max(this.estimate.cost * 2, this.estimate.txSummary.effectiveFee));
+
+          this.maxRateOptions = [1, 2, 4].map((multiplier, index) => {
+            return {
+              fee: this.minExtraCost * multiplier,
+              rate: (this.estimate.txSummary.effectiveFee + (this.minExtraCost * multiplier)) / this.estimate.txSummary.effectiveVsize,
+              index,
+            };
+          });
+
+          this.minBidAllowed = this.minExtraCost * MIN_BID_RATIO;
+          this.defaultBid = this.minExtraCost * DEFAULT_BID_RATIO;
+          this.maxBidAllowed = this.minExtraCost * MAX_BID_RATIO;
+
+          this.userBid = this.defaultBid;
+          if (this.userBid < this.minBidAllowed) {
+            this.userBid = this.minBidAllowed;
+          } else if (this.userBid > this.maxBidAllowed) {
+            this.userBid = this.maxBidAllowed;
+          }            
+          this.maxCost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
+
+          if (!this.error) {
+            this.scrollToPreview('acceleratePreviewAnchor', 'start');
+
+            setTimeout(() => {
+              this.onScroll();
+            }, 100);
+          }
+        }
+      }),
+      catchError((response) => {
+        this.estimate = undefined;
+        this.error = response.error;
+        this.scrollToPreviewWithTimeout('mempoolError', 'center');
+        this.estimateSubscription.unsubscribe();
+        return of(null);
+      })
+    ).subscribe();
+  }
+
+  /**
+   * User changed his bid
+   */
+  setUserBid({ fee, index }: { fee: number, index: number}) {
+    if (this.estimate) {
+      this.selectFeeRateIndex = index;
+      this.userBid = Math.max(0, fee);
+      this.maxCost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
+    }
+  }
+
+  /**
+   * Scroll to element id with or without setTimeout
+   */
+  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition) {
+    setTimeout(() => {
+      this.scrollToPreview(id, position);
+    }, 100);
+  }
+  scrollToPreview(id: string, position: ScrollLogicalPosition) {
+    const acceleratePreviewAnchor = document.getElementById(id);
+    if (acceleratePreviewAnchor) {
+      this.cd.markForCheck();
+      acceleratePreviewAnchor.scrollIntoView({
+        behavior: 'smooth',
+        inline: position,
+        block: position,
+      });
+    }
+  }
+
+  /**
+   * Send acceleration request
+   */
+  accelerate() {
+    if (this.accelerationSubscription) {
+      this.accelerationSubscription.unsubscribe();
+    }
+    this.accelerationSubscription = this.servicesApiService.accelerate$(
+      this.tx.txid,
+      this.userBid,
+      this.accelerationUUID
+    ).subscribe({
+      next: () => {
+        this.audioService.playSound('ascend-chime-cartoon');
+        this.showSuccess = true;
+        this.scrollToPreviewWithTimeout('successAlert', 'center');
+        this.estimateSubscription.unsubscribe();
+      },
+      error: (response) => {
+        if (response.status === 403 && response.error === 'not_available') {
+          this.error = 'waitlisted';
+        } else {
+          this.error = response.error;
+        }
+        this.scrollToPreviewWithTimeout('mempoolError', 'center');
+      }
+    });
+  }
+
+  isLoggedIn() {
+    const auth = this.storageService.getAuth();
+    return auth !== null;
+  }
+
+  @HostListener('window:resize', ['$event'])
+  onResize(): void {
+    this.isMobile = window.innerWidth <= 767.98;
+  }
+
+
+  @HostListener('window:scroll', ['$event']) // for window scroll events
+  onScroll() {
+    if (this.estimate) {
+      setTimeout(() => {
+        this.onScroll();
+      }, 200);
+      return;
+    }
+  }
+}
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline-tooltip.component.html
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline-tooltip.component.html
@@ -1,62 +0,0 @@
-<div
-  #tooltip
-  *ngIf="accelerationInfo && tooltipPosition !== null"
-  class="acceleration-tooltip"
-  [style.left]="tooltipPosition.x + 'px'"
-  [style.top]="tooltipPosition.y + 'px'"
->
-  <table>
-    <tbody>
-      <tr>
-        <td class="label" i18n="transaction.status|Transaction Status">Status</td>
-        <td class="value">
-          @if (accelerationInfo.status === 'seen') {
-          <span class="badge badge-primary" i18n="transaction.first-seen|Transaction first seen">First seen</span>
-          } @else if (accelerationInfo.status === 'accelerated') {
-          <span class="badge badge-accelerated" i18n="transaction.audit.accelerated">Accelerated</span>
-          } @else if (accelerationInfo.status === 'mined') {
-          <span class="badge badge-success" i18n="transaction.rbf.mined">Mined</span>
-          }
-        </td>
-      </tr>
-      <tr *ngIf="accelerationInfo.fee">
-        <td class="label" i18n="transaction.fee|Transaction fee">Fee</td>
-        <td class="value">{{ accelerationInfo.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></td>
-      </tr>
-      <tr *ngIf="accelerationInfo.bidBoost >= 0 || accelerationInfo.feeDelta">
-        <td class="label" i18n="transaction.out-of-band-fees">Out-of-band fees</td>
-        @if (accelerationInfo.status === 'accelerated') {
-          <td class="value oobFees">{{ accelerationInfo.feeDelta | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></td>
-        } @else {
-          <td class="value oobFees">{{ accelerationInfo.bidBoost | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></td>
-        }
-      </tr>
-      <tr *ngIf="accelerationInfo.fee && accelerationInfo.weight">
-        @if (accelerationInfo.status === 'seen') {
-          <td class="label" i18n="transaction.fee-rate|Transaction fee rate">Fee rate</td>
-          <td class="value"><app-fee-rate [fee]="accelerationInfo.fee" [weight]="accelerationInfo.weight"></app-fee-rate></td>
-        } @else if (accelerationInfo.status === 'accelerated' || accelerationInfo.status === 'mined') {
-          <td class="label" i18n="transaction.accelerated-fee-rate|Accelerated transaction fee rate">Accelerated fee rate</td>
-          @if (accelerationInfo.status === 'accelerated') {
-            <td class="value oobFees"><app-fee-rate [fee]="accelerationInfo.fee + (accelerationInfo.feeDelta || 0)" [weight]="accelerationInfo.weight"></app-fee-rate></td>
-          } @else {
-            <td class="value oobFees"><app-fee-rate [fee]="accelerationInfo.fee + (accelerationInfo.bidBoost || 0)" [weight]="accelerationInfo.weight"></app-fee-rate></td>
-          }
-        }
-      </tr>
-      <tr *ngIf="['accelerated', 'mined'].includes(accelerationInfo.status) && hasPoolsData()">
-        <td class="label" i18n="transaction.accelerated-by-hashrate|Accelerated to hashrate">Accelerated by</td>
-        <td class="value" *ngIf="accelerationInfo.pools">
-          <ng-container *ngFor="let pool of accelerationInfo.pools">
-            <img *ngIf="accelerationInfo.poolsData[pool]" 
-              class="pool-logo" 
-              [style.opacity]="accelerationInfo?.minedByPoolUniqueId && pool !== accelerationInfo?.minedByPoolUniqueId ? '0.3' : '1'"
-              [src]="'/resources/mining-pools/' + accelerationInfo.poolsData[pool].slug + '.svg'" 
-              onError="this.src = '/resources/mining-pools/default.svg'" 
-              [alt]="'Logo of ' + pool.name + ' mining pool'">
-          </ng-container>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</div>
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline-tooltip.component.scss
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline-tooltip.component.scss
@@ -1,39 +0,0 @@
-.acceleration-tooltip {
-  position: fixed;
-  z-index: 3;
-  background: color-mix(in srgb, var(--active-bg) 95%, transparent);
-  border-radius: 4px;
-  box-shadow: 1px 1px 10px rgba(0,0,0,0.5);
-  color: var(--tooltip-grey);
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  padding: 10px 15px;
-  text-align: left;
-  pointer-events: none;
-
-  .badge.badge-accelerated {
-    background-color: var(--tertiary);
-    color: white;
-  }
-
-  .value {
-    text-align: end;
-  }
-
-  .label {
-    padding-right: 30px;
-  }
-
-  .pool-logo {
-    width: 22px;
-    height: 22px;
-    position: relative;
-    top: -1px;
-    margin-right: 3px;
-  }
-
-  .oobFees {
-    color: #905cf4;
-  }
-}
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline-tooltip.component.ts
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline-tooltip.component.ts
@@ -1,38 +0,0 @@
-import { Component, ElementRef, ViewChild, Input, OnChanges } from '@angular/core';
-
-@Component({
-  selector: 'app-acceleration-timeline-tooltip',
-  templateUrl: './acceleration-timeline-tooltip.component.html',
-  styleUrls: ['./acceleration-timeline-tooltip.component.scss'],
-})
-export class AccelerationTimelineTooltipComponent implements OnChanges {
-  @Input() accelerationInfo: any;
-  @Input() cursorPosition: { x: number, y: number };
-
-  tooltipPosition: any = null;
-
-  @ViewChild('tooltip') tooltipElement: ElementRef<HTMLCanvasElement>;
-
-  constructor() {}
-
-  ngOnChanges(changes): void {
-    if (changes.cursorPosition && changes.cursorPosition.currentValue) {
-      let x = Math.max(10, changes.cursorPosition.currentValue.x - 50);
-      let y = changes.cursorPosition.currentValue.y + 20;
-      if (this.tooltipElement) {
-        const elementBounds = this.tooltipElement.nativeElement.getBoundingClientRect();
-        if ((x + elementBounds.width) > (window.innerWidth - 10)) {
-          x = Math.max(0, window.innerWidth - elementBounds.width - 10);
-        }
-        if (y + elementBounds.height > (window.innerHeight - 20)) {
-          y = y - elementBounds.height - 20;
-        }
-      }
-      this.tooltipPosition = { x, y };
-    }
-  }
-
-  hasPoolsData(): boolean {
-    return Object.keys(this.accelerationInfo.poolsData).length > 0;
-  }
-}
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.html
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.html
@@ -1,142 +0,0 @@
-<div class="acceleration-timeline box" [class.lower-padding]="!tx.status.confirmed">
-  <div class="timeline-wrapper">
-    @if (!tx.status.confirmed) {
-    <div class="timeline">
-      <div class="intervals">
-        <div class="node-spacer"></div>
-        <div class="interval-spacer"></div>
-        <div class="node-spacer"></div>
-        <div class="interval">
-          <div class="interval-time">
-            @if (eta) {
-              ~<app-time [time]="eta?.wait / 1000"></app-time> <!-- <span *ngIf="accelerateRatio > 1" class="compare"> ({{ accelerateRatio }}x faster)</span> -->
-              }
-          </div>
-        </div>
-        <div class="node-spacer"></div>
-      </div>
-      <div class="nodes">
-        <div class="node-spacer"></div>
-        <div class="interval-spacer"></div>
-        <div class="node">
-          <div class="acc-to-confirmed right go-faster"></div>
-        </div>
-        <div class="interval-spacer">
-        </div>
-        <div class="node" [id]="'confirmed'">
-          <div class="acc-to-confirmed left go-faster"></div>
-          <div class="shape-border waiting">
-            <div class="shape"></div>
-          </div>
-          <div class="status"><span class="badge badge-waiting" i18n="transaction.rbf.mined">Mined</span></div>
-        </div>
-      </div>
-    </div>
-    }
-    <div class="timeline">
-      <div class="intervals">
-        <div class="node-spacer"></div>
-        <div class="interval">
-          <div class="interval-time">
-            <app-time [time]="acceleratedAt - transactionTime"></app-time>
-          </div>
-        </div>
-        <div class="node-spacer"></div>
-        <div class="interval">
-          <div class="interval-time">
-            @if (tx.status.confirmed) {
-              <div class="interval-time">
-                <app-time [time]="tx.status.block_time - acceleratedAt"></app-time>
-              </div>
-            } @else if (standardETA && !tx.status.confirmed) {
-              <!-- ~<app-time [time]="standardETA / 1000 - now"></app-time> -->
-            }
-          </div>
-        </div>
-        <div class="node-spacer"></div>
-      </div>
-      <div class="nodes">
-        <div class="node" [id]="'first-seen'">
-          <div class="seen-to-acc right"></div>
-          <div class="shape-border hovering" (pointerover)="onHover($event, 'seen');" (pointerout)="onBlur($event);">
-            <div class="shape"></div>
-          </div>
-          <div class="status"><span class="badge badge-primary" i18n="transaction.first-seen|Transaction first seen">First seen</span></div>
-          <div class="time">
-            @if (useAbsoluteTime) {
-            <span>{{ transactionTime * 1000 | date }}</span>
-            } @else {
-            <app-time kind="since" [time]="transactionTime"></app-time>
-            }
-          </div>
-        </div>
-        <div class="interval-spacer">
-          <div class="seen-to-acc"></div>
-        </div>
-        <div class="node" [class.accelerated]="!tx.status.confirmed" [id]="'accelerated'">
-          <div class="seen-to-acc left"></div>
-          @if (tx.status.confirmed) {
-            <div class="acc-to-confirmed right"></div>
-          } @else {
-          <div class="seen-to-acc right"></div>
-          }
-          <div  class="shape-border hovering" (pointerover)="onHover($event, 'accelerated');" (pointerout)="onBlur($event);">
-            <div class="shape"></div>
-            @if (!tx.status.confirmed) {
-            <div class="connector down loading"></div>
-            }
-          </div>
-          @if (tx.status.confirmed) {
-            <div class="status"><span class="badge badge-accelerated" i18n="transaction.audit.accelerated">Accelerated</span></div>
-          }
-          <div class="time" [class.no-margin]="!tx.status.confirmed" [class.offset-left]="!tx.status.confirmed">
-            @if (!tx.status.confirmed) {
-            <span i18n="transaction.audit.accelerated">Accelerated</span>{{ "" }} 
-            }
-            @if (useAbsoluteTime) {
-            <span>{{ acceleratedAt * 1000 | date }}</span>
-            } @else {
-            <app-time kind="since" [time]="acceleratedAt" [lowercaseStart]="!tx.status.confirmed"></app-time>
-            }
-          </div>
-        </div>
-        <div class="interval-spacer">
-          @if (tx.status.confirmed) {
-          <div class="acc-to-confirmed"></div>
-          } @else {
-          <div class="seen-to-acc"></div>
-          }
-        </div>
-        <div class="node" [class.selected]="tx.status.confirmed" [id]="'confirmed'">
-          @if (tx.status.confirmed) {
-          <div class="acc-to-confirmed left"></div>
-          } @else {
-          <div class="seen-to-acc left"></div>
-          }
-          <div class="shape-border" 
-              [ngClass]="{'waiting': !tx.status.confirmed, 'hovering': tx.status.confirmed}"
-              (pointerover)="onHover($event, tx.status.confirmed ? 'mined' : null)" 
-              (pointerout)="onBlur($event);">
-            <div class="shape"></div>
-          </div>
-          @if (tx.status.confirmed) {
-          <div class="status"><span class="badge badge-success" i18n="transaction.rbf.mined">Mined</span></div>
-          <div class="time">
-            @if (useAbsoluteTime) {
-            <span>{{ tx.status.block_time * 1000 | date }}</span>
-            } @else {
-            <app-time kind="since" [time]="tx.status.block_time"></app-time>
-            }
-          </div>
-          }
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <app-acceleration-timeline-tooltip
-  [accelerationInfo]="hoverInfo"
-  [cursorPosition]="tooltipPosition"
-></app-acceleration-timeline-tooltip>
-
-</div>
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.scss
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.scss
@@ -1,272 +0,0 @@
-.acceleration-timeline {
-  position: relative;
-  width: 100%;
-  padding: 1em 0;
-  &.lower-padding {
-    padding: 0.5em 0 1em;
-  }
-
-  &::after, &::before {
-    content: '';
-    display: block;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    width: 2em;
-    z-index: 2;
-  }
-
-  &::before {
-    left: 0;
-    background: linear-gradient(to right, var(--box-bg), var(--box-bg), transparent);
-  }
-
-  &::after {
-    right: 0;
-    background: linear-gradient(to left, var(--box-bg), var(--box-bg), transparent);
-  }
-
-  .timeline-wrapper {
-    position: relative;
-    width: calc(100% - 2em);
-    margin: auto;
-    overflow-x: auto;
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-  
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
-
-  .intervals, .nodes {
-    min-width: 100%;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: flex-start;
-    text-align: center;
-
-    .node, .node-spacer {
-      width: 6em;
-      min-width: 6em;
-      flex-grow: 1;
-    }
-
-    .interval, .interval-spacer {
-      width: 8em;
-      min-width: 8em;
-      max-width: 8em;
-      height: 32px;
-      display: flex;
-      flex-direction: row;
-      justify-content: center;
-      align-items: flex-end;
-    }
-
-    .interval {
-      overflow: visible;
-    }
-
-    .interval-time {
-      font-size: 12px;
-      line-height: 16px;
-      white-space: nowrap;
-
-      .compare {
-        font-style: italic;
-        color: var(--mainnet-alt);
-        font-weight: 600;
-        @media (max-width: 600px) {
-          display: none;
-        }
-      }
-    }
-  }
-
-  .node, .interval-spacer {
-    position: relative;
-    .seen-to-acc {
-      position: absolute;
-      height: 10px;
-      left: -5px;
-      right: -5px;
-      top: 0;
-      transform: translateY(-50%);
-      background: var(--primary);
-      border-radius: 5px;
-
-      &.left {
-        right: 50%;
-      }
-
-      &.right {
-        left: 50%;
-      }
-    }
-
-    .acc-to-confirmed {
-      position: absolute;
-      height: 10px;
-      left: -5px;
-      right: -5px;
-      top: 0;
-      transform: translateY(-50%);
-      background: var(--tertiary);
-      border-radius: 5px;
-
-      &.go-faster {
-        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='10'%3E%3Cpath style='fill:%239339f4;' d='M 0,0 5,5 0,10 Z'/%3E%3Cpath style='fill:%23653b9c;' d='M 0,0 10,0 15,5 10,10 0,10 5,5 Z'/%3E%3Cpath style='fill:%239339f4;' d='M 10,0 20,0 20,10 10,10 15,5 Z'/%3E%3C/svg%3E%0A");        background-size: 20px 10px;
-        border-radius: 0;
-
-        &.right {
-          left: calc(50% + 5px);
-          margin-right: calc(-4em + 5px);
-          animation: goFasterRight 0.8s infinite linear;
-        }
-        &.left {
-          right: calc(50% + 5px);
-          margin-left: calc(-4em + 5px);
-          animation: goFasterLeft 0.8s infinite linear;
-        }
-      }
-
-      &.left {
-        right: 50%;
-      }
-      &.right {
-        left: 50%;
-      }
-    }
-  }
-
-  .nodes {
-    position: relative;
-    margin-top: 1em;
-    .node {
-      .shape-border {
-        display: block;
-        margin: auto;
-        height: calc(1em + 8px);
-        width: calc(1em + 8px);
-        margin-bottom: -8px;
-        transform: translateY(-50%);
-        border-radius: 50%;
-        padding: 4px;
-        background: transparent;
-        transition: background-color 300ms, padding 300ms;
-
-        &.hovering {
-          cursor: pointer;
-          &:hover {
-            padding: 0px;
-          }
-        }
-    
-        .shape {
-          position: relative;
-          width: 100%;
-          height: 100%;
-          border-radius: 50%;
-          background: white;
-          z-index: 1;
-        }
-
-        &.waiting {
-          .shape {
-            background: var(--grey);
-          }
-        }
-    
-        .connector {
-          position: absolute;
-          z-index: 0;
-          height: 88px;
-          width: 10px;
-          left: -5px;
-          top: -73px;
-          transform: translateX(120%);
-          background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='10' height='20'%3E%3Cpath style='fill:%239339f4;' d='M 0,20 5,15 10,20 Z'/%3E%3Cpath style='fill:%23653b9c;' d='M 0,20 5,15 10,20 10,10 5,5 0,10 Z'/%3E%3Cpath style='fill:%239339f4;' d='M 0,10 5,5 10,10 10,0 0,0 Z'/%3E%3C/svg%3E%0A");      //     linear-gradient(135deg, var(--tertiary) 34%, transparent 34%),
-          background-size: 10px 20px;
-    
-          &.down {
-            border-top-left-radius: 10px;
-          }
-    
-          &.up {
-            border-top-right-radius: 10px;
-          }
-    
-          &.loading {
-            animation: goFasterUp 0.8s infinite linear;
-          }
-        }
-      }
-    
-      &.accelerated {
-        .shape-border {
-          animation: acceleratePulse 0.4s infinite;
-        }
-      }
-
-      &.selected {
-        .shape-border {
-          background: var(--mainnet-alt);
-        }
-      }
-
-      .status {
-        margin-top: -66px;
-
-        .badge.badge-waiting {
-          opacity: 0.5;
-          background-color: var(--grey);
-          color: white;
-        }
-        
-        .badge.badge-accelerated {
-          background-color: var(--tertiary);
-          color: white;
-        }
-      }
-
-      .time {
-        margin-top: 32px;
-        font-size: 12px;
-        line-height: 16px;
-        white-space: nowrap;
-
-        &.offset-left {
-          @media (max-width: 650px) {
-            margin-left: -20px;
-          }
-        }
-
-        &.no-margin {
-          margin-top: 0px;
-        }
-      }
-    }
-  }
-}
-
-@keyframes acceleratePulse {
-  0% { background-color: var(--tertiary) }
-  50% { background-color: var(--mainnet-alt) }
-  100% { background-color: var(--tertiary) }
-}
-
-@keyframes goFasterUp {
-  0% { background-position-y: 0; }
-  100% { background-position-y: -40px; }
-}
-
-@keyframes goFasterLeft {
-  0% { background-position: left 0px bottom 0px }
-  100% { background-position: left 40px bottom 0px; }
-}
-
-@keyframes goFasterRight {
-  0% { background-position: right 0 bottom 0px; }
-  100% { background-position: right -40px bottom 0px; }
-}
--- a/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts
+++ b/frontend/src/app/components/acceleration-timeline/acceleration-timeline.component.ts
@@ -1,108 +0,0 @@
-import { Component, Input, OnInit, OnChanges, HostListener } from '@angular/core';
-import { ETA } from '../../services/eta.service';
-import { Transaction } from '../../interfaces/electrs.interface';
-import { Acceleration, SinglePoolStats } from '../../interfaces/node-api.interface';
-import { MiningService } from '../../services/mining.service';
-
-@Component({
-  selector: 'app-acceleration-timeline',
-  templateUrl: './acceleration-timeline.component.html',
-  styleUrls: ['./acceleration-timeline.component.scss'],
-})
-export class AccelerationTimelineComponent implements OnInit, OnChanges {
-  @Input() transactionTime: number;
-  @Input() tx: Transaction;
-  @Input() accelerationInfo: Acceleration;
-  @Input() eta: ETA;
-  // A mined transaction has standard ETA and accelerated ETA undefined
-  // A transaction in mempool has either standardETA defined (if accelerated) or acceleratedETA defined (if not accelerated yet)
-  @Input() standardETA: number;
-  @Input() acceleratedETA: number;
-
-  acceleratedAt: number;
-  now: number;
-  accelerateRatio: number;
-  useAbsoluteTime: boolean = false;
-  interval: number;
-
-  tooltipPosition = null;
-  hoverInfo: any = null;
-  poolsData: { [id: number]: SinglePoolStats } = {};
-
-  constructor(
-    private miningService: MiningService,
-  ) {}
-
-  ngOnInit(): void {
-    this.acceleratedAt = this.tx.acceleratedAt ?? new Date().getTime() / 1000;
-    this.now = Math.floor(new Date().getTime() / 1000);
-    this.useAbsoluteTime = this.tx.status.block_time < this.now - 7 * 24 * 3600;
-
-    this.miningService.getPools().subscribe(pools => {
-      for (const pool of pools) {
-        this.poolsData[pool.unique_id] = pool;
-      }
-    });
-
-    this.interval = window.setInterval(() => {
-      this.now = Math.floor(new Date().getTime() / 1000);
-      this.useAbsoluteTime = this.tx.status.block_time < this.now - 7 * 24 * 3600;
-    }, 60000);
-  }
-
-  ngOnChanges(changes): void {
-    // Hide standard ETA while we don't have a proper standard ETA calculation, see https://github.com/mempool/mempool/issues/65
-    
-    // if (changes?.eta?.currentValue || changes?.standardETA?.currentValue || changes?.acceleratedETA?.currentValue) {
-    //   if (changes?.eta?.currentValue) {
-    //     if (changes?.acceleratedETA?.currentValue) {
-    //       this.accelerateRatio = Math.floor((Math.floor(changes.eta.currentValue.time / 1000) - this.now) / (Math.floor(changes.acceleratedETA.currentValue / 1000) - this.now));
-    //     } else if (changes?.standardETA?.currentValue) {
-    //       this.accelerateRatio = Math.floor((Math.floor(changes.standardETA.currentValue / 1000) - this.now) / (Math.floor(changes.eta.currentValue.time / 1000) - this.now));
-    //     }
-    //   }
-    // }
-  }
-
-  ngOnDestroy(): void {
-    clearInterval(this.interval);
-  }
-  
-  onHover(event, status: string): void {
-    if (status === 'seen') {
-      this.hoverInfo = {
-        status,
-        fee: this.tx.fee,
-        weight: this.tx.weight
-      };
-    } else if (status === 'accelerated') {
-      this.hoverInfo = {
-        status,
-        fee: this.accelerationInfo?.effectiveFee || this.tx.fee,
-        weight: this.tx.weight,
-        feeDelta: this.accelerationInfo?.feeDelta || this.tx.feeDelta,
-        pools: this.tx.acceleratedBy || this.accelerationInfo?.pools,
-        poolsData: this.poolsData
-      };
-    } else if (status === 'mined') {
-      this.hoverInfo = {
-        status,
-        fee: this.accelerationInfo?.effectiveFee,
-        weight: this.tx.weight,
-        bidBoost: this.accelerationInfo?.bidBoost,
-        minedByPoolUniqueId: this.accelerationInfo?.minedByPoolUniqueId,
-        pools: this.tx.acceleratedBy || this.accelerationInfo?.pools,
-        poolsData: this.poolsData
-      };
-    }
-  }
-
-  onBlur(event): void {
-    this.hoverInfo = null;
-  }
-
-  @HostListener('pointermove', ['$event'])
-  onPointerMove(event) {
-    this.tooltipPosition = { x: event.clientX, y: event.clientY };
-  }
-}
--- 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
@@ -45,8 +45,8 @@
    </form>
  </div>

-  <div [class.chart]="!widget" [class.chart-widget]="widget" *browserOnly [style]="{ height: widget ? ((height + 20) + 'px') : null, opacity: isLoading ? 0.5 : 1 }" echarts [initOpts]="chartInitOptions" [options]="chartOptions"
-    (chartInit)="onChartInit($event)">
+  <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}">
  </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.ts
+++ b/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, NgZone, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Inject, Input, LOCALE_ID, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
 import { EChartsOption } from '../../../graphs/echarts';
 import { Observable, Subject, Subscription, combineLatest, fromEvent, merge, share } from 'rxjs';
 import { startWith, switchMap, tap } from 'rxjs/operators';
@@ -8,11 +8,10 @@ import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { download, formatterXAxis, formatterXAxisLabel, formatterXAxisTimeCategory } from '../../../shared/graphs.utils';
 import { StorageService } from '../../../services/storage.service';
 import { MiningService } from '../../../services/mining.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Acceleration } from '../../../interfaces/node-api.interface';
 import { ServicesApiServices } from '../../../services/services-api.service';
 import { StateService } from '../../../services/state.service';
-import { RelativeUrlPipe } from '../../../shared/pipes/relative-url/relative-url.pipe';

@Component({
  selector: 'app-acceleration-fees-graph',
@@ -23,7 +22,7 @@ import { RelativeUrlPipe } from '../../../shared/pipes/relative-url/relative-url
      position: absolute;
      top: 50%;
      left: calc(50% - 15px);
-      z-index: 99;
+      z-index: 100;
    }
  `],
  changeDetection: ChangeDetectionStrategy.OnPush,
@@ -33,7 +32,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
  @Input() height: number = 300;
  @Input() right: number | string = 45;
  @Input() left: number | string = 75;
-  @Input() period: '24h' | '3d' | '1w' | '1m' | 'all' = '1w';
+  @Input() period: '3d' | '1w' | '1m' = '1w';
  @Input() accelerations$: Observable<Acceleration[]>;

  miningWindowPreference: string;
@@ -49,7 +48,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
  isLoading = true;
  formatNumber = formatNumber;
  timespan = '';
-  periodSubject$: Subject<'24h' | '3d' | '1w' | '1m' | 'all'> = new Subject();
+  periodSubject$: Subject<'3d' | '1w' | '1m'> = new Subject();
  chartInstance: any = undefined;
  daysAvailable: number = 0;

@@ -63,8 +62,6 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
    private route: ActivatedRoute,
    public stateService: StateService,
    private cd: ChangeDetectorRef,
-    private router: Router,
-    private zone: NgZone,
  ) {
    this.radioGroupForm = this.formBuilder.group({ dateSpan: '1w' });
    this.radioGroupForm.controls.dateSpan.setValue('1w');
@@ -81,7 +78,7 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest
    this.radioGroupForm.controls.dateSpan.setValue(this.miningWindowPreference);
    
    this.route.fragment.subscribe((fragment) => {
-      if (['24h', '3d', '1w', '1m', '3m', 'all'].indexOf(fragment) > -1) {
+      if (['24h', '3d', '1w', '1m', '3m'].indexOf(fragment) > -1) {
        this.radioGroupForm.controls.dateSpan.setValue(fragment, { emitEvent: false });
      }
    });
@@ -297,19 +294,6 @@ export class AccelerationFeesGraphComponent implements OnInit, OnChanges, OnDest

  onChartInit(ec) {
    this.chartInstance = ec;
-
-    this.chartInstance.on('click', (e) => {
-      this.zone.run(() => {
-        if (['24h', '3d'].includes(this.timespan)) {
-          const url = new RelativeUrlPipe(this.stateService).transform(`/block/${e.data[2]}`);
-          if (e.event.event.shiftKey || e.event.event.ctrlKey || e.event.event.metaKey) {
-            window.open(url);
-          } else {
-            this.router.navigate([url]);
-          }
-        }
-      });
-    });
  }

  isMobile() {
--- a/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html
+++ b/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html
@@ -4,7 +4,7 @@
      <h5 class="card-title" i18n="accelerator.requests">Requests</h5>
      <div class="card-text">
        <div>{{ stats.totalRequested }}</div>
-        <div class="symbol" i18n="accelerator.total-accelerated-plural">accelerated</div>
+        <div class="symbol" i18n="accelerator.total-accelerated">accelerated</div>
      </div>
    </div>
    <div class="item">
--- a/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.ts
+++ b/frontend/src/app/components/acceleration/acceleration-stats/acceleration-stats.component.ts
@@ -16,7 +16,7 @@ export type AccelerationStats = {
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AccelerationStatsComponent implements OnInit, OnChanges {
-  @Input() timespan: '24h' | '3d' | '1w' | '1m' | 'all' = '1w';
+  @Input() timespan: '3d' | '1w' | '1m' = '1w';
  accelerationStats$: Observable<AccelerationStats>;
  blocksInPeriod: number = 7 * 144;

@@ -35,9 +35,6 @@ export class AccelerationStatsComponent implements OnInit, OnChanges {
  updateStats(): void {
    this.accelerationStats$ = this.servicesApiService.getAccelerationStats$({ timeframe: this.timespan });
    switch (this.timespan) {
-      case '24h':
-        this.blocksInPeriod = 144;
-        break;
      case '3d':
        this.blocksInPeriod = 3 * 144;
        break;
@@ -47,9 +44,6 @@ export class AccelerationStatsComponent implements OnInit, OnChanges {
      case '1m':
        this.blocksInPeriod = 30 * 144;
        break;
-      case 'all':
-        this.blocksInPeriod = Infinity;
-        break;
    }
  }
 }
--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.html
@@ -4,8 +4,8 @@

  <div class="clearfix"></div>

-  <div class="acceleration-list">
-    <table *ngIf="nonEmptyAccelerations; else noData" class="table table-borderless table-fixed">
+  <div class="acceleration-list" *ngIf="accelerationList$ | async as accelerations">
+    <table *ngIf="!accelerations || accelerations.length; else noData" class="table table-borderless table-fixed">
      <thead>
        <th class="txid text-left" i18n="dashboard.latest-transactions.txid">TXID</th>
        <ng-container *ngIf="pending">
@@ -16,12 +16,11 @@
        <ng-container *ngIf="!pending">
          <th class="fee text-right" i18n="transaction.bid-boost|Bid Boost">Bid Boost</th>
          <th class="block text-right" i18n="shared.block-title">Block</th>
-          <th class="pool text-right" i18n="mining.pool-name" *ngIf="!this.widget">Pool</th>
          <th class="status text-right" i18n="transaction.status|Transaction Status">Status</th>
          <th class="date text-right" i18n="accelerator.requested" *ngIf="!this.widget">Requested</th>
        </ng-container>
      </thead>
-      <tbody *ngIf="accelerationList$ | async as accelerations; else skeleton" [style]="isLoading ? 'opacity: 0.75' : ''">
+      <tbody *ngIf="accelerations; else skeleton" [style]="isLoading ? 'opacity: 0.75' : ''">
        <tr *ngFor="let acceleration of accelerations; let i= index;">
          <td class="txid text-left">
            <a [routerLink]="['/tx' | relativeUrl, acceleration.txid]">
@@ -36,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">
@@ -50,70 +49,34 @@
              <a *ngIf="acceleration.blockHeight" [routerLink]="['/block' | relativeUrl, acceleration.blockHeight]">{{ acceleration.blockHeight }}</a>
              <span *ngIf="!acceleration.blockHeight">~</span>
            </td>
-            <td class="pool text-right" *ngIf="!this.widget">
-              @if (acceleration.minedByPoolUniqueId && pools[acceleration.minedByPoolUniqueId]) {
-                <a placement="bottom" [routerLink]="['/mining/pool' | relativeUrl, pools[acceleration.minedByPoolUniqueId].slug]" class="badge" style="color: #FFF;padding:0;">
-                  <img class="pool-logo" [src]="'/resources/mining-pools/' + pools[acceleration.minedByPoolUniqueId].slug + '.svg'" onError="this.src = '/resources/mining-pools/default.svg'" [alt]="'Logo of ' + pools[acceleration.minedByPoolUniqueId].name + ' mining pool'">
-                  {{ pools[acceleration.minedByPoolUniqueId].name }}
-                </a>
-              } @else {
-                ~
-              }
-            </td>
            <td class="status text-right">
              <span *ngIf="acceleration.status === 'accelerating'" class="badge badge-warning" i18n="accelerator.pending">Pending</span>
-              <span *ngIf="acceleration.status.includes('completed') && acceleration.minedByPoolUniqueId && pools[acceleration.minedByPoolUniqueId]" class="badge badge-success"><ng-container i18n="accelerator.completed">Completed</ng-container><span *ngIf="acceleration.status === 'completed_provisional'">&nbsp;⌛</span></span>
-              <span *ngIf="acceleration.status.includes('completed') && (!acceleration.minedByPoolUniqueId || !pools[acceleration.minedByPoolUniqueId])" class="badge badge-success"><ng-container i18n="transaction.rbf.mined">Mined</ng-container><span *ngIf="acceleration.status === 'completed_provisional'">&nbsp;⌛</span></span>
-              <span *ngIf="acceleration.status.includes('failed')" class="badge badge-danger"><ng-container i18n="accelerator.canceled">Failed</ng-container><span *ngIf="acceleration.status === 'failed_provisional'">&nbsp;⌛</span></span>
+              <span *ngIf="acceleration.status.includes('completed')" class="badge badge-success" i18n="">Completed <span *ngIf="acceleration.status === 'completed_provisional'">🔄</span></span>
+              <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>
      </tbody>
      <ng-template #skeleton>
-        @if (!pending) {
-          <tbody>
-            <tr *ngFor="let item of skeletonLines">
-              <td class="txid text-left">
-                <span class="skeleton-loader" style="max-width: 200px"></span>
-              </td>
-              <td class="fee text-right">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-              <td class="block text-right">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-              <td class="pool text-right" *ngIf="!this.widget">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-              <td class="status text-right">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-              <td class="date text-right" *ngIf="!this.widget">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-            </tr>
-          </tbody>
-        } @else {
-          <tbody>
-            <tr *ngFor="let item of skeletonLines">
-              <td class="txid text-left">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-              <td class="fee-rate text-right">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-              <td class="bid text-right">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-              <td class="time text-right">
-                <span class="skeleton-loader" style="max-width: 100px"></span>
-              </td>
-            </tr>
-          </tbody>
-        }
+        <tbody>
+          <tr *ngFor="let item of skeletonLines">
+            <td class="txid text-left">
+              <span class="skeleton-loader" style="max-width: 75px"></span>
+            </td>
+            <td class="fee text-right">
+              <span class="skeleton-loader" style="max-width: 75px"></span>
+            </td>
+            <td class="fee-delta text-right">
+              <span class="skeleton-loader" style="max-width: 75px"></span>
+            </td>
+            <td class="status text-right">
+              <span class="skeleton-loader" style="max-width: 75px"></span>
+            </td>
+          </tr>
+        </tbody>
      </ng-template>
    </table>

--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.scss
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.scss
@@ -12,7 +12,7 @@
  padding-bottom: 0px;
 }
 .container-xl.legacy {
-  max-width: 1200px;
+  max-width: 1140px;
 }
 .container-xl.widget-container {
  min-height: 335px;
@@ -72,25 +72,9 @@ tr, td, th {

 .block {
  width: 15%;
-  @media (max-width: 900px) {
-    display: none;
-  }
-}
-
-.pool {
-  width: 15%;
-  
  @media (max-width: 700px) {
    display: none;
  }
-
-  .pool-logo {
-    width: 18px;
-    height: 18px;
-    position: relative;
-    top: -1px;
-    margin-right: 2px;
-  }
 }

 .status {
--- 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,12 +1,9 @@
-import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnDestroy, Inject, LOCALE_ID } from '@angular/core';
-import { BehaviorSubject, Observable, Subscription, catchError, filter, of, switchMap, tap, throttleTime } from 'rxjs';
-import { Acceleration, BlockExtended, SinglePoolStats } from '../../../interfaces/node-api.interface';
+import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnDestroy } from '@angular/core';
+import { 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';
-import { MiningService } from '../../../services/mining.service';

@Component({
  selector: 'app-accelerations-list',
@@ -28,75 +25,25 @@ 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;
-  pools: { [id: number]: SinglePoolStats } = {};
-  nonEmptyAccelerations: boolean = true;

  constructor(
    private servicesApiService: ServicesApiServices,
    private websocketService: WebsocketService,
    public stateService: StateService,
-    private miningService: MiningService,
    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 {
-    this.miningService.getPools().subscribe(pools => {
-      for (const pool of pools) {
-        this.pools[pool.unique_id] = pool;
-      }
-    });
-
    if (!this.widget) {
      this.websocketService.want(['blocks']);
-      this.seoService.setTitle($localize`:@@02573b6980a2d611b4361a2595a4447e390058cd:Accelerations`);
-
-      this.paramSubscription = this.route.params.pipe(
-        tap(params => {
-          this.page = +params['page'] || 1;
-          this.pageSubject.next(this.page);
-        })
-      ).subscribe();
-
-      const prevKey = this.dir === 'ltr' ? 'ArrowLeft' : 'ArrowRight';
-      const nextKey = this.dir === 'ltr' ? 'ArrowRight' : 'ArrowLeft';
-
-      this.keyNavigationSubscription = this.stateService.keyNavigation$.pipe(
-        filter((event) => event.key === prevKey || event.key === nextKey),
-        tap((event) => {
-          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);
-      });
    }

    this.skeletonLines = this.widget === true ? [...Array(6).keys()] : [...Array(15).keys()];
    this.paginationMaxSize = window.matchMedia('(max-width: 670px)').matches ? 3 : 5;
-
+    
    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();
@@ -116,7 +63,6 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
            for (const acc of accelerations) {
              acc.boost = acc.boostCost != null ? acc.boostCost : acc.bidBoost;
            }
-            this.nonEmptyAccelerations = accelerations.length > 0;
            if (this.widget) {
              return of(accelerations.slice(0, 6));
            } else {
@@ -136,7 +82,7 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
  }

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

  trackByBlock(index: number, block: BlockExtended): number {
@@ -145,7 +91,5 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {

  ngOnDestroy(): void {
    this.websocketService.stopTrackAccelerations();
-    this.paramSubscription?.unsubscribe();
-    this.keyNavigationSubscription?.unsubscribe();
  }
 }
--- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
+++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
@@ -23,18 +23,12 @@
      <div class="main-title">
        <span [attr.data-cy]="'acceleration-stats'" i18n="accelerator.acceleration-stats">Acceleration stats</span>&nbsp;
        @switch (timespan) {
-          @case ('24h') {
-            <span style="font-size: xx-small" i18n="mining.1-day">(1 day)</span>
-          }
          @case ('1w') {
            <span style="font-size: xx-small" i18n="mining.1-week">(1 week)</span>
          }
          @case ('1m') {
            <span style="font-size: xx-small" i18n="mining.1-month">(1 month)</span>
          }
-          @case ('all') {
-            <span style="font-size: xx-small" i18n="mining.all-time">(all time)</span>
-          }
        }
      </div>
      <div class="card-wrapper">
@@ -42,17 +36,11 @@
          <div class="card-body more-padding">
            <app-acceleration-stats [timespan]="timespan"></app-acceleration-stats>
            <div class="widget-toggler">
-              <a href="" (click)="setTimespan('24h')" class="toggler-option"
-                [ngClass]="{'inactive': timespan === '24h'}"><small>24h</small></a>
-              <span style="color: #ffffff66; font-size: 8px"> | </span>
              <a href="" (click)="setTimespan('1w')" class="toggler-option"
                [ngClass]="{'inactive': timespan === '1w'}"><small>1w</small></a>
              <span style="color: #ffffff66; font-size: 8px"> | </span>
              <a href="" (click)="setTimespan('1m')" class="toggler-option"
              [ngClass]="{'inactive': timespan === '1m'}"><small>1m</small></a>
-              <span style="color: #ffffff66; font-size: 8px"> | </span>
-              <a href="" (click)="setTimespan('all')" class="toggler-option"
-              [ngClass]="{'inactive': timespan === 'all'}"><small>all</small></a>
            </div>
          </div>
        </div>
--- a/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts
+++ b/frontend/src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.ts
@@ -37,7 +37,7 @@ export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
  webGlEnabled = true;
  seen: Set<string> = new Set();
  firstLoad = true;
-  timespan: '24h' | '3d' | '1w' | '1m' | 'all' = '1w';
+  timespan: '3d' | '1w' | '1m' = '1w';

  accelerationDeltaSubscription: Subscription;

@@ -96,16 +96,10 @@ export class AcceleratorDashboardComponent implements OnInit, OnDestroy {
      share(),
    );

-    this.minedAccelerations$ = this.stateService.chainTip$.pipe(
-      distinctUntilChanged(),
-      switchMap(() => {
-        return this.serviceApiServices.getAccelerationHistory$({ status: 'completed_provisional,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([
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
natsoni	ab9ee3151e	Add explanatory tooltips in incoming txs widget	2024-05-27 15:56:42 +02:00
natsoni	c933d975f3	Slightly lift up blockchain toggle button	2024-05-27 11:53:58 +02:00
natsoni	53458da3bb	Fix widget mining graphs	2024-05-27 11:50:11 +02:00