Add regtest network support

2023-07-24 16:06:14 +09:00
110 changed files with 802 additions and 1688 deletions
--- a/2
+++ b/2
@@ -13,7 +13,7 @@ the terms of (at your option) either:
 proxy statement published on <https://mempool.space/about>.

 However, this copyright license does not include an implied right or license to
-use our trademarks: The Mempool Open Source Project®, mempool.space™, the
+use our trademarks: The Mempool Open Source Project™, mempool.space™, the
 mempool Logo™, the mempool.space Vertical Logo™, the mempool.space Horizontal
 Logo™, the mempool Square Logo™, and the mempool Blocks logo™ are registered
 trademarks or trademarks of Mempool Space K.K in Japan, the United States,
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# The Mempool Open Source Project® [![mempool](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/ry4br7/master&style=flat-square)](https://dashboard.cypress.io/projects/ry4br7/runs)
+# The Mempool Open Source Project™ [![mempool](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/simple/ry4br7/master&style=flat-square)](https://dashboard.cypress.io/projects/ry4br7/runs)

 https://user-images.githubusercontent.com/93150691/226236121-375ea64f-b4a1-4cc0-8fad-a6fb33226840.mp4

--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -8,7 +8,6 @@
    "API_URL_PREFIX": "/api/v1/",
    "POLL_RATE_MS": 2000,
    "CACHE_DIR": "./cache",
-    "CACHE_ENABLED": true,
    "CLEAR_PROTECTION_MINUTES": 20,
    "RECOMMENDED_FEE_PERCENTILE": 50,
    "BLOCK_WEIGHT_UNITS": 4000000,
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -19,7 +19,6 @@
        "maxmind": "~4.3.11",
        "mysql2": "~3.5.2",
        "rust-gbt": "file:./rust-gbt",
-        "redis": "^4.6.6",
        "socks-proxy-agent": "~7.0.0",
        "typescript": "~4.9.3",
        "ws": "~8.13.0"
@@ -1556,64 +1555,6 @@
        "node": ">= 8"
      }
    },
-    "node_modules/@redis/bloom": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz",
-      "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==",
-      "peerDependencies": {
-        "@redis/client": "^1.0.0"
-      }
-    },
-    "node_modules/@redis/client": {
-      "version": "1.5.7",
-      "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.7.tgz",
-      "integrity": "sha512-gaOBOuJPjK5fGtxSseaKgSvjiZXQCdLlGg9WYQst+/GRUjmXaiB5kVkeQMRtPc7Q2t93XZcJfBMSwzs/XS9UZw==",
-      "dependencies": {
-        "cluster-key-slot": "1.1.2",
-        "generic-pool": "3.9.0",
-        "yallist": "4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@redis/client/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/@redis/graph": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz",
-      "integrity": "sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==",
-      "peerDependencies": {
-        "@redis/client": "^1.0.0"
-      }
-    },
-    "node_modules/@redis/json": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz",
-      "integrity": "sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==",
-      "peerDependencies": {
-        "@redis/client": "^1.0.0"
-      }
-    },
-    "node_modules/@redis/search": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.1.2.tgz",
-      "integrity": "sha512-/cMfstG/fOh/SsE+4/BQGeuH/JJloeWuH+qJzM8dbxuWvdWibWAOAHHCZTMPhV3xIlH4/cUEIA8OV5QnYpaVoA==",
-      "peerDependencies": {
-        "@redis/client": "^1.0.0"
-      }
-    },
-    "node_modules/@redis/time-series": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz",
-      "integrity": "sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==",
-      "peerDependencies": {
-        "@redis/client": "^1.0.0"
-      }
-    },
    "node_modules/@sinclair/typebox": {
      "version": "0.25.24",
      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
@@ -2777,14 +2718,6 @@
        "node": ">=12"
      }
    },
-    "node_modules/cluster-key-slot": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
-      "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/co": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -3745,14 +3678,6 @@
        "is-property": "^1.0.2"
      }
    },
-    "node_modules/generic-pool": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz",
-      "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
    "node_modules/gensync": {
      "version": "1.0.0-beta.2",
      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -6652,19 +6577,6 @@
      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
      "dev": true
    },
-    "node_modules/redis": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.6.tgz",
-      "integrity": "sha512-aLs2fuBFV/VJ28oLBqYykfnhGGkFxvx0HdCEBYdJ99FFbSEMZ7c1nVKwR6ZRv+7bb7JnC0mmCzaqu8frgOYhpA==",
-      "dependencies": {
-        "@redis/bloom": "1.2.0",
-        "@redis/client": "1.5.7",
-        "@redis/graph": "1.1.0",
-        "@redis/json": "1.0.4",
-        "@redis/search": "1.1.2",
-        "@redis/time-series": "1.0.4"
-      }
-    },
    "node_modules/require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -8792,53 +8704,6 @@
        "fastq": "^1.6.0"
      }
    },
-    "@redis/bloom": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz",
-      "integrity": "sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==",
-      "requires": {}
-    },
-    "@redis/client": {
-      "version": "1.5.7",
-      "resolved": "https://registry.npmjs.org/@redis/client/-/client-1.5.7.tgz",
-      "integrity": "sha512-gaOBOuJPjK5fGtxSseaKgSvjiZXQCdLlGg9WYQst+/GRUjmXaiB5kVkeQMRtPc7Q2t93XZcJfBMSwzs/XS9UZw==",
-      "requires": {
-        "cluster-key-slot": "1.1.2",
-        "generic-pool": "3.9.0",
-        "yallist": "4.0.0"
-      },
-      "dependencies": {
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        }
-      }
-    },
-    "@redis/graph": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz",
-      "integrity": "sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==",
-      "requires": {}
-    },
-    "@redis/json": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@redis/json/-/json-1.0.4.tgz",
-      "integrity": "sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==",
-      "requires": {}
-    },
-    "@redis/search": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@redis/search/-/search-1.1.2.tgz",
-      "integrity": "sha512-/cMfstG/fOh/SsE+4/BQGeuH/JJloeWuH+qJzM8dbxuWvdWibWAOAHHCZTMPhV3xIlH4/cUEIA8OV5QnYpaVoA==",
-      "requires": {}
-    },
-    "@redis/time-series": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz",
-      "integrity": "sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==",
-      "requires": {}
-    },
    "@sinclair/typebox": {
      "version": "0.25.24",
      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.25.24.tgz",
@@ -9739,11 +9604,6 @@
        "wrap-ansi": "^7.0.0"
      }
    },
-    "cluster-key-slot": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
-      "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="
-    },
    "co": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -10472,11 +10332,6 @@
        "is-property": "^1.0.2"
      }
    },
-    "generic-pool": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz",
-      "integrity": "sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g=="
-    },
    "gensync": {
      "version": "1.0.0-beta.2",
      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -12599,19 +12454,6 @@
      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
      "dev": true
    },
-    "redis": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/redis/-/redis-4.6.6.tgz",
-      "integrity": "sha512-aLs2fuBFV/VJ28oLBqYykfnhGGkFxvx0HdCEBYdJ99FFbSEMZ7c1nVKwR6ZRv+7bb7JnC0mmCzaqu8frgOYhpA==",
-      "requires": {
-        "@redis/bloom": "1.2.0",
-        "@redis/client": "1.5.7",
-        "@redis/graph": "1.1.0",
-        "@redis/json": "1.0.4",
-        "@redis/search": "1.1.2",
-        "@redis/time-series": "1.0.4"
-      }
-    },
    "require-directory": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
--- a/backend/package.json
+++ b/backend/package.json
@@ -47,14 +47,13 @@
    "maxmind": "~4.3.11",
    "mysql2": "~3.5.2",
    "rust-gbt": "file:./rust-gbt",
-    "redis": "^4.6.6",
    "socks-proxy-agent": "~7.0.0",
    "typescript": "~4.9.3",
    "ws": "~8.13.0"
  },
  "devDependencies": {
-    "@babel/code-frame": "^7.18.6",
    "@babel/core": "^7.21.3",
+    "@babel/code-frame": "^7.18.6",
    "@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,6 @@
    "AUTOMATIC_BLOCK_REINDEXING": false,
    "POLL_RATE_MS": 3,
    "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
-    "CACHE_ENABLED": true,
    "CLEAR_PROTECTION_MINUTES": 4,
    "RECOMMENDED_FEE_PERCENTILE": 5,
    "BLOCK_WEIGHT_UNITS": 6,
@@ -128,9 +127,5 @@
    "AUDIT": false,
    "AUDIT_START_HEIGHT": 774000,
    "SERVERS": []
-  },
-  "REDIS": {
-    "ENABLED": false,
-    "UNIX_SOCKET_PATH": "/tmp/redis.sock"
  }
 }
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -23,7 +23,6 @@ describe('Mempool Backend Config', () => {
        AUTOMATIC_BLOCK_REINDEXING: false,
        POLL_RATE_MS: 2000,
        CACHE_DIR: './cache',
-        CACHE_ENABLED: true,
        CLEAR_PROTECTION_MINUTES: 20,
        RECOMMENDED_FEE_PERCENTILE: 50,
        BLOCK_WEIGHT_UNITS: 4000000,
@@ -128,11 +127,6 @@ describe('Mempool Backend Config', () => {
        AUDIT_START_HEIGHT: 774000,
        SERVERS: []
      });
-
-      expect(config.REDIS).toStrictEqual({
-        ENABLED: false,
-        UNIX_SOCKET_PATH: ''
-      });
    });
  });

@@ -166,8 +160,6 @@ describe('Mempool Backend Config', () => {
      expect(config.PRICE_DATA_SERVER).toStrictEqual(fixture.PRICE_DATA_SERVER);

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

@@ -181,12 +173,12 @@ describe('Mempool Backend Config', () => {
          // We have a few cases where we can't follow the pattern
          if (root === 'MEMPOOL' && key === 'HTTP_PORT') {
            console.log('skipping check for MEMPOOL_HTTP_PORT');
-            continue;
+            return;
          }
          switch (typeof value) {
            case 'object': {
              if (Array.isArray(value)) {
-                continue;
+                return;
              } else {
                parseJson(value, key);
              }
--- a/backend/src/api/audit.ts
+++ b/backend/src/api/audit.ts
@@ -15,7 +15,7 @@ class Audit {
    const matches: string[] = []; // present in both mined block and template
    const added: string[] = []; // present in mined block, not in template
    const fresh: string[] = []; // missing, but firstSeen 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 fullrbf: string[] = []; // either missing or present, and part of a fullrbf replacement
    const isCensored = {}; // missing, without excuse
    const isDisplaced = {};
    let displacedWeight = 0;
@@ -36,9 +36,8 @@ class Audit {
    // look for transactions that were expected in the template, but missing from the mined block
    for (const txid of projectedBlocks[0].transactionIds) {
      if (!inBlock[txid]) {
-        // allow missing transactions which either belong to a full rbf tree, or conflict with any transaction in the mined block
-        if (rbfCache.has(txid) && (rbfCache.isFullRbf(txid) || rbfCache.anyInSameTree(txid, (tx) => inBlock[tx.txid]))) {
-          rbf.push(txid);
+        if (rbfCache.isFullRbf(txid)) {
+          fullrbf.push(txid);
        } else if (mempool[txid]?.firstSeen != null && (now - (mempool[txid]?.firstSeen || 0)) <= PROPAGATION_MARGIN) {
          // tx is recent, may have reached the miner too late for inclusion
          fresh.push(txid);
@@ -99,8 +98,8 @@ class Audit {
      if (inTemplate[tx.txid]) {
        matches.push(tx.txid);
      } else {
-        if (rbfCache.has(tx.txid)) {
-          rbf.push(tx.txid);
+        if (rbfCache.isFullRbf(tx.txid)) {
+          fullrbf.push(tx.txid);
        } else if (!isDisplaced[tx.txid]) {
          added.push(tx.txid);
        }
@@ -148,7 +147,7 @@ class Audit {
      added,
      fresh,
      sigop: [],
-      fullrbf: rbf,
+      fullrbf,
      score,
      similarity,
    };
--- a/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
+++ b/backend/src/api/bitcoin/bitcoin-api-abstract-factory.ts
@@ -3,12 +3,10 @@ import { IEsploraApi } from './esplora-api.interface';
 export interface AbstractBitcoinApi {
  $getRawMempool(): Promise<IEsploraApi.Transaction['txid'][]>;
  $getRawTransaction(txId: string, skipConversion?: boolean, addPrevout?: boolean, lazyPrevouts?: boolean): Promise<IEsploraApi.Transaction>;
-  $getMempoolTransactions(lastTxid: string);
  $getTransactionHex(txId: string): Promise<string>;
  $getBlockHeightTip(): Promise<number>;
  $getBlockHashTip(): Promise<string>;
  $getTxIdsForBlock(hash: string): Promise<string[]>;
-  $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]>;
  $getBlockHash(height: number): Promise<string>;
  $getBlockHeader(hash: string): Promise<string>;
  $getBlock(hash: string): Promise<IEsploraApi.Block>;
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -5,7 +5,6 @@ import { IEsploraApi } from './esplora-api.interface';
 import blocks from '../blocks';
 import mempool from '../mempool';
 import { TransactionExtended } from '../../mempool.interfaces';
-import transactionUtils from '../transaction-utils';

 class BitcoinApi implements AbstractBitcoinApi {
  private rawMempoolCache: IBitcoinApi.RawMempool | null = null;
@@ -60,20 +59,9 @@ class BitcoinApi implements AbstractBitcoinApi {
      });
  }

-  $getMempoolTransactions(lastTxid: string): Promise<IEsploraApi.Transaction[]> {
-    return Promise.resolve([]);
-  }
-
-  async $getTransactionHex(txId: string): Promise<string> {
-    const txInMempool = mempool.getMempool()[txId];
-    if (txInMempool && txInMempool.hex) {
-      return txInMempool.hex;
-    }
-
-    return this.bitcoindClient.getRawTransaction(txId, true)
-      .then((transaction: IBitcoinApi.Transaction) => {
-        return transaction.hex;
-      });
+  $getTransactionHex(txId: string): Promise<string> {
+    return this.$getRawTransaction(txId, true)
+      .then((tx) => tx.hex || '');
  }

  $getBlockHeightTip(): Promise<number> {
@@ -89,10 +77,6 @@ class BitcoinApi implements AbstractBitcoinApi {
      .then((rpcBlock: IBitcoinApi.Block) => rpcBlock.tx);
  }

-  $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]> {
-    throw new Error('Method getTxsForBlock not supported by the Bitcoin RPC API.');
-  }
-
  $getRawBlock(hash: string): Promise<Buffer> {
    return this.bitcoindClient.getBlock(hash, 0)
      .then((raw: string) => Buffer.from(raw, "hex"));
@@ -217,7 +201,7 @@ class BitcoinApi implements AbstractBitcoinApi {
        scriptpubkey: vout.scriptPubKey.hex,
        scriptpubkey_address: vout.scriptPubKey && vout.scriptPubKey.address ? vout.scriptPubKey.address
          : vout.scriptPubKey.addresses ? vout.scriptPubKey.addresses[0] : '',
-        scriptpubkey_asm: vout.scriptPubKey.asm ? transactionUtils.convertScriptSigAsm(vout.scriptPubKey.hex) : '',
+        scriptpubkey_asm: vout.scriptPubKey.asm ? this.convertScriptSigAsm(vout.scriptPubKey.hex) : '',
        scriptpubkey_type: this.translateScriptPubKeyType(vout.scriptPubKey.type),
      };
    });
@@ -227,7 +211,7 @@ class BitcoinApi implements AbstractBitcoinApi {
        is_coinbase: !!vin.coinbase,
        prevout: null,
        scriptsig: vin.scriptSig && vin.scriptSig.hex || vin.coinbase || '',
-        scriptsig_asm: vin.scriptSig && transactionUtils.convertScriptSigAsm(vin.scriptSig.hex) || '',
+        scriptsig_asm: vin.scriptSig && this.convertScriptSigAsm(vin.scriptSig.hex) || '',
        sequence: vin.sequence,
        txid: vin.txid || '',
        vout: vin.vout || 0,
@@ -299,7 +283,7 @@ class BitcoinApi implements AbstractBitcoinApi {
      }
      const innerTx = await this.$getRawTransaction(vin.txid, false, false);
      vin.prevout = innerTx.vout[vin.vout];
-      transactionUtils.addInnerScriptsToVin(vin);
+      this.addInnerScriptsToVin(vin);
    }
    return transaction;
  }
@@ -338,7 +322,7 @@ class BitcoinApi implements AbstractBitcoinApi {
      }
      const innerTx = await this.$getRawTransaction(transaction.vin[i].txid, false, false);
      transaction.vin[i].prevout = innerTx.vout[transaction.vin[i].vout];
-      transactionUtils.addInnerScriptsToVin(transaction.vin[i]);
+      this.addInnerScriptsToVin(transaction.vin[i]);
      totalIn += innerTx.vout[transaction.vin[i].vout].value;
    }
    if (lazyPrevouts && transaction.vin.length > 12) {
@@ -350,6 +334,122 @@ class BitcoinApi implements AbstractBitcoinApi {
    return transaction;
  }

+  private convertScriptSigAsm(hex: string): string {
+    const buf = Buffer.from(hex, 'hex');
+
+    const b: string[] = [];
+
+    let i = 0;
+    while (i < buf.length) {
+      const op = buf[i];
+      if (op >= 0x01 && op <= 0x4e) {
+        i++;
+        let push: number;
+        if (op === 0x4c) {
+          push = buf.readUInt8(i);
+          b.push('OP_PUSHDATA1');
+          i += 1;
+        } else if (op === 0x4d) {
+          push = buf.readUInt16LE(i);
+          b.push('OP_PUSHDATA2');
+          i += 2;
+        } else if (op === 0x4e) {
+          push = buf.readUInt32LE(i);
+          b.push('OP_PUSHDATA4');
+          i += 4;
+        } else {
+          push = op;
+          b.push('OP_PUSHBYTES_' + push);
+        }
+
+        const data = buf.slice(i, i + push);
+        if (data.length !== push) {
+          break;
+        }
+
+        b.push(data.toString('hex'));
+        i += data.length;
+      } else {
+        if (op === 0x00) {
+          b.push('OP_0');
+        } else if (op === 0x4f) {
+          b.push('OP_PUSHNUM_NEG1');
+        } else if (op === 0xb1) {
+          b.push('OP_CLTV');
+        } else if (op === 0xb2) {
+          b.push('OP_CSV');
+        } else if (op === 0xba) {
+          b.push('OP_CHECKSIGADD');
+        } else {
+          const opcode = bitcoinjs.script.toASM([ op ]);
+          if (opcode && op < 0xfd) {
+            if (/^OP_(\d+)$/.test(opcode)) {
+              b.push(opcode.replace(/^OP_(\d+)$/, 'OP_PUSHNUM_$1'));
+            } else {
+              b.push(opcode);
+            }
+          } else {
+            b.push('OP_RETURN_' + op);
+          }
+        }
+        i += 1;
+      }
+    }
+
+    return b.join(' ');
+  }
+
+  private addInnerScriptsToVin(vin: IEsploraApi.Vin): void {
+    if (!vin.prevout) {
+      return;
+    }
+
+    if (vin.prevout.scriptpubkey_type === 'p2sh') {
+      const redeemScript = vin.scriptsig_asm.split(' ').reverse()[0];
+      vin.inner_redeemscript_asm = this.convertScriptSigAsm(redeemScript);
+      if (vin.witness && vin.witness.length > 2) {
+        const witnessScript = vin.witness[vin.witness.length - 1];
+        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
+      }
+    }
+
+    if (vin.prevout.scriptpubkey_type === 'v0_p2wsh' && vin.witness) {
+      const witnessScript = vin.witness[vin.witness.length - 1];
+      vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
+    }
+
+    if (vin.prevout.scriptpubkey_type === 'v1_p2tr' && vin.witness) {
+      const witnessScript = this.witnessToP2TRScript(vin.witness);
+      if (witnessScript !== null) {
+        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
+      }
+    }
+  }
+
+  /**
+   * This function must only be called when we know the witness we are parsing
+   * is a taproot witness.
+   * @param witness An array of hex strings that represents the witness stack of
+   *                the input.
+   * @returns null if the witness is not a script spend, and the hex string of
+   *          the script item if it is a script spend.
+   */
+  private witnessToP2TRScript(witness: string[]): string | null {
+    if (witness.length < 2) return null;
+    // Note: see BIP341 for parsing details of witness stack
+
+    // If there are at least two witness elements, and the first byte of the
+    // last element is 0x50, this last element is called annex a and
+    // is removed from the witness stack.
+    const hasAnnex = witness[witness.length - 1].substring(0, 2) === '50';
+    // If there are at least two witness elements left, script path spending is used.
+    // Call the second-to-last stack element s, the script.
+    // (Note: this phrasing from BIP341 assumes we've *removed* the annex from the stack)
+    if (hasAnnex && witness.length < 3) return null;
+    const positionOfScript = hasAnnex ? witness.length - 3 : witness.length - 2;
+    return witness[positionOfScript];
+  }
+
 }

 export default BitcoinApi;
--- a/backend/src/api/bitcoin/bitcoin.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -6,7 +6,7 @@ import websocketHandler from '../websocket-handler';
 import mempool from '../mempool';
 import feeApi from '../fee-api';
 import mempoolBlocks from '../mempool-blocks';
-import bitcoinApi from './bitcoin-api-factory';
+import bitcoinApi, { bitcoinCoreApi } from './bitcoin-api-factory';
 import { Common } from '../common';
 import backendInfo from '../backend-info';
 import transactionUtils from '../transaction-utils';
@@ -414,7 +414,7 @@ class BitcoinRoutes {

  private async getBlocks(req: Request, res: Response) {
    try {
-      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) { // Bitcoin
+      if (['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) { // Bitcoin
        const height = req.params.height === undefined ? undefined : parseInt(req.params.height, 10);
        res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
        res.json(await blocks.$getBlocks(height, 15));
@@ -428,7 +428,7 @@ class BitcoinRoutes {

  private async getBlocksByBulk(req: Request, res: Response) {
    try {
-      if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid, Bisq - Not implemented
+      if (['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) === false) { // Liquid, Bisq - Not implemented
        return res.status(404).send(`This API is only available for Bitcoin networks`);
      }
      if (config.MEMPOOL.MAX_BLOCKS_BULK_QUERY <= 0) {
@@ -483,7 +483,7 @@ class BitcoinRoutes {
          returnBlocks.push(localBlock);
          nextHash = localBlock.previousblockhash;
        } else {
-          const block = await bitcoinApi.$getBlock(nextHash);
+          const block = await bitcoinCoreApi.$getBlock(nextHash);
          returnBlocks.push(block);
          nextHash = block.previousblockhash;
        }
@@ -576,7 +576,7 @@ class BitcoinRoutes {
    }

    try {
-      const addressData = await bitcoinApi.$getScriptHash(req.params.scripthash);
+      const addressData = await bitcoinApi.$getScriptHash(req.params.address);
      res.json(addressData);
    } catch (e) {
      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
@@ -597,7 +597,7 @@ class BitcoinRoutes {
      if (req.query.after_txid && typeof req.query.after_txid === 'string') {
        lastTxId = req.query.after_txid;
      }
-      const transactions = await bitcoinApi.$getScriptHashTransactions(req.params.scripthash, lastTxId);
+      const transactions = await bitcoinApi.$getScriptHashTransactions(req.params.address, lastTxId);
      res.json(transactions);
    } catch (e) {
      if (e instanceof Error && e.message && (e.message.indexOf('too long') > 0 || e.message.indexOf('confirmed status') > 0)) {
--- a/backend/src/api/bitcoin/esplora-api.ts
+++ b/backend/src/api/bitcoin/esplora-api.ts
@@ -69,10 +69,6 @@ class ElectrsApi implements AbstractBitcoinApi {
    return this.$queryWrapper<IEsploraApi.Transaction>(config.ESPLORA.REST_API_URL + '/tx/' + txId);
  }

-  async $getMempoolTransactions(lastSeenTxid?: string): Promise<IEsploraApi.Transaction[]> {
-    return this.$queryWrapper<IEsploraApi.Transaction[]>(config.ESPLORA.REST_API_URL + '/mempool/txs' + (lastSeenTxid ? '/' + lastSeenTxid : ''));
-  }
-
  $getTransactionHex(txId: string): Promise<string> {
    return this.$queryWrapper<string>(config.ESPLORA.REST_API_URL + '/tx/' + txId + '/hex');
  }
@@ -89,10 +85,6 @@ class ElectrsApi implements AbstractBitcoinApi {
    return this.$queryWrapper<string[]>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/txids');
  }

-  $getTxsForBlock(hash: string): Promise<IEsploraApi.Transaction[]> {
-    return this.$queryWrapper<IEsploraApi.Transaction[]>(config.ESPLORA.REST_API_URL + '/block/' + hash + '/txs');
-  }
-
  $getBlockHash(height: number): Promise<string> {
    return this.$queryWrapper<string>(config.ESPLORA.REST_API_URL + '/block-height/' + height);
  }
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -26,8 +26,6 @@ import PricesRepository from '../repositories/PricesRepository';
 import priceUpdater from '../tasks/price-updater';
 import chainTips from './chain-tips';
 import websocketHandler from './websocket-handler';
-import redisCache from './redis-cache';
-import rbfCache from './rbf-cache';

 class Blocks {
  private blocks: BlockExtended[] = [];
@@ -72,9 +70,6 @@ class Blocks {
   * @param blockHash
   * @param blockHeight
   * @param onlyCoinbase - Set to true if you only need the coinbase transaction
-   * @param txIds - optional ordered list of transaction ids if already known
-   * @param quiet - don't print non-essential logs
-   * @param addMempoolData - calculate sigops etc
   * @returns Promise<TransactionExtended[]>
   */
  private async $getTransactionsExtended(
@@ -85,98 +80,62 @@ class Blocks {
    quiet: boolean = false,
    addMempoolData: boolean = false,
  ): Promise<TransactionExtended[]> {
-    const isEsplora = config.MEMPOOL.BACKEND === 'esplora';
-    const transactionMap: { [txid: string]: TransactionExtended } = {};
-
+    const transactions: TransactionExtended[] = [];
    if (!txIds) {
      txIds = await bitcoinApi.$getTxIdsForBlock(blockHash);
    }

    const mempool = memPool.getMempool();
-    let foundInMempool = 0;
-    let totalFound = 0;
+    let transactionsFound = 0;
+    let transactionsFetched = 0;

-    // Copy existing transactions from the mempool
-    if (!onlyCoinbase) {
-      for (const txid of txIds) {
-        if (mempool[txid]) {
-          transactionMap[txid] = mempool[txid];
-          foundInMempool++;
-          totalFound++;
+    for (let i = 0; i < txIds.length; i++) {
+      if (mempool[txIds[i]]) {
+        // We update blocks before the mempool (index.ts), therefore we can
+        // optimize here by directly fetching txs in the "outdated" mempool
+        transactions.push(mempool[txIds[i]]);
+        transactionsFound++;
+      } else if (config.MEMPOOL.BACKEND === 'esplora' || !memPool.hasPriority() || i === 0) {
+        // Otherwise we fetch the tx data through backend services (esplora, electrum, core rpc...)
+        if (!quiet && (i % (Math.round((txIds.length) / 10)) === 0 || i + 1 === txIds.length)) { // Avoid log spam
+          logger.debug(`Indexing tx ${i + 1} of ${txIds.length} in block #${blockHeight}`);
        }
-      }
-    }
-
-    if (onlyCoinbase) {
-      try {
-        const coinbase = await transactionUtils.$getTransactionExtendedRetry(txIds[0], false, false, false, addMempoolData);
-        if (coinbase && coinbase.vin[0].is_coinbase) {
-          return [coinbase];
-        } else {
-          const msg = `Expected a coinbase tx, but the backend API returned something else`;
-          logger.err(msg);
-          throw new Error(msg);
-        }
-      } catch (e) {
-        const msg = `Cannot fetch coinbase tx ${txIds[0]}. Reason: ` + (e instanceof Error ? e.message : e);
-        logger.err(msg);
-        throw new Error(msg);
-      }
-    }
-
-    // Fetch remaining txs in bulk
-    if (isEsplora && (txIds.length - totalFound > 500)) {
-      try {
-        const rawTransactions = await bitcoinApi.$getTxsForBlock(blockHash);
-        for (const tx of rawTransactions) {
-          if (!transactionMap[tx.txid]) {
-            transactionMap[tx.txid] = addMempoolData ? transactionUtils.extendMempoolTransaction(tx) : transactionUtils.extendTransaction(tx);
-            totalFound++;
+        try {
+          const tx = await transactionUtils.$getTransactionExtended(txIds[i], false, false, false, addMempoolData);
+          transactions.push(tx);
+          transactionsFetched++;
+        } catch (e) {
+          try {
+            if (config.MEMPOOL.BACKEND === 'esplora') {
+              // Try again with core
+              const tx = await transactionUtils.$getTransactionExtended(txIds[i], false, false, true, addMempoolData);
+              transactions.push(tx);
+              transactionsFetched++;
+            } else {
+              throw e;
+            }
+          } catch (e) {
+            if (i === 0) {
+              const msg = `Cannot fetch coinbase tx ${txIds[i]}. Reason: ` + (e instanceof Error ? e.message : e); 
+              logger.err(msg);
+              throw new Error(msg);
+            } else {
+              logger.err(`Cannot fetch tx ${txIds[i]}. Reason: ` + (e instanceof Error ? e.message : e));
+            }
          }
        }
-      } catch (e) {
-        logger.err(`Cannot fetch bulk txs for block ${blockHash}. Reason: ` + (e instanceof Error ? e.message : e));
      }
-    }

-    // Fetch remaining txs individually
-    for (const txid of txIds.filter(txid => !transactionMap[txid])) {
-      if (!quiet && (totalFound % (Math.round((txIds.length) / 10)) === 0 || totalFound + 1 === txIds.length)) { // Avoid log spam
-        logger.debug(`Indexing tx ${totalFound + 1} of ${txIds.length} in block #${blockHeight}`);
-      }
-      try {
-        const tx = await transactionUtils.$getTransactionExtendedRetry(txid, false, false, false, addMempoolData);
-        transactionMap[txid] = tx;
-        totalFound++;
-      } catch (e) {
-        const msg = `Cannot fetch tx ${txid}. Reason: ` + (e instanceof Error ? e.message : e);
-        logger.err(msg);
-        throw new Error(msg);
+      if (onlyCoinbase === true) {
+        break; // Fetch the first transaction and exit
      }
    }

    if (!quiet) {
-      logger.debug(`${foundInMempool} of ${txIds.length} found in mempool. ${totalFound - foundInMempool} fetched through backend service.`);
+      logger.debug(`${transactionsFound} of ${txIds.length} found in mempool. ${transactionsFetched} fetched through backend service.`);
    }

-    // Require the first transaction to be a coinbase
-    const coinbase = transactionMap[txIds[0]];
-    if (!coinbase || !coinbase.vin[0].is_coinbase) {
-      const msg = `Expected first tx in a block to be a coinbase, but found something else`;
-      logger.err(msg);
-      throw new Error(msg);
-    }
-
-    // Require all transactions to be present
-    // (we should have thrown an error already if a tx request failed)
-    if (txIds.some(txid => !transactionMap[txid])) {
-      const msg = `Failed to fetch ${txIds.length - totalFound} transactions from block`;
-      logger.err(msg);
-      throw new Error(msg);
-    }
-
-    // Return list of transactions, preserving block order
-    return txIds.map(txid => transactionMap[txid]);
+    return transactions;
  }

  /**
@@ -304,7 +263,7 @@ class Blocks {
      extras.totalInputAmt = null;
    }

-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
+    if (['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) {
      let pool: PoolTag;
      if (coinbaseTx !== undefined) {
        pool = await this.$findBlockMiner(coinbaseTx);
@@ -419,8 +378,8 @@ class Blocks {
      let newlyIndexed = 0;
      let totalIndexed = indexedBlockSummariesHashesArray.length;
      let indexedThisRun = 0;
-      let timer = Date.now() / 1000;
-      const startedAt = Date.now() / 1000;
+      let timer = new Date().getTime() / 1000;
+      const startedAt = new Date().getTime() / 1000;

      for (const block of indexedBlocks) {
        if (indexedBlockSummariesHashes[block.hash] === true) {
@@ -428,24 +387,17 @@ class Blocks {
        }

        // Logging
-        const elapsedSeconds = (Date.now() / 1000) - timer;
+        const elapsedSeconds = Math.max(1, Math.round((new Date().getTime() / 1000) - timer));
        if (elapsedSeconds > 5) {
-          const runningFor = (Date.now() / 1000) - startedAt;
-          const blockPerSeconds = indexedThisRun / elapsedSeconds;
+          const runningFor = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
+          const blockPerSeconds = Math.max(1, indexedThisRun / elapsedSeconds);
          const progress = Math.round(totalIndexed / indexedBlocks.length * 10000) / 100;
-          logger.debug(`Indexing block summary for #${block.height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexedBlocks.length} (${progress}%) | elapsed: ${runningFor.toFixed(2)} seconds`, logger.tags.mining);
-          timer = Date.now() / 1000;
+          logger.debug(`Indexing block summary for #${block.height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexedBlocks.length} (${progress}%) | elapsed: ${runningFor} seconds`, logger.tags.mining);
+          timer = new Date().getTime() / 1000;
          indexedThisRun = 0;
        }

-
-        if (config.MEMPOOL.BACKEND === 'esplora') {
-          const txs = (await bitcoinApi.$getTxsForBlock(block.hash)).map(tx => transactionUtils.extendTransaction(tx));
-          const cpfpSummary = await this.$indexCPFP(block.hash, block.height, txs);
-          await this.$getStrippedBlockTransactions(block.hash, true, true, cpfpSummary, block.height); // This will index the block summary
-        } else {
-          await this.$getStrippedBlockTransactions(block.hash, true, true); // This will index the block summary
-        }
+        await this.$getStrippedBlockTransactions(block.hash, true, true); // This will index the block summary

        // Logging
        indexedThisRun++;
@@ -484,18 +436,18 @@ class Blocks {
      // Logging
      let count = 0;
      let countThisRun = 0;
-      let timer = Date.now() / 1000;
-      const startedAt = Date.now() / 1000;
+      let timer = new Date().getTime() / 1000;
+      const startedAt = new Date().getTime() / 1000;
      for (const height of unindexedBlockHeights) {
        // Logging
        const hash = await bitcoinApi.$getBlockHash(height);
-        const elapsedSeconds = (Date.now() / 1000) - timer;
+        const elapsedSeconds = Math.max(1, new Date().getTime() / 1000 - timer);
        if (elapsedSeconds > 5) {
-          const runningFor = (Date.now() / 1000) - startedAt;
-          const blockPerSeconds = countThisRun / elapsedSeconds;
+          const runningFor = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
+          const blockPerSeconds = (countThisRun / elapsedSeconds);
          const progress = Math.round(count / unindexedBlockHeights.length * 10000) / 100;
-          logger.debug(`Indexing cpfp clusters for #${height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${count}/${unindexedBlockHeights.length} (${progress}%) | elapsed: ${runningFor.toFixed(2)} seconds`);
-          timer = Date.now() / 1000;
+          logger.debug(`Indexing cpfp clusters for #${height} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${count}/${unindexedBlockHeights.length} (${progress}%) | elapsed: ${runningFor} seconds`);
+          timer = new Date().getTime() / 1000;
          countThisRun = 0;
        }

@@ -574,8 +526,8 @@ class Blocks {
      let totalIndexed = await blocksRepository.$blockCountBetweenHeight(currentBlockHeight, lastBlockToIndex);
      let indexedThisRun = 0;
      let newlyIndexed = 0;
-      const startedAt = Date.now() / 1000;
-      let timer = Date.now() / 1000;
+      const startedAt = new Date().getTime() / 1000;
+      let timer = new Date().getTime() / 1000;

      while (currentBlockHeight >= lastBlockToIndex) {
        const endBlock = Math.max(0, lastBlockToIndex, currentBlockHeight - chunkSize + 1);
@@ -595,18 +547,18 @@ class Blocks {
          }
          ++indexedThisRun;
          ++totalIndexed;
-          const elapsedSeconds = (Date.now() / 1000) - timer;
+          const elapsedSeconds = Math.max(1, new Date().getTime() / 1000 - timer);
          if (elapsedSeconds > 5 || blockHeight === lastBlockToIndex) {
-            const runningFor = (Date.now() / 1000) - startedAt;
-            const blockPerSeconds = indexedThisRun / elapsedSeconds;
+            const runningFor = Math.max(1, Math.round((new Date().getTime() / 1000) - startedAt));
+            const blockPerSeconds = Math.max(1, indexedThisRun / elapsedSeconds);
            const progress = Math.round(totalIndexed / indexingBlockAmount * 10000) / 100;
-            logger.debug(`Indexing block #${blockHeight} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexingBlockAmount} (${progress.toFixed(2)}%) | elapsed: ${runningFor.toFixed(2)} seconds`, logger.tags.mining);
-            timer = Date.now() / 1000;
+            logger.debug(`Indexing block #${blockHeight} | ~${blockPerSeconds.toFixed(2)} blocks/sec | total: ${totalIndexed}/${indexingBlockAmount} (${progress}%) | elapsed: ${runningFor} seconds`, logger.tags.mining);
+            timer = new Date().getTime() / 1000;
            indexedThisRun = 0;
            loadingIndicators.setProgress('block-indexing', progress, false);
          }
          const blockHash = await bitcoinApi.$getBlockHash(blockHeight);
-          const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
+          const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(blockHash);
          const transactions = await this.$getTransactionsExtended(blockHash, block.height, true, null, true);
          const blockExtended = await this.$getBlockExtended(block, transactions);

@@ -663,7 +615,7 @@ class Blocks {
        const heightDiff = blockHeightTip % 2016;
        const blockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff);
        this.updateTimerProgress(timer, 'got block hash for initial difficulty adjustment');
-        const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
+        const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(blockHash);
        this.updateTimerProgress(timer, 'got block for initial difficulty adjustment');
        this.lastDifficultyAdjustmentTime = block.timestamp;
        this.currentDifficulty = block.difficulty;
@@ -671,7 +623,7 @@ class Blocks {
        if (blockHeightTip >= 2016) {
          const previousPeriodBlockHash = await bitcoinApi.$getBlockHash(blockHeightTip - heightDiff - 2016);
          this.updateTimerProgress(timer, 'got previous block hash for initial difficulty adjustment');
-          const previousPeriodBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(previousPeriodBlockHash);
+          const previousPeriodBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(previousPeriodBlockHash);
          this.updateTimerProgress(timer, 'got previous block for initial difficulty adjustment');
          this.previousDifficultyRetarget = (block.difficulty - previousPeriodBlock.difficulty) / previousPeriodBlock.difficulty * 100;
          logger.debug(`Initial difficulty adjustment data set.`);
@@ -697,14 +649,14 @@ class Blocks {
      const block = BitcoinApi.convertBlock(verboseBlock);
      const txIds: string[] = verboseBlock.tx.map(tx => tx.txid);
      const transactions = await this.$getTransactionsExtended(blockHash, block.height, false, txIds, false, true) as MempoolTransactionExtended[];
-
-      // fill in missing transaction fee data from verboseBlock
-      for (let i = 0; i < transactions.length; i++) {
-        if (!transactions[i].fee && transactions[i].txid === verboseBlock.tx[i].txid) {
-          transactions[i].fee = verboseBlock.tx[i].fee * 100_000_000;
+      if (config.MEMPOOL.BACKEND !== 'esplora') {
+        // fill in missing transaction fee data from verboseBlock
+        for (let i = 0; i < transactions.length; i++) {
+          if (!transactions[i].fee && transactions[i].txid === verboseBlock.tx[i].txid) {
+            transactions[i].fee = verboseBlock.tx[i].fee * 100_000_000;
+          }
        }
      }
-
      const cpfpSummary: CpfpSummary = Common.calculateCpfp(block.height, transactions);
      const blockExtended: BlockExtended = await this.$getBlockExtended(block, cpfpSummary.transactions);
      const blockSummary: BlockSummary = this.summarizeBlockTransactions(block.id, cpfpSummary.transactions);
@@ -813,18 +765,10 @@ class Blocks {
      if (this.newBlockCallbacks.length) {
        this.newBlockCallbacks.forEach((cb) => cb(blockExtended, txIds, transactions));
      }
-      if (config.MEMPOOL.CACHE_ENABLED && !memPool.hasPriority() && (block.height % config.MEMPOOL.DISK_CACHE_BLOCK_INTERVAL === 0)) {
+      if (!memPool.hasPriority() && (block.height % config.MEMPOOL.DISK_CACHE_BLOCK_INTERVAL === 0)) {
        diskCache.$saveCacheToDisk();
      }

-      // Update Redis cache
-      if (config.REDIS.ENABLED) {
-        await redisCache.$updateBlocks(this.blocks);
-        await redisCache.$updateBlockSummaries(this.blockSummaries);
-        await redisCache.$removeTransactions(txIds);
-        await rbfCache.updateCache();
-      }
-
      handledBlocks++;
    }

@@ -869,7 +813,7 @@ class Blocks {
    }

    const blockHash = await bitcoinApi.$getBlockHash(height);
-    const block: IEsploraApi.Block = await bitcoinApi.$getBlock(blockHash);
+    const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(blockHash);
    const transactions = await this.$getTransactionsExtended(blockHash, block.height, true);
    const blockExtended = await this.$getBlockExtended(block, transactions);

@@ -881,7 +825,7 @@ class Blocks {
  }

  public async $indexStaleBlock(hash: string): Promise<BlockExtended> {
-    const block: IEsploraApi.Block = await bitcoinApi.$getBlock(hash);
+    const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(hash);
    const transactions = await this.$getTransactionsExtended(hash, block.height, true);
    const blockExtended = await this.$getBlockExtended(block, transactions);

@@ -901,12 +845,12 @@ class Blocks {
    }

    // Not Bitcoin network, return the block as it from the bitcoin backend
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false) {
+    if (['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) === false) {
      return await bitcoinCoreApi.$getBlock(hash);
    }

    // Bitcoin network, add our custom data on top
-    const block: IEsploraApi.Block = await bitcoinApi.$getBlock(hash);
+    const block: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(hash);
    if (block.stale) {
      return await this.$indexStaleBlock(hash);
    } else {
@@ -949,15 +893,10 @@ class Blocks {
        }),
      };
    } else {
-      if (config.MEMPOOL.BACKEND === 'esplora') {
-        const txs = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
-        summary = this.summarizeBlockTransactions(hash, txs);
-      } else {
-        // Call Core RPC
-        const block = await bitcoinClient.getBlock(hash, 2);
-        summary = this.summarizeBlock(block);
-        height = block.height;
-      }
+      // Call Core RPC
+      const block = await bitcoinClient.getBlock(hash, 2);
+      summary = this.summarizeBlock(block);
+      height = block.height;
    }
    if (height == null) {
      const block = await bitcoinApi.$getBlock(hash);
@@ -1080,17 +1019,8 @@ class Blocks {
      if (Common.blocksSummariesIndexingEnabled() && cleanBlock.fee_amt_percentiles === null) {
        cleanBlock.fee_amt_percentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(cleanBlock.hash);
        if (cleanBlock.fee_amt_percentiles === null) {
-
-          let summary;
-          if (config.MEMPOOL.BACKEND === 'esplora') {
-            const txs = (await bitcoinApi.$getTxsForBlock(cleanBlock.hash)).map(tx => transactionUtils.extendTransaction(tx));
-            summary = this.summarizeBlockTransactions(cleanBlock.hash, txs);
-          } else {
-            // Call Core RPC
-            const block = await bitcoinClient.getBlock(cleanBlock.hash, 2);
-            summary = this.summarizeBlock(block);
-          }
-
+          const block = await bitcoinClient.getBlock(cleanBlock.hash, 2);
+          const summary = this.summarizeBlock(block);
          await BlocksSummariesRepository.$saveTransactions(cleanBlock.height, cleanBlock.hash, summary.transactions);
          cleanBlock.fee_amt_percentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(cleanBlock.hash);
        }
@@ -1131,7 +1061,7 @@ class Blocks {
  }

  public async $getBlockAuditSummary(hash: string): Promise<any> {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
+    if (['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) {
      return BlocksAuditsRepository.$getBlockAudit(hash);
    } else {
      return null;
@@ -1150,29 +1080,19 @@ class Blocks {
    return this.currentBlockHeight;
  }

-  public async $indexCPFP(hash: string, height: number, txs?: TransactionExtended[]): Promise<CpfpSummary> {
-    let transactions = txs;
-    if (!transactions) {
-      if (config.MEMPOOL.BACKEND === 'esplora') {
-        transactions = (await bitcoinApi.$getTxsForBlock(hash)).map(tx => transactionUtils.extendTransaction(tx));
-      }
-      if (!transactions) {
-        const block = await bitcoinClient.getBlock(hash, 2);
-        transactions = block.tx.map(tx => {
-          tx.fee *= 100_000_000;
-          return tx;
-        });
-      }
-    }
+  public async $indexCPFP(hash: string, height: number): Promise<void> {
+    const block = await bitcoinClient.getBlock(hash, 2);
+    const transactions = block.tx.map(tx => {
+      tx.fee *= 100_000_000;
+      return tx;
+    });

-    const summary = Common.calculateCpfp(height, transactions as TransactionExtended[]);
+    const summary = Common.calculateCpfp(height, transactions);

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

    const effectiveFeeStats = Common.calcEffectiveFeeStatistics(summary.transactions);
    await blocksRepository.$saveEffectiveFeeStats(hash, effectiveFeeStats);
-
-    return summary;
  }

  public async $saveCpfp(hash: string, height: number, cpfpSummary: CpfpSummary): Promise<void> {
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -239,7 +239,7 @@ export class Common {

  static indexingEnabled(): boolean {
    return (
-      ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) &&
+      ['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) &&
      config.DATABASE.ENABLED === true &&
      config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== 0
    );
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -104,7 +104,7 @@ class DatabaseMigration {
  private async $createMissingTablesAndIndexes(databaseSchemaVersion: number) {
    await this.$setStatisticsAddedIndexedFlag(databaseSchemaVersion);

-    const isBitcoin = ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK);
+    const isBitcoin = ['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK);

    await this.$executeQuery(this.getCreateElementsTableQuery(), await this.$checkIfTableExists('elements_pegs'));
    await this.$executeQuery(this.getCreateStatisticsQuery(), await this.$checkIfTableExists('statistics'));
@@ -512,7 +512,7 @@ class DatabaseMigration {
      await this.updateToSchemaVersion(58);
    }

-    if (databaseSchemaVersion < 59 && (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'testnet')) {
+    if (databaseSchemaVersion < 59 && ['testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) {
      // https://github.com/mempool/mempool/issues/3360
      await this.$executeQuery(`TRUNCATE prices`);
    }
@@ -656,7 +656,7 @@ class DatabaseMigration {
   */
  private getMigrationQueriesFromVersion(version: number): string[] {
    const queries: string[] = [];
-    const isBitcoin = ['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK);
+    const isBitcoin = ['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK);

    if (version < 1) {
      if (config.MEMPOOL.NETWORK !== 'liquid' && config.MEMPOOL.NETWORK !== 'liquidtestnet') {
--- a/backend/src/api/disk-cache.ts
+++ b/backend/src/api/disk-cache.ts
@@ -29,7 +29,7 @@ class DiskCache {
  };

  constructor() {
-    if (!cluster.isPrimary || !config.MEMPOOL.CACHE_ENABLED) {
+    if (!cluster.isPrimary) {
      return;
    }
    process.on('SIGINT', (e) => {
@@ -39,7 +39,7 @@ class DiskCache {
  }

  async $saveCacheToDisk(sync: boolean = false): Promise<void> {
-    if (!cluster.isPrimary || !config.MEMPOOL.CACHE_ENABLED) {
+    if (!cluster.isPrimary) {
      return;
    }
    if (this.isWritingCache) {
@@ -175,11 +175,10 @@ class DiskCache {
  }

  async $loadMempoolCache(): Promise<void> {
-    if (!config.MEMPOOL.CACHE_ENABLED || !fs.existsSync(DiskCache.FILE_NAME)) {
+    if (!fs.existsSync(DiskCache.FILE_NAME)) {
      return;
    }
    try {
-      const start = Date.now();
      let data: any = {};
      const cacheData = fs.readFileSync(DiskCache.FILE_NAME, 'utf8');
      if (cacheData) {
@@ -221,8 +220,6 @@ class DiskCache {
        }
      }

-      logger.info(`Loaded mempool from disk cache in ${Date.now() - start} ms`);
-
      await memPool.$setMempool(data.mempool);
      if (!this.ignoreBlocksCache) {
        blocks.setBlocks(data.blocks);
--- a/backend/src/api/mempool.ts
+++ b/backend/src/api/mempool.ts
@@ -9,7 +9,6 @@ import loadingIndicators from './loading-indicators';
 import bitcoinClient from './bitcoin/bitcoin-client';
 import bitcoinSecondClient from './bitcoin/bitcoin-second-client';
 import rbfCache from './rbf-cache';
-import redisCache from './redis-cache';

 class Mempool {
  private inSync: boolean = false;
@@ -86,10 +85,6 @@ class Mempool {
  public async $setMempool(mempoolData: { [txId: string]: MempoolTransactionExtended }) {
    this.mempoolCache = mempoolData;
    let count = 0;
-    const redisTimer = Date.now();
-    if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
-      logger.debug(`Migrating ${Object.keys(this.mempoolCache).length} transactions from disk cache to Redis cache`);
-    }
    for (const txid of Object.keys(this.mempoolCache)) {
      if (!this.mempoolCache[txid].sigops || this.mempoolCache[txid].effectiveFeePerVsize == null) {
        this.mempoolCache[txid] = transactionUtils.extendMempoolTransaction(this.mempoolCache[txid]);
@@ -98,13 +93,6 @@ class Mempool {
        this.mempoolCache[txid].order = transactionUtils.txidToOrdering(txid);
      }
      count++;
-      if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
-        await redisCache.$addTransaction(this.mempoolCache[txid]);
-      }
-    }
-    if (config.MEMPOOL.CACHE_ENABLED && config.REDIS.ENABLED) {
-      await redisCache.$flushTransactions();
-      logger.debug(`Finished migrating cache transactions in ${((Date.now() - redisTimer) / 1000).toFixed(2)} seconds`);
    }
    if (this.mempoolChangedCallback) {
      this.mempoolChangedCallback(this.mempoolCache, [], []);
@@ -115,44 +103,6 @@ class Mempool {
    this.addToSpendMap(Object.values(this.mempoolCache));
  }

-  public async $reloadMempool(expectedCount: number): Promise<MempoolTransactionExtended[]> {
-    let count = 0;
-    let done = false;
-    let last_txid;
-    const newTransactions: MempoolTransactionExtended[] = [];
-    loadingIndicators.setProgress('mempool', count / expectedCount * 100);
-    while (!done) {
-      try {
-        const result = await bitcoinApi.$getMempoolTransactions(last_txid);
-        if (result) {
-          for (const tx of result) {
-            const extendedTransaction = transactionUtils.extendMempoolTransaction(tx);
-            if (!this.mempoolCache[extendedTransaction.txid]) {
-              newTransactions.push(extendedTransaction);
-              this.mempoolCache[extendedTransaction.txid] = extendedTransaction;
-            }
-            count++;
-          }
-          logger.info(`Fetched ${count} of ${expectedCount} mempool transactions from esplora`);
-          if (result.length > 0) {
-            last_txid = result[result.length - 1].txid;
-          } else {
-            done = true;
-          }
-          if (Math.floor((count / expectedCount) * 100) < 100) {
-            loadingIndicators.setProgress('mempool', count / expectedCount * 100);
-          }
-        } else {
-          done = true;
-        }
-      } catch(err) {
-        logger.err('failed to fetch bulk mempool transactions from esplora');
-      }
-    }
-    logger.info(`Done inserting loaded mempool transactions into local cache`);
-    return newTransactions;
-  }
-
  public async $updateMemPoolInfo() {
    this.mempoolInfo = await this.$getMempoolInfo();
  }
@@ -182,7 +132,7 @@ class Mempool {
    return txTimes;
  }

-  public async $updateMempool(transactions: string[], pollRate: number): Promise<void> {
+  public async $updateMempool(transactions: string[]): Promise<void> {
    logger.debug(`Updating mempool...`);

    // warn if this run stalls the main loop for more than 2 minutes
@@ -193,7 +143,7 @@ class Mempool {
    const currentMempoolSize = Object.keys(this.mempoolCache).length;
    this.updateTimerProgress(timer, 'got raw mempool');
    const diff = transactions.length - currentMempoolSize;
-    let newTransactions: MempoolTransactionExtended[] = [];
+    const newTransactions: MempoolTransactionExtended[] = [];

    this.mempoolCacheDelta = Math.abs(diff);

@@ -212,66 +162,41 @@ class Mempool {
    };

    let intervalTimer = Date.now();
-
-    let loaded = false;
-    if (config.MEMPOOL.BACKEND === 'esplora' && currentMempoolSize < transactions.length * 0.5 && transactions.length > 20_000) {
-      this.inSync = false;
-      logger.info(`Missing ${transactions.length - currentMempoolSize} mempool transactions, attempting to reload in bulk from esplora`);
-      try {
-        newTransactions = await this.$reloadMempool(transactions.length);
-        if (config.REDIS.ENABLED) {
-          for (const tx of newTransactions) {
-            await redisCache.$addTransaction(tx);
-          }
-        }
-        loaded = true;
-      } catch (e) {
-        logger.err('failed to load mempool in bulk from esplora, falling back to fetching individual transactions');
-      }
-    }
-
-    if (!loaded) {
-      for (const txid of transactions) {
-        if (!this.mempoolCache[txid]) {
-          try {
-            const transaction = await transactionUtils.$getMempoolTransactionExtended(txid, false, false, false);
-            this.updateTimerProgress(timer, 'fetched new transaction');
-            this.mempoolCache[txid] = transaction;
-            if (this.inSync) {
-              this.txPerSecondArray.push(new Date().getTime());
-              this.vBytesPerSecondArray.push({
-                unixTime: new Date().getTime(),
-                vSize: transaction.vsize,
-              });
-            }
-            hasChange = true;
-            newTransactions.push(transaction);
-
-            if (config.REDIS.ENABLED) {
-              await redisCache.$addTransaction(transaction);
-            }
-          } catch (e: any) {
-            if (config.MEMPOOL.BACKEND === 'esplora' && e.response?.status === 404) {
-              this.missingTxCount++;
-            }
-            logger.debug(`Error finding transaction '${txid}' in the mempool: ` + (e instanceof Error ? e.message : e));
-          }
-        }
-
-        if (Date.now() - intervalTimer > Math.max(pollRate * 2, 5_000)) {
+    for (const txid of transactions) {
+      if (!this.mempoolCache[txid]) {
+        try {
+          const transaction = await transactionUtils.$getMempoolTransactionExtended(txid, false, false, false);
+          this.updateTimerProgress(timer, 'fetched new transaction');
+          this.mempoolCache[txid] = transaction;
          if (this.inSync) {
-            // Break and restart mempool loop if we spend too much time processing
-            // new transactions that may lead to falling behind on block height
-            logger.debug('Breaking mempool loop because the 5s time limit exceeded.');
-            break;
-          } else {
-            const progress = (currentMempoolSize + newTransactions.length) / transactions.length * 100;
-            logger.debug(`Mempool is synchronizing. Processed ${newTransactions.length}/${diff} txs (${Math.round(progress)}%)`);
-            if (Math.floor(progress) < 100) {
-              loadingIndicators.setProgress('mempool', progress);
-            }
-            intervalTimer = Date.now();
+            this.txPerSecondArray.push(new Date().getTime());
+            this.vBytesPerSecondArray.push({
+              unixTime: new Date().getTime(),
+              vSize: transaction.vsize,
+            });
          }
+          hasChange = true;
+          newTransactions.push(transaction);
+        } catch (e: any) {
+          if (config.MEMPOOL.BACKEND === 'esplora' && e.response?.status === 404) {
+            this.missingTxCount++;
+          }
+          logger.debug(`Error finding transaction '${txid}' in the mempool: ` + (e instanceof Error ? e.message : e));
+        }
+      }
+
+      if (Date.now() - intervalTimer > 5_000) {
+        
+        if (this.inSync) {
+          // Break and restart mempool loop if we spend too much time processing
+          // new transactions that may lead to falling behind on block height
+          logger.debug('Breaking mempool loop because the 5s time limit exceeded.');
+          break;
+        } else {
+          const progress = (currentMempoolSize + newTransactions.length) / transactions.length * 100;
+          logger.debug(`Mempool is synchronizing. Processed ${newTransactions.length}/${diff} txs (${Math.round(progress)}%)`);
+          loadingIndicators.setProgress('mempool', progress);
+          intervalTimer = Date.now()
        }
      }
    }
@@ -294,7 +219,7 @@ class Mempool {
      logger.warn(`Mempool clear protection triggered because transactions.length: ${transactions.length} and currentMempoolSize: ${currentMempoolSize}.`);
      setTimeout(() => {
        this.mempoolProtection = 2;
-        logger.warn('Mempool clear protection ended, normal operation resumed.');
+        logger.warn('Mempool clear protection resumed.');
      }, 1000 * 60 * config.MEMPOOL.CLEAR_PROTECTION_MINUTES);
    }

@@ -321,6 +246,12 @@ class Mempool {
    const newTransactionsStripped = newTransactions.map((tx) => Common.stripTransaction(tx));
    this.latestTransactions = newTransactionsStripped.concat(this.latestTransactions).slice(0, 6);

+    if (!this.inSync && transactions.length === newMempoolSize) {
+      this.inSync = true;
+      logger.notice('The mempool is now in sync!');
+      loadingIndicators.setProgress('mempool', 100);
+    }
+
    this.mempoolCacheDelta = Math.abs(transactions.length - newMempoolSize);

    if (this.mempoolChangedCallback && (hasChange || deletedTransactions.length)) {
@@ -332,19 +263,6 @@ class Mempool {
      this.updateTimerProgress(timer, 'completed async mempool callback');
    }

-    if (!this.inSync && transactions.length === newMempoolSize) {
-      this.inSync = true;
-      logger.notice('The mempool is now in sync!');
-      loadingIndicators.setProgress('mempool', 100);
-    }
-
-    // Update Redis cache
-    if (config.REDIS.ENABLED) {
-      await redisCache.$flushTransactions();
-      await redisCache.$removeTransactions(deletedTransactions.map(tx => tx.txid));
-      await rbfCache.updateCache();
-    }
-
    const end = new Date().getTime();
    const time = end - start;
    logger.debug(`Mempool updated in ${time / 1000} seconds. New size: ${Object.keys(this.mempoolCache).length} (${diff > 0 ? '+' + diff : diff})`);
--- a/backend/src/api/mining/mining.ts
+++ b/backend/src/api/mining/mining.ts
@@ -11,7 +11,7 @@ import DifficultyAdjustmentsRepository from '../../repositories/DifficultyAdjust
 import config from '../../config';
 import BlocksAuditsRepository from '../../repositories/BlocksAuditsRepository';
 import PricesRepository from '../../repositories/PricesRepository';
-import bitcoinApi from '../bitcoin/bitcoin-api-factory';
+import { bitcoinCoreApi } from '../bitcoin/bitcoin-api-factory';
 import { IEsploraApi } from '../bitcoin/esplora-api.interface';
 import database from '../../database';

@@ -201,7 +201,7 @@ class Mining {
    try {
      const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp;

-      const genesisBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(await bitcoinApi.$getBlockHash(0));
+      const genesisBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(await bitcoinClient.getBlockHash(0));
      const genesisTimestamp = genesisBlock.timestamp * 1000;

      const indexedTimestamp = await HashratesRepository.$getWeeklyHashrateTimestamps();
@@ -312,7 +312,7 @@ class Mining {
    const oldestConsecutiveBlockTimestamp = 1000 * (await BlocksRepository.$getOldestConsecutiveBlock()).timestamp;

    try {
-      const genesisBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(await bitcoinApi.$getBlockHash(0));
+      const genesisBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(await bitcoinClient.getBlockHash(0));
      const genesisTimestamp = genesisBlock.timestamp * 1000;
      const indexedTimestamp = (await HashratesRepository.$getRawNetworkDailyHashrate(null)).map(hashrate => hashrate.timestamp);
      const lastMidnight = this.getDateMidnight(new Date());
@@ -421,9 +421,8 @@ class Mining {
    }

    const blocks: any = await BlocksRepository.$getBlocksDifficulty();
-    const genesisBlock: IEsploraApi.Block = await bitcoinApi.$getBlock(await bitcoinApi.$getBlockHash(0));
+    const genesisBlock: IEsploraApi.Block = await bitcoinCoreApi.$getBlock(await bitcoinClient.getBlockHash(0));
    let currentDifficulty = genesisBlock.difficulty;
-    let currentBits = genesisBlock.bits;
    let totalIndexed = 0;

    if (config.MEMPOOL.INDEXING_BLOCKS_AMOUNT === -1 && indexedHeights[0] !== true) {
@@ -437,18 +436,17 @@ class Mining {

    const oldestConsecutiveBlock = await BlocksRepository.$getOldestConsecutiveBlock();
    if (config.MEMPOOL.INDEXING_BLOCKS_AMOUNT !== -1) {
-      currentBits = oldestConsecutiveBlock.bits;
+      currentDifficulty = oldestConsecutiveBlock.difficulty;
    }

    let totalBlockChecked = 0;
    let timer = new Date().getTime() / 1000;

    for (const block of blocks) {
-      if (block.bits !== currentBits) {
+      if (block.difficulty !== currentDifficulty) {
        if (indexedHeights[block.height] === true) { // Already indexed
          if (block.height >= oldestConsecutiveBlock.height) {
            currentDifficulty = block.difficulty;
-            currentBits = block.bits;
          }
          continue;          
        }
@@ -466,7 +464,6 @@ class Mining {
        totalIndexed++;
        if (block.height >= oldestConsecutiveBlock.height) {
          currentDifficulty = block.difficulty;
-          currentBits = block.bits;
        }
    }

--- a/backend/src/api/pools-parser.ts
+++ b/backend/src/api/pools-parser.ts
@@ -131,7 +131,7 @@ class PoolsParser {
    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') {
+    } else if (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'regtest') {
      firstKnownBlockPool = 0;
    }

@@ -159,7 +159,7 @@ class PoolsParser {
    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') {
+    } else if (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'regtest') {
      firstKnownBlockPool = 0;
    }

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

-export interface RbfTransaction extends TransactionStripped {
+interface RbfTransaction extends TransactionStripped {
  rbf?: boolean;
  mined?: boolean;
  fullRbf?: boolean;
 }

-export interface RbfTree {
+interface RbfTree {
  tx: RbfTransaction;
  time: number;
  interval?: number;
@@ -30,19 +28,6 @@ export interface ReplacementInfo {
  newVsize: number;
 }

-enum CacheOp {
-  Remove = 0,
-  Add = 1,
-  Change = 2,
-}
-
-interface CacheEvent {
-  op: CacheOp;
-  type: 'tx' | 'tree' | 'exp';
-  txid: string,
-  value?: any,
-}
-
 class RbfCache {
  private replacedBy: Map<string, string> = new Map();
  private replaces: Map<string, string[]> = new Map();
@@ -51,43 +36,11 @@ class RbfCache {
  private treeMap: Map<string, string> = new Map(); // map of txids to sequence ids
  private txs: Map<string, MempoolTransactionExtended> = new Map();
  private expiring: Map<string, number> = new Map();
-  private cacheQueue: CacheEvent[] = [];

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

-  private addTx(txid: string, tx: MempoolTransactionExtended): void {
-    this.txs.set(txid, tx);
-    this.cacheQueue.push({ op: CacheOp.Add, type: 'tx', txid });
-  }
-
-  private addTree(txid: string, tree: RbfTree): void {
-    this.rbfTrees.set(txid, tree);
-    this.dirtyTrees.add(txid);
-    this.cacheQueue.push({ op: CacheOp.Add, type: 'tree', txid });
-  }
-
-  private addExpiration(txid: string, expiry: number): void {
-    this.expiring.set(txid, expiry);
-    this.cacheQueue.push({ op: CacheOp.Add, type: 'exp', txid, value: expiry });
-  }
-
-  private removeTx(txid: string): void {
-    this.txs.delete(txid);
-    this.cacheQueue.push({ op: CacheOp.Remove, type: 'tx', txid });
-  }
-
-  private removeTree(txid: string): void {
-    this.rbfTrees.delete(txid);
-    this.cacheQueue.push({ op: CacheOp.Remove, type: 'tree', txid });
-  }
-
-  private removeExpiration(txid: string): void {
-    this.expiring.delete(txid);
-    this.cacheQueue.push({ op: CacheOp.Remove, type: 'exp', txid });
-  }
-
  public add(replaced: MempoolTransactionExtended[], newTxExtended: MempoolTransactionExtended): void {
    if (!newTxExtended || !replaced?.length || this.txs.has(newTxExtended.txid)) {
      return;
@@ -96,7 +49,7 @@ class RbfCache {
    const newTx = Common.stripTransaction(newTxExtended) as RbfTransaction;
    const newTime = newTxExtended.firstSeen || (Date.now() / 1000);
    newTx.rbf = newTxExtended.vin.some((v) => v.sequence < 0xfffffffe);
-    this.addTx(newTx.txid, newTxExtended);
+    this.txs.set(newTx.txid, newTxExtended);

    // maintain rbf trees
    let txFullRbf = false;
@@ -113,7 +66,7 @@ class RbfCache {
        const treeId = this.treeMap.get(replacedTx.txid);
        if (treeId) {
          const tree = this.rbfTrees.get(treeId);
-          this.removeTree(treeId);
+          this.rbfTrees.delete(treeId);
          if (tree) {
            tree.interval = newTime - tree?.time;
            replacedTrees.push(tree);
@@ -130,7 +83,7 @@ class RbfCache {
          replaces: [],
        });
        treeFullRbf = treeFullRbf || !replacedTx.rbf;
-        this.addTx(replacedTx.txid, replacedTxExtended);
+        this.txs.set(replacedTx.txid, replacedTxExtended);
      }
    }
    newTx.fullRbf = txFullRbf;
@@ -141,27 +94,10 @@ class RbfCache {
      fullRbf: treeFullRbf,
      replaces: replacedTrees
    };
-    this.addTree(treeId, newTree);
+    this.rbfTrees.set(treeId, newTree);
    this.updateTreeMap(treeId, newTree);
    this.replaces.set(newTx.txid, replacedTrees.map(tree => tree.tx.txid));
-  }
-
-  public has(txId: string): boolean {
-    return this.txs.has(txId);
-  }
-
-  public anyInSameTree(txId: string, predicate: (tx: RbfTransaction) => boolean): boolean {
-    const tree = this.getRbfTree(txId);
-    if (!tree) {
-      return false;
-    }
-    const txs = this.getTransactionsInTree(tree);
-    for (const tx of txs) {
-      if (predicate(tx)) {
-        return true;
-      }
-    }
-    return false;
+    this.dirtyTrees.add(treeId);
  }

  public getReplacedBy(txId: string): string | undefined {
@@ -237,7 +173,6 @@ class RbfCache {
        this.setTreeMined(tree, txid);
        tree.mined = true;
        this.dirtyTrees.add(treeId);
-        this.cacheQueue.push({ op: CacheOp.Change, type: 'tree', txid: treeId });
      }
    }
    this.evict(txid);
@@ -246,8 +181,7 @@ class RbfCache {
  // flag a transaction as removed from the mempool
  public evict(txid: string, fast: boolean = false): void {
    if (this.txs.has(txid) && (fast || !this.expiring.has(txid))) {
-      const expiryTime = fast ? Date.now() + (1000 * 60 * 10) : Date.now() + (1000 * 86400); // 24 hours
-      this.addExpiration(txid, expiryTime);
+      this.expiring.set(txid, fast ? Date.now() + (1000 * 60 * 10) : Date.now() + (1000 * 86400)); // 24 hours
    }
  }

@@ -268,11 +202,11 @@ class RbfCache {
    const now = Date.now();
    for (const txid of this.expiring.keys()) {
      if ((this.expiring.get(txid) || 0) < now) {
-        this.removeExpiration(txid);
+        this.expiring.delete(txid);
        this.remove(txid);
      }
    }
-    logger.debug(`rbf cache contains ${this.txs.size} txs, ${this.rbfTrees.size} trees, ${this.expiring.size} due to expire`);
+    logger.debug(`rbf cache contains ${this.txs.size} txs, ${this.expiring.size} due to expire`);
  }

  // remove a transaction & all previous versions from the cache
@@ -282,14 +216,14 @@ class RbfCache {
      const replaces = this.replaces.get(txid);
      this.replaces.delete(txid);
      this.treeMap.delete(txid);
-      this.removeTx(txid);
-      this.removeExpiration(txid);
+      this.txs.delete(txid);
+      this.expiring.delete(txid);
      for (const tx of (replaces || [])) {
        // recursively remove prior versions from the cache
        this.replacedBy.delete(tx);
        // if this is the id of a tree, remove that too
        if (this.treeMap.get(tx) === tx) {
-          this.removeTree(tx);
+          this.rbfTrees.delete(tx);
        }
        this.remove(tx);
      }
@@ -321,33 +255,6 @@ class RbfCache {
    }
  }

-  public async updateCache(): Promise<void> {
-    if (!config.REDIS.ENABLED) {
-      return;
-    }
-    // Update the Redis cache by replaying queued events
-    for (const e of this.cacheQueue) {
-      if (e.op === CacheOp.Add || e.op === CacheOp.Change) {
-        let value = e.value;
-          switch(e.type) {
-            case 'tx': {
-              value = this.txs.get(e.txid);
-            } break;
-            case 'tree': {
-              const tree = this.rbfTrees.get(e.txid);
-              value = tree ? this.exportTree(tree) : null;
-            } break;
-          }
-          if (value != null) {
-            await redisCache.$setRbfEntry(e.type, e.txid, value);
-          }
-      } else if (e.op === CacheOp.Remove) {
-        await redisCache.$removeRbfEntry(e.type, e.txid);
-      }
-    }
-    this.cacheQueue = [];
-  }
-
  public dump(): any {
    const trees = Array.from(this.rbfTrees.values()).map((tree: RbfTree) => { return this.exportTree(tree); });

@@ -360,14 +267,14 @@ class RbfCache {

  public async load({ txs, trees, expiring }): Promise<void> {
    txs.forEach(txEntry => {
-      this.txs.set(txEntry.key, txEntry.value);
+      this.txs.set(txEntry[0], txEntry[1]);
    });
    for (const deflatedTree of trees) {
      await this.importTree(deflatedTree.root, deflatedTree.root, deflatedTree, this.txs);
    }
    expiring.forEach(expiringEntry => {
-      if (this.txs.has(expiringEntry.key)) {
-        this.expiring.set(expiringEntry.key, new Date(expiringEntry.value).getTime());
+      if (this.txs.has(expiringEntry[0])) {
+        this.expiring.set(expiringEntry[0], new Date(expiringEntry[1]).getTime());
      }
    });
    this.cleanup();
@@ -453,7 +360,8 @@ class RbfCache {
    };
    this.treeMap.set(txid, root);
    if (root === txid) {
-      this.addTree(root, tree);
+      this.rbfTrees.set(root, tree);
+      this.dirtyTrees.add(root);
    }
    return tree;
  }
--- a/backend/src/api/redis-cache.ts
+++ b/backend/src/api/redis-cache.ts
@@ -1,276 +0,0 @@
-import { createClient } from 'redis';
-import memPool from './mempool';
-import blocks from './blocks';
-import logger from '../logger';
-import config from '../config';
-import { BlockExtended, BlockSummary, MempoolTransactionExtended } from '../mempool.interfaces';
-import rbfCache from './rbf-cache';
-import transactionUtils from './transaction-utils';
-
-enum NetworkDB {
-  mainnet = 0,
-  testnet,
-  signet,
-  liquid,
-  liquidtestnet,
-}
-
-class RedisCache {
-  private client;
-  private connected = false;
-  private schemaVersion = 1;
-
-  private cacheQueue: MempoolTransactionExtended[] = [];
-  private txFlushLimit: number = 10000;
-
-  constructor() {
-    if (config.REDIS.ENABLED) {
-      const redisConfig = {
-        socket: {
-          path: config.REDIS.UNIX_SOCKET_PATH
-        },
-        database: NetworkDB[config.MEMPOOL.NETWORK],
-      };
-      this.client = createClient(redisConfig);
-      this.client.on('error', (e) => {
-        logger.err(`Error in Redis client: ${e instanceof Error ? e.message : e}`);
-      });
-      this.$ensureConnected();
-    }
-  }
-
-  private async $ensureConnected(): Promise<void> {
-    if (!this.connected && config.REDIS.ENABLED) {
-      return this.client.connect().then(async () => {
-        this.connected = true;
-        logger.info(`Redis client connected`);
-        const version = await this.client.get('schema_version');
-        if (version !== this.schemaVersion) {
-          // schema changed
-          // perform migrations or flush DB if necessary
-          logger.info(`Redis schema version changed from ${version} to ${this.schemaVersion}`);
-          await this.client.set('schema_version', this.schemaVersion);
-        }
-      });
-    }
-  }
-
-  async $updateBlocks(blocks: BlockExtended[]) {
-    try {
-      await this.$ensureConnected();
-      await this.client.set('blocks', JSON.stringify(blocks));
-      logger.debug(`Saved latest blocks to Redis cache`);
-    } catch (e) {
-      logger.warn(`Failed to update blocks in Redis cache: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
-  async $updateBlockSummaries(summaries: BlockSummary[]) {
-    try {
-      await this.$ensureConnected();
-      await this.client.set('block-summaries', JSON.stringify(summaries));
-      logger.debug(`Saved latest block summaries to Redis cache`);
-    } catch (e) {
-      logger.warn(`Failed to update block summaries in Redis cache: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
-  async $addTransaction(tx: MempoolTransactionExtended) {
-    this.cacheQueue.push(tx);
-    if (this.cacheQueue.length >= this.txFlushLimit) {
-      await this.$flushTransactions();
-    }
-  }
-
-  async $flushTransactions() {
-    const success = await this.$addTransactions(this.cacheQueue);
-    if (success) {
-      logger.debug(`Saved ${this.cacheQueue.length} transactions to Redis cache`);
-      this.cacheQueue = [];
-    } else {
-      logger.err(`Failed to save ${this.cacheQueue.length} transactions to Redis cache`);
-    }
-  }
-
-  private async $addTransactions(newTransactions: MempoolTransactionExtended[]): Promise<boolean> {
-    if (!newTransactions.length) {
-      return true;
-    }
-    try {
-      await this.$ensureConnected();
-      const msetData = newTransactions.map(tx => {
-        const minified: any = { ...tx };
-        delete minified.hex;
-        for (const vin of minified.vin) {
-          delete vin.inner_redeemscript_asm;
-          delete vin.inner_witnessscript_asm;
-          delete vin.scriptsig_asm;
-        }
-        for (const vout of minified.vout) {
-          delete vout.scriptpubkey_asm;
-        }
-        return [`mempool:tx:${tx.txid}`, JSON.stringify(minified)];
-      });
-      await this.client.MSET(msetData);
-      return true;
-    } catch (e) {
-      logger.warn(`Failed to add ${newTransactions.length} transactions to Redis cache: ${e instanceof Error ? e.message : e}`);
-      return false;
-    }
-  }
-
-  async $removeTransactions(transactions: string[]) {
-    try {
-      await this.$ensureConnected();
-      for (let i = 0; i < Math.ceil(transactions.length / 10000); i++) {
-        const slice = transactions.slice(i * 10000, (i + 1) * 10000);
-        await this.client.unlink(slice.map(txid => `mempool:tx:${txid}`));
-        logger.debug(`Deleted ${slice.length} transactions from the Redis cache`);
-      }
-    } catch (e) {
-      logger.warn(`Failed to remove ${transactions.length} transactions from Redis cache: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
-  async $setRbfEntry(type: string, txid: string, value: any): Promise<void> {
-    try {
-      await this.$ensureConnected();
-      await this.client.set(`rbf:${type}:${txid}`, JSON.stringify(value));
-    } catch (e) {
-      logger.warn(`Failed to set RBF ${type} in Redis cache: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
-  async $removeRbfEntry(type: string, txid: string): Promise<void> {
-    try {
-      await this.$ensureConnected();
-      await this.client.unlink(`rbf:${type}:${txid}`);
-    } catch (e) {
-      logger.warn(`Failed to remove RBF ${type} from Redis cache: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
-  async $getBlocks(): Promise<BlockExtended[]> {
-    try {
-      await this.$ensureConnected();
-      const json = await this.client.get('blocks');
-      return JSON.parse(json);
-    } catch (e) {
-      logger.warn(`Failed to retrieve blocks from Redis cache: ${e instanceof Error ? e.message : e}`);
-      return [];
-    }
-  }
-
-  async $getBlockSummaries(): Promise<BlockSummary[]> {
-    try {
-      await this.$ensureConnected();
-      const json = await this.client.get('block-summaries');
-      return JSON.parse(json);
-    } catch (e) {
-      logger.warn(`Failed to retrieve blocks from Redis cache: ${e instanceof Error ? e.message : e}`);
-      return [];
-    }
-  }
-
-  async $getMempool(): Promise<{ [txid: string]: MempoolTransactionExtended }> {
-    const start = Date.now();
-    const mempool = {};
-    try {
-      await this.$ensureConnected();
-      const mempoolList = await this.scanKeys<MempoolTransactionExtended>('mempool:tx:*');
-      for (const tx of mempoolList) {
-        mempool[tx.key] = tx.value;
-      }
-      logger.info(`Loaded mempool from Redis cache in ${Date.now() - start} ms`);
-      return mempool || {};
-    } catch (e) {
-      logger.warn(`Failed to retrieve mempool from Redis cache: ${e instanceof Error ? e.message : e}`);
-    }
-    return {};
-  }
-
-  async $getRbfEntries(type: string): Promise<any[]> {
-    try {
-      await this.$ensureConnected();
-      const rbfEntries = await this.scanKeys<MempoolTransactionExtended[]>(`rbf:${type}:*`);
-      return rbfEntries;
-    } catch (e) {
-      logger.warn(`Failed to retrieve Rbf ${type}s from Redis cache: ${e instanceof Error ? e.message : e}`);
-      return [];
-    }
-  }
-
-  async $loadCache() {
-    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);
-    // Load rbf data
-    const rbfTxs = await this.$getRbfEntries('tx');
-    const rbfTrees = await this.$getRbfEntries('tree');
-    const rbfExpirations = await this.$getRbfEntries('exp');
-
-    // Set loaded data
-    blocks.setBlocks(loadedBlocks || []);
-    blocks.setBlockSummaries(loadedBlockSummaries || []);
-    await memPool.$setMempool(loadedMempool);
-    await rbfCache.load({
-      txs: rbfTxs,
-      trees: rbfTrees.map(loadedTree => loadedTree.value),
-      expiring: rbfExpirations,
-    });
-  }
-
-  private inflateLoadedTxs(mempool: { [txid: string]: MempoolTransactionExtended }) {
-    for (const tx of Object.values(mempool)) {
-      for (const vin of tx.vin) {
-        if (vin.scriptsig) {
-          vin.scriptsig_asm = transactionUtils.convertScriptSigAsm(vin.scriptsig);
-          transactionUtils.addInnerScriptsToVin(vin);
-        }
-      }
-      for (const vout of tx.vout) {
-        if (vout.scriptpubkey) {
-          vout.scriptpubkey_asm = transactionUtils.convertScriptSigAsm(vout.scriptpubkey);
-        }
-      }
-    }
-  }
-
-  private async scanKeys<T>(pattern): Promise<{ key: string, value: T }[]> {
-    logger.info(`loading Redis entries for ${pattern}`);
-    let keys: string[] = [];
-    const result: { key: string, value: T }[] = [];
-    const patternLength = pattern.length - 1;
-    let count = 0;
-    const processValues = async (keys): Promise<void> => {
-      const values = await this.client.MGET(keys);
-      for (let i = 0; i < values.length; i++) {
-        if (values[i]) {
-          result.push({ key: keys[i].slice(patternLength), value: JSON.parse(values[i]) });
-          count++;
-        }
-      }
-      logger.info(`loaded ${count} entries from Redis cache`);
-    };
-    for await (const key of this.client.scanIterator({
-      MATCH: pattern,
-      COUNT: 100
-    })) {
-      keys.push(key);
-      if (keys.length >= 10000) {
-        await processValues(keys);
-        keys = [];
-      }
-    }
-    if (keys.length) {
-      await processValues(keys);
-    }
-    return result;
-  }
-}
-
-export default new RedisCache();
--- a/backend/src/api/transaction-utils.ts
+++ b/backend/src/api/transaction-utils.ts
@@ -3,7 +3,6 @@ import { IEsploraApi } from './bitcoin/esplora-api.interface';
 import { Common } from './common';
 import bitcoinApi, { bitcoinCoreApi } from './bitcoin/bitcoin-api-factory';
 import * as bitcoinjs from 'bitcoinjs-lib';
-import logger from '../logger';

 class TransactionUtils {
  constructor() { }
@@ -23,23 +22,6 @@ class TransactionUtils {
    };
  }

-  // Wrapper for $getTransactionExtended with an automatic retry direct to Core if the first API request fails.
-  // Propagates any error from the retry request.
-  public async $getTransactionExtendedRetry(txid: string, addPrevouts = false, lazyPrevouts = false, forceCore = false, addMempoolData = false): Promise<TransactionExtended> {
-    try {
-      const result = await this.$getTransactionExtended(txid, addPrevouts, lazyPrevouts, forceCore, addMempoolData);
-      if (result) {
-        return result;
-      } else {
-        logger.err(`Cannot fetch tx ${txid}. Reason: backend returned null data`);
-      }
-    } catch (e) {
-      logger.err(`Cannot fetch tx ${txid}. Reason: ` + (e instanceof Error ? e.message : e));
-    }
-    // retry direct from Core if first request failed
-    return this.$getTransactionExtended(txid, addPrevouts, lazyPrevouts, true, addMempoolData);
-  }
-
  /**
   * @param txId
   * @param addPrevouts
@@ -49,7 +31,7 @@ class TransactionUtils {
  public async $getTransactionExtended(txId: string, addPrevouts = false, lazyPrevouts = false, forceCore = false, addMempoolData = false): Promise<TransactionExtended> {
    let transaction: IEsploraApi.Transaction;
    if (forceCore === true) {
-      transaction  = await bitcoinCoreApi.$getRawTransaction(txId, false, addPrevouts, lazyPrevouts);
+      transaction  = await bitcoinCoreApi.$getRawTransaction(txId, true);
    } else {
      transaction  = await bitcoinApi.$getRawTransaction(txId, false, addPrevouts, lazyPrevouts);
    }
@@ -71,7 +53,7 @@ class TransactionUtils {
    return (await this.$getTransactionExtended(txId, addPrevouts, lazyPrevouts, forceCore, true)) as MempoolTransactionExtended;
  }

-  public extendTransaction(transaction: IEsploraApi.Transaction): TransactionExtended {
+  private extendTransaction(transaction: IEsploraApi.Transaction): TransactionExtended {
    // @ts-ignore
    if (transaction.vsize) {
      // @ts-ignore
@@ -188,122 +170,6 @@ class TransactionUtils {
      16
    );
  }
-
-  public addInnerScriptsToVin(vin: IEsploraApi.Vin): void {
-    if (!vin.prevout) {
-      return;
-    }
-
-    if (vin.prevout.scriptpubkey_type === 'p2sh') {
-      const redeemScript = vin.scriptsig_asm.split(' ').reverse()[0];
-      vin.inner_redeemscript_asm = this.convertScriptSigAsm(redeemScript);
-      if (vin.witness && vin.witness.length > 2) {
-        const witnessScript = vin.witness[vin.witness.length - 1];
-        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
-      }
-    }
-
-    if (vin.prevout.scriptpubkey_type === 'v0_p2wsh' && vin.witness) {
-      const witnessScript = vin.witness[vin.witness.length - 1];
-      vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
-    }
-
-    if (vin.prevout.scriptpubkey_type === 'v1_p2tr' && vin.witness) {
-      const witnessScript = this.witnessToP2TRScript(vin.witness);
-      if (witnessScript !== null) {
-        vin.inner_witnessscript_asm = this.convertScriptSigAsm(witnessScript);
-      }
-    }
-  }
-
-  public convertScriptSigAsm(hex: string): string {
-    const buf = Buffer.from(hex, 'hex');
-
-    const b: string[] = [];
-
-    let i = 0;
-    while (i < buf.length) {
-      const op = buf[i];
-      if (op >= 0x01 && op <= 0x4e) {
-        i++;
-        let push: number;
-        if (op === 0x4c) {
-          push = buf.readUInt8(i);
-          b.push('OP_PUSHDATA1');
-          i += 1;
-        } else if (op === 0x4d) {
-          push = buf.readUInt16LE(i);
-          b.push('OP_PUSHDATA2');
-          i += 2;
-        } else if (op === 0x4e) {
-          push = buf.readUInt32LE(i);
-          b.push('OP_PUSHDATA4');
-          i += 4;
-        } else {
-          push = op;
-          b.push('OP_PUSHBYTES_' + push);
-        }
-
-        const data = buf.slice(i, i + push);
-        if (data.length !== push) {
-          break;
-        }
-
-        b.push(data.toString('hex'));
-        i += data.length;
-      } else {
-        if (op === 0x00) {
-          b.push('OP_0');
-        } else if (op === 0x4f) {
-          b.push('OP_PUSHNUM_NEG1');
-        } else if (op === 0xb1) {
-          b.push('OP_CLTV');
-        } else if (op === 0xb2) {
-          b.push('OP_CSV');
-        } else if (op === 0xba) {
-          b.push('OP_CHECKSIGADD');
-        } else {
-          const opcode = bitcoinjs.script.toASM([ op ]);
-          if (opcode && op < 0xfd) {
-            if (/^OP_(\d+)$/.test(opcode)) {
-              b.push(opcode.replace(/^OP_(\d+)$/, 'OP_PUSHNUM_$1'));
-            } else {
-              b.push(opcode);
-            }
-          } else {
-            b.push('OP_RETURN_' + op);
-          }
-        }
-        i += 1;
-      }
-    }
-
-    return b.join(' ');
-  }
-
-  /**
-   * This function must only be called when we know the witness we are parsing
-   * is a taproot witness.
-   * @param witness An array of hex strings that represents the witness stack of
-   *                the input.
-   * @returns null if the witness is not a script spend, and the hex string of
-   *          the script item if it is a script spend.
-   */
-  public witnessToP2TRScript(witness: string[]): string | null {
-    if (witness.length < 2) return null;
-    // Note: see BIP341 for parsing details of witness stack
-
-    // If there are at least two witness elements, and the first byte of the
-    // last element is 0x50, this last element is called annex a and
-    // is removed from the witness stack.
-    const hasAnnex = witness[witness.length - 1].substring(0, 2) === '50';
-    // If there are at least two witness elements left, script path spending is used.
-    // Call the second-to-last stack element s, the script.
-    // (Note: this phrasing from BIP341 assumes we've *removed* the annex from the stack)
-    if (hasAnnex && witness.length < 3) return null;
-    const positionOfScript = hasAnnex ? witness.length - 3 : witness.length - 2;
-    return witness[positionOfScript];
-  }
 }

 export default new TransactionUtils();
--- a/backend/src/api/websocket-handler.ts
+++ b/backend/src/api/websocket-handler.ts
@@ -183,25 +183,15 @@ class WebsocketHandler {
          }

          if (parsedMessage && parsedMessage['track-address']) {
-            if (/^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,100}|[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64})$/
+            if (/^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[a-z]{2,5}1[ac-hj-np-z02-9]{8,100}|[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100})$/
              .test(parsedMessage['track-address'])) {
              let matchedAddress = parsedMessage['track-address'];
              if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}$/.test(parsedMessage['track-address'])) {
                matchedAddress = matchedAddress.toLowerCase();
              }
-              if (/^04[a-fA-F0-9]{128}$/.test(parsedMessage['track-address'])) {
-                client['track-address'] = null;
-                client['track-scriptpubkey'] = '41' + matchedAddress + 'ac';
-              } else if (/^|(02|03)[a-fA-F0-9]{64}$/.test(parsedMessage['track-address'])) {
-                client['track-address'] = null;
-                client['track-scriptpubkey'] = '21' + matchedAddress + 'ac';
-              } else {
-                client['track-address'] = matchedAddress;
-                client['track-scriptpubkey'] = null;
-              }
+              client['track-address'] = matchedAddress;
            } else {
              client['track-address'] = null;
-              client['track-scriptpubkey'] = null;
            }
          }

@@ -556,44 +546,6 @@ class WebsocketHandler {
        }
      }

-      if (client['track-scriptpubkey']) {
-        const foundTransactions: TransactionExtended[] = [];
-
-        for (const tx of newTransactions) {
-          const someVin = tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_type === 'p2pk' && vin.prevout.scriptpubkey === client['track-scriptpubkey']);
-          if (someVin) {
-            if (config.MEMPOOL.BACKEND !== 'esplora') {
-              try {
-                const fullTx = await transactionUtils.$getMempoolTransactionExtended(tx.txid, true);
-                foundTransactions.push(fullTx);
-              } catch (e) {
-                logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
-              }
-            } else {
-              foundTransactions.push(tx);
-            }
-            return;
-          }
-          const someVout = tx.vout.some((vout) => vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey === client['track-scriptpubkey']);
-          if (someVout) {
-            if (config.MEMPOOL.BACKEND !== 'esplora') {
-              try {
-                const fullTx = await transactionUtils.$getMempoolTransactionExtended(tx.txid, true);
-                foundTransactions.push(fullTx);
-              } catch (e) {
-                logger.debug('Error finding transaction in mempool: ' + (e instanceof Error ? e.message : e));
-              }
-            } else {
-              foundTransactions.push(tx);
-            }
-          }
-        }
-
-        if (foundTransactions.length) {
-          response['address-transactions'] = JSON.stringify(foundTransactions);
-        }
-      }
-
      if (client['track-asset']) {
        const foundTransactions: TransactionExtended[] = [];

@@ -652,7 +604,7 @@ class WebsocketHandler {
        }
      }

-      if (client['track-mempool-block'] >= 0 && memPool.isInSync()) {
+      if (client['track-mempool-block'] >= 0) {
        const index = client['track-mempool-block'];
        if (mBlockDeltas[index]) {
          response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, {
@@ -692,7 +644,7 @@ class WebsocketHandler {
    memPool.handleMinedRbfTransactions(rbfTransactions);
    memPool.removeFromSpendMap(transactions);

-    if (config.MEMPOOL.AUDIT && memPool.isInSync()) {
+    if (config.MEMPOOL.AUDIT) {
      let projectedBlocks;
      let auditMempool = _memPool;
      // template calculation functions have mempool side effects, so calculate audits using
@@ -713,7 +665,7 @@ class WebsocketHandler {
        projectedBlocks = mempoolBlocks.getMempoolBlocksWithTransactions();
      }

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

@@ -869,33 +821,6 @@ class WebsocketHandler {
        }
      }

-      if (client['track-scriptpubkey']) {
-        const foundTransactions: TransactionExtended[] = [];
-
-        transactions.forEach((tx) => {
-          if (tx.vin && tx.vin.some((vin) => !!vin.prevout && vin.prevout.scriptpubkey_type === 'p2pk' && vin.prevout.scriptpubkey === client['track-scriptpubkey'])) {
-            foundTransactions.push(tx);
-            return;
-          }
-          if (tx.vout && tx.vout.some((vout) => vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey === client['track-scriptpubkey'])) {
-            foundTransactions.push(tx);
-          }
-        });
-
-        if (foundTransactions.length) {
-          foundTransactions.forEach((tx) => {
-            tx.status = {
-              confirmed: true,
-              block_height: block.height,
-              block_hash: block.id,
-              block_time: block.timestamp,
-            };
-          });
-
-          response['block-transactions'] = JSON.stringify(foundTransactions);
-        }
-      }
-
      if (client['track-asset']) {
        const foundTransactions: TransactionExtended[] = [];

@@ -933,7 +858,7 @@ class WebsocketHandler {
        }
      }

-      if (client['track-mempool-block'] >= 0 && memPool.isInSync()) {
+      if (client['track-mempool-block'] >= 0) {
        const index = client['track-mempool-block'];
        if (mBlockDeltas && mBlockDeltas[index]) {
          response['projected-block-transactions'] = getCachedResponse(`projected-block-transactions-${index}`, {
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -5,14 +5,13 @@ const configFromFile = require(
 interface IConfig {
  MEMPOOL: {
    ENABLED: boolean;
-    NETWORK: 'mainnet' | 'testnet' | 'signet' | 'liquid' | 'liquidtestnet';
+    NETWORK: 'mainnet' | 'testnet' | 'signet' | 'regtest' | 'liquid' | 'liquidtestnet';
    BACKEND: 'esplora' | 'electrum' | 'none';
    HTTP_PORT: number;
    SPAWN_CLUSTER_PROCS: number;
    API_URL_PREFIX: string;
    POLL_RATE_MS: number;
    CACHE_DIR: string;
-    CACHE_ENABLED: boolean;
    CLEAR_PROTECTION_MINUTES: number;
    RECOMMENDED_FEE_PERCENTILE: number;
    BLOCK_WEIGHT_UNITS: number;
@@ -138,11 +137,7 @@ interface IConfig {
    AUDIT: boolean;
    AUDIT_START_HEIGHT: number;
    SERVERS: string[];
-  },
-  REDIS: {
-    ENABLED: boolean;
-    UNIX_SOCKET_PATH: string;
-  },
+  }
 }

 const defaults: IConfig = {
@@ -155,7 +150,6 @@ const defaults: IConfig = {
    'API_URL_PREFIX': '/api/v1/',
    'POLL_RATE_MS': 2000,
    'CACHE_DIR': './cache',
-    'CACHE_ENABLED': true,
    'CLEAR_PROTECTION_MINUTES': 20,
    'RECOMMENDED_FEE_PERCENTILE': 50,
    'BLOCK_WEIGHT_UNITS': 4000000,
@@ -281,11 +275,7 @@ const defaults: IConfig = {
    'AUDIT': false,
    'AUDIT_START_HEIGHT': 774000,
    'SERVERS': [],
-  },
-  'REDIS': {
-    'ENABLED': false,
-    'UNIX_SOCKET_PATH': '',
-  },
+  }
 };

 class Config implements IConfig {
@@ -306,7 +296,6 @@ class Config implements IConfig {
  EXTERNAL_DATA_SERVER: IConfig['EXTERNAL_DATA_SERVER'];
  MAXMIND: IConfig['MAXMIND'];
  REPLICATION: IConfig['REPLICATION'];
-  REDIS: IConfig['REDIS'];

  constructor() {
    const configs = this.merge(configFromFile, defaults);
@@ -327,7 +316,6 @@ class Config implements IConfig {
    this.EXTERNAL_DATA_SERVER = configs.EXTERNAL_DATA_SERVER;
    this.MAXMIND = configs.MAXMIND;
    this.REPLICATION = configs.REPLICATION;
-    this.REDIS = configs.REDIS;
  }

  merge = (...objects: object[]): IConfig => {
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -41,7 +41,6 @@ import chainTips from './api/chain-tips';
 import { AxiosError } from 'axios';
 import v8 from 'v8';
 import { formatBytes, getBytesUnit } from './utils/format';
-import redisCache from './api/redis-cache';

 class Server {
  private wss: WebSocket.Server | undefined;
@@ -123,11 +122,7 @@ class Server {
    await poolsUpdater.updatePoolsJson(); // Needs to be done before loading the disk cache because we sometimes wipe it
    await syncAssets.syncAssets$();
    if (config.MEMPOOL.ENABLED) {
-      if (config.MEMPOOL.CACHE_ENABLED) {
-        await diskCache.$loadMempoolCache();
-      } else if (config.REDIS.ENABLED) {
-        await redisCache.$loadCache();
-      }
+      await diskCache.$loadMempoolCache();
    }

    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && cluster.isPrimary) {
@@ -188,15 +183,14 @@ class Server {
      }
      const newMempool = await bitcoinApi.$getRawMempool();
      const numHandledBlocks = await blocks.$updateBlocks();
-      const pollRate = config.MEMPOOL.POLL_RATE_MS * (indexer.indexerRunning ? 10 : 1);
      if (numHandledBlocks === 0) {
-        await memPool.$updateMempool(newMempool, pollRate);
+        await memPool.$updateMempool(newMempool);
      }
      indexer.$run();

      // rerun immediately if we skipped the mempool update, otherwise wait POLL_RATE_MS
      const elapsed = Date.now() - start;
-      const remainingTime = Math.max(0, pollRate - elapsed);
+      const remainingTime = Math.max(0, config.MEMPOOL.POLL_RATE_MS - elapsed)
      setTimeout(this.runMainUpdateLoop.bind(this), numHandledBlocks > 0 ? 0 : remainingTime);
      this.backendRetryCount = 0;
    } catch (e: any) {
--- a/backend/src/repositories/BlocksRepository.ts
+++ b/backend/src/repositories/BlocksRepository.ts
@@ -1,4 +1,3 @@
-import bitcoinApi from '../api/bitcoin/bitcoin-api-factory';
 import { BlockExtended, BlockExtension, BlockPrice, EffectiveFeeStats } from '../mempool.interfaces';
 import DB from '../database';
 import logger from '../logger';
@@ -13,7 +12,6 @@ import config from '../config';
 import chainTips from '../api/chain-tips';
 import blocks from '../api/blocks';
 import BlocksAuditsRepository from './BlocksAuditsRepository';
-import transactionUtils from '../api/transaction-utils';

 interface DatabaseBlock {
  id: string;
@@ -541,7 +539,7 @@ class BlocksRepository {
   */
  public async $getBlocksDifficulty(): Promise<object[]> {
    try {
-      const [rows]: any[] = await DB.query(`SELECT UNIX_TIMESTAMP(blockTimestamp) as time, height, difficulty, bits FROM blocks`);
+      const [rows]: any[] = await DB.query(`SELECT UNIX_TIMESTAMP(blockTimestamp) as time, height, difficulty FROM blocks`);
      return rows;
    } catch (e) {
      logger.err('Cannot get blocks difficulty list from the db. Reason: ' + (e instanceof Error ? e.message : e));
@@ -850,7 +848,7 @@ class BlocksRepository {
   */
  public async $getOldestConsecutiveBlock(): Promise<any> {
    try {
-      const [rows]: any = await DB.query(`SELECT height, UNIX_TIMESTAMP(blockTimestamp) as timestamp, difficulty, bits FROM blocks ORDER BY height DESC`);
+      const [rows]: any = await DB.query(`SELECT height, UNIX_TIMESTAMP(blockTimestamp) as timestamp, difficulty FROM blocks ORDER BY height DESC`);
      for (let i = 0; i < rows.length - 1; ++i) {
        if (rows[i].height - rows[i + 1].height > 1) {
          return rows[i];
@@ -1038,17 +1036,8 @@ class BlocksRepository {
    {
      extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(dbBlk.id);
      if (extras.feePercentiles === null) {
-
-        let summary;
-        if (config.MEMPOOL.BACKEND === 'esplora') {
-          const txs = (await bitcoinApi.$getTxsForBlock(dbBlk.id)).map(tx => transactionUtils.extendTransaction(tx));
-          summary = blocks.summarizeBlockTransactions(dbBlk.id, txs);
-        } else {
-          // Call Core RPC
-          const block = await bitcoinClient.getBlock(dbBlk.id, 2);
-          summary = blocks.summarizeBlock(block);
-        }
-
+        const block = await bitcoinClient.getBlock(dbBlk.id, 2);
+        const summary = blocks.summarizeBlock(block);
        await BlocksSummariesRepository.$saveTransactions(dbBlk.height, dbBlk.id, summary.transactions);
        extras.feePercentiles = await BlocksSummariesRepository.$getFeePercentilesByBlockId(dbBlk.id);
      }
--- a/backend/src/repositories/PoolsRepository.ts
+++ b/backend/src/repositories/PoolsRepository.ts
@@ -99,7 +99,7 @@ class PoolsRepository {
      if (parse) {
        rows[0].regexes = JSON.parse(rows[0].regexes);
      }
-      if (['testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
+      if (['testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) {
        rows[0].addresses = []; // pools-v2.json only contains mainnet addresses
      } else if (parse) {
        rows[0].addresses = JSON.parse(rows[0].addresses);
@@ -131,7 +131,7 @@ class PoolsRepository {
      if (parse) {
        rows[0].regexes = JSON.parse(rows[0].regexes);
      }
-      if (['testnet', 'signet'].includes(config.MEMPOOL.NETWORK)) {
+      if (['testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) {
        rows[0].addresses = []; // pools.json only contains mainnet addresses
      } else if (parse) {
        rows[0].addresses = JSON.parse(rows[0].addresses);
--- a/backend/src/tasks/pools-updater.ts
+++ b/backend/src/tasks/pools-updater.ts
@@ -17,7 +17,7 @@ class PoolsUpdater {
  treeUrl: string = config.MEMPOOL.POOLS_JSON_TREE_URL;

  public async updatePoolsJson(): Promise<void> {
-    if (['mainnet', 'testnet', 'signet'].includes(config.MEMPOOL.NETWORK) === false ||
+    if (['mainnet', 'testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK) === false ||
      config.MEMPOOL.ENABLED === false
    ) {
      return;
--- a/backend/src/tasks/price-updater.ts
+++ b/backend/src/tasks/price-updater.ts
@@ -73,7 +73,7 @@ class PriceUpdater {
  }

  public async $run(): Promise<void> {
-    if (config.MEMPOOL.NETWORK === 'signet' || config.MEMPOOL.NETWORK === 'testnet') {
+    if (['testnet', 'signet', 'regtest'].includes(config.MEMPOOL.NETWORK)) {
      // Coins have no value on testnet/signet, so we want to always show 0
      return;
    }
--- a/contributors/Czino.txt
+++ b/contributors/Czino.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 29, 2023.
-
-Signed: Czino
--- a/contributors/bguillaumat.txt
+++ b/contributors/bguillaumat.txt
@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
-
-Signed: bguillaumat
--- a/contributors/fiatjaf.txt
+++ b/contributors/fiatjaf.txt
@@ -1,5 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of January 25, 2022.
-I also regret having ever contributed to this repository since they keep asking me to sign this legalese timewaste things.
-And finally I don't care about licenses and won't sue anyone over intellectual property, which is a fake statist construct invented by evil lobby lawyers.
-
-Signed: fiatjaf
--- a/contributors/rishkwal.txt
+++ b/contributors/rishkwal.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 29, 2023.
-
-Signed: rishkwal
--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -8,7 +8,6 @@
    "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__",
    "POLL_RATE_MS": __MEMPOOL_POLL_RATE_MS__,
    "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
-    "CACHE_ENABLED": __MEMPOOL_CACHE_ENABLED__,
    "CLEAR_PROTECTION_MINUTES": __MEMPOOL_CLEAR_PROTECTION_MINUTES__,
    "RECOMMENDED_FEE_PERCENTILE": __MEMPOOL_RECOMMENDED_FEE_PERCENTILE__,
    "BLOCK_WEIGHT_UNITS": __MEMPOOL_BLOCK_WEIGHT_UNITS__,
@@ -134,9 +133,5 @@
    "AUDIT": __REPLICATION_AUDIT__,
    "AUDIT_START_HEIGHT": __REPLICATION_AUDIT_START_HEIGHT__,
    "SERVERS": __REPLICATION_SERVERS__
-  },
-  "REDIS": {
-    "ENABLED": __REDIS_ENABLED__,
-    "UNIX_SOCKET_PATH": "__REDIS_UNIX_SOCKET_PATH__"
  }
 }
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -9,7 +9,6 @@ __MEMPOOL_SPAWN_CLUSTER_PROCS__=${MEMPOOL_SPAWN_CLUSTER_PROCS:=0}
 __MEMPOOL_API_URL_PREFIX__=${MEMPOOL_API_URL_PREFIX:=/api/v1/}
 __MEMPOOL_POLL_RATE_MS__=${MEMPOOL_POLL_RATE_MS:=2000}
 __MEMPOOL_CACHE_DIR__=${MEMPOOL_CACHE_DIR:=./cache}
-__MEMPOOL_CACHE_ENABLED__=${MEMPOOL_CACHE_ENABLED:=true}
 __MEMPOOL_CLEAR_PROTECTION_MINUTES__=${MEMPOOL_CLEAR_PROTECTION_MINUTES:=20}
 __MEMPOOL_RECOMMENDED_FEE_PERCENTILE__=${MEMPOOL_RECOMMENDED_FEE_PERCENTILE:=50}
 __MEMPOOL_BLOCK_WEIGHT_UNITS__=${MEMPOOL_BLOCK_WEIGHT_UNITS:=4000000}
@@ -137,9 +136,6 @@ __REPLICATION_AUDIT__=${REPLICATION_AUDIT:=true}
 __REPLICATION_AUDIT_START_HEIGHT__=${REPLICATION_AUDIT_START_HEIGHT:=774000}
 __REPLICATION_SERVERS__=${REPLICATION_SERVERS:=[]}

-# REDIS
-__REDIS_ENABLED__=${REDIS_ENABLED:=true}
-__REDIS_UNIX_SOCKET_PATH__=${REDIS_UNIX_SOCKET_PATH:=true}

 mkdir -p "${__MEMPOOL_CACHE_DIR__}"

@@ -151,7 +147,6 @@ sed -i "s!__MEMPOOL_SPAWN_CLUSTER_PROCS__!${__MEMPOOL_SPAWN_CLUSTER_PROCS__}!g"
 sed -i "s!__MEMPOOL_API_URL_PREFIX__!${__MEMPOOL_API_URL_PREFIX__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_POLL_RATE_MS__!${__MEMPOOL_POLL_RATE_MS__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_CACHE_DIR__!${__MEMPOOL_CACHE_DIR__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_CACHE_ENABLED__!${__MEMPOOL_CACHE_ENABLED__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_CLEAR_PROTECTION_MINUTES__!${__MEMPOOL_CLEAR_PROTECTION_MINUTES__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__!${__MEMPOOL_RECOMMENDED_FEE_PERCENTILE__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_BLOCK_WEIGHT_UNITS__!${__MEMPOOL_BLOCK_WEIGHT_UNITS__}!g" mempool-config.json
@@ -170,7 +165,7 @@ sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-co
 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
 sed -i "s!__MEMPOOL_ADVANCED_GBT_MEMPOOL__!${__MEMPOOL_ADVANCED_GBT_MEMPOOL__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_RUST_GBT__!${__MEMPOOL_RUST_GBT__}!g" mempool-config.json
+sed -i "s!__MEMPOOL_RUST_GBT__!${__MEMPOOL_GBT__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_ADVANCED_GBT_AUDIT__!${__MEMPOOL_ADVANCED_GBT_AUDIT__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_CPFP_INDEXING__!${__MEMPOOL_CPFP_INDEXING__}!g" mempool-config.json
 sed -i "s!__MEMPOOL_MAX_BLOCKS_BULK_QUERY__!${__MEMPOOL_MAX_BLOCKS_BULK_QUERY__}!g" mempool-config.json
@@ -267,8 +262,4 @@ sed -i "s!__REPLICATION_AUDIT__!${__REPLICATION_AUDIT__}!g" mempool-config.json
 sed -i "s!__REPLICATION_AUDIT_START_HEIGHT__!${__REPLICATION_AUDIT_START_HEIGHT__}!g" mempool-config.json
 sed -i "s!__REPLICATION_SERVERS__!${__REPLICATION_SERVERS__}!g" mempool-config.json

-# REDIS
-sed -i "s!__REDIS_ENABLED__!${__REDIS_ENABLED__}!g" mempool-config.json
-sed -i "s!__REDIS_UNIX_SOCKET_PATH__!${__REDIS_UNIX_SOCKET_PATH__}!g" mempool-config.json
-
 node /backend/package/index.js
--- a/docker/frontend/entrypoint.sh
+++ b/docker/frontend/entrypoint.sh
@@ -18,7 +18,8 @@ fi

 __TESTNET_ENABLED__=${TESTNET_ENABLED:=false}
 __SIGNET_ENABLED__=${SIGNET_ENABLED:=false}
-__LIQUID_ENABLED__=${LIQUID_ENABLED:=false}
+__REGTEST_ENABLED__=${REGTEST_ENABLED:=false}
+__LIQUID_ENABLED__=${LIQUID_EANBLED:=false}
 __LIQUID_TESTNET_ENABLED__=${LIQUID_TESTNET_ENABLED:=false}
 __BISQ_ENABLED__=${BISQ_ENABLED:=false}
 __BISQ_SEPARATE_BACKEND__=${BISQ_SEPARATE_BACKEND:=false}
@@ -44,6 +45,7 @@ __HISTORICAL_PRICE__=${HISTORICAL_PRICE:=true}
 # Export as environment variables to be used by envsubst
 export __TESTNET_ENABLED__
 export __SIGNET_ENABLED__
+export __REGTEST_ENABLED__
 export __LIQUID_ENABLED__
 export __LIQUID_TESTNET_ENABLED__
 export __BISQ_ENABLED__
--- a/frontend/mempool-frontend-config.sample.json
+++ b/frontend/mempool-frontend-config.sample.json
@@ -1,6 +1,7 @@
 {
  "TESTNET_ENABLED": false,
  "SIGNET_ENABLED": false,
+  "REGTEST_ENABLED": false,
  "LIQUID_ENABLED": false,
  "LIQUID_TESTNET_ENABLED": false,
  "BISQ_ENABLED": false,
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -249,6 +249,115 @@ let routes: Routes = [
      },
    ]
  },
+  {
+    path: 'regtest',
+    children: [
+      {
+        path: 'mining/blocks',
+        redirectTo: 'blocks',
+        pathMatch: 'full'
+      },
+      {
+        path: '',
+        pathMatch: 'full',
+        loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule)
+      },
+      {
+        path: '',
+        component: MasterPageComponent,
+        children: [
+          {
+            path: 'tx/push',
+            component: PushTransactionComponent,
+          },
+          {
+            path: 'about',
+            component: AboutComponent,
+          },
+          {
+            path: 'blocks',
+            component: BlocksList,
+          },
+          {
+            path: 'rbf',
+            component: RbfList,
+          },
+          {
+            path: 'terms-of-service',
+            component: TermsOfServiceComponent
+          },
+          {
+            path: 'privacy-policy',
+            component: PrivacyPolicyComponent
+          },
+          {
+            path: 'trademark-policy',
+            component: TrademarkPolicyComponent
+          },
+          {
+            path: 'address/:id',
+            children: [],
+            component: AddressComponent,
+            data: {
+              ogImage: true,
+              networkSpecific: true,
+            }
+          },
+          {
+            path: 'tx',
+            data: { networkSpecific: true },
+            component: StartComponent,
+            children: [
+              {
+                path: ':id',
+                component: TransactionComponent
+              },
+            ],
+          },
+          {
+            path: 'block',
+            data: { networkSpecific: true },
+            component: StartComponent,
+            children: [
+              {
+                path: ':id',
+                component: BlockComponent,
+                data: {
+                  ogImage: true
+                }
+              },
+            ],
+          },
+          {
+            path: 'docs',
+            loadChildren: () => import('./docs/docs.module').then(m => m.DocsModule)
+          },
+          {
+            path: 'api',
+            loadChildren: () => import('./docs/docs.module').then(m => m.DocsModule)
+          },
+          {
+            path: 'lightning',
+            data: { networks: ['bitcoin'] },
+            loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
+          },
+        ],
+      },
+      {
+        path: 'status',
+        data: { networks: ['bitcoin', 'liquid'] },
+        component: StatusViewComponent
+      },
+      {
+        path: '',
+        loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule)
+      },
+      {
+        path: '**',
+        redirectTo: '/signet'
+      },
+    ]
+  },
  {
    path: '',
    pathMatch: 'full',
--- a/frontend/src/app/bitcoin.utils.ts
+++ b/frontend/src/app/bitcoin.utils.ts
@@ -271,6 +271,11 @@ const featureActivation = {
    segwit: 0,
    taproot: 0,
  },
+  regtest: {
+    rbf: 0,
+    segwit: 0,
+    taproot: 0,
+  },
 };

 export function isFeatureActive(network: string, height: number, feature: 'rbf' | 'segwit' | 'taproot'): boolean {
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -411,7 +411,7 @@
      Trademark Notice<br>
    </div>
    <p>
-      The Mempool Open Source Project&reg;, mempool.space&trade;, the mempool logo&reg;, the mempool.space logos&trade;, the mempool square logo&reg;, and the mempool blocks logo&trade; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
+      The Mempool Open Source Project&trade;, mempool.space&trade;, the mempool logo&reg;, the mempool.space logos&trade;, the mempool square logo&reg;, and the mempool blocks logo&trade; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
    </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/address/address-preview.component.ts
+++ b/frontend/src/app/components/address/address-preview.component.ts
@@ -64,12 +64,12 @@ export class AddressPreviewComponent implements OnInit, OnDestroy {
          this.address = null;
          this.addressInfo = null;
          this.addressString = params.get('id') || '';
-          if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}$/.test(this.addressString)) {
+          if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|[A-F0-9]{130}$/.test(this.addressString)) {
            this.addressString = this.addressString.toLowerCase();
          }
          this.seoService.setTitle($localize`:@@address.component.browser-title:Address: ${this.addressString}:INTERPOLATION:`);

-          return (this.addressString.match(/04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}/)
+          return (this.addressString.match(/[a-f0-9]{130}/)
              ? this.electrsApiService.getPubKeyAddress$(this.addressString)
              : this.electrsApiService.getAddress$(this.addressString)
            ).pipe(
--- a/frontend/src/app/components/address/address.component.ts
+++ b/frontend/src/app/components/address/address.component.ts
@@ -72,7 +72,7 @@ export class AddressComponent implements OnInit, OnDestroy {
          this.addressInfo = null;
          document.body.scrollTo(0, 0);
          this.addressString = params.get('id') || '';
-          if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}$/.test(this.addressString)) {
+          if (/^[A-Z]{2,5}1[AC-HJ-NP-Z02-9]{8,100}|[A-F0-9]{130}$/.test(this.addressString)) {
            this.addressString = this.addressString.toLowerCase();
          }
          this.seoService.setTitle($localize`:@@address.component.browser-title:Address: ${this.addressString}:INTERPOLATION:`);
@@ -84,7 +84,7 @@ export class AddressComponent implements OnInit, OnDestroy {
          )
          .pipe(
            switchMap(() => (
-              this.addressString.match(/04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64}/)
+              this.addressString.match(/[a-f0-9]{130}/)
              ? this.electrsApiService.getPubKeyAddress$(this.addressString)
              : this.electrsApiService.getAddress$(this.addressString)
            ).pipe(
@@ -118,7 +118,7 @@ export class AddressComponent implements OnInit, OnDestroy {
          this.isLoadingAddress = false;
          this.isLoadingTransactions = true;
          return address.is_pubkey
-              ? this.electrsApiService.getScriptHashTransactions$((address.address.length === 66 ? '21' : '41') + address.address + 'ac')
+              ? this.electrsApiService.getScriptHashTransactions$('41' + address.address + 'ac')
              : this.electrsApiService.getAddressTransactions$(address.address);
        }),
        switchMap((transactions) => {
@@ -166,8 +166,31 @@ export class AddressComponent implements OnInit, OnDestroy {
      });

    this.stateService.mempoolTransactions$
-      .subscribe(tx => {
-        this.addTransaction(tx);
+      .subscribe((transaction) => {
+        if (this.transactions.some((t) => t.txid === transaction.txid)) {
+          return;
+        }
+
+        this.transactions.unshift(transaction);
+        this.transactions = this.transactions.slice();
+        this.txCount++;
+
+        if (transaction.vout.some((vout) => vout.scriptpubkey_address === this.address.address)) {
+          this.audioService.playSound('cha-ching');
+        } else {
+          this.audioService.playSound('chime');
+        }
+
+        transaction.vin.forEach((vin) => {
+          if (vin.prevout.scriptpubkey_address === this.address.address) {
+            this.sent += vin.prevout.value;
+          }
+        });
+        transaction.vout.forEach((vout) => {
+          if (vout.scriptpubkey_address === this.address.address) {
+            this.received += vout.value;
+          }
+        });
      });

    this.stateService.blockTransactions$
@@ -177,47 +200,12 @@ export class AddressComponent implements OnInit, OnDestroy {
          tx.status = transaction.status;
          this.transactions = this.transactions.slice();
          this.audioService.playSound('magic');
-        } else {
-          if (this.addTransaction(transaction, false)) {
-            this.audioService.playSound('magic');
-          }
        }
        this.totalConfirmedTxCount++;
        this.loadedConfirmedTxCount++;
      });
  }

-  addTransaction(transaction: Transaction, playSound: boolean = true): boolean {
-    if (this.transactions.some((t) => t.txid === transaction.txid)) {
-      return false;
-    }
-
-    this.transactions.unshift(transaction);
-    this.transactions = this.transactions.slice();
-    this.txCount++;
-
-    if (playSound) {
-      if (transaction.vout.some((vout) => vout?.scriptpubkey_address === this.address.address)) {
-        this.audioService.playSound('cha-ching');
-      } else {
-        this.audioService.playSound('chime');
-      }
-    }
-
-    transaction.vin.forEach((vin) => {
-      if (vin?.prevout?.scriptpubkey_address === this.address.address) {
-        this.sent += vin.prevout.value;
-      }
-    });
-    transaction.vout.forEach((vout) => {
-      if (vout?.scriptpubkey_address === this.address.address) {
-        this.received += vout.value;
-      }
-    });
-
-    return true;
-  }
-
  loadMore() {
    if (this.isLoadingTransactions || !this.totalConfirmedTxCount || this.loadedConfirmedTxCount >= this.totalConfirmedTxCount) {
      return;
--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html
@@ -39,7 +39,7 @@
    </ng-container>
  </a>

-  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
+  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.REGTEST_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
    <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split d-flex justify-content-center align-items-center" aria-haspopup="true">
      <app-svg-images class="d-flex justify-content-center align-items-center current-network-svg" name="bisq" width="20" height="20" viewBox="0 0 80 80"></app-svg-images>
    </button>
@@ -47,6 +47,7 @@
      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['mainnet'] || '/')" ngbDropdownItem class="mainnet"><app-svg-images name="bitcoin" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Mainnet</a>
      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['signet'] || '/signet')" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><app-svg-images name="signet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Signet</a>
      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['testnet'] || '/testnet')" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><app-svg-images name="testnet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Testnet</a>
+      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['regtest'] || '/regtest')" ngbDropdownItem *ngIf="env.REGTEST_ENABLED" class="regtest"><app-svg-images name="regtest" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Regtest</a>
      <h6 class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
      <a ngbDropdownItem class="mainnet active" [routerLink]="networkPaths['bisq'] || '/'"><app-svg-images name="bisq" width="20" height="20" viewBox="0 0 75 75" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Bisq</a>
      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage + (networkPaths['liquid'] || '/')" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid"><app-svg-images name="liquid" width="22" height="22" viewBox="0 0 125 125" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Liquid</a>
--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.scss
@@ -120,6 +120,10 @@ nav {
  background-color: #6f1d5d;
 }

+.regtest.active {
+  background-color: #a5a5a5;
+}
+
 .dropdown-divider {
  border-top: 1px solid #121420;
 }
--- a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.scss
+++ b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/components/block-fees-graph/block-fees-graph.component.scss
+++ b/frontend/src/app/components/block-fees-graph/block-fees-graph.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/components/block-health-graph/block-health-graph.component.scss
+++ b/frontend/src/app/components/block-health-graph/block-health-graph.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/components/block-overview-graph/tx-view.ts
+++ b/frontend/src/app/components/block-overview-graph/tx-view.ts
@@ -38,7 +38,7 @@ export default class TxView implements TransactionStripped {
  value: number;
  feerate: number;
  rate?: number;
-  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'rbf';
+  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'fullrbf';
  context?: 'projected' | 'actual';
  scene?: BlockScene;

@@ -207,7 +207,7 @@ export default class TxView implements TransactionStripped {
        return auditColors.censored;
      case 'missing':
      case 'sigop':
-      case 'rbf':
+      case 'fullrbf':
        return marginalFeeColors[feeLevelIndex] || marginalFeeColors[mempoolFeeColors.length - 1];
      case 'fresh':
      case 'freshcpfp':
--- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
+++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.html
@@ -53,7 +53,7 @@
          <td *ngSwitchCase="'freshcpfp'"><span class="badge badge-warning" i18n="transaction.audit.recently-cpfped">Recently CPFP'd</span></td>
          <td *ngSwitchCase="'added'"><span class="badge badge-warning" i18n="transaction.audit.added">Added</span></td>
          <td *ngSwitchCase="'selected'"><span class="badge badge-warning" i18n="transaction.audit.marginal">Marginal fee rate</span></td>
-          <td *ngSwitchCase="'rbf'"><span class="badge badge-warning" i18n="transaction.audit.conflicting">Conflicting</span></td>
+          <td *ngSwitchCase="'fullrbf'"><span class="badge badge-warning" i18n="transaction.audit.fullrbf">Full RBF</span></td>
        </ng-container>
      </tr>
    </tbody>
--- a/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.scss
+++ b/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.scss
+++ b/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/components/block/block.component.ts
+++ b/frontend/src/app/components/block/block.component.ts
@@ -339,7 +339,7 @@ export class BlockComponent implements OnInit, OnDestroy {
        const isSelected = {};
        const isFresh = {};
        const isSigop = {};
-        const isRbf = {};
+        const isFullRbf = {};
        this.numMissing = 0;
        this.numUnexpected = 0;

@@ -363,7 +363,7 @@ export class BlockComponent implements OnInit, OnDestroy {
            isSigop[txid] = true;
          }
          for (const txid of blockAudit.fullrbfTxs || []) {
-            isRbf[txid] = true;
+            isFullRbf[txid] = true;
          }
          // set transaction statuses
          for (const tx of blockAudit.template) {
@@ -381,8 +381,8 @@ export class BlockComponent implements OnInit, OnDestroy {
                }
              } else if (isSigop[tx.txid]) {
                tx.status = 'sigop';
-              } else if (isRbf[tx.txid]) {
-                tx.status = 'rbf';
+              } else if (isFullRbf[tx.txid]) {
+                tx.status = 'fullrbf';
              } else {
                tx.status = 'missing';
              }
@@ -398,8 +398,8 @@ export class BlockComponent implements OnInit, OnDestroy {
              tx.status = 'added';
            } else if (inTemplate[tx.txid]) {
              tx.status = 'found';
-            } else if (isRbf[tx.txid]) {
-              tx.status = 'rbf';
+            } else if (isFullRbf[tx.txid]) {
+              tx.status = 'fullrbf';
            } else {
              tx.status = 'selected';
              isSelected[tx.txid] = true;
@@ -676,6 +676,7 @@ export class BlockComponent implements OnInit, OnDestroy {
        }
        break;
      case 'signet':
+      case 'regtest':
        if (blockHeight < this.stateService.env.SIGNET_BLOCK_AUDIT_START_HEIGHT) {
          return false;
        }
--- a/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
+++ b/frontend/src/app/components/blockchain-blocks/blockchain-blocks.component.ts
@@ -68,6 +68,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
    'liquidtestnet': ['#494a4a', '#272e46'],
    testnet: ['#1d486f', '#183550'],
    signet: ['#6f1d5d', '#471850'],
+    regtest: ['#9339f4', '#105fb0'],
  };

  constructor(
@@ -86,7 +87,7 @@ export class BlockchainBlocksComponent implements OnInit, OnChanges, OnDestroy {
  ngOnInit() {
    this.dynamicBlocksAmount = Math.min(8, this.stateService.env.KEEP_BLOCKS_AMOUNT);

-    if (['', 'testnet', 'signet'].includes(this.stateService.network)) {
+    if (['', 'testnet', 'signet', 'regtest'].includes(this.stateService.network)) {
      this.enabledMiningInfoIfNeeded(this.location.path());
      this.location.onUrlChange((url) => this.enabledMiningInfoIfNeeded(url));
    }
--- a/frontend/src/app/components/blocks-list/blocks-list.component.ts
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.ts
@@ -68,7 +68,7 @@ export class BlocksList implements OnInit {
                  for (const block of blocks) {
                    // @ts-ignore: Need to add an extra field for the template
                    block.extras.pool.logo = `/resources/mining-pools/` +
-                      block.extras.pool.slug + '.svg';
+                      block.extras.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg';
                  }
                }
                if (this.widget) {
@@ -102,7 +102,7 @@ export class BlocksList implements OnInit {
            if (this.stateService.env.MINING_DASHBOARD) {
              // @ts-ignore: Need to add an extra field for the template
              blocks[1][0].extras.pool.logo = `/resources/mining-pools/` +
-                blocks[1][0].extras.pool.slug + '.svg';
+                blocks[1][0].extras.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg';
            }
            acc.unshift(blocks[1][0]);
            acc = acc.slice(0, this.widget ? 6 : 15);
--- a/frontend/src/app/components/clock/clock.component.ts
+++ b/frontend/src/app/components/clock/clock.component.ts
@@ -38,6 +38,7 @@ export class ClockComponent implements OnInit {
    'liquidtestnet': ['#494a4a', '#272e46'],
    testnet: ['#1d486f', '#183550'],
    signet: ['#6f1d5d', '#471850'],
+    regtest: ['#9339f4', '#105fb0'],
  };

  constructor(
--- a/frontend/src/app/components/difficulty/difficulty.component.ts
+++ b/frontend/src/app/components/difficulty/difficulty.component.ts
@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, Inject, Input, LOCALE_ID, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, HostListener, Inject, Input, LOCALE_ID, OnInit } from '@angular/core';
 import { combineLatest, Observable, timer } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { StateService } from '../..//services/state.service';
@@ -61,7 +61,6 @@ export class DifficultyComponent implements OnInit {

  constructor(
    public stateService: StateService,
-    private cd: ChangeDetectorRef,
    @Inject(LOCALE_ID) private locale: string,
  ) { }

@@ -190,15 +189,9 @@ export class DifficultyComponent implements OnInit {
    return shapes;
  }

-  @HostListener('pointerdown', ['$event'])
-  onPointerDown(event) {
-    this.onPointerMove(event);
-  }
-
  @HostListener('pointermove', ['$event'])
  onPointerMove(event) {
    this.tooltipPosition = { x: event.clientX, y: event.clientY };
-    this.cd.markForCheck();
  }

  onHover(event, rect): void {
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss
+++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html
+++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html
@@ -44,7 +44,7 @@
    </ng-container>
  </a>

-  <div ngbDropdown (window:resize)="onResize()" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
+  <div ngbDropdown (window:resize)="onResize()" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.REGTEST_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
    <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split d-flex justify-content-center align-items-center" aria-haspopup="true">
      <app-svg-images class="d-flex justify-content-center align-items-center current-network-svg" [name]="network.val === '' ? 'liquid' : network.val" width="20" height="20" viewBox="0 0 125 125"></app-svg-images>
    </button>
@@ -52,6 +52,7 @@
      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['mainnet'] || '')" ngbDropdownItem class="mainnet"><app-svg-images name="bitcoin" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Mainnet</a>
      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['signet'] || '/signet')" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><app-svg-images name="signet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Signet</a>
      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['testnet'] || '/testnet')" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><app-svg-images name="testnet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Testnet</a>
+      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + (networkPaths['regtest'] || '/regtest')" ngbDropdownItem *ngIf="env.REGTEST_ENABLED" class="regtest"><app-svg-images name="regtest" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Regtest</a>
      <h6 class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
      <a [href]="env.BISQ_WEBSITE_URL + urlLanguage + (networkPaths['bisq'] || '')" ngbDropdownItem class="mainnet"><app-svg-images name="bisq" width="22" height="22" viewBox="0 0 75 75" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Bisq</a>
      <a ngbDropdownItem class="liquid mr-1" [class.active]="network.val === 'liquid'" [routerLink]="networkPaths['liquid'] || '/'"><app-svg-images name="liquid" width="22" height="22" viewBox="0 0 125 125" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Liquid</a>
--- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss
+++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.scss
@@ -114,6 +114,10 @@ nav {
  background-color: #6f1d5d;
 }

+.regtest.active {
+  background-color: #a5a5a5;
+}
+
 .dropdown-divider {
  border-top: 1px solid #121420;
 }
--- a/frontend/src/app/components/master-page-preview/master-page-preview.component.html
+++ b/frontend/src/app/components/master-page-preview/master-page-preview.component.html
@@ -9,6 +9,7 @@
    <div [ngSwitch]="network.val">
      <span *ngSwitchCase="'signet'" class="network signet"><app-svg-images name="signet" width="35" height="35" viewBox="0 0 65 65" style="width: 40px; height: 48px;" class="mainnet mr-1"></app-svg-images> Signet</span>
      <span *ngSwitchCase="'testnet'" class="network testnet"><app-svg-images name="testnet" width="35" height="35" viewBox="0 0 65 65" style="width: 40px; height: 48px;" class="mainnet mr-1"></app-svg-images> Testnet</span>
+      <span *ngSwitchCase="'regtest'" class="network regtest"><app-svg-images name="regtest" width="35" height="35" viewBox="0 0 65 65" style="width: 40px; height: 48px;" class="mainnet mr-1"></app-svg-images> Regtest</span>
      <span *ngSwitchCase="'bisq'" class="network bisq"><app-svg-images name="bisq" width="35" height="35" viewBox="0 0 75 75" style="width: 40px; height: 48px;" class="mainnet mr-1"></app-svg-images> Bisq</span>
      <span *ngSwitchCase="'liquid'" class="network liquid"><app-svg-images name="liquid" width="35" height="35" viewBox="0 0 125 125" style="width: 40px; height: 48px;" class="mainnet mr-1"></app-svg-images> Mainnet</span>
      <span *ngSwitchCase="'liquidtestnet'" class="network liquidtestnet"><app-svg-images name="liquidtestnet" width="35" height="35" viewBox="0 0 125 125" style="width: 40px; height: 48px;" class="mainnet mr-1"></app-svg-images> Testnet</span>
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -17,7 +17,7 @@
    </ng-container>
  </a>

-  <div (window:resize)="onResize()" ngbDropdown class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
+  <div (window:resize)="onResize()" ngbDropdown class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.REGTEST_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
    <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split d-flex justify-content-center align-items-center" aria-haspopup="true">
      <app-svg-images class="d-flex justify-content-center align-items-center current-network-svg" [name]="network.val === '' ? 'bitcoin' : network.val" width="20" height="20" viewBox="0 0 65 65"></app-svg-images>
    </button>
@@ -25,6 +25,7 @@
      <a ngbDropdownItem class="mainnet" [routerLink]="networkPaths['mainnet'] || '/'"><app-svg-images name="bitcoin" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Mainnet</a>
      <a ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet" [class.active]="network.val === 'signet'" [routerLink]="networkPaths['signet'] || '/signet'"><app-svg-images name="signet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Signet</a>
      <a ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet" [class.active]="network.val === 'testnet'" [routerLink]="networkPaths['testnet'] || '/testnet'"><app-svg-images name="testnet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Testnet</a>
+      <a ngbDropdownItem *ngIf="env.REGTEST_ENABLED" class="regtest" [class.active]="network.val === 'regtest'" [routerLink]="networkPaths['regtest'] || '/regtest'"><app-svg-images name="regtest" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Regtest</a>
      <h6 *ngIf="env.LIQUID_ENABLED || env.BISQ_ENABLED" class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
      <a [href]="env.BISQ_WEBSITE_URL + urlLanguage + (networkPaths['bisq'] || '')" ngbDropdownItem *ngIf="env.BISQ_ENABLED" class="bisq"><app-svg-images name="bisq" width="20" height="20" viewBox="0 0 75 75" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Bisq</a>
      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage + (networkPaths['liquid'] || '')" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid" [class.active]="network.val === 'liquid'"><app-svg-images name="liquid" width="22" height="22" viewBox="0 0 125 125" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Liquid</a>
@@ -62,7 +63,7 @@
 </nav>
 </header>

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

 <main>
  <router-outlet></router-outlet>
--- a/frontend/src/app/components/master-page/master-page.component.scss
+++ b/frontend/src/app/components/master-page/master-page.component.scss
@@ -131,6 +131,10 @@ nav {
  background-color: #6f1d5d;
 }

+.regtest.active {
+  background-color: #a5a5a5;
+}
+
 .dropdown-divider {
  border-top: 1px solid #121420;
 }
--- a/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts
+++ b/frontend/src/app/components/mempool-blocks/mempool-blocks.component.ts
@@ -50,8 +50,6 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
  blockSubscription: Subscription;
  networkSubscription: Subscription;
  chainTipSubscription: Subscription;
-  keySubscription: Subscription;
-  isTabHiddenSubscription: Subscription;
  network = '';
  now = new Date().getTime();
  timeOffset = 0;
@@ -95,7 +93,7 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
  ngOnInit() {
    this.chainTip = this.stateService.latestBlockHeight;

-    if (['', 'testnet', 'signet'].includes(this.stateService.network)) {
+    if (['', 'testnet', 'signet', 'regtest'].includes(this.stateService.network)) {
      this.enabledMiningInfoIfNeeded(this.location.path());
      this.location.onUrlChange((url) => this.enabledMiningInfoIfNeeded(url));
    }
@@ -118,15 +116,8 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
      this.calculateTransactionPosition();
    });
    this.reduceMempoolBlocksToFitScreen(this.mempoolBlocks);
-    this.isTabHiddenSubscription = this.stateService.isTabHidden$.subscribe((tabHidden) => this.tabHidden = tabHidden);
-    this.loadingBlocks$ = combineLatest([
-      this.stateService.isLoadingWebSocket$,
-      this.stateService.isLoadingMempool$
-    ]).pipe(
-      switchMap(([loadingBlocks, loadingMempool]) => {
-        return of(loadingBlocks || loadingMempool);
-      })
-    );
+    this.stateService.isTabHidden$.subscribe((tabHidden) => this.tabHidden = tabHidden);
+    this.loadingBlocks$ = this.stateService.isLoadingWebSocket$;

    this.mempoolBlocks$ = merge(
      of(true),
@@ -226,7 +217,7 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
    this.networkSubscription = this.stateService.networkChanged$
      .subscribe((network) => this.network = network);

-    this.keySubscription = this.stateService.keyNavigation$.subscribe((event) => {
+    this.stateService.keyNavigation$.subscribe((event) => {
      if (this.markIndex === undefined) {
        return;
      }
@@ -237,12 +228,13 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
        if (this.mempoolBlocks[this.markIndex - 1]) {
          this.router.navigate([this.relativeUrlPipe.transform('mempool-block/'), this.markIndex - 1]);
        } else {
-          const blocks = this.stateService.blocksSubject$.getValue();
-          for (const block of (blocks || [])) {
-            if (this.stateService.latestBlockHeight === block.height) {
-              this.router.navigate([this.relativeUrlPipe.transform('/block/'), block.id], { state: { data: { block } }});
-            }
-          }
+          this.stateService.blocks$
+            .pipe(map((blocks) => blocks[0]))
+            .subscribe((block) => {
+              if (this.stateService.latestBlockHeight === block.height) {
+                this.router.navigate([this.relativeUrlPipe.transform('/block/'), block.id], { state: { data: { block } }});
+              }
+            });
        }
      } else if (event.key === nextKey) {
        if (this.mempoolBlocks[this.markIndex + 1]) {
@@ -266,8 +258,6 @@ export class MempoolBlocksComponent implements OnInit, OnChanges, OnDestroy {
    this.networkSubscription.unsubscribe();
    this.timeLtrSubscription.unsubscribe();
    this.chainTipSubscription.unsubscribe();
-    this.keySubscription.unsubscribe();
-    this.isTabHiddenSubscription.unsubscribe();
    clearTimeout(this.resetTransitionTimeout);
  }

--- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts
+++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.ts
@@ -1,8 +1,6 @@
-import { AfterViewInit, ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { SeoService } from '../../services/seo.service';
 import { WebsocketService } from '../../services/websocket.service';
-import { StateService } from '../../services/state.service';
-import { EventType, NavigationStart, Router } from '@angular/router';

@Component({
  selector: 'app-mining-dashboard',
@@ -10,12 +8,10 @@ import { EventType, NavigationStart, Router } from '@angular/router';
  styleUrls: ['./mining-dashboard.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class MiningDashboardComponent implements OnInit, AfterViewInit {
+export class MiningDashboardComponent implements OnInit {
  constructor(
    private seoService: SeoService,
    private websocketService: WebsocketService,
-    private stateService: StateService,
-    private router: Router
  ) {
    this.seoService.setTitle($localize`:@@a681a4e2011bb28157689dbaa387de0dd0aa0c11:Mining Dashboard`);
  }
@@ -23,15 +19,4 @@ export class MiningDashboardComponent implements OnInit, AfterViewInit {
  ngOnInit(): void {
    this.websocketService.want(['blocks', 'mempool-blocks', 'stats']);
  }
-
-  ngAfterViewInit(): void {
-    this.stateService.focusSearchInputDesktop();
-    this.router.events.subscribe((e: NavigationStart) => {
-      if (e.type === EventType.NavigationStart) {
-        if (e.url.indexOf('graphs') === -1) { // The mining dashboard and the graph component are part of the same module so we can't use ngAfterViewInit in graphs.component.ts to blur the input
-          this.stateService.focusSearchInputDesktop(); 
-        }
-      }
-    });
-  }
 }
--- a/frontend/src/app/components/pool/pool-preview.component.ts
+++ b/frontend/src/app/components/pool/pool-preview.component.ts
@@ -89,7 +89,7 @@ export class PoolPreviewComponent implements OnInit {

          this.openGraphService.waitOver('pool-stats-' + this.slug);

-          const logoSrc = `/resources/mining-pools/` + poolStats.pool.slug + '.svg';
+          const logoSrc = `/resources/mining-pools/` + poolStats.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg';
          if (logoSrc === this.lastImgSrc) {
            this.openGraphService.waitOver('pool-img-' + this.slug);
          }
--- a/frontend/src/app/components/pool/pool.component.ts
+++ b/frontend/src/app/components/pool/pool.component.ts
@@ -79,7 +79,7 @@ export class PoolComponent implements OnInit {
          poolStats.pool.regexes = regexes.slice(0, -3);

          return Object.assign({
-            logo: `/resources/mining-pools/` + poolStats.pool.slug + '.svg'
+            logo: `/resources/mining-pools/` + poolStats.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg'
          }, poolStats);
        })
      );
--- a/frontend/src/app/components/privacy-policy/privacy-policy.component.html
+++ b/frontend/src/app/components/privacy-policy/privacy-policy.component.html
@@ -43,7 +43,7 @@

      <h4>TRUST YOUR OWN SELF-HOSTED MEMPOOL EXPLORER</h4>

-      <p>For maximum privacy, we recommend that you use your own self-hosted instance of The Mempool Open Source Project&reg; on your own hardware. You can easily install your own self-hosted instance of this website on a Raspberry Pi using a one-click installation method maintained by various Bitcoin fullnode distributions such as Umbrel, RaspiBlitz, MyNode, and RoninDojo. See our project's GitHub page for more details about self-hosting this website.</p>
+      <p>For maximum privacy, we recommend that you use your own self-hosted instance of The Mempool Open Source Project&trade; on your own hardware. You can easily install your own self-hosted instance of this website on a Raspberry Pi using a one-click installation method maintained by various Bitcoin fullnode distributions such as Umbrel, RaspiBlitz, MyNode, and RoninDojo. See our project's GitHub page for more details about self-hosting this website.</p>

      <br>

--- a/frontend/src/app/components/search-form/search-form.component.html
+++ b/frontend/src/app/components/search-form/search-form.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="searchForm" (submit)="searchForm.valid && search()" novalidate>
  <div class="d-flex">
    <div class="search-box-container mr-2">
-      <input #searchInput (focus)="focus$.next($any($event).target.value)" (click)="click$.next($any($event).target.value)" formControlName="searchText" type="text" class="form-control" i18n-placeholder="search-form.searchbar-placeholder" placeholder="Explore the full Bitcoin ecosystem">
+      <input autofocus (focus)="focus$.next($any($event).target.value)" (click)="click$.next($any($event).target.value)" formControlName="searchText" type="text" class="form-control" i18n-placeholder="search-form.searchbar-placeholder" placeholder="Explore the full Bitcoin ecosystem">
      <app-search-results #searchResults [hidden]="dropdownHidden" [results]="typeAhead$ | async" (selectedResult)="selectedResult($event)"></app-search-results>
    </div>
    <div>
--- a/frontend/src/app/components/search-form/search-form.component.ts
+++ b/frontend/src/app/components/search-form/search-form.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ChangeDetectionStrategy, EventEmitter, Output, ViewChild, HostListener, ElementRef } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
-import { EventType, NavigationStart, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { AssetsService } from '../../services/assets.service';
 import { StateService } from '../../services/state.service';
 import { Observable, of, Subject, zip, BehaviorSubject, combineLatest } from 'rxjs';
@@ -34,7 +34,7 @@ export class SearchFormComponent implements OnInit {
    }
  }

-  regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[A-z]{2,5}1[a-zA-HJ-NP-Z0-9]{39,59}|04[a-fA-F0-9]{128}|(02|03)[a-fA-F0-9]{64})$/;
+  regexAddress = /^([a-km-zA-HJ-NP-Z1-9]{26,35}|[a-km-zA-HJ-NP-Z1-9]{80}|[A-z]{2,5}1[a-zA-HJ-NP-Z0-9]{39,59}|[0-9a-fA-F]{130})$/;
  regexBlockhash = /^[0]{8}[a-fA-F0-9]{56}$/;
  regexTransaction = /^([a-fA-F0-9]{64})(:\d+)?$/;
  regexBlockheight = /^[0-9]{1,9}$/;
@@ -47,8 +47,6 @@ export class SearchFormComponent implements OnInit {
    this.handleKeyDown($event);
  }

-  @ViewChild('searchInput') searchInput: ElementRef;
-
  constructor(
    private formBuilder: UntypedFormBuilder,
    private router: Router,
@@ -57,26 +55,11 @@ export class SearchFormComponent implements OnInit {
    private electrsApiService: ElectrsApiService,
    private apiService: ApiService,
    private relativeUrlPipe: RelativeUrlPipe,
-    private elementRef: ElementRef
-  ) {
-  }
+    private elementRef: ElementRef,
+  ) { }

  ngOnInit(): void {
    this.stateService.networkChanged$.subscribe((network) => this.network = network);
-    
-    this.router.events.subscribe((e: NavigationStart) => { // Reset search focus when changing page
-      if (this.searchInput && e.type === EventType.NavigationStart) {
-        this.searchInput.nativeElement.blur();
-      }
-    });
-
-    this.stateService.searchFocus$.subscribe(() => {
-      if (!this.searchInput) { // Try again a bit later once the view is properly initialized
-        setTimeout(() => this.searchInput.nativeElement.focus(), 100);
-      } else if (this.searchInput) {
-        this.searchInput.nativeElement.focus();
-      }
-    });

    this.searchForm = this.formBuilder.group({
      searchText: ['', Validators.required],
--- a/frontend/src/app/components/svg-images/svg-images.component.html
+++ b/frontend/src/app/components/svg-images/svg-images.component.html
@@ -60,6 +60,9 @@
  <ng-container *ngSwitchCase="'testnet'">
    <ng-component *ngTemplateOutlet="bitcoinLogo; context: {$implicit: '#5fd15c', width, height, viewBox}"></ng-component>
  </ng-container>
+  <ng-container *ngSwitchCase="'regtest'">
+    <ng-component *ngTemplateOutlet="bitcoinLogo; context: {$implicit: '#a5a5a5', width, height, viewBox}"></ng-component>
+  </ng-container>
  <ng-container *ngSwitchCase="'bisq'">
    <svg xmlns="http://www.w3.org/2000/svg" [attr.width]="width" [attr.height]="height" [attr.viewBox]="viewBox"><path id="Combined-Shape" fill="#25b135" d="M62.6 18.2c2.6 5.7 3.2 6.8 5.2 12.6 1.1 3.6-1.2 9-10.6 4.4-6.8-3.2-11.7-5.5-7.6-10.9 2-2.6 4.2-5 6.6-7.3 2.5-2.2 4.1-3.6 6.4 1.2zm-2.3 36.4c5-4.9 11.9.6 7.1 7.1C57.6 75 40.7 80.3 25.5 74.9S0 55 0 38.3c0-10 3.3-18.4 9.6-25.9C15.7 5.6 24.8.1 33.8 0 46.4 0 52 11 47.6 17.2c-5 6.8-10.7 6.3-15 3.3 0 0-5.9-4.2-7.6-5.6-2.7-2.1-5.6-2.1-6.7 1.3-1.9 6-2.8 9.8-4.3 15.8-.7 3-1 6.1-1.1 9.2 0 5.7 2.5 11.1 6.8 14.6 3 2.8 6.1 5.3 9.5 7.5 2.7 1.9 5.9 2.9 9.1 2.9h.3c3.2-.1 6.4-1.1 9.1-2.9 4.4-2.6 8.6-5.5 12.6-8.7zm-35.4-7c-1.8-.7-5.8-4.2-4.6-6.8.5-1.4 3.9-1.8 5-1.8 6.2-.1 6.5 11.1-.4 8.6zm11.1 12c-.8-.7-2.3-2.2-3.6-3.4-.4-.4-.4-1-.2-1.4.3-.5.8-.8 1.4-.7 2.4-.1 4.8-.1 7.1 0 .6 0 1 .4 1.2.8.2.5.1 1-.3 1.3-1.3 1.2-2.8 2.7-3.5 3.4-.3.3-.7.4-1.1.4-.4 0-.7-.1-1-.4zm14.1-12c-6.9 2.5-6.7-8.8-.4-8.6 1.1 0 4.4.4 5 1.8 1.3 2.7-2.8 6.2-4.6 6.8z"/></svg>
  </ng-container>
--- a/frontend/src/app/components/trademark-policy/trademark-policy.component.html
+++ b/frontend/src/app/components/trademark-policy/trademark-policy.component.html
@@ -7,7 +7,7 @@

  <div *ngIf="officialMempoolSpace">
    <h2>Trademark Policy and Guidelines</h2>
-    <h5>The Mempool Open Source Project &reg;</h5>
+    <h5>The Mempool Open Source Project &trade;</h5>
    <h6>Updated: July 19, 2021</h6>
    <br>

@@ -304,7 +304,7 @@

          <p>Also, if you are using our Marks in a way described in the sections "Uses for Which We Are Granting a License," you must include the following trademark attribution at the foot of the webpage where you have used the Mark (or, if in a book, on the credits page), on any packaging or labeling, and on advertising or marketing materials:</p>

-          <p>“The Mempool Space K.K.&trade;, The Mempool Open Source Project&reg;, mempool.space&trade;, the mempool logo&reg;, the mempool.space logos&trade;, the mempool square logo&reg;, and the mempool blocks logo&trade; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries, and are used with permission. Mempool Space K.K. has no affiliation with and does not sponsor or endorse the information provided herein.”</p>
+          <p>“The Mempool Space K.K.&trade;, The Mempool Open Source Project&trade;, mempool.space&trade;, the mempool logo&reg;, the mempool.space logos&trade;, the mempool square logo&reg;, and the mempool blocks logo&trade; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries, and are used with permission. Mempool Space K.K. has no affiliation with and does not sponsor or endorse the information provided herein.”</p>

          <li>What to Do When You See Abuse</li>

--- a/frontend/src/app/components/transactions-list/transactions-list.component.html
+++ b/frontend/src/app/components/transactions-list/transactions-list.component.html
@@ -23,7 +23,7 @@
            <ng-template ngFor let-vin let-vindex="index" [ngForOf]="tx.vin.slice(0, getVinLimit(tx))" [ngForTrackBy]="trackByIndexFn">
              <tr [ngClass]="{
                'assetBox': (assetsMinimal && vin.prevout && assetsMinimal[vin.prevout.asset] && !vin.is_coinbase && vin.prevout.scriptpubkey_address && tx._unblinded) || inputIndex === vindex,
-                'highlight': this.address !== '' && (vin.prevout?.scriptpubkey_address === this.address || (vin.prevout?.scriptpubkey_type === 'p2pk' && vin.prevout?.scriptpubkey.slice(2, -2) === this.address))
+                'highlight': this.address !== '' && (vin.prevout?.scriptpubkey_address === this.address || (vin.prevout?.scriptpubkey_type === 'p2pk' && vin.prevout?.scriptpubkey.slice(2, 132) === this.address))
              }">
                <td class="arrow-td">
                  <ng-template [ngIf]="vin.prevout === null && !vin.is_pegin" [ngIfElse]="hasPrevout">
@@ -56,8 +56,8 @@
                      <span i18n="transactions-list.peg-in">Peg-in</span>
                    </ng-container>
                    <ng-container *ngSwitchCase="vin.prevout && vin.prevout.scriptpubkey_type === 'p2pk'">
-                      <span>P2PK <a class="address p2pk-address" [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey.slice(2, -2)]" title="{{ vin.prevout.scriptpubkey.slice(2, -2) }}">
-                        <app-truncate [text]="vin.prevout.scriptpubkey.slice(2, -2)" [lastChars]="8"></app-truncate>
+                      <span>P2PK <a class="address p2pk-address" [routerLink]="['/address/' | relativeUrl, vin.prevout.scriptpubkey.slice(2, 132)]" title="{{ vin.prevout.scriptpubkey.slice(2, 132) }}">
+                        <app-truncate [text]="vin.prevout.scriptpubkey.slice(2, 132)" [lastChars]="8"></app-truncate>
                      </a></span>
                    </ng-container>
                    <ng-container *ngSwitchDefault>
@@ -184,7 +184,7 @@
            <ng-template ngFor let-vout let-vindex="index" [ngForOf]="tx.vout.slice(0, getVoutLimit(tx))" [ngForTrackBy]="trackByIndexFn">
              <tr [ngClass]="{
                'assetBox': assetsMinimal && assetsMinimal[vout.asset] && vout.scriptpubkey_address && tx.vin && !tx.vin[0].is_coinbase && tx._unblinded || outputIndex === vindex,
-                'highlight': this.address !== '' && (vout.scriptpubkey_address === this.address || (vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey.slice(2, -2) === this.address))
+                'highlight': this.address !== '' && (vout.scriptpubkey_address === this.address || (vout.scriptpubkey_type === 'p2pk' && vout.scriptpubkey.slice(2, 132) === this.address))
              }">
                <td class="address-cell">
                  <a class="address" *ngIf="vout.scriptpubkey_address; else pubkey_type" [routerLink]="['/address/' | relativeUrl, vout.scriptpubkey_address]" title="{{ vout.scriptpubkey_address }}">
@@ -192,8 +192,8 @@
                  </a>
                  <ng-template #pubkey_type>
                    <ng-container *ngIf="vout.scriptpubkey_type === 'p2pk'; else scriptpubkey_type">
-                      P2PK <a class="address p2pk-address" [routerLink]="['/address/' | relativeUrl, vout.scriptpubkey.slice(2, -2)]" title="{{ vout.scriptpubkey.slice(2, -2) }}">
-                        <app-truncate [text]="vout.scriptpubkey.slice(2, -2)" [lastChars]="8"></app-truncate>
+                      P2PK <a class="address p2pk-address" [routerLink]="['/address/' | relativeUrl, vout.scriptpubkey.slice(2, 132)]" title="{{ vout.scriptpubkey.slice(2, 132) }}">
+                        <app-truncate [text]="vout.scriptpubkey.slice(2, 132)" [lastChars]="8"></app-truncate>
                      </a>
                    </ng-container>
                  </ng-template>
--- a/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts
+++ b/frontend/src/app/components/tx-bowtie-graph/tx-bowtie-graph.component.ts
@@ -92,6 +92,7 @@ export class TxBowtieGraphComponent implements OnInit, OnChanges {
    testnet: ['#4edf77', '#10a0af', '#4edf7700'],
    // signet: ['#6f1d5d', '#471850'],
    signet: ['#d24fc8', '#a84fd2', '#d24fc800'],
+    regtest: ['#9339f4', '#105fb0', '#9339f400'],
  };

  gradient: string[] = ['#105fb0', '#105fb0'];
--- a/frontend/src/app/dashboard/dashboard.component.ts
+++ b/frontend/src/app/dashboard/dashboard.component.ts
@@ -1,7 +1,7 @@
-import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { combineLatest, merge, Observable, of, Subscription } from 'rxjs';
-import { catchError, filter, map, scan, share, switchMap, tap } from 'rxjs/operators';
-import { BlockExtended, OptimizedMempoolStats } from '../interfaces/node-api.interface';
+import { filter, map, scan, share, switchMap, tap } from 'rxjs/operators';
+import { BlockExtended, OptimizedMempoolStats, RbfTree } from '../interfaces/node-api.interface';
 import { MempoolInfo, TransactionStripped, ReplacementInfo } from '../interfaces/websocket.interface';
 import { ApiService } from '../services/api.service';
 import { StateService } from '../services/state.service';
@@ -31,7 +31,7 @@ interface MempoolStatsData {
  styleUrls: ['./dashboard.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
+export class DashboardComponent implements OnInit, OnDestroy {
  featuredAssets$: Observable<any>;
  network$: Observable<string>;
  mempoolBlocksData$: Observable<MempoolBlocksData>;
@@ -57,10 +57,6 @@ export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
    private seoService: SeoService
  ) { }

-  ngAfterViewInit(): void {
-    this.stateService.focusSearchInputDesktop();
-  }
-
  ngOnDestroy(): void {
    this.currencySubscription.unsubscribe();
    this.websocketService.stopTrackRbfSummary();
@@ -159,7 +155,7 @@ export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
            for (const block of blocks) {
              // @ts-ignore: Need to add an extra field for the template
              block.extras.pool.logo = `/resources/mining-pools/` +
-                block.extras.pool.slug + '.svg';
+                block.extras.pool.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg';
            }
          }
          return of(blocks.slice(0, 6));
@@ -171,11 +167,7 @@ export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
    this.mempoolStats$ = this.stateService.connectionState$
      .pipe(
        filter((state) => state === 2),
-        switchMap(() => this.apiService.list2HStatistics$().pipe(
-          catchError((e) => {
-            return of(null);
-          })
-        )),
+        switchMap(() => this.apiService.list2HStatistics$()),
        switchMap((mempoolStats) => {
          return merge(
            this.stateService.live2Chart$
@@ -190,14 +182,10 @@ export class DashboardComponent implements OnInit, OnDestroy, AfterViewInit {
          );
        }),
        map((mempoolStats) => {
-          if (mempoolStats) {
-            return {
-              mempool: mempoolStats,
-              weightPerSecond: this.handleNewMempoolData(mempoolStats.concat([])),
-            };
-          } else {
-            return null;
-          }
+          return {
+            mempool: mempoolStats,
+            weightPerSecond: this.handleNewMempoolData(mempoolStats.concat([])),
+          };
        }),
        share(),
      );
--- a/frontend/src/app/interfaces/node-api.interface.ts
+++ b/frontend/src/app/interfaces/node-api.interface.ts
@@ -110,7 +110,6 @@ export interface PoolInfo {
  regexes: string; // JSON array
  addresses: string; // JSON array
  emptyBlocks: number;
-  slug: string;
 }
 export interface PoolStat {
  pool: PoolInfo;
@@ -175,7 +174,7 @@ export interface TransactionStripped {
  vsize: number;
  value: number;
  rate?: number; // effective fee rate
-  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'rbf';
+  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'fullrbf';
  context?: 'projected' | 'actual';
 }

--- a/frontend/src/app/interfaces/websocket.interface.ts
+++ b/frontend/src/app/interfaces/websocket.interface.ts
@@ -89,7 +89,7 @@ export interface TransactionStripped {
  vsize: number;
  value: number;
  rate?: number; // effective fee rate
-  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'rbf';
+  status?: 'found' | 'missing' | 'sigop' | 'fresh' | 'freshcpfp' | 'added' | 'censored' | 'selected' | 'fullrbf';
  context?: 'projected' | 'actual';
 }

--- a/frontend/src/app/lightning/channel/channel-close-box/channel-close-box.component.html
+++ b/frontend/src/app/lightning/channel/channel-close-box/channel-close-box.component.html
@@ -1,43 +1,19 @@
 <div class="box">
-  <div class="starting-balance" *ngIf="showStartingBalance">
-    <h5 i18n="lightning.starting-balance|Channel starting balance">Starting balance</h5>
-    <div class="nodes">
-      <h5 class="alias">{{ left.alias }}</h5>
-      <h5 class="alias">{{ right.alias }}</h5>
-    </div>
-    <div class="balances">
-      <div class="balance left">
-        <span class="value" *ngIf="minStartingBalance !== maxStartingBalance">{{ minStartingBalance | number : '1.0-0' }} - {{ maxStartingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-        <span class="value" *ngIf="minStartingBalance === maxStartingBalance">{{ minStartingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-      </div>
-      <div class="balance right">
-        <span class="value" *ngIf="minStartingBalance !== maxStartingBalance">{{ channel.capacity - maxStartingBalance | number : '1.0-0' }} - {{ channel.capacity - minStartingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-        <span class="value" *ngIf="minStartingBalance === maxStartingBalance">{{ channel.capacity - maxStartingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-      </div>
-    </div>
-    <div class="balance-bar">
-      <div class="bar left" [class.hide-value]="hideStartingLeft" [style]="startingBalanceStyle.left"></div>
-      <div class="bar center" [style]="startingBalanceStyle.center"></div>
-      <div class="bar right"  [class.hide-value]="hideStartingRight" [style]="startingBalanceStyle.right"></div>
-    </div>
-  </div>
-  <br>
-  <div class="closing-balance" *ngIf="showClosingBalance">
-    <h5 i18n="lightning.closing-balance|Channel closing balance">Closing balance</h5>
-    <div class="balances">
-      <div class="balance left">
-        <span class="value" *ngIf="minClosingBalance !== maxClosingBalance">{{ minClosingBalance | number : '1.0-0' }} - {{ maxClosingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-        <span class="value" *ngIf="minClosingBalance === maxClosingBalance">{{ minClosingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-      </div>
-      <div class="balance right">
-        <span class="value" *ngIf="minClosingBalance !== maxClosingBalance">{{ channel.capacity - maxClosingBalance | number : '1.0-0' }} - {{ channel.capacity - minClosingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-        <span class="value" *ngIf="minClosingBalance === maxClosingBalance">{{ channel.capacity - maxClosingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></span>
-      </div>
-    </div>
-    <div class="balance-bar">
-      <div class="bar left" [class.hide-value]="hideClosingLeft" [style]="closingBalanceStyle.left"></div>
-      <div class="bar center" [style]="closingBalanceStyle.center"></div>
-      <div class="bar right" [class.hide-value]="hideClosingRight" [style]="closingBalanceStyle.right"></div>
-    </div>
-  </div>
+  <table class="table table-borderless table-striped">
+    <tbody>
+      <tr></tr>
+      <tr>
+        <td i18n="lightning.starting-balance|Channel starting balance">Starting balance</td>
+        <td *ngIf="showStartingBalance && minStartingBalance === maxStartingBalance"><app-sats [satoshis]="minStartingBalance"></app-sats></td>
+        <td *ngIf="showStartingBalance && minStartingBalance !== maxStartingBalance">{{ minStartingBalance | number : '1.0-0' }} - {{ maxStartingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></td>
+        <td *ngIf="!showStartingBalance">?</td>
+      </tr>
+      <tr *ngIf="channel.status === 2">
+        <td i18n="lightning.closing-balance|Channel closing balance">Closing balance</td>
+        <td *ngIf="showClosingBalance && minClosingBalance === maxClosingBalance"><app-sats [satoshis]="minClosingBalance"></app-sats></td>
+        <td *ngIf="showClosingBalance && minClosingBalance !== maxClosingBalance">{{ minClosingBalance | number : '1.0-0' }} - {{ maxClosingBalance | number : '1.0-0' }}<app-sats [valueOverride]=" "></app-sats></td>
+        <td *ngIf="!showClosingBalance">?</td>
+      </tr>
+    </tbody>
+  </table>
 </div>
--- a/frontend/src/app/lightning/channel/channel-close-box/channel-close-box.component.scss
+++ b/frontend/src/app/lightning/channel/channel-close-box/channel-close-box.component.scss
@@ -6,98 +6,4 @@
  .box {
    margin-bottom: 20px;
  }
-}
-
-.starting-balance, .closing-balance {
-  width: 100%;
-
-  h5 {
-    text-align: center;
-  }
-}
-
-.nodes {
-  display: none;
-  flex-direction: row;
-  align-items: baseline;
-  justify-content: space-between;
-
-  @media (max-width: 768px) {
-    display: flex;
-	}
-}
-
-.balances {
-  display: flex;
-  flex-direction: row;
-  align-items: baseline;
-  justify-content: space-between;
-  margin-bottom: 8px;
-
-  .balance {
-    &.left {
-      text-align: start;
-    }
-    &.right {
-      text-align: end;
-    }
-  }
-}
-
-.balance-bar {
-  width: 100%;
-  height: 2em;
-  position: relative;
-
-  .bar {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    height: 100%;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-
-    &.left {
-      background: #105fb0;
-    }
-    &.center {
-      background: repeating-linear-gradient(
-        60deg,
-        #105fb0 0,
-        #105fb0 12px,
-        #1a9436 12px,
-        #1a9436 24px
-      );
-    }
-    &.right {
-      background: #1a9436;
-    }
-
-    .value {
-      flex: 0;
-      white-space: nowrap;
-    }
-
-    &.hide-value {
-      .value {
-        display: none;
-      }
-    }
-  }
-
-  @media (max-width: 768px) {
-    height: 1em;
-
-    .bar.center {
-      background: repeating-linear-gradient(
-        60deg,
-        #105fb0 0,
-        #105fb0 8px,
-        #1a9436 8px,
-        #1a9436 16px
-      )
-    }
-	}
 }
--- a/frontend/src/app/lightning/channel/channel-close-box/channel-close-box.component.ts
+++ b/frontend/src/app/lightning/channel/channel-close-box/channel-close-box.component.ts
@@ -8,8 +8,8 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } f
 })
 export class ChannelCloseBoxComponent implements OnChanges {
  @Input() channel: any;
-  @Input() left: any;
-  @Input() right: any;
+  @Input() local: any;
+  @Input() remote: any;

  showStartingBalance: boolean = false;
  showClosingBalance: boolean = false;
@@ -18,55 +18,29 @@ export class ChannelCloseBoxComponent implements OnChanges {
  minClosingBalance: number;
  maxClosingBalance: number;

-  startingBalanceStyle: {
-    left: string,
-    center: string,
-    right: string,
-  } = {
-    left: '',
-    center: '',
-    right: '',
-  };
-
-  closingBalanceStyle: {
-    left: string,
-    center: string,
-    right: string,
-  } = {
-    left: '',
-    center: '',
-    right: '',
-  };
-
-  hideStartingLeft: boolean = false;
-  hideStartingRight: boolean = false;
-  hideClosingLeft: boolean = false;
-  hideClosingRight: boolean = false;
-
  constructor() { }

  ngOnChanges(changes: SimpleChanges): void {
-    let closingCapacity;
-    if (this.channel && this.left && this.right) {
-      this.showStartingBalance = (this.left.funding_balance || this.right.funding_balance) && this.channel.funding_ratio;
-      this.showClosingBalance = this.left.closing_balance || this.right.closing_balance;
+    if (this.channel && this.local && this.remote) {
+      this.showStartingBalance = (this.local.funding_balance || this.remote.funding_balance) && this.channel.funding_ratio;
+      this.showClosingBalance = this.local.closing_balance || this.remote.closing_balance;

      if (this.channel.single_funded) {
-        if (this.left.funding_balance) {
+        if (this.local.funding_balance) {
          this.minStartingBalance = this.channel.capacity;
          this.maxStartingBalance = this.channel.capacity;
-        } else if (this.right.funding_balance) {
+        } else if (this.remote.funding_balance) {
          this.minStartingBalance = 0;
          this.maxStartingBalance = 0;
        }
      } else {
-        this.minStartingBalance = clampRound(0, this.channel.capacity, this.left.funding_balance * this.channel.funding_ratio);
-        this.maxStartingBalance = clampRound(0, this.channel.capacity, this.channel.capacity - (this.right.funding_balance * this.channel.funding_ratio));
+        this.minStartingBalance = clampRound(0, this.channel.capacity, this.local.funding_balance * this.channel.funding_ratio);
+        this.maxStartingBalance = clampRound(0, this.channel.capacity, this.channel.capacity - (this.remote.funding_balance * this.channel.funding_ratio));
      }

-      closingCapacity = this.channel.capacity - this.channel.closing_fee;
-      this.minClosingBalance = clampRound(0, closingCapacity, this.left.closing_balance);
-      this.maxClosingBalance = clampRound(0, closingCapacity, closingCapacity - this.right.closing_balance);
+      const closingCapacity = this.channel.capacity - this.channel.closing_fee;
+      this.minClosingBalance = clampRound(0, closingCapacity, this.local.closing_balance);
+      this.maxClosingBalance = clampRound(0, closingCapacity, closingCapacity - this.remote.closing_balance);

      // margin of error to account for 2 x 330 sat anchor outputs
      if (Math.abs(this.minClosingBalance - this.maxClosingBalance) <= 660) {
@@ -76,26 +50,6 @@ export class ChannelCloseBoxComponent implements OnChanges {
      this.showStartingBalance = false;
      this.showClosingBalance = false;
    }
-
-    const startingMinPc = (this.minStartingBalance / this.channel.capacity) * 100;
-    const startingMaxPc = (this.maxStartingBalance / this.channel.capacity) * 100;
-    this.startingBalanceStyle = {
-      left: `left: 0%; right: ${100 - startingMinPc}%;`,
-      center: `left: ${startingMinPc}%; right: ${100 -startingMaxPc}%;`,
-      right: `left: ${startingMaxPc}%; right: 0%;`,
-    };
-    this.hideStartingLeft = startingMinPc < 15;
-    this.hideStartingRight = startingMaxPc > 85;
-
-    const closingMinPc = (this.minClosingBalance / closingCapacity) * 100;
-    const closingMaxPc = (this.maxClosingBalance / closingCapacity) * 100;
-    this.closingBalanceStyle = {
-      left: `left: 0%; right: ${100 - closingMinPc}%;`,
-      center: `left: ${closingMinPc}%; right: ${100 - closingMaxPc}%;`,
-      right: `left: ${closingMaxPc}%; right: 0%;`,
-    };
-    this.hideClosingLeft = closingMinPc < 15;
-    this.hideClosingRight = closingMaxPc > 85;
  }
 }

--- a/frontend/src/app/lightning/channel/channel.component.html
+++ b/frontend/src/app/lightning/channel/channel.component.html
@@ -75,14 +75,14 @@
  <div class="row row-cols-1 row-cols-md-2" *ngIf="!error">
    <div class="col">
      <app-channel-box [channel]="channel.node_left"></app-channel-box>
+      <app-channel-close-box *ngIf="showCloseBoxes(channel)" [channel]="channel" [local]="channel.node_left" [remote]="channel.node_right"></app-channel-close-box>
    </div>
    <div class="col">
      <app-channel-box [channel]="channel.node_right"></app-channel-box>
+      <app-channel-close-box *ngIf="showCloseBoxes(channel)" [channel]="channel" [local]="channel.node_right" [remote]="channel.node_left"></app-channel-close-box>
    </div>
  </div>

-  <app-channel-close-box *ngIf="showCloseBoxes(channel)" [channel]="channel" [left]="channel.node_left" [right]="channel.node_right"></app-channel-close-box>
-
  <br>

  <ng-container *ngIf="transactions$ | async as transactions">
--- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts
+++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { share } from 'rxjs/operators';
 import { INodesRanking } from '../../interfaces/node-api.interface';
@@ -12,7 +12,7 @@ import { LightningApiService } from '../lightning-api.service';
  styleUrls: ['./lightning-dashboard.component.scss'],
  changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class LightningDashboardComponent implements OnInit, AfterViewInit {
+export class LightningDashboardComponent implements OnInit {
  statistics$: Observable<any>;
  nodesRanking$: Observable<INodesRanking>;
  officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE;
@@ -30,7 +30,4 @@ export class LightningDashboardComponent implements OnInit, AfterViewInit {
    this.statistics$ = this.lightningApiService.getLatestStatistics$().pipe(share());
  }

-  ngAfterViewInit(): void {
-    this.stateService.focusSearchInputDesktop();
-  }
 }
--- a/frontend/src/app/lightning/nodes-map/nodes-map.component.scss
+++ b/frontend/src/app/lightning/nodes-map/nodes-map.component.scss
@@ -14,8 +14,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.scss
+++ b/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.scss
+++ b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.scss
@@ -25,8 +25,7 @@
  flex-direction: column;
  padding: 0px 15px;
  width: 100%;
-  height: calc(100vh - 225px);
-  min-height: 400px;
+  height: calc(100vh - 250px);
  @media (min-width: 992px) {
    height: calc(100vh - 150px);
  }
--- a/frontend/src/app/services/electrs-api.service.ts
+++ b/frontend/src/app/services/electrs-api.service.ts
@@ -67,8 +67,7 @@ export class ElectrsApiService {
  }

  getPubKeyAddress$(pubkey: string): Observable<Address> {
-    const scriptpubkey = (pubkey.length === 130 ? '41' : '21') + pubkey + 'ac';
-    return this.getScriptHash$(scriptpubkey).pipe(
+    return this.getScriptHash$('41' + pubkey + 'ac').pipe(
      switchMap((scripthash: ScriptHash) => {
        return of({
          ...scripthash,
--- a/frontend/src/app/services/enterprise.service.ts
+++ b/frontend/src/app/services/enterprise.service.ts
@@ -38,6 +38,7 @@ export class EnterpriseService {
    this.stateService.env.LIQUID_ENABLED = false;
    this.stateService.env.LIQUID_TESTNET_ENABLED = false;
    this.stateService.env.SIGNET_ENABLED = false;
+    this.stateService.env.REGTEST_ENABLED = false;
    this.stateService.env.BISQ_ENABLED = false;
  }

--- a/frontend/src/app/services/mining.service.ts
+++ b/frontend/src/app/services/mining.service.ts
@@ -96,7 +96,7 @@ export class MiningService {
        share: parseFloat((poolStat.blockCount / stats.blockCount * 100).toFixed(2)),
        lastEstimatedHashrate: (poolStat.blockCount / stats.blockCount * stats.lastEstimatedHashrate / hashrateDivider).toFixed(2),
        emptyBlockRatio: (poolStat.emptyBlocks / poolStat.blockCount * 100).toFixed(2),
-        logo: `/resources/mining-pools/` + poolStat.slug + '.svg',
+        logo: `/resources/mining-pools/` + poolStat.name.toLowerCase().replace(' ', '').replace('.', '') + '.svg',
        ...poolStat
      };
    });
--- a/frontend/src/app/services/navigation.service.ts
+++ b/frontend/src/app/services/navigation.service.ts
@@ -10,6 +10,7 @@ const networkModules = {
      { name: 'mainnet', path: '' },
      { name: 'testnet', path: '/testnet' },
      { name: 'signet', path: '/signet' },
+      { name: 'regtest', path: '/regtest' },
    ],
  },
  liquid: {
@@ -73,7 +74,7 @@ export class NavigationService {
      }
      if (route.url?.length) {
        path = [path, ...route.url.map(segment => segment.path).filter(path => {
-          return path.length && !['testnet', 'signet'].includes(path);
+          return path.length && !['testnet', 'signet', 'regtest'].includes(path);
        })].join('/');
      }
      route = route.firstChild;
--- a/frontend/src/app/services/seo.service.ts
+++ b/frontend/src/app/services/seo.service.ts
@@ -41,6 +41,8 @@ export class SeoService {
      return this.baseTitle + ' - Bitcoin Testnet';
    if (this.network === 'signet')
      return this.baseTitle + ' - Bitcoin Signet';
+    if (this.network === 'regtest')
+      return this.baseTitle + ' - Bitcoin Regtest';
    if (this.network === 'liquid')
      return this.baseTitle + ' - Liquid Network';
    if (this.network === 'liquidtestnet')
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -7,7 +7,6 @@ import { Router, NavigationStart } from '@angular/router';
 import { isPlatformBrowser } from '@angular/common';
 import { filter, map, scan, shareReplay } from 'rxjs/operators';
 import { StorageService } from './storage.service';
-import { hasTouchScreen } from '../shared/pipes/bytes-pipe/utils';

 export interface MarkBlockState {
  blockHeight?: number;
@@ -22,6 +21,7 @@ export interface ILoadingIndicators { [name: string]: number; }
 export interface Env {
  TESTNET_ENABLED: boolean;
  SIGNET_ENABLED: boolean;
+  REGTEST_ENABLED: boolean;
  LIQUID_ENABLED: boolean;
  LIQUID_TESTNET_ENABLED: boolean;
  BISQ_ENABLED: boolean;
@@ -52,6 +52,7 @@ export interface Env {
 const defaultEnv: Env = {
  'TESTNET_ENABLED': false,
  'SIGNET_ENABLED': false,
+  'REGTEST_ENABLED': false,
  'LIQUID_ENABLED': false,
  'LIQUID_TESTNET_ENABLED': false,
  'BASE_MODULE': 'mempool',
@@ -114,7 +115,6 @@ export class StateService {
  mempoolTxPosition$ = new Subject<{ txid: string, position: MempoolPosition}>();
  blockTransactions$ = new Subject<Transaction>();
  isLoadingWebSocket$ = new ReplaySubject<boolean>(1);
-  isLoadingMempool$ = new BehaviorSubject<boolean>(true);
  vbytesPerSecond$ = new ReplaySubject<number>(1);
  previousRetarget$ = new ReplaySubject<number>(1);
  backendInfo$ = new ReplaySubject<IBackendInfo>(1);
@@ -140,8 +140,6 @@ export class StateService {
  fiatCurrency$: BehaviorSubject<string>;
  rateUnits$: BehaviorSubject<string>;

-  searchFocus$: Subject<boolean> = new Subject<boolean>();
-
  constructor(
    @Inject(PLATFORM_ID) private platformId: any,
    @Inject(LOCALE_ID) private locale: string,
@@ -251,9 +249,9 @@ export class StateService {
    // /^\/                                         starts with a forward slash...
    // (?:[a-z]{2}(?:-[A-Z]{2})?\/)?                optional locale prefix (non-capturing)
    // (?:preview\/)?                               optional "preview" prefix (non-capturing)
-    // (bisq|testnet|liquidtestnet|liquid|signet)/  network string (captured as networkMatches[1])
+    // (bisq|testnet|liquidtestnet|liquid|signet|regtest)/  network string (captured as networkMatches[1])
    // ($|\/)                                       network string must end or end with a slash
-    const networkMatches = url.match(/^\/(?:[a-z]{2}(?:-[A-Z]{2})?\/)?(?:preview\/)?(bisq|testnet|liquidtestnet|liquid|signet)($|\/)/);
+    const networkMatches = url.match(/^\/(?:[a-z]{2}(?:-[A-Z]{2})?\/)?(?:preview\/)?(bisq|testnet|liquidtestnet|liquid|signet|regtest)($|\/)/);
    switch (networkMatches && networkMatches[1]) {
      case 'liquid':
        if (this.network !== 'liquid') {
@@ -273,6 +271,12 @@ export class StateService {
          this.networkChanged$.next('signet');
        }
        return;
+      case 'regtest':
+        if (this.network !== 'regtest') {
+          this.network = 'regtest';
+          this.networkChanged$.next('regtest');
+        }
+        return;
      case 'testnet':
        if (this.network !== 'testnet') {
          if (this.env.BASE_MODULE === 'liquid') {
@@ -359,10 +363,4 @@ export class StateService {
    this.blocks = this.blocks.slice(0, this.env.KEEP_BLOCKS_AMOUNT);
    this.blocksSubject$.next(this.blocks);
  }
-
-  focusSearchInputDesktop() {
-    if (!hasTouchScreen()) {
-      this.searchFocus$.next(true);
-    }    
-  }
 }
--- a/frontend/src/app/services/websocket.service.ts
+++ b/frontend/src/app/services/websocket.service.ts
@@ -113,7 +113,7 @@ export class WebsocketService {
          this.stateService.connectionState$.next(2);
        }

-        if (this.stateService.connectionState$.value !== 2) {
+        if (this.stateService.connectionState$.value === 1) {
          this.stateService.connectionState$.next(2);
        }

@@ -368,11 +368,6 @@ export class WebsocketService {

    if (response.loadingIndicators) {
      this.stateService.loadingIndicators$.next(response.loadingIndicators);
-      if (response.loadingIndicators.mempool != null && response.loadingIndicators.mempool < 100) {
-        this.stateService.isLoadingMempool$.next(true);
-      } else {
-        this.stateService.isLoadingMempool$.next(false);
-      }
    }

    if (response.mempoolInfo) {
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -2,10 +2,7 @@
    <div class="container-fluid">
    <div class="row main">
      <div class="offset-lg-1 col-lg-4 col align-self-center branding">
-        <div class="main-logo">
-          <app-svg-images *ngIf="officialMempoolSpace" name="officialMempoolSpace" viewBox="0 0 500 126"></app-svg-images>
-          <app-svg-images *ngIf="!officialMempoolSpace" name="mempoolSpace" viewBox="0 0 500 126"></app-svg-images>
-        </div>
+        <h5><ng-container i18n="about.about-the-project">The Mempool Open Source Project</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></h5>
        <p><ng-container i18n="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></p>
        <div class="selector">
          <app-language-selector></app-language-selector>
@@ -20,16 +17,17 @@
          <a *ngIf="officialMempoolSpace" class="cta btn btn-purple sponsor" [routerLink]="['/signup' | relativeUrl]">Support the Project</a>
          <p *ngIf="officialMempoolSpace && env.BASE_MODULE === 'mempool'" class="cta-secondary"><a [routerLink]="['/signin' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Sign In</a></p>
        </ng-template>
+        <p class="cta-secondary"><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p>
+        <p *ngIf="officialMempoolSpace && env.LIGHTNING" class="cta-secondary"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
+        <p><a [routerLink]="['/about' | relativeUrl]">About The Mempool Open Source Project™</a></p>
      </div>
      <div class="col-lg-6 col-md-10 offset-md-1 links outer">
        <div class="row">
          <div class="col-lg-6">
            <p class="category">Explore</p>
            <p><a [routerLink]="['/mining' | relativeUrl]">Mining Dashboard</a></p>
-            <p><a *ngIf="env.LIGHTNING" [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p>
+            <p><a [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p>
            <p><a [routerLink]="['/blocks' | relativeUrl]">Recent Blocks</a></p>
-            <p><a [routerLink]="['/tx/push' | relativeUrl]" i18n="shared.broadcast-transaction|Broadcast Transaction">Broadcast Transaction</a></p>
-            <p *ngIf="officialMempoolSpace"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
            <p><a [routerLink]="['/docs/api' | relativeUrl]">API Documentation</a></p>
          </div>
          <div class="col-lg-6 links">
@@ -40,22 +38,24 @@
            <p><a [routerLink]="['/docs/faq']" fragment="why-is-transaction-stuck-in-mempool">Why isn't my transaction confirming?</a></p>
            <p><a [routerLink]="['/docs/faq' | relativeUrl]">More FAQs ›</a></p>
          </div>
+          <!--<div class="col-lg-4 links">
+            <p class="category">Connect</p>
+            <p><a href="https://github.com/mempool" target="_blank">GitHub</a></p>
+            <p><a href="https://twitter.com/mempool" target="_blank">Twitter</a></p>
+            <p><a href="nostr:npub18d4r6wanxkyrdfjdrjqzj2ukua5cas669ew2g5w7lf4a8te7awzqey6lt3" target="_blank">Nostr</a></p>
+            <p><a href="https://youtube.com/@mempool" target="_blank">YouTube</a></p>
+            <p><a href="https://bitcointv.com/c/mempool/videos" target="_blank">BitcoinTV</a></p>
+            <p><a href="https://mempool.chat" target="_blank">Matrix</a></p>
+          </div>-->
        </div>
        <div class="row">
-          <div class="col-lg-6 links" *ngIf="officialMempoolSpace || env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.LIQUID_TESTNET_ENABLED">
-            <p class="category">Networks</p>
-            <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== '') && (currentNetwork !== 'mainnet')"><a [href]="networkLink('mainnet')">Mainnet Explorer</a></p>
-            <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== 'testnet') && env.TESTNET_ENABLED"><a [href]="networkLink('testnet')">Testnet Explorer</a></p>
-            <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== 'signet') && env.SIGNET_ENABLED"><a [href]="networkLink('signet')">Signet Explorer</a></p>
-            <p *ngIf="(officialMempoolSpace || env.LIQUID_ENABLED) && (currentNetwork !== 'liquidtestnet')"><a [href]="networkLink('liquidtestnet')">Liquid Testnet Explorer</a></p>
-            <p *ngIf="(officialMempoolSpace || env.LIQUID_ENABLED) && (currentNetwork !== 'liquid')"><a [href]="networkLink('liquid')">Liquid Explorer</a></p>
-            <p *ngIf="(officialMempoolSpace && (currentNetwork !== 'bisq'))"><a [href]="networkLink('bisq')">Bisq Explorer</a></p>
-          </div>
-          <div class="col-lg-6 links" *ngIf="!(officialMempoolSpace || env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.LIQUID_TESTNET_ENABLED)">
-            <p class="category">Tools</p>
-            <p><a [routerLink]="['/clock/mempool/0']">Clock (Mempool)</a></p>
-            <p><a [routerLink]="['/clock/mined/0']">Clock (Mined)</a></p>
-            <p><a [routerLink]="['/tools/calculator']">BTC/Fiat Converter</a></p>
+          <div class="col-lg-6 links">
+            <p class="category">More Networks</p>
+            <p *ngIf="currentNetwork !== '' && currentNetwork !== 'mainnet'"><a [href]="networkLink('mainnet')">Mainnet Explorer</a></p>
+            <p *ngIf="currentNetwork !== 'testnet'"><a [href]="networkLink('testnet')">Testnet Explorer</a></p>
+            <p *ngIf="currentNetwork !== 'signet'"><a [href]="networkLink('signet')">Signet Explorer</a></p>
+            <p *ngIf="currentNetwork !== 'liquid' && currentNetwork !== 'liquidtestnet'"><a [href]="networkLink('liquid')">Liquid Explorer</a></p>
+            <p *ngIf="currentNetwork !== 'bisq'"><a [href]="networkLink('bisq')">Bisq Explorer</a></p>
          </div>
          <div class="col-lg-6 links">
            <p class="category">Legal</p>
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.scss
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss
@@ -21,10 +21,6 @@ footer .row.main .branding {
  text-align: center;
 }

-footer .row.main .branding > p {
-  margin-bottom: 45px;
-}
-
 footer .row.main .branding .btn {
  display: inline-block;
  color: #fff !important;
@@ -93,11 +89,6 @@ footer .row.version p a {
  color: #09a3ba;
 }

-.main-logo {
-  max-width: 220px;
-  margin: 0 auto 20px auto;
-}
-
@media (max-width: 992px) {

  footer .row.main .links.outer {
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.ts
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts
@@ -55,7 +55,7 @@ export class GlobalFooterComponent implements OnInit {

  networkLink(network) {
    const thisNetwork = network || 'mainnet';
-    if( network === '' || network === 'mainnet' || network === 'testnet' || network === 'signet' ) {
+    if( network === '' || network === 'mainnet' || network === 'testnet' || network === 'signet' || network === 'regtest' ) {
      return (this.env.BASE_MODULE === 'mempool' ? '' : this.env.MEMPOOL_WEBSITE_URL + this.urlLanguage) + this.networkPaths[thisNetwork] || '/';
    }
    if( network === 'liquid' || network === 'liquidtestnet' ) {
--- a/frontend/src/app/shared/pipes/bytes-pipe/utils.ts
+++ b/frontend/src/app/shared/pipes/bytes-pipe/utils.ts
@@ -309,28 +309,3 @@ export function takeWhile(input: any[], predicate: CollectionPredicate) {
  return takeUntil(input, (item: any, index: number | undefined, collection: any[] | undefined) =>
    !predicate(item, index, collection));
 }
-
-// https://developer.mozilla.org/en-US/docs/Web/HTTP/Browser_detection_using_the_user_agent
-export function hasTouchScreen(): boolean {
-  let hasTouchScreen = false;
-  if ('maxTouchPoints' in navigator) {
-    hasTouchScreen = navigator.maxTouchPoints > 0;
-  } else if ('msMaxTouchPoints' in navigator) {
-    // @ts-ignore
-    hasTouchScreen = navigator.msMaxTouchPoints > 0;
-  } else {
-    const mQ = matchMedia?.('(pointer:coarse)');
-    if (mQ?.media === '(pointer:coarse)') {
-      hasTouchScreen = !!mQ.matches;
-    } else if ('orientation' in window) {
-      hasTouchScreen = true; // deprecated, but good fallback
-    } else {
-      // @ts-ignore - Only as a last resort, fall back to user agent sniffing
-    const UA = navigator.userAgent;
-      hasTouchScreen =
-        /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) ||
-        /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA);
-    }
-  }
-  return hasTouchScreen;
-}
--- a/frontend/src/index.bisq.html
+++ b/frontend/src/index.bisq.html
@@ -7,7 +7,7 @@
  <script src="/resources/config.js"></script>
  <base href="/">

-  <meta name="description" content="The Mempool Open Source Project® - Explore the full Bitcoin ecosystem.">
+  <meta name="description" content="The Mempool Open Source Project™ - Explore the full Bitcoin ecosystem.">

  <meta property="og:image" content="https://bisq.markets/resources/bisq/bisq-markets-preview.png" />
  <meta property="og:image:type" content="image/jpeg" />
@@ -15,7 +15,7 @@
  <meta property="twitter:card" content="summary_large_image">
  <meta property="twitter:site" content="https://bisq.markets/">
  <meta property="twitter:creator" content="@bisq_network">
-  <meta property="twitter:title" content="The Mempool Open Source Project®">
+  <meta property="twitter:title" content="The Mempool Open Source Project™">
  <meta property="twitter:description" content="Explore the full Bitcoin ecosystem with mempool.space™" />
  <meta property="twitter:image:src" content="https://bisq.markets/resources/bisq/bisq-markets-preview.png" />
  <meta property="twitter:domain" content="bisq.markets">
--- a/frontend/src/index.liquid.html
+++ b/frontend/src/index.liquid.html
@@ -7,7 +7,7 @@
  <script src="/resources/config.js"></script>
  <base href="/">

-  <meta name="description" content="The Mempool Open Source Project® - Explore the full Bitcoin ecosystem.">
+  <meta name="description" content="The Mempool Open Source Project™ - Explore the full Bitcoin ecosystem.">
  <meta property="og:image" content="https://liquid.network/resources/liquid/liquid-network-preview.png" />
  <meta property="og:image:type" content="image/png" />
  <meta property="og:image:width" content="1000" />
@@ -15,7 +15,7 @@
  <meta property="twitter:card" content="summary_large_image">
  <meta property="twitter:site" content="@mempool">
  <meta property="twitter:creator" content="@mempool">
-  <meta property="twitter:title" content="The Mempool Open Source Project®">
+  <meta property="twitter:title" content="The Mempool Open Source Project™">
  <meta property="twitter:description" content="Explore the full Bitcoin ecosystem with mempool.space™" />
  <meta property="twitter:image:src" content="https://liquid.network/resources/liquid/liquid-network-preview.png" />
  <meta property="twitter:domain" content="liquid.network">
--- a/frontend/src/index.mempool.html
+++ b/frontend/src/index.mempool.html
@@ -7,7 +7,7 @@
  <script src="/resources/config.js"></script>
  <base href="/">

-  <meta name="description" content="The Mempool Open Source Project® - Explore the full Bitcoin ecosystem." />
+  <meta name="description" content="The Mempool Open Source Project™ - Explore the full Bitcoin ecosystem." />
  <meta property="og:image" content="https://mempool.space/resources/mempool-space-preview.png" />
  <meta property="og:image:type" content="image/png" />
  <meta property="og:image:width" content="1000" />
@@ -15,7 +15,7 @@
  <meta property="twitter:card" content="summary_large_image">
  <meta property="twitter:site" content="@mempool">
  <meta property="twitter:creator" content="@mempool">
-  <meta property="twitter:title" content="The Mempool Open Source Project®">
+  <meta property="twitter:title" content="The Mempool Open Source Project™">
  <meta property="twitter:description" content="Explore the full Bitcoin ecosystem with mempool.space™" />
  <meta property="twitter:image:src" content="https://mempool.space/resources/mempool-space-preview.png" />
  <meta property="twitter:domain" content="mempool.space">
--- a/frontend/src/resources/mempool-space-preview.png
+++ b/frontend/src/resources/mempool-space-preview.png
--- a/Show More
+++ b/Show More